diff --git a/.core_files.yaml b/.core_files.yaml
index 118346408f8fa1..b1870654be06f2 100644
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -21,11 +21,13 @@ base_platforms: &base_platforms
   - homeassistant/components/climate/**
   - homeassistant/components/cover/**
   - homeassistant/components/date/**
+  - homeassistant/components/datetime/**
   - homeassistant/components/device_tracker/**
   - homeassistant/components/diagnostics/**
   - homeassistant/components/fan/**
   - homeassistant/components/geo_location/**
   - homeassistant/components/humidifier/**
+  - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**
diff --git a/.coveragerc b/.coveragerc
index 792e0c3785ca5f..0d44a63633ae43 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -90,6 +90,8 @@ omit =
     homeassistant/components/atome/*
     homeassistant/components/aurora/__init__.py
     homeassistant/components/aurora/binary_sensor.py
+    homeassistant/components/aurora/coordinator.py
+    homeassistant/components/aurora/entity.py
     homeassistant/components/aurora/sensor.py
     homeassistant/components/avea/light.py
     homeassistant/components/avion/light.py
@@ -122,7 +124,6 @@ omit =
     homeassistant/components/bluetooth_tracker/*
     homeassistant/components/bmw_connected_drive/__init__.py
     homeassistant/components/bmw_connected_drive/binary_sensor.py
-    homeassistant/components/bmw_connected_drive/button.py
     homeassistant/components/bmw_connected_drive/coordinator.py
     homeassistant/components/bmw_connected_drive/lock.py
     homeassistant/components/bmw_connected_drive/notify.py
@@ -181,7 +182,6 @@ omit =
     homeassistant/components/crownstone/listeners.py
     homeassistant/components/cups/sensor.py
     homeassistant/components/currencylayer/sensor.py
-    homeassistant/components/daikin/__init__.py
     homeassistant/components/daikin/climate.py
     homeassistant/components/daikin/sensor.py
     homeassistant/components/daikin/switch.py
@@ -202,6 +202,9 @@ omit =
     homeassistant/components/discogs/sensor.py
     homeassistant/components/discord/__init__.py
     homeassistant/components/discord/notify.py
+    homeassistant/components/discovergy/__init__.py
+    homeassistant/components/discovergy/sensor.py
+    homeassistant/components/discovergy/coordinator.py
     homeassistant/components/dlib_face_detect/image_processing.py
     homeassistant/components/dlib_face_identify/image_processing.py
     homeassistant/components/dlink/data.py
@@ -227,6 +230,7 @@ omit =
     homeassistant/components/dunehd/__init__.py
     homeassistant/components/dunehd/media_player.py
     homeassistant/components/dwd_weather_warnings/const.py
+    homeassistant/components/dwd_weather_warnings/coordinator.py
     homeassistant/components/dwd_weather_warnings/sensor.py
     homeassistant/components/dweet/*
     homeassistant/components/ebox/sensor.py
@@ -300,23 +304,10 @@ omit =
     homeassistant/components/escea/__init__.py
     homeassistant/components/escea/climate.py
     homeassistant/components/escea/discovery.py
-    homeassistant/components/esphome/__init__.py
-    homeassistant/components/esphome/binary_sensor.py
     homeassistant/components/esphome/bluetooth/*
-    homeassistant/components/esphome/button.py
-    homeassistant/components/esphome/camera.py
-    homeassistant/components/esphome/climate.py
-    homeassistant/components/esphome/cover.py
     homeassistant/components/esphome/domain_data.py
     homeassistant/components/esphome/entry_data.py
-    homeassistant/components/esphome/fan.py
-    homeassistant/components/esphome/light.py
-    homeassistant/components/esphome/lock.py
-    homeassistant/components/esphome/media_player.py
-    homeassistant/components/esphome/number.py
-    homeassistant/components/esphome/select.py
-    homeassistant/components/esphome/sensor.py
-    homeassistant/components/esphome/switch.py
+    homeassistant/components/esphome/manager.py
     homeassistant/components/etherscan/sensor.py
     homeassistant/components/eufy/*
     homeassistant/components/eufylife_ble/__init__.py
@@ -326,7 +317,9 @@ omit =
     homeassistant/components/ezviz/__init__.py
     homeassistant/components/ezviz/binary_sensor.py
     homeassistant/components/ezviz/camera.py
+    homeassistant/components/ezviz/light.py
     homeassistant/components/ezviz/coordinator.py
+    homeassistant/components/ezviz/number.py
     homeassistant/components/ezviz/entity.py
     homeassistant/components/ezviz/sensor.py
     homeassistant/components/ezviz/switch.py
@@ -360,10 +353,13 @@ omit =
     homeassistant/components/fitbit/*
     homeassistant/components/fivem/__init__.py
     homeassistant/components/fivem/binary_sensor.py
+    homeassistant/components/fivem/coordinator.py
+    homeassistant/components/fivem/entity.py
     homeassistant/components/fivem/sensor.py
     homeassistant/components/fixer/sensor.py
     homeassistant/components/fjaraskupan/__init__.py
     homeassistant/components/fjaraskupan/binary_sensor.py
+    homeassistant/components/fjaraskupan/coordinator.py
     homeassistant/components/fjaraskupan/fan.py
     homeassistant/components/fjaraskupan/light.py
     homeassistant/components/fjaraskupan/number.py
@@ -418,7 +414,6 @@ omit =
     homeassistant/components/gitlab_ci/sensor.py
     homeassistant/components/gitter/sensor.py
     homeassistant/components/glances/sensor.py
-    homeassistant/components/goalfeed/*
     homeassistant/components/goodwe/__init__.py
     homeassistant/components/goodwe/button.py
     homeassistant/components/goodwe/coordinator.py
@@ -614,7 +609,6 @@ omit =
     homeassistant/components/kwb/sensor.py
     homeassistant/components/lacrosse/sensor.py
     homeassistant/components/lannouncer/notify.py
-    homeassistant/components/lastfm/sensor.py
     homeassistant/components/launch_library/__init__.py
     homeassistant/components/launch_library/sensor.py
     homeassistant/components/lcn/climate.py
@@ -656,6 +650,7 @@ omit =
     homeassistant/components/lookin/light.py
     homeassistant/components/lookin/media_player.py
     homeassistant/components/lookin/sensor.py
+    homeassistant/components/loqed/sensor.py
     homeassistant/components/luci/device_tracker.py
     homeassistant/components/luftdaten/sensor.py
     homeassistant/components/lupusec/*
@@ -863,6 +858,9 @@ omit =
     homeassistant/components/openweathermap/sensor.py
     homeassistant/components/openweathermap/weather_update_coordinator.py
     homeassistant/components/opnsense/__init__.py
+    homeassistant/components/opower/__init__.py
+    homeassistant/components/opower/coordinator.py
+    homeassistant/components/opower/sensor.py
     homeassistant/components/opnsense/device_tracker.py
     homeassistant/components/opple/light.py
     homeassistant/components/oru/*
@@ -945,6 +943,8 @@ omit =
     homeassistant/components/pyload/sensor.py
     homeassistant/components/qbittorrent/__init__.py
     homeassistant/components/qbittorrent/sensor.py
+    homeassistant/components/qnap/__init__.py
+    homeassistant/components/qnap/coordinator.py
     homeassistant/components/qnap/sensor.py
     homeassistant/components/qrcode/image_processing.py
     homeassistant/components/quantum_gateway/device_tracker.py
@@ -972,6 +972,10 @@ omit =
     homeassistant/components/rainmachine/switch.py
     homeassistant/components/rainmachine/update.py
     homeassistant/components/rainmachine/util.py
+    homeassistant/components/renson/__init__.py
+    homeassistant/components/renson/const.py
+    homeassistant/components/renson/entity.py
+    homeassistant/components/renson/sensor.py
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/sensor.py
     homeassistant/components/recorder/repack.py
@@ -1045,12 +1049,6 @@ omit =
     homeassistant/components/sense/__init__.py
     homeassistant/components/sense/binary_sensor.py
     homeassistant/components/sense/sensor.py
-    homeassistant/components/senseme/__init__.py
-    homeassistant/components/senseme/discovery.py
-    homeassistant/components/senseme/entity.py
-    homeassistant/components/senseme/fan.py
-    homeassistant/components/senseme/light.py
-    homeassistant/components/senseme/switch.py
     homeassistant/components/senz/__init__.py
     homeassistant/components/senz/api.py
     homeassistant/components/senz/climate.py
@@ -1297,6 +1295,7 @@ omit =
     homeassistant/components/touchline/climate.py
     homeassistant/components/tplink_lte/*
     homeassistant/components/tplink_omada/__init__.py
+    homeassistant/components/tplink_omada/binary_sensor.py
     homeassistant/components/tplink_omada/controller.py
     homeassistant/components/tplink_omada/coordinator.py
     homeassistant/components/tplink_omada/entity.py
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 237fc2888ab3e9..80291c73e6193c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -59,15 +59,15 @@ body:
     attributes:
       label: Integration causing the issue
       description: >
-        The name of the integration. For example: Automation, Philips Hue
+        The name of the integration, for example Automation or Philips Hue.
   - type: input
     id: integration_link
     attributes:
       label: Link to integration documentation on our website
       placeholder: "https://www.home-assistant.io/integrations/..."
       description: |
-        Providing a link [to the documentation][docs] helps us categorize the
-        issue, while also providing a useful reference for others.
+        Providing a link [to the documentation][docs] helps us categorize the issue and might speed up the
+        investigation by automatically informing a contributor, while also providing a useful reference for others.
 
         [docs]: https://www.home-assistant.io/integrations
 
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 94d4128bc66077..2ee32ca9dbc6e8 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.10"
+  DEFAULT_PYTHON: "3.11"
 
 jobs:
   init:
@@ -24,12 +24,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -48,29 +48,18 @@ jobs:
         with:
           ignore-dev: true
 
-      - name: Generate meta info
-        shell: bash
-        run: |
-          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > OFFICIAL_IMAGE
-
-      - name: Signing meta info file
-        uses: home-assistant/actions/helpers/codenotary@master
-        with:
-          source: file://${{ github.workspace }}/OFFICIAL_IMAGE
-          asset: OFFICIAL_IMAGE-${{ steps.version.outputs.version }}
-          token: ${{ secrets.CAS_TOKEN }}
-
   build_python:
     name: Build PyPi package
-    needs: init
+    environment: ${{ needs.init.outputs.channel }}
+    needs: ["init", "build_base"]
     runs-on: ubuntu-latest
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -100,12 +89,16 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: init
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -123,7 +116,7 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          repo: home-assistant/intents
+          repo: home-assistant/intents-package
           branch: main
           workflow: nightly.yaml
           workflow_conclusion: success
@@ -131,7 +124,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -181,7 +174,7 @@ jobs:
           # will drop the platform in the near future (they consider it
           # "flimsy" on 386). The following packages depend on pandas,
           # so we comment them out.
-          sed -i "s|env_canada|# env_canada|g" requirements_all.txt
+          sed -i "s|env-canada|# env-canada|g" requirements_all.txt
           sed -i "s|noaa-coops|# noaa-coops|g" requirements_all.txt
           sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
@@ -196,25 +189,20 @@ jobs:
         run: |
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.03.0
+        uses: home-assistant/builder@2023.06.1
         with:
           args: |
             $BUILD_ARGS \
             --${{ matrix.arch }} \
+            --cosign \
             --target /data \
             --generic ${{ needs.init.outputs.version }}
         env:
@@ -236,6 +224,10 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       matrix:
         machine:
@@ -261,7 +253,7 @@ jobs:
           - yellow
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set build additional args
         run: |
@@ -274,37 +266,33 @@ jobs:
             echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
           fi
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2023.03.0
+        uses: home-assistant/builder@2023.06.1
         with:
           args: |
             $BUILD_ARGS \
             --target /data/machine \
+            --cosign \
             --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
         env:
           CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
 
   publish_ha:
     name: Publish version files
+    environment: ${{ needs.init.outputs.channel }}
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_machine"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -332,37 +320,36 @@ jobs:
 
   publish_container:
     name: Publish meta container for ${{ matrix.registry }}
+    environment: ${{ needs.init.outputs.channel }}
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        registry:
-          - "ghcr.io/home-assistant"
-          - "homeassistant"
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@v3.1.1
+        with:
+          cosign-release: "v2.0.2"
 
       - name: Login to DockerHub
-        if: matrix.registry == 'homeassistant'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install CAS tools
-        uses: home-assistant/actions/helpers/cas@master
-
       - name: Build Meta Image
         shell: bash
         run: |
@@ -372,55 +359,78 @@ jobs:
             local tag_l=${1}
             local tag_r=${2}
 
-            docker manifest create "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
-              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}"
+            for registry in "ghcr.io/home-assistant" "docker.io/homeassistant"
+            do
+
+              docker manifest create "${registry}/home-assistant:${tag_l}" \
+                "${registry}/amd64-homeassistant:${tag_r}" \
+                "${registry}/i386-homeassistant:${tag_r}" \
+                "${registry}/armhf-homeassistant:${tag_r}" \
+                "${registry}/armv7-homeassistant:${tag_r}" \
+                "${registry}/aarch64-homeassistant:${tag_r}"
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
-              --os linux --arch amd64
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/amd64-homeassistant:${tag_r}" \
+                --os linux --arch amd64
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
-              --os linux --arch 386
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/i386-homeassistant:${tag_r}" \
+                --os linux --arch 386
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v6
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/armhf-homeassistant:${tag_r}" \
+                --os linux --arch arm --variant=v6
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
-              --os linux --arch arm --variant=v7
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/armv7-homeassistant:${tag_r}" \
+                --os linux --arch arm --variant=v7
 
-            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
-              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}" \
-              --os linux --arch arm64 --variant=v8
+              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+                "${registry}/aarch64-homeassistant:${tag_r}" \
+                --os linux --arch arm64 --variant=v8
 
-            docker manifest push --purge "${{ matrix.registry }}/home-assistant:${tag_l}"
+              docker manifest push --purge "${registry}/home-assistant:${tag_l}"
+              cosign sign --yes "${registry}/home-assistant:${tag_l}"
+
+            done
           }
 
           function validate_image() {
             local image=${1}
-            if ! cas authenticate --signerID notary@home-assistant.io "docker://${image}"; then
+            if ! cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp https://github.com/home-assistant/core/.* "${image}"; then
               echo "Invalid signature!"
               exit 1
             fi
           }
 
-          docker pull "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
-
-          validate_image "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+          function push_dockerhub() {
+            local image=${1}
+            local tag=${2}
+
+            docker tag "ghcr.io/home-assistant/${image}:${tag}" "docker.io/homeassistant/${image}:${tag}"
+            docker push "docker.io/homeassistant/${image}:${tag}"
+            cosign sign --yes "docker.io/homeassistant/${image}:${tag}"
+          }
+
+          # Pull images from github container registry and verify signature
+          docker pull "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          validate_image "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          # Upload images to dockerhub
+          push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "i386-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "armhf-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "armv7-homeassistant" "${{ needs.init.outputs.version }}"
+          push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
 
           # Create version tag
           create_manifest "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 583be8f458658a..331a1bc151a5da 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,7 +32,7 @@ env:
   CACHE_VERSION: 5
   PIP_CACHE_VERSION: 4
   MYPY_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2023.6
+  HA_SHORT_VERSION: 2023.8
   DEFAULT_PYTHON: "3.10"
   ALL_PYTHON_VERSIONS: "['3.10', '3.11']"
   # 10.3 is the oldest supported version
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: >-
@@ -206,10 +206,10 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -251,9 +251,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -297,9 +297,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -338,44 +338,6 @@ jobs:
           shopt -s globstar
           pre-commit run --hook-stage manual ruff --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure
 
-  lint-isort:
-    name: Check isort
-    runs-on: ubuntu-22.04
-    needs:
-      - info
-      - pre-commit
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
-        id: python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          check-latest: true
-      - name: Restore base Python virtual environment
-        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: venv
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
-              needs.info.outputs.pre-commit_cache_key }}
-      - name: Restore pre-commit environment from cache
-        id: cache-precommit
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: ${{ env.PRE_COMMIT_CACHE }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-              needs.info.outputs.pre-commit_cache_key }}
-      - name: Run isort
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
-
   lint-other:
     name: Check other linters
     runs-on: ubuntu-22.04
@@ -384,9 +346,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -468,19 +430,6 @@ jobs:
         with:
           args: hadolint Dockerfile.dev
 
-      - name: Run bandit (fully)
-        if: needs.info.outputs.test_full_suite == 'true'
-        run: |
-          . venv/bin/activate
-          pre-commit run --hook-stage manual bandit --all-files --show-diff-on-failure
-      - name: Run bandit (partially)
-        if: needs.info.outputs.test_full_suite == 'false'
-        shell: bash
-        run: |
-          . venv/bin/activate
-          shopt -s globstar
-          pre-commit run --hook-stage manual bandit --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure
-
   base:
     name: Prepare dependencies
     runs-on: ubuntu-22.04
@@ -491,10 +440,10 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -543,10 +492,10 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.2" setuptools wheel
+          pip install --cache-dir=$PIP_CACHE -U "pip>=21.3.1,<23.2" setuptools wheel
           pip install --cache-dir=$PIP_CACHE -r requirements_all.txt
           pip install --cache-dir=$PIP_CACHE -r requirements_test.txt
-          pip install -e .
+          pip install -e . --config-settings editable_mode=compat
 
   hassfest:
     name: Check hassfest
@@ -559,10 +508,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -591,10 +540,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -624,10 +573,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -668,10 +617,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -732,7 +681,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -751,10 +699,10 @@ jobs:
             bluez \
             ffmpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -857,7 +805,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -877,10 +824,10 @@ jobs:
             ffmpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -965,7 +912,6 @@ jobs:
       - base
       - gen-requirements-all
       - hassfest
-      - lint-isort
       - lint-other
       - lint-ruff
       - mypy
@@ -985,10 +931,10 @@ jobs:
             ffmpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1062,12 +1008,12 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v3
       - name: Upload coverage to Codecov (full coverage)
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3.1.3
           with: |
@@ -1077,7 +1023,7 @@ jobs:
           attempt_delay: 30000
       - name: Upload coverage to Codecov (partial coverage)
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3.1.3
           with: |
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index c0593fa3a9a346..2b5364fa950a98 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.0
+      - uses: dessant/lock-threads@v4.0.1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index a18c050024b86f..dd1f3d061a99f7 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.10"
+  DEFAULT_PYTHON: "3.11"
 
 jobs:
   upload:
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index c735a446938496..16bd347d7cf471 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -26,7 +26,7 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Get information
         id: info
@@ -47,10 +47,7 @@ jobs:
             echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
             echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
             echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
-            # GRPC on armv7 needs -lexecinfo (issue #56669) since home assistant installs
-            # execinfo-dev when building wheels. The setuptools build setup does not have an option for
-            # adding a single LDFLAG so copy all relevant linux flags here (as of 1.43.0)
-            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc -lexecinfo"
+            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc"
 
             # Fix out of memory issues with rust
             echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
@@ -83,11 +80,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp310", "cp311"]
+        abi: ["cp311"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -113,7 +110,7 @@ jobs:
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements.txt"
 
-  integrations_cp310:
+  integrations_cp311:
     name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
     if: github.repository_owner == 'home-assistant'
     needs: init
@@ -121,11 +118,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp310"]
+        abi: ["cp311"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -137,144 +134,16 @@ jobs:
         with:
           name: requirements_diff
 
-      - name: Uncomment packages
-        run: |
-          requirement_files="requirements_all.txt requirements_diff.txt"
-          for requirement_file in ${requirement_files}; do
-            sed -i "s|# pybluez|pybluez|g" ${requirement_file}
-            sed -i "s|# beacontools|beacontools|g" ${requirement_file}
-            sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
-            sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
-            sed -i "s|# evdev|evdev|g" ${requirement_file}
-            sed -i "s|# pycups|pycups|g" ${requirement_file}
-            sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
-            sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
-            sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
-          done
-
-      - name: Split requirements all
-        run: |
-          # We split requirements all into two different files.
-          # This is to prevent the build from running out of memory when
-          # resolving packages on 32-bits systems (like armhf, armv7).
-
-          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 2) requirements_all.txt requirements_all.txt
-
-      - name: Adjust build env
-        run: |
-          if [ "${{ matrix.arch }}" = "i386" ]; then
-            echo "NPY_DISABLE_SVML=1" >> .env_file
-          fi
-
-          (
-            # cmake > 3.22.2 have issue on arm
-            # Tested until 3.22.5
-            echo "cmake==3.22.2"
-          ) >> homeassistant/package_constraints.txt
-
-          # Do not pin numpy in wheels building
-          sed -i "/numpy/d" homeassistant/package_constraints.txt
-
-      - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2023.04.0
-        with:
-          abi: ${{ matrix.abi }}
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtaa"
-
-      - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2023.04.0
-        with:
-          abi: ${{ matrix.abi }}
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtab"
-
-  # Wheels building for the cp311 ABI is currently split
-  # This is mainly until we have figured out to get all wheels built.
-  # Without harming our current workflow.
-  integrations_cp311:
-    name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
-    if: github.repository_owner == 'home-assistant'
-    needs: init
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        abi: ["cp311"]
-        arch: ${{ fromJson(needs.init.outputs.architectures) }}
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
-
-      - name: Write alternative env-file for cp311
-        run: |
-          (
-            echo "GRPC_BUILD_WITH_BORING_SSL_ASM=false"
-            echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
-            echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
-            echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
-
-            # GRPC on armv7 needed -lexecinfo (issue #56669) since home assistant installed
-            # execinfo-dev when building wheels. However, this package is no longer available
-            # Alpine 3.17, which we use for the cp311 ABI, so the flag should no longer be needed.
-            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc" # -lexecinfo
-
-            # Fix out of memory issues with rust
-            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
-
-            # OpenCV headless installation
-            echo "CI_BUILD=1"
-            echo "ENABLE_HEADLESS=1"
-
-            # Use C-Extension for sqlalchemy
-            echo "REQUIRE_SQLALCHEMY_CEXT=1"
-          ) > .env_file
-
-      - name: Download requirements_diff
-        uses: actions/download-artifact@v3
-        with:
-          name: requirements_diff
-
       - name: (Un)comment packages
         run: |
           requirement_files="requirements_all.txt requirements_diff.txt"
           for requirement_file in ${requirement_files}; do
-
-            # PyBluez no longer compiles. Commented it out for now.
-            # It need further cleanup down the line, as all machine images
-            # try to install it.
-            # sed -i "s|# pybluez|pybluez|g" ${requirement_file}
-
-            # beacontools requires PyBluez.
-            # sed -i "s|# beacontools|beacontools|g" ${requirement_file}
-
-            # It doesn't build for some reason, so we skip it for now.
-            # Bumping to the latest version (4.7.0.72) supporting Python 3.11
-            # doesn't help. Reverted bump in #91871. There are 8 registered
-            # instances using this integration according to analytics.
-            # sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
-
             sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
             sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
             sed -i "s|# evdev|evdev|g" ${requirement_file}
             sed -i "s|# pycups|pycups|g" ${requirement_file}
             sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
+            sed -i "s|# decora-wifi|decora-wifi|g" ${requirement_file}
             sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
 
             # Some packages are not buildable on armhf anymore
@@ -284,7 +153,7 @@ jobs:
               # will drop the platform in the near future (they consider it
               # "flimsy" on 386). The following packages depend on pandas,
               # so we comment them out.
-              sed -i "s|env_canada|# env_canada|g" ${requirement_file}
+              sed -i "s|env-canada|# env-canada|g" ${requirement_file}
               sed -i "s|noaa-coops|# noaa-coops|g" ${requirement_file}
               sed -i "s|pyezviz|# pyezviz|g" ${requirement_file}
               sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
@@ -297,7 +166,7 @@ jobs:
           # This is to prevent the build from running out of memory when
           # resolving packages on 32-bits systems (like armhf, armv7).
 
-          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 2) requirements_all.txt requirements_all.txt
+          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all.txt requirements_all.txt
 
       - name: Adjust build env
         run: |
@@ -305,13 +174,6 @@ jobs:
             echo "NPY_DISABLE_SVML=1" >> .env_file
           fi
 
-          # Probably not an issue anymore. Removing for now.
-          # (
-          #   # cmake > 3.22.2 have issue on arm
-          #   # Tested until 3.22.5
-          #   echo "cmake==3.22.2"
-          # ) >> homeassistant/package_constraints.txt
-
           # Do not pin numpy in wheels building
           sed -i "/numpy/d" homeassistant/package_constraints.txt
 
@@ -342,3 +204,17 @@ jobs:
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
+
+      - name: Build wheels (part 3)
+        uses: home-assistant/wheels@2023.04.0
+        with:
+          abi: ${{ matrix.abi }}
+          tag: musllinux_1_2
+          arch: ${{ matrix.arch }}
+          wheels-key: ${{ secrets.WHEELS_KEY }}
+          env-file: true
+          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          constraints: "homeassistant/package_constraints.txt"
+          requirements-diff: "requirements_diff.txt"
+          requirements: "requirements_all.txtac"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8e8fef97697573..c662c6754f4c79 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.262
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.272
     hooks:
       - id: ruff
         args:
@@ -22,19 +22,6 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
         exclude: ^tests/fixtures/|homeassistant/generated/
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
-    hooks:
-      - id: bandit
-        args:
-          - --quiet
-          - --format=custom
-          - --configfile=tests/bandit.yaml
-        files: ^(homeassistant|script|tests)/.+\.py$
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
diff --git a/.strict-typing b/.strict-typing
index fc40996a37bf71..67ebca7aea772f 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -49,6 +49,7 @@ homeassistant.components.air_quality.*
 homeassistant.components.airly.*
 homeassistant.components.airvisual.*
 homeassistant.components.airzone.*
+homeassistant.components.airzone_cloud.*
 homeassistant.components.aladdin_connect.*
 homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
@@ -86,6 +87,7 @@ homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
+homeassistant.components.cloud.*
 homeassistant.components.configurator.*
 homeassistant.components.cover.*
 homeassistant.components.cpuspeed.*
@@ -167,8 +169,10 @@ homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
+homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
+homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
@@ -233,12 +237,14 @@ homeassistant.components.oncue.*
 homeassistant.components.onewire.*
 homeassistant.components.open_meteo.*
 homeassistant.components.openexchangerates.*
+homeassistant.components.opensky.*
 homeassistant.components.openuv.*
 homeassistant.components.otbr.*
 homeassistant.components.overkiz.*
 homeassistant.components.peco.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
+homeassistant.components.ping.*
 homeassistant.components.powerwall.*
 homeassistant.components.proximity.*
 homeassistant.components.prusalink.*
@@ -271,7 +277,6 @@ homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.scrape.*
 homeassistant.components.select.*
-homeassistant.components.senseme.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
 homeassistant.components.sensor.*
@@ -304,6 +309,7 @@ homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tautulli.*
 homeassistant.components.tcp.*
+homeassistant.components.text.*
 homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*
diff --git a/CODEOWNERS b/CODEOWNERS
index 406fa6e4f3cf19..16c0426d87f620 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -59,6 +59,8 @@ build.json @home-assistant/supervisor
 /tests/components/airvisual_pro/ @bachya
 /homeassistant/components/airzone/ @Noltari
 /tests/components/airzone/ @Noltari
+/homeassistant/components/airzone_cloud/ @Noltari
+/tests/components/airzone_cloud/ @Noltari
 /homeassistant/components/aladdin_connect/ @mkmer
 /tests/components/aladdin_connect/ @mkmer
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
@@ -211,6 +213,8 @@ build.json @home-assistant/supervisor
 /tests/components/color_extractor/ @GenericStudent
 /homeassistant/components/comfoconnect/ @michaelarnauts
 /tests/components/comfoconnect/ @michaelarnauts
+/homeassistant/components/command_line/ @gjohansson-ST
+/tests/components/command_line/ @gjohansson-ST
 /homeassistant/components/compensation/ @Petro31
 /tests/components/compensation/ @Petro31
 /homeassistant/components/config/ @home-assistant/core
@@ -236,6 +240,8 @@ build.json @home-assistant/supervisor
 /tests/components/daikin/ @fredrike
 /homeassistant/components/date/ @home-assistant/core
 /tests/components/date/ @home-assistant/core
+/homeassistant/components/datetime/ @home-assistant/core
+/tests/components/datetime/ @home-assistant/core
 /homeassistant/components/debugpy/ @frenck
 /tests/components/debugpy/ @frenck
 /homeassistant/components/deconz/ @Kane610
@@ -269,6 +275,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/discogs/ @thibmaek
 /homeassistant/components/discord/ @tkdrob
 /tests/components/discord/ @tkdrob
+/homeassistant/components/discovergy/ @jpbede
+/tests/components/discovergy/ @jpbede
 /homeassistant/components/discovery/ @home-assistant/core
 /tests/components/discovery/ @home-assistant/core
 /homeassistant/components/dlink/ @tkdrob
@@ -283,6 +291,8 @@ build.json @home-assistant/supervisor
 /tests/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /homeassistant/components/dormakaba_dkey/ @emontnemery
 /tests/components/dormakaba_dkey/ @emontnemery
+/homeassistant/components/dremel_3d_printer/ @tkdrob
+/tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/dsmr/ @Robbie1221 @frenck
 /tests/components/dsmr/ @Robbie1221 @frenck
 /homeassistant/components/dsmr_reader/ @depl0y @glodenox
@@ -346,8 +356,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/eq3btsmart/ @rytilahti
 /homeassistant/components/escea/ @lazdavila
 /tests/components/escea/ @lazdavila
-/homeassistant/components/esphome/ @OttoWinter @jesserockz
-/tests/components/esphome/ @OttoWinter @jesserockz
+/homeassistant/components/esphome/ @OttoWinter @jesserockz @bdraco
+/tests/components/esphome/ @OttoWinter @jesserockz @bdraco
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/evil_genius_labs/ @balloob
@@ -442,8 +452,8 @@ build.json @home-assistant/supervisor
 /tests/components/glances/ @engrbm87
 /homeassistant/components/goalzero/ @tkdrob
 /tests/components/goalzero/ @tkdrob
-/homeassistant/components/gogogate2/ @vangorra @bdraco
-/tests/components/gogogate2/ @vangorra @bdraco
+/homeassistant/components/gogogate2/ @vangorra
+/tests/components/gogogate2/ @vangorra
 /homeassistant/components/goodwe/ @mletenay @starkillerOG
 /tests/components/goodwe/ @mletenay @starkillerOG
 /homeassistant/components/google/ @allenporter
@@ -553,12 +563,14 @@ build.json @home-assistant/supervisor
 /tests/components/icloud/ @Quentame @nzapponi
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
+/homeassistant/components/image/ @home-assistant/core
+/tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
 /tests/components/image_processing/ @home-assistant/core
 /homeassistant/components/image_upload/ @home-assistant/core
 /tests/components/image_upload/ @home-assistant/core
-/homeassistant/components/imap/ @engrbm87 @jbouwh
-/tests/components/imap/ @engrbm87 @jbouwh
+/homeassistant/components/imap/ @jbouwh
+/tests/components/imap/ @jbouwh
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
@@ -649,6 +661,8 @@ build.json @home-assistant/supervisor
 /tests/components/lametric/ @robbiet480 @frenck @bachya
 /homeassistant/components/landisgyr_heat_meter/ @vpathuis
 /tests/components/landisgyr_heat_meter/ @vpathuis
+/homeassistant/components/lastfm/ @joostlek
+/tests/components/lastfm/ @joostlek
 /homeassistant/components/launch_library/ @ludeeus @DurgNomis-drol
 /tests/components/launch_library/ @ludeeus @DurgNomis-drol
 /homeassistant/components/laundrify/ @xLarry
@@ -689,6 +703,8 @@ build.json @home-assistant/supervisor
 /tests/components/logi_circle/ @evanjd
 /homeassistant/components/lookin/ @ANMalko @bdraco
 /tests/components/lookin/ @ANMalko @bdraco
+/homeassistant/components/loqed/ @mikewoudenberg
+/tests/components/loqed/ @mikewoudenberg
 /homeassistant/components/lovelace/ @home-assistant/frontend
 /tests/components/lovelace/ @home-assistant/frontend
 /homeassistant/components/luci/ @mzdrale
@@ -771,11 +787,12 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
-/homeassistant/components/myq/ @bdraco @ehendrix23
-/tests/components/myq/ @bdraco @ehendrix23
+/homeassistant/components/myq/ @ehendrix23
+/tests/components/myq/ @ehendrix23
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
+/tests/components/mystrom/ @fabaff
 /homeassistant/components/nam/ @bieniu
 /tests/components/nam/ @bieniu
 /homeassistant/components/nanoleaf/ @milanmeu
@@ -870,6 +887,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/opengarage/ @danielhiversen
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
+/tests/components/openhome/ @bazwilliams
+/homeassistant/components/opensky/ @joostlek
 /homeassistant/components/opentherm_gw/ @mvn23
 /tests/components/opentherm_gw/ @mvn23
 /homeassistant/components/openuv/ @bachya
@@ -878,6 +897,8 @@ build.json @home-assistant/supervisor
 /tests/components/openweathermap/ @fabaff @freekode @nzapponi
 /homeassistant/components/opnsense/ @mtreinish
 /tests/components/opnsense/ @mtreinish
+/homeassistant/components/opower/ @tronikos
+/tests/components/opower/ @tronikos
 /homeassistant/components/oralb/ @bdraco @Lash-L
 /tests/components/oralb/ @bdraco @Lash-L
 /homeassistant/components/oru/ @bvlaicu
@@ -952,6 +973,8 @@ build.json @home-assistant/supervisor
 /tests/components/qingping/ @bdraco @skgsergio
 /homeassistant/components/qld_bushfire/ @exxamalte
 /tests/components/qld_bushfire/ @exxamalte
+/homeassistant/components/qnap/ @disforw
+/tests/components/qnap/ @disforw
 /homeassistant/components/qnap_qsw/ @Noltari
 /tests/components/qnap_qsw/ @Noltari
 /homeassistant/components/quantum_gateway/ @cisasteelersfan
@@ -964,8 +987,8 @@ build.json @home-assistant/supervisor
 /tests/components/radarr/ @tkdrob
 /homeassistant/components/radio_browser/ @frenck
 /tests/components/radio_browser/ @frenck
-/homeassistant/components/radiotherm/ @bdraco @vinnyfuria
-/tests/components/radiotherm/ @bdraco @vinnyfuria
+/homeassistant/components/radiotherm/ @vinnyfuria
+/tests/components/radiotherm/ @vinnyfuria
 /homeassistant/components/rainbird/ @konikvranik @allenporter
 /tests/components/rainbird/ @konikvranik @allenporter
 /homeassistant/components/raincloud/ @vanstinator
@@ -979,8 +1002,8 @@ build.json @home-assistant/supervisor
 /tests/components/rapt_ble/ @sairon
 /homeassistant/components/raspberry_pi/ @home-assistant/core
 /tests/components/raspberry_pi/ @home-assistant/core
-/homeassistant/components/rdw/ @frenck
-/tests/components/rdw/ @frenck
+/homeassistant/components/rdw/ @frenck @joostlek
+/tests/components/rdw/ @frenck @joostlek
 /homeassistant/components/recollect_waste/ @bachya
 /tests/components/recollect_waste/ @bachya
 /homeassistant/components/recorder/ @home-assistant/core
@@ -990,6 +1013,8 @@ build.json @home-assistant/supervisor
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
+/homeassistant/components/renson/ @jimmyd-be
+/tests/components/renson/ @jimmyd-be
 /homeassistant/components/reolink/ @starkillerOG
 /tests/components/reolink/ @starkillerOG
 /homeassistant/components/repairs/ @home-assistant/core
@@ -1059,8 +1084,6 @@ build.json @home-assistant/supervisor
 /tests/components/select/ @home-assistant/core
 /homeassistant/components/sense/ @kbickar
 /tests/components/sense/ @kbickar
-/homeassistant/components/senseme/ @mikelawrence @bdraco
-/tests/components/senseme/ @mikelawrence @bdraco
 /homeassistant/components/sensibo/ @andrey-git @gjohansson-ST
 /tests/components/sensibo/ @andrey-git @gjohansson-ST
 /homeassistant/components/sensirion_ble/ @akx
@@ -1103,8 +1126,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/sky_hub/ @rogerselwyn
 /homeassistant/components/skybell/ @tkdrob
 /tests/components/skybell/ @tkdrob
-/homeassistant/components/slack/ @bachya @tkdrob
-/tests/components/slack/ @bachya @tkdrob
+/homeassistant/components/slack/ @tkdrob
+/tests/components/slack/ @tkdrob
 /homeassistant/components/sleepiq/ @mfugate1 @kbickar
 /tests/components/sleepiq/ @mfugate1 @kbickar
 /homeassistant/components/slide/ @ualex73
@@ -1209,8 +1232,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/synology_srm/ @aerialls
 /homeassistant/components/system_bridge/ @timmo001
 /tests/components/system_bridge/ @timmo001
-/homeassistant/components/tado/ @michaelarnauts
-/tests/components/tado/ @michaelarnauts
+/homeassistant/components/tado/ @michaelarnauts @chiefdragon
+/tests/components/tado/ @michaelarnauts @chiefdragon
 /homeassistant/components/tag/ @balloob @dmulcahey
 /tests/components/tag/ @balloob @dmulcahey
 /homeassistant/components/tailscale/ @frenck
@@ -1283,6 +1306,8 @@ build.json @home-assistant/supervisor
 /tests/components/twentemilieu/ @frenck
 /homeassistant/components/twinkly/ @dr1rrb @Robbie1221
 /tests/components/twinkly/ @dr1rrb @Robbie1221
+/homeassistant/components/twitch/ @joostlek
+/tests/components/twitch/ @joostlek
 /homeassistant/components/ukraine_alarm/ @PaulAnnekov
 /tests/components/ukraine_alarm/ @PaulAnnekov
 /homeassistant/components/unifi/ @Kane610
@@ -1413,6 +1438,8 @@ build.json @home-assistant/supervisor
 /tests/components/yolink/ @matrixd2
 /homeassistant/components/youless/ @gjong
 /tests/components/youless/ @gjong
+/homeassistant/components/youtube/ @joostlek
+/tests/components/youtube/ @joostlek
 /homeassistant/components/zamg/ @killer0071234
 /tests/components/zamg/ @killer0071234
 /homeassistant/components/zengge/ @emontnemery
diff --git a/Dockerfile.dev b/Dockerfile.dev
index de49bb77f12758..857ccfa3997e72 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/README.rst b/README.rst
index 084949dc44e707..0dc98a379a317f 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
 
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
-   :target: https://discord.gg/c5DvZ4e
+   :target: https://www.home-assistant.io/join-chat/
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/master/docs/screenshots.png
    :target: https://demo.home-assistant.io
 .. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/docs/screenshot-integrations.png
diff --git a/build.yaml b/build.yaml
index 11b60a662952df..a181e9d154872b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,14 +1,16 @@
-image: homeassistant/{arch}-homeassistant
-shadow_repository: ghcr.io/home-assistant
+image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.05.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.05.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.05.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.05.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.05.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.06.1
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.06.1
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.06.1
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.06.1
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.06.1
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
+cosign:
+  base_identity: https://github.com/home-assistant/docker/.*
+  identity: https://github.com/home-assistant/core/.*
 labels:
   io.hass.type: core
   org.opencontainers.image.title: Home Assistant
diff --git a/docs/screenshot-integrations.png b/docs/screenshot-integrations.png
index bc304f11b160f2..f169e4486a6547 100644
Binary files a/docs/screenshot-integrations.png and b/docs/screenshot-integrations.png differ
diff --git a/homeassistant/auth/providers/command_line.py b/homeassistant/auth/providers/command_line.py
index f63d6d465f6a3f..bfe8a2fdddb5c4 100644
--- a/homeassistant/auth/providers/command_line.py
+++ b/homeassistant/auth/providers/command_line.py
@@ -13,8 +13,8 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 CONF_ARGS = "args"
 CONF_META = "meta"
diff --git a/homeassistant/auth/providers/homeassistant.py b/homeassistant/auth/providers/homeassistant.py
index 050a0660a6b63b..6f621b93a6af73 100644
--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -16,8 +16,8 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.storage import Store
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"
diff --git a/homeassistant/auth/providers/insecure_example.py b/homeassistant/auth/providers/insecure_example.py
index 47626686f9dff4..f7f01e74c270fb 100644
--- a/homeassistant/auth/providers/insecure_example.py
+++ b/homeassistant/auth/providers/insecure_example.py
@@ -11,8 +11,8 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 USER_SCHEMA = vol.Schema(
     {
diff --git a/homeassistant/auth/providers/legacy_api_password.py b/homeassistant/auth/providers/legacy_api_password.py
index 72ba3b1ecb3e40..0cadbf0758936c 100644
--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -15,8 +15,8 @@
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 AUTH_PROVIDER_TYPE = "legacy_api_password"
 CONF_API_PASSWORD = "api_password"
diff --git a/homeassistant/auth/providers/trusted_networks.py b/homeassistant/auth/providers/trusted_networks.py
index a6c4c19b02fc12..6962671cb2fde9 100644
--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -23,9 +23,9 @@
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from .. import InvalidAuthError
 from ..models import Credentials, RefreshToken, UserMeta
+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 IPAddress = IPv4Address | IPv6Address
 IPNetwork = IPv4Network | IPv6Network
@@ -46,7 +46,7 @@
                     [
                         vol.Or(
                             cv.uuid4_hex,
-                            vol.Schema({vol.Required(CONF_GROUP): cv.uuid4_hex}),
+                            vol.Schema({vol.Required(CONF_GROUP): str}),
                         )
                     ],
                 )
diff --git a/homeassistant/backports/functools.py b/homeassistant/backports/functools.py
new file mode 100644
index 00000000000000..c7ab0d08693921
--- /dev/null
+++ b/homeassistant/backports/functools.py
@@ -0,0 +1,72 @@
+"""Functools backports from standard lib."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from types import GenericAlias
+from typing import Any, Generic, TypeVar, overload
+
+from typing_extensions import Self
+
+_T = TypeVar("_T")
+_R = TypeVar("_R")
+
+
+class cached_property(Generic[_T, _R]):  # pylint: disable=invalid-name
+    """Backport of Python 3.12's cached_property.
+
+    Includes https://github.com/python/cpython/pull/101890/files
+    """
+
+    def __init__(self, func: Callable[[_T], _R]) -> None:
+        """Initialize."""
+        self.func = func
+        self.attrname: Any = None
+        self.__doc__ = func.__doc__
+
+    def __set_name__(self, owner: type[_T], name: str) -> None:
+        """Set name."""
+        if self.attrname is None:
+            self.attrname = name
+        elif name != self.attrname:
+            raise TypeError(
+                "Cannot assign the same cached_property to two different names "
+                f"({self.attrname!r} and {name!r})."
+            )
+
+    @overload
+    def __get__(self, instance: None, owner: type[_T]) -> Self:
+        ...
+
+    @overload
+    def __get__(self, instance: _T, owner: type[_T]) -> _R:
+        ...
+
+    def __get__(self, instance: _T | None, owner: type[_T] | None = None) -> _R | Self:
+        """Get."""
+        if instance is None:
+            return self
+        if self.attrname is None:
+            raise TypeError(
+                "Cannot use cached_property instance without calling __set_name__ on it."
+            )
+        try:
+            cache = instance.__dict__
+        # not all objects have __dict__ (e.g. class defines slots)
+        except AttributeError:
+            msg = (
+                f"No '__dict__' attribute on {type(instance).__name__!r} "
+                f"instance to cache {self.attrname!r} property."
+            )
+            raise TypeError(msg) from None
+        val = self.func(instance)
+        try:
+            cache[self.attrname] = val
+        except TypeError:
+            msg = (
+                f"The '__dict__' attribute on {type(instance).__name__!r} instance "
+                f"does not support item assignment for caching {self.attrname!r} property."
+            )
+            raise TypeError(msg) from None
+        return val
+
+    __class_getitem__ = classmethod(GenericAlias)
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 46bd4b5d881eb7..6a667884962076 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -19,6 +19,7 @@
 from . import config as conf_util, config_entries, core, loader
 from .components import http
 from .const import (
+    FORMAT_DATETIME,
     REQUIRED_NEXT_PYTHON_HA_RELEASE,
     REQUIRED_NEXT_PYTHON_VER,
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
@@ -31,6 +32,7 @@
     entity_registry,
     issue_registry,
     recorder,
+    restore_state,
     template,
 )
 from .helpers.dispatcher import async_dispatcher_send
@@ -247,6 +249,7 @@ def _cache_uname_processor() -> None:
         issue_registry.async_load(hass),
         hass.async_add_executor_job(_cache_uname_processor),
         template.async_load_custom_templates(hass),
+        restore_state.async_load(hass),
     )
 
 
@@ -347,7 +350,6 @@ def async_enable_logging(
     fmt = (
         "%(asctime)s.%(msecs)03d %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
     )
-    datefmt = "%Y-%m-%d %H:%M:%S"
 
     if not log_no_color:
         try:
@@ -362,7 +364,7 @@ def async_enable_logging(
             logging.getLogger().handlers[0].setFormatter(
                 ColoredFormatter(
                     colorfmt,
-                    datefmt=datefmt,
+                    datefmt=FORMAT_DATETIME,
                     reset=True,
                     log_colors={
                         "DEBUG": "cyan",
@@ -378,7 +380,7 @@ def async_enable_logging(
 
     # If the above initialization failed for any reason, setup the default
     # formatting.  If the above succeeds, this will result in a no-op.
-    logging.basicConfig(format=fmt, datefmt=datefmt, level=logging.INFO)
+    logging.basicConfig(format=fmt, datefmt=FORMAT_DATETIME, level=logging.INFO)
 
     # Capture warnings.warn(...) and friends messages in logs.
     # The standard destination for them is stderr, which may end up unnoticed.
@@ -389,6 +391,7 @@ def async_enable_logging(
     logging.getLogger("requests").setLevel(logging.WARNING)
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
+    logging.getLogger("httpx").setLevel(logging.WARNING)
 
     sys.excepthook = lambda *args: logging.getLogger(None).exception(
         "Uncaught exception", exc_info=args  # type: ignore[arg-type]
@@ -435,7 +438,7 @@ def async_enable_logging(
             _LOGGER.error("Error rolling over log file: %s", err)
 
         err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
-        err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))
+        err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
 
         logger = logging.getLogger("")
         logger.addHandler(err_handler)
diff --git a/homeassistant/brands/airzone.json b/homeassistant/brands/airzone.json
new file mode 100644
index 00000000000000..b41d1cb2e1cdef
--- /dev/null
+++ b/homeassistant/brands/airzone.json
@@ -0,0 +1,5 @@
+{
+  "domain": "airzone",
+  "name": "Airzone",
+  "integrations": ["airzone", "airzone_cloud"]
+}
diff --git a/homeassistant/brands/google.json b/homeassistant/brands/google.json
index 3eb2e9e64f014a..ce71457a656d1b 100644
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -17,6 +17,7 @@
     "google",
     "nest",
     "cast",
-    "dialogflow"
+    "dialogflow",
+    "youtube"
   ]
 }
diff --git a/homeassistant/brands/yale.json b/homeassistant/brands/yale.json
index 87c119fdd40ff7..53dc9b43569746 100644
--- a/homeassistant/brands/yale.json
+++ b/homeassistant/brands/yale.json
@@ -1,5 +1,5 @@
 {
   "domain": "yale",
   "name": "Yale",
-  "integrations": ["august", "yale_smart_alarm", "yalexs_ble"]
+  "integrations": ["august", "yale_smart_alarm", "yalexs_ble", "yale_home"]
 }
diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py
index 2546f7629122dc..66a2e3b0db59e9 100644
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -34,6 +34,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
     """An alarm_control_panel implementation for Abode."""
 
     _attr_icon = ICON
+    _attr_name = None
     _attr_code_arm_required = False
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py
index 402b636e5d6124..a10dbc8e664839 100644
--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -42,6 +42,7 @@ async def async_setup_entry(
 class AbodeBinarySensor(AbodeDevice, BinarySensorEntity):
     """A binary sensor implementation for Abode device."""
 
+    _attr_name = None
     _device: ABBinarySensor
 
     @property
diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py
index 17d7b820d45307..afe017bfcc714f 100644
--- a/homeassistant/components/abode/camera.py
+++ b/homeassistant/components/abode/camera.py
@@ -39,6 +39,7 @@ class AbodeCamera(AbodeDevice, Camera):
     """Representation of an Abode camera."""
 
     _device: AbodeCam
+    _attr_name = None
 
     def __init__(self, data: AbodeSystem, device: AbodeDev, event: Event) -> None:
         """Initialize the Abode device."""
diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py
index 507b1284362f61..d504040ee90297 100644
--- a/homeassistant/components/abode/cover.py
+++ b/homeassistant/components/abode/cover.py
@@ -29,6 +29,7 @@ class AbodeCover(AbodeDevice, CoverEntity):
     """Representation of an Abode cover."""
 
     _device: AbodeCV
+    _attr_name = None
 
     @property
     def is_closed(self) -> bool:
diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py
index be69897431fb34..539b89a5546898 100644
--- a/homeassistant/components/abode/light.py
+++ b/homeassistant/components/abode/light.py
@@ -42,6 +42,7 @@ class AbodeLight(AbodeDevice, LightEntity):
     """Representation of an Abode light."""
 
     _device: AbodeLT
+    _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py
index 039b24230998b7..c110b3fd558fff 100644
--- a/homeassistant/components/abode/lock.py
+++ b/homeassistant/components/abode/lock.py
@@ -29,6 +29,7 @@ class AbodeLock(AbodeDevice, LockEntity):
     """Representation of an Abode lock."""
 
     _device: AbodeLK
+    _attr_name = None
 
     def lock(self, **kwargs: Any) -> None:
         """Lock the device."""
diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py
index 87a9f8e9a27401..1e238783221b63 100644
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -12,6 +12,7 @@
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import LIGHT_LUX
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -21,17 +22,14 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=CONST.TEMP_STATUS_KEY,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key=CONST.HUMI_STATUS_KEY,
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
     ),
     SensorEntityDescription(
         key=CONST.LUX_STATUS_KEY,
-        name="Lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
     ),
 )
@@ -71,7 +69,7 @@ def __init__(
         elif description.key == CONST.HUMI_STATUS_KEY:
             self._attr_native_unit_of_measurement = device.humidity_unit
         elif description.key == CONST.LUX_STATUS_KEY:
-            self._attr_native_unit_of_measurement = device.lux_unit
+            self._attr_native_unit_of_measurement = LIGHT_LUX
 
     @property
     def native_value(self) -> float | None:
diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py
index ab83e3a20c1c3a..14bdf4e0caf784 100644
--- a/homeassistant/components/abode/switch.py
+++ b/homeassistant/components/abode/switch.py
@@ -44,6 +44,7 @@ class AbodeSwitch(AbodeDevice, SwitchEntity):
     """Representation of an Abode switch."""
 
     _device: AbodeSW
+    _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn on the device."""
diff --git a/homeassistant/components/accuweather/weather.py b/homeassistant/components/accuweather/weather.py
index 6107285e3760b7..20cb12179eeb3e 100644
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -4,10 +4,13 @@
 from typing import cast
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TIME,
@@ -29,7 +32,16 @@
 from homeassistant.util.dt import utc_from_timestamp
 
 from . import AccuWeatherDataUpdateCoordinator
-from .const import API_METRIC, ATTR_FORECAST, ATTRIBUTION, CONDITION_CLASSES, DOMAIN
+from .const import (
+    API_METRIC,
+    ATTR_DIRECTION,
+    ATTR_FORECAST,
+    ATTR_SPEED,
+    ATTR_VALUE,
+    ATTRIBUTION,
+    CONDITION_CLASSES,
+    DOMAIN,
+)
 
 PARALLEL_UPDATES = 1
 
@@ -50,6 +62,7 @@ class AccuWeatherEntity(
     """Define an AccuWeather entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
         """Initialize."""
@@ -78,35 +91,61 @@ def condition(self) -> str | None:
         except IndexError:
             return None
 
+    @property
+    def cloud_coverage(self) -> float:
+        """Return the Cloud coverage in %."""
+        return cast(float, self.coordinator.data["CloudCover"])
+
+    @property
+    def native_apparent_temperature(self) -> float:
+        """Return the apparent temperature."""
+        return cast(
+            float, self.coordinator.data["ApparentTemperature"][API_METRIC][ATTR_VALUE]
+        )
+
     @property
     def native_temperature(self) -> float:
         """Return the temperature."""
-        return cast(float, self.coordinator.data["Temperature"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Temperature"][API_METRIC][ATTR_VALUE])
 
     @property
     def native_pressure(self) -> float:
         """Return the pressure."""
-        return cast(float, self.coordinator.data["Pressure"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Pressure"][API_METRIC][ATTR_VALUE])
+
+    @property
+    def native_dew_point(self) -> float:
+        """Return the dew point."""
+        return cast(float, self.coordinator.data["DewPoint"][API_METRIC][ATTR_VALUE])
 
     @property
     def humidity(self) -> int:
         """Return the humidity."""
         return cast(int, self.coordinator.data["RelativeHumidity"])
 
+    @property
+    def native_wind_gust_speed(self) -> float:
+        """Return the wind gust speed."""
+        return cast(
+            float, self.coordinator.data["WindGust"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+        )
+
     @property
     def native_wind_speed(self) -> float:
         """Return the wind speed."""
-        return cast(float, self.coordinator.data["Wind"]["Speed"][API_METRIC]["Value"])
+        return cast(
+            float, self.coordinator.data["Wind"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+        )
 
     @property
     def wind_bearing(self) -> int:
         """Return the wind bearing."""
-        return cast(int, self.coordinator.data["Wind"]["Direction"]["Degrees"])
+        return cast(int, self.coordinator.data["Wind"][ATTR_DIRECTION]["Degrees"])
 
     @property
     def native_visibility(self) -> float:
         """Return the visibility."""
-        return cast(float, self.coordinator.data["Visibility"][API_METRIC]["Value"])
+        return cast(float, self.coordinator.data["Visibility"][API_METRIC][ATTR_VALUE])
 
     @property
     def forecast(self) -> list[Forecast] | None:
@@ -117,14 +156,23 @@ def forecast(self) -> list[Forecast] | None:
         return [
             {
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
-                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"]["Value"],
-                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"]["Value"],
-                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"]["Value"],
+                ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
+                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
+                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
+                ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"][ATTR_VALUE],
                 ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
                     "PrecipitationProbabilityDay"
                 ],
-                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"]["Speed"]["Value"],
-                ATTR_FORECAST_WIND_BEARING: item["WindDay"]["Direction"]["Degrees"],
+                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"][ATTR_SPEED][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: item["WindGustDay"][ATTR_SPEED][
+                    ATTR_VALUE
+                ],
+                ATTR_FORECAST_WIND_BEARING: item["WindDay"][ATTR_DIRECTION]["Degrees"],
                 ATTR_FORECAST_CONDITION: [
                     k for k, v in CONDITION_CLASSES.items() if item["IconDay"] in v
                 ][0],
diff --git a/homeassistant/components/acmeda/base.py b/homeassistant/components/acmeda/base.py
index 138587bbad3210..2fc106f75f5b22 100644
--- a/homeassistant/components/acmeda/base.py
+++ b/homeassistant/components/acmeda/base.py
@@ -14,6 +14,7 @@ class AcmedaBase(entity.Entity):
     """Base representation of an Acmeda roller."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
     def __init__(self, roller: aiopulse.Roller) -> None:
         """Initialize the roller."""
@@ -72,11 +73,6 @@ def device_id(self) -> str:
         """Return the ID of this roller."""
         return self.roller.id
 
-    @property
-    def name(self) -> str | None:
-        """Return the name of roller."""
-        return self.roller.name
-
     @property
     def device_info(self) -> entity.DeviceInfo:
         """Return the device info."""
diff --git a/homeassistant/components/acmeda/cover.py b/homeassistant/components/acmeda/cover.py
index 15a20cf693272b..2af985033b6c58 100644
--- a/homeassistant/components/acmeda/cover.py
+++ b/homeassistant/components/acmeda/cover.py
@@ -45,7 +45,9 @@ def async_add_acmeda_covers():
 
 
 class AcmedaCover(AcmedaBase, CoverEntity):
-    """Representation of a Acmeda cover device."""
+    """Representation of an Acmeda cover device."""
+
+    _attr_name = None
 
     @property
     def current_cover_position(self) -> int | None:
diff --git a/homeassistant/components/acmeda/sensor.py b/homeassistant/components/acmeda/sensor.py
index f92d9fcf57b8ad..e8ccb30ada431c 100644
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -40,16 +40,11 @@ def async_add_acmeda_sensors():
 
 
 class AcmedaBattery(AcmedaBase, SensorEntity):
-    """Representation of a Acmeda cover device."""
+    """Representation of an Acmeda cover sensor."""
 
     _attr_device_class = SensorDeviceClass.BATTERY
     _attr_native_unit_of_measurement = PERCENTAGE
 
-    @property
-    def name(self) -> str:
-        """Return the name of roller."""
-        return f"{super().name} Battery"
-
     @property
     def native_value(self) -> float | int | None:
         """Return the state of the device."""
diff --git a/homeassistant/components/adax/climate.py b/homeassistant/components/adax/climate.py
index cc15872dafa098..0db6a3615f6adf 100644
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -1,7 +1,7 @@
 """Support for Adax wifi-enabled home heaters."""
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 from adax import Adax
 from adax_local import Adax as AdaxLocal
@@ -79,7 +79,10 @@ def __init__(self, heater_data: dict[str, Any], adax_data_handler: Adax) -> None
         self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, heater_data["id"])},
-            name=self.name,
+            # Instead of setting the device name to the entity name, adax
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             manufacturer="Adax",
         )
 
diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py
index f24aa20d28d0c9..9f1c0a5b0fe07b 100644
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -39,56 +39,56 @@ class AdGuardHomeEntityDescription(
 SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
     AdGuardHomeEntityDescription(
         key="dns_queries",
-        name="DNS queries",
+        translation_key="dns_queries",
         icon="mdi:magnify",
         native_unit_of_measurement="queries",
         value_fn=lambda adguard: adguard.stats.dns_queries(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_filtering",
-        name="DNS queries blocked",
+        translation_key="dns_queries_blocked",
         icon="mdi:magnify-close",
         native_unit_of_measurement="queries",
         value_fn=lambda adguard: adguard.stats.blocked_filtering(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_percentage",
-        name="DNS queries blocked ratio",
+        translation_key="dns_queries_blocked_ratio",
         icon="mdi:magnify-close",
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda adguard: adguard.stats.blocked_percentage(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_parental",
-        name="Parental control blocked",
+        translation_key="parental_control_blocked",
         icon="mdi:human-male-girl",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_parental(),
     ),
     AdGuardHomeEntityDescription(
         key="blocked_safebrowsing",
-        name="Safe browsing blocked",
+        translation_key="safe_browsing_blocked",
         icon="mdi:shield-half-full",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_safebrowsing(),
     ),
     AdGuardHomeEntityDescription(
         key="enforced_safesearch",
-        name="Safe searches enforced",
+        translation_key="safe_searches_enforced",
         icon="mdi:shield-search",
         native_unit_of_measurement="requests",
         value_fn=lambda adguard: adguard.stats.replaced_safesearch(),
     ),
     AdGuardHomeEntityDescription(
         key="average_speed",
-        name="Average processing speed",
+        translation_key="average_processing_speed",
         icon="mdi:speedometer",
         native_unit_of_measurement=UnitOfTime.MILLISECONDS,
         value_fn=lambda adguard: adguard.stats.avg_processing_time(),
     ),
     AdGuardHomeEntityDescription(
         key="rules_count",
-        name="Rules count",
+        translation_key="rules_count",
         icon="mdi:counter",
         native_unit_of_measurement="rules",
         value_fn=lambda adguard: adguard.filtering.rules_count(allowlist=False),
diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json
index e593d4199a40dd..bde73e82b37b37 100644
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -24,5 +24,53 @@
       "existing_instance_updated": "Updated existing configuration.",
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "dns_queries": {
+        "name": "DNS queries"
+      },
+      "dns_queries_blocked": {
+        "name": "DNS queries blocked"
+      },
+      "dns_queries_blocked_ratio": {
+        "name": "DNS queries blocked ratio"
+      },
+      "parental_control_blocked": {
+        "name": "Parental control blocked"
+      },
+      "safe_browsing_blocked": {
+        "name": "Safe browsing blocked"
+      },
+      "safe_searches_enforced": {
+        "name": "Safe searches enforced"
+      },
+      "average_processing_speed": {
+        "name": "Average processing speed"
+      },
+      "rules_count": {
+        "name": "Rules count"
+      }
+    },
+    "switch": {
+      "protection": {
+        "name": "Protection"
+      },
+      "parental": {
+        "name": "Parental control"
+      },
+      "safe_search": {
+        "name": "Safe search"
+      },
+      "safe_browsing": {
+        "name": "Safe browsing"
+      },
+      "filtering": {
+        "name": "Filtering"
+      },
+      "query_log": {
+        "name": "Query log"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/adguard/switch.py b/homeassistant/components/adguard/switch.py
index a359bf86c2d25d..1020e8690f10a5 100644
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -40,7 +40,7 @@ class AdGuardHomeSwitchEntityDescription(
 SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
     AdGuardHomeSwitchEntityDescription(
         key="protection",
-        name="Protection",
+        translation_key="protection",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.protection_enabled,
         turn_on_fn=lambda adguard: adguard.enable_protection,
@@ -48,7 +48,7 @@ class AdGuardHomeSwitchEntityDescription(
     ),
     AdGuardHomeSwitchEntityDescription(
         key="parental",
-        name="Parental control",
+        translation_key="parental",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.parental.enabled,
         turn_on_fn=lambda adguard: adguard.parental.enable,
@@ -56,7 +56,7 @@ class AdGuardHomeSwitchEntityDescription(
     ),
     AdGuardHomeSwitchEntityDescription(
         key="safesearch",
-        name="Safe search",
+        translation_key="safe_search",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.safesearch.enabled,
         turn_on_fn=lambda adguard: adguard.safesearch.enable,
@@ -64,7 +64,7 @@ class AdGuardHomeSwitchEntityDescription(
     ),
     AdGuardHomeSwitchEntityDescription(
         key="safebrowsing",
-        name="Safe browsing",
+        translation_key="safe_browsing",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.safebrowsing.enabled,
         turn_on_fn=lambda adguard: adguard.safebrowsing.enable,
@@ -72,7 +72,7 @@ class AdGuardHomeSwitchEntityDescription(
     ),
     AdGuardHomeSwitchEntityDescription(
         key="filtering",
-        name="Filtering",
+        translation_key="filtering",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.filtering.enabled,
         turn_on_fn=lambda adguard: adguard.filtering.enable,
@@ -80,7 +80,7 @@ class AdGuardHomeSwitchEntityDescription(
     ),
     AdGuardHomeSwitchEntityDescription(
         key="querylog",
-        name="Query log",
+        translation_key="query_log",
         icon="mdi:shield-check",
         is_on_fn=lambda adguard: adguard.querylog.enabled,
         turn_on_fn=lambda adguard: adguard.querylog.enable,
diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py
index 76d73f75a8b330..17aede2bd2bb06 100644
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -10,6 +10,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 
+from .. import ads
 from . import (
     ADS_TYPEMAP,
     CONF_ADS_FACTOR,
@@ -18,7 +19,6 @@
     STATE_KEY_STATE,
     AdsEntity,
 )
-from .. import ads
 
 DEFAULT_NAME = "ADS sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/advantage_air/climate.py b/homeassistant/components/advantage_air/climate.py
index a13fa95f6ba750..fa9f609ba10605 100644
--- a/homeassistant/components/advantage_air/climate.py
+++ b/homeassistant/components/advantage_air/climate.py
@@ -90,6 +90,17 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_max_temp = 32
     _attr_min_temp = 16
+    _attr_name = None
+
+    _attr_hvac_modes = [
+        HVACMode.OFF,
+        HVACMode.COOL,
+        HVACMode.HEAT,
+        HVACMode.FAN_ONLY,
+        HVACMode.DRY,
+    ]
+
+    _attr_supported_features = ClimateEntityFeature.FAN_MODE
 
     def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an AdvantageAir AC unit."""
@@ -98,36 +109,14 @@ def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         # Set supported features and HVAC modes based on current operating mode
         if self._ac.get(ADVANTAGE_AIR_MYAUTO_ENABLED):
             # MyAuto
-            self._attr_supported_features = (
-                ClimateEntityFeature.FAN_MODE
-                | ClimateEntityFeature.TARGET_TEMPERATURE
+            self._attr_supported_features |= (
+                ClimateEntityFeature.TARGET_TEMPERATURE
                 | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
-            self._attr_hvac_modes = [
-                HVACMode.OFF,
-                HVACMode.COOL,
-                HVACMode.HEAT,
-                HVACMode.FAN_ONLY,
-                HVACMode.DRY,
-                HVACMode.HEAT_COOL,
-            ]
-        elif self._ac.get(ADVANTAGE_AIR_MYTEMP_ENABLED):
-            # MyTemp
-            self._attr_supported_features = ClimateEntityFeature.FAN_MODE
-            self._attr_hvac_modes = [HVACMode.OFF, HVACMode.COOL, HVACMode.HEAT]
-
-        else:
+            self._attr_hvac_modes += [HVACMode.HEAT_COOL]
+        elif not self._ac.get(ADVANTAGE_AIR_MYTEMP_ENABLED):
             # MyZone
-            self._attr_supported_features = (
-                ClimateEntityFeature.FAN_MODE | ClimateEntityFeature.TARGET_TEMPERATURE
-            )
-            self._attr_hvac_modes = [
-                HVACMode.OFF,
-                HVACMode.COOL,
-                HVACMode.HEAT,
-                HVACMode.FAN_ONLY,
-                HVACMode.DRY,
-            ]
+            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
 
         # Add "ezfan" mode if supported
         if self._ac.get(ADVANTAGE_AIR_AUTOFAN):
diff --git a/homeassistant/components/advantage_air/diagnostics.py b/homeassistant/components/advantage_air/diagnostics.py
index 27eaef09b43b6a..4c440610838f6a 100644
--- a/homeassistant/components/advantage_air/diagnostics.py
+++ b/homeassistant/components/advantage_air/diagnostics.py
@@ -9,17 +9,30 @@
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 
-TO_REDACT = ["dealerPhoneNumber", "latitude", "logoPIN", "longitude", "postCode"]
+TO_REDACT = [
+    "dealerPhoneNumber",
+    "latitude",
+    "logoPIN",
+    "longitude",
+    "postCode",
+    "rid",
+    "deviceNames",
+    "deviceIds",
+    "deviceIdsV2",
+    "backupId",
+]
 
 
 async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]["coordinator"].data
+    data = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id].coordinator.data
 
     # Return only the relevant children
     return {
-        "aircons": data["aircons"],
+        "aircons": data.get("aircons"),
+        "myLights": data.get("myLights"),
+        "myThings": data.get("myThings"),
         "system": async_redact_data(data["system"], TO_REDACT),
     }
diff --git a/homeassistant/components/advantage_air/entity.py b/homeassistant/components/advantage_air/entity.py
index bbc8738c4ae7a4..9e4f92e8c98baa 100644
--- a/homeassistant/components/advantage_air/entity.py
+++ b/homeassistant/components/advantage_air/entity.py
@@ -84,6 +84,8 @@ def _zone(self) -> dict[str, Any]:
 class AdvantageAirThingEntity(AdvantageAirEntity):
     """Parent class for Advantage Air Things Entities."""
 
+    _attr_name = None
+
     def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
         """Initialize common aspects of an Advantage Air Things entity."""
         super().__init__(instance)
diff --git a/homeassistant/components/advantage_air/light.py b/homeassistant/components/advantage_air/light.py
index 13a77d5cab352f..7815354dd928f4 100644
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -41,6 +41,7 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
     """Representation of Advantage Air Light."""
 
     _attr_supported_color_modes = {ColorMode.ONOFF}
+    _attr_name = None
 
     def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
         """Initialize an Advantage Air Light."""
diff --git a/homeassistant/components/advantage_air/manifest.json b/homeassistant/components/advantage_air/manifest.json
index ed9d3bff9891be..a07d14896eb062 100644
--- a/homeassistant/components/advantage_air/manifest.json
+++ b/homeassistant/components/advantage_air/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["advantage_air"],
   "quality_scale": "platinum",
-  "requirements": ["advantage_air==0.4.4"]
+  "requirements": ["advantage-air==0.4.4"]
 }
diff --git a/homeassistant/components/airly/sensor.py b/homeassistant/components/airly/sensor.py
index 53e15c651a7b73..cfbe7b98883699 100644
--- a/homeassistant/components/airly/sensor.py
+++ b/homeassistant/components/airly/sensor.py
@@ -80,7 +80,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_PM1,
         device_class=SensorDeviceClass.PM1,
-        translation_key="pm1",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -88,7 +87,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_PM25,
         device_class=SensorDeviceClass.PM25,
-        translation_key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -100,7 +98,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_PM10,
         device_class=SensorDeviceClass.PM10,
-        translation_key="pm10",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -112,7 +109,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
@@ -120,7 +116,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_PRESSURE,
         device_class=SensorDeviceClass.PRESSURE,
-        translation_key="pressure",
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -128,7 +123,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_TEMPERATURE,
         device_class=SensorDeviceClass.TEMPERATURE,
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
@@ -147,7 +141,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_NO2,
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        translation_key="no2",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -159,7 +152,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_SO2,
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        translation_key="so2",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -171,7 +163,6 @@ class AirlySensorEntityDescription(SensorEntityDescription):
     AirlySensorEntityDescription(
         key=ATTR_API_O3,
         device_class=SensorDeviceClass.OZONE,
-        translation_key="o3",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index 50ebdd6d4dd0d9..7ec58ccd8e51be 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -32,35 +32,8 @@
       "caqi": {
         "name": "Common air quality index"
       },
-      "pm1": {
-        "name": "[%key:component::sensor::entity_component::pm1::name%]"
-      },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "pressure": {
-        "name": "[%key:component::sensor::entity_component::pressure::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
       "co": {
         "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
-      },
-      "no2": {
-        "name": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]"
-      },
-      "so2": {
-        "name": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
-      },
-      "o3": {
-        "name": "[%key:component::sensor::entity_component::ozone::name%]"
       }
     }
   }
diff --git a/homeassistant/components/airnow/const.py b/homeassistant/components/airnow/const.py
index 67a9289efc540f..34b1f4392bc557 100644
--- a/homeassistant/components/airnow/const.py
+++ b/homeassistant/components/airnow/const.py
@@ -17,5 +17,3 @@
 ATTR_API_STATION_LONGITUDE = "Longitude"
 DEFAULT_NAME = "AirNow"
 DOMAIN = "airnow"
-SENSOR_AQI_ATTR_DESCR = "description"
-SENSOR_AQI_ATTR_LEVEL = "level"
diff --git a/homeassistant/components/airnow/sensor.py b/homeassistant/components/airnow/sensor.py
index decec74ee47fc4..f3d29cc65df444 100644
--- a/homeassistant/components/airnow/sensor.py
+++ b/homeassistant/components/airnow/sensor.py
@@ -1,7 +1,12 @@
 """Support for the AirNow sensor service."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any
+
 from homeassistant.components.sensor import (
+    SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
@@ -12,7 +17,10 @@
     CONCENTRATION_PARTS_PER_MILLION,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AirNowDataUpdateCoordinator
@@ -22,36 +30,60 @@
     ATTR_API_AQI_LEVEL,
     ATTR_API_O3,
     ATTR_API_PM25,
+    DEFAULT_NAME,
     DOMAIN,
-    SENSOR_AQI_ATTR_DESCR,
-    SENSOR_AQI_ATTR_LEVEL,
 )
 
 ATTRIBUTION = "Data provided by AirNow"
 
 PARALLEL_UPDATES = 1
 
-SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
+ATTR_DESCR = "description"
+ATTR_LEVEL = "level"
+
+
+@dataclass
+class AirNowEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[Any], StateType]
+    extra_state_attributes_fn: Callable[[Any], dict[str, str]] | None
+
+
+@dataclass
+class AirNowEntityDescription(SensorEntityDescription, AirNowEntityDescriptionMixin):
+    """Describes Airnow sensor entity."""
+
+
+SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
+    AirNowEntityDescription(
         key=ATTR_API_AQI,
         icon="mdi:blur",
-        name=ATTR_API_AQI,
-        native_unit_of_measurement="aqi",
         state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.AQI,
+        value_fn=lambda data: data.get(ATTR_API_AQI),
+        extra_state_attributes_fn=lambda data: {
+            ATTR_DESCR: data[ATTR_API_AQI_DESCRIPTION],
+            ATTR_LEVEL: data[ATTR_API_AQI_LEVEL],
+        },
     ),
-    SensorEntityDescription(
+    AirNowEntityDescription(
         key=ATTR_API_PM25,
         icon="mdi:blur",
-        name=ATTR_API_PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.PM25,
+        value_fn=lambda data: data.get(ATTR_API_PM25),
+        extra_state_attributes_fn=None,
     ),
-    SensorEntityDescription(
+    AirNowEntityDescription(
         key=ATTR_API_O3,
+        translation_key="o3",
         icon="mdi:blur",
-        name=ATTR_API_O3,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.get(ATTR_API_O3),
+        extra_state_attributes_fn=None,
     ),
 )
 
@@ -73,38 +105,38 @@ class AirNowSensor(CoordinatorEntity[AirNowDataUpdateCoordinator], SensorEntity)
     """Define an AirNow sensor."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+
+    entity_description: AirNowEntityDescription
 
     def __init__(
         self,
         coordinator: AirNowDataUpdateCoordinator,
-        description: SensorEntityDescription,
+        description: AirNowEntityDescription,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
         self.entity_description = description
-        self._state = None
-        self._attrs: dict[str, str] = {}
-        self._attr_name = f"AirNow {description.name}"
         self._attr_unique_id = (
             f"{coordinator.latitude}-{coordinator.longitude}-{description.key.lower()}"
         )
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, self._attr_unique_id)},
+            manufacturer=DEFAULT_NAME,
+            name=DEFAULT_NAME,
+        )
 
     @property
-    def native_value(self):
+    def native_value(self) -> StateType:
         """Return the state."""
-        self._state = self.coordinator.data.get(self.entity_description.key)
-
-        return self._state
+        return self.entity_description.value_fn(self.coordinator.data)
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, str] | None:
         """Return the state attributes."""
-        if self.entity_description.key == ATTR_API_AQI:
-            self._attrs[SENSOR_AQI_ATTR_DESCR] = self.coordinator.data[
-                ATTR_API_AQI_DESCRIPTION
-            ]
-            self._attrs[SENSOR_AQI_ATTR_LEVEL] = self.coordinator.data[
-                ATTR_API_AQI_LEVEL
-            ]
-
-        return self._attrs
+        if self.entity_description.extra_state_attributes_fn:
+            return self.entity_description.extra_state_attributes_fn(
+                self.coordinator.data
+            )
+        return None
diff --git a/homeassistant/components/airnow/strings.json b/homeassistant/components/airnow/strings.json
index 0e86c4531dc64b..aed12596176cc6 100644
--- a/homeassistant/components/airnow/strings.json
+++ b/homeassistant/components/airnow/strings.json
@@ -20,5 +20,12 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "o3": {
+        "name": "[%key:component::sensor::entity_component::ozone::name%]"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airq/sensor.py b/homeassistant/components/airq/sensor.py
index 7f0d51fcaa87c2..9974307b4cd3ad 100644
--- a/homeassistant/components/airq/sensor.py
+++ b/homeassistant/components/airq/sensor.py
@@ -53,63 +53,62 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
 SENSOR_TYPES: list[AirQEntityDescription] = [
     AirQEntityDescription(
         key="c2h4o",
-        name="Acetaldehyde",
+        translation_key="acetaldehyde",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c2h4o"),
     ),
     AirQEntityDescription(
         key="nh3_MR100",
-        name="Ammonia",
+        translation_key="ammonia",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("nh3_MR100"),
     ),
     AirQEntityDescription(
         key="ash3",
-        name="Arsine",
+        translation_key="arsine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ash3"),
     ),
     AirQEntityDescription(
         key="br2",
-        name="Bromine",
+        translation_key="bromine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("br2"),
     ),
     AirQEntityDescription(
         key="ch4s",
-        name="CH4S",
+        translation_key="methanethiol",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch4s"),
     ),
     AirQEntityDescription(
         key="cl2_M20",
-        name="Chlorine",
+        translation_key="chlorine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("cl2_M20"),
     ),
     AirQEntityDescription(
         key="clo2",
-        name="ClO2",
+        translation_key="chlorine_dioxide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("clo2"),
     ),
     AirQEntityDescription(
         key="co",
-        name="CO",
+        translation_key="carbon_monoxide",
         native_unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("co"),
     ),
     AirQEntityDescription(
         key="co2",
-        name="CO2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
@@ -117,14 +116,14 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="cs2",
-        name="CS2",
+        translation_key="carbon_disulfide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("cs2"),
     ),
     AirQEntityDescription(
         key="dewpt",
-        name="Dew point",
+        translation_key="dew_point",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("dewpt"),
@@ -132,63 +131,63 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="ethanol",
-        name="Ethanol",
+        translation_key="ethanol",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ethanol"),
     ),
     AirQEntityDescription(
         key="c2h4",
-        name="Ethylene",
+        translation_key="ethylene",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c2h4"),
     ),
     AirQEntityDescription(
         key="ch2o_M10",
-        name="Formaldehyde",
+        translation_key="formaldehyde",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch2o_M10"),
     ),
     AirQEntityDescription(
         key="f2",
-        name="Fluorine",
+        translation_key="fluorine",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("f2"),
     ),
     AirQEntityDescription(
         key="h2s",
-        name="H2S",
+        translation_key="hydrogen_sulfide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2s"),
     ),
     AirQEntityDescription(
         key="hcl",
-        name="HCl",
+        translation_key="hydrochloric_acid",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hcl"),
     ),
     AirQEntityDescription(
         key="hcn",
-        name="HCN",
+        translation_key="hydrogen_cyanide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hcn"),
     ),
     AirQEntityDescription(
         key="hf",
-        name="HF",
+        translation_key="hydrogen_fluoride",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("hf"),
     ),
     AirQEntityDescription(
         key="health",
-        name="Health Index",
+        translation_key="health_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:heart-pulse",
@@ -196,7 +195,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -204,7 +202,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="humidity_abs",
-        name="Absolute humidity",
+        translation_key="absolute_humidity",
         native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("humidity_abs"),
@@ -212,28 +210,27 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="h2_M1000",
-        name="Hydrogen",
+        translation_key="hydrogen",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2_M1000"),
     ),
     AirQEntityDescription(
         key="h2o2",
-        name="Hydrogen peroxide",
+        translation_key="hydrogen_peroxide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("h2o2"),
     ),
     AirQEntityDescription(
         key="ch4_MIPEX",
-        name="Methane",
+        translation_key="methane",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ch4_MIPEX"),
     ),
     AirQEntityDescription(
         key="n2o",
-        name="N2O",
         device_class=SensorDeviceClass.NITROUS_OXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -241,7 +238,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="no_M250",
-        name="NO",
         device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -249,7 +245,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="no2",
-        name="NO2",
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -257,14 +252,14 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="acid_M100",
-        name="Organic acid",
+        translation_key="organic_acid",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("acid_M100"),
     ),
     AirQEntityDescription(
         key="oxygen",
-        name="Oxygen",
+        translation_key="oxygen",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("oxygen"),
@@ -272,7 +267,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="o3",
-        name="Ozone",
         device_class=SensorDeviceClass.OZONE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -280,7 +274,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="performance",
-        name="Performance Index",
+        translation_key="performance_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:head-check",
@@ -288,14 +282,13 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="ph3",
-        name="PH3",
+        translation_key="hydrogen_phosphide",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("ph3"),
     ),
     AirQEntityDescription(
         key="pm1",
-        name="PM1",
         device_class=SensorDeviceClass.PM1,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -304,7 +297,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="pm2_5",
-        name="PM2.5",
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -313,7 +305,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="pm10",
-        name="PM10",
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -322,7 +313,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="pressure",
-        name="Pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
@@ -330,7 +320,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="pressure_rel",
-        name="Relative pressure",
+        translation_key="relative_pressure",
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("pressure_rel"),
@@ -338,28 +328,27 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="c3h8_MIPEX",
-        name="Propane",
+        translation_key="propane",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("c3h8_MIPEX"),
     ),
     AirQEntityDescription(
         key="refigerant",
-        name="Refrigerant",
+        translation_key="refigerant",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("refigerant"),
     ),
     AirQEntityDescription(
         key="sih4",
-        name="SiH4",
+        translation_key="silicon_hydride",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sih4"),
     ),
     AirQEntityDescription(
         key="so2",
-        name="SO2",
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -367,7 +356,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="sound",
-        name="Noise",
+        translation_key="noise",
         native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sound"),
@@ -375,7 +364,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="sound_max",
-        name="Noise (Maximum)",
+        translation_key="maximum_noise",
         native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("sound_max"),
@@ -383,7 +372,7 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="radon",
-        name="Radon",
+        translation_key="radon",
         native_unit_of_measurement=ACTIVITY_BECQUEREL_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("radon"),
@@ -391,7 +380,6 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -399,21 +387,22 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)
     ),
     AirQEntityDescription(
         key="tvoc",
-        name="VOC",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("tvoc"),
     ),
     AirQEntityDescription(
         key="tvoc_ionsc",
-        name="VOC (Industrial)",
+        translation_key="industrial_volatile_organic_compounds",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("tvoc_ionsc"),
     ),
     AirQEntityDescription(
         key="virus",
-        name="Virus Index",
+        translation_key="virus_index",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:virus-off",
diff --git a/homeassistant/components/airq/strings.json b/homeassistant/components/airq/strings.json
index 3618d9d517e092..8628ede4116365 100644
--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -18,5 +18,117 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "acetaldehyde": {
+        "name": "Acetaldehyde"
+      },
+      "ammonia": {
+        "name": "Ammonia"
+      },
+      "arsine": {
+        "name": "Arsine"
+      },
+      "bromine": {
+        "name": "Bromine"
+      },
+      "methanethiol": {
+        "name": "Methanethiol"
+      },
+      "chlorine": {
+        "name": "Chlorine"
+      },
+      "chlorine_dioxide": {
+        "name": "Chlorine dioxide"
+      },
+      "carbon_disulfide": {
+        "name": "Carbon disulfide"
+      },
+      "carbon_monoxide": {
+        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
+      },
+      "dew_point": {
+        "name": "Dew point"
+      },
+      "ethanol": {
+        "name": "Ethanol"
+      },
+      "ethylene": {
+        "name": "Ethylene"
+      },
+      "formaldehyde": {
+        "name": "Formaldehyde"
+      },
+      "fluorine": {
+        "name": "Fluorine"
+      },
+      "hydrogen_sulfide": {
+        "name": "Hydrogen sulfide"
+      },
+      "hydrochloric_acid": {
+        "name": "Hydrochloric acid"
+      },
+      "hydrogen_cyanide": {
+        "name": "Hydrogen cyanide"
+      },
+      "hydrogen_fluoride": {
+        "name": "Hydrogen fluoride"
+      },
+      "health_index": {
+        "name": "Health Index"
+      },
+      "absolute_humidity": {
+        "name": "Absolute humidity"
+      },
+      "hydrogen": {
+        "name": "Hydrogen"
+      },
+      "hydrogen_peroxide": {
+        "name": "Hydrogen peroxide"
+      },
+      "methane": {
+        "name": "Methane"
+      },
+      "organic_acid": {
+        "name": "Organic acid"
+      },
+      "oxygen": {
+        "name": "Oxygen"
+      },
+      "performance_index": {
+        "name": "Performance Index"
+      },
+      "hydrogen_phosphide": {
+        "name": "Hydrogen Phosphide"
+      },
+      "relative_pressure": {
+        "name": "Relative pressure"
+      },
+      "propane": {
+        "name": "Propane"
+      },
+      "refigerant": {
+        "name": "Refrigerant"
+      },
+      "silicon_hydride": {
+        "name": "Silicon Hydride"
+      },
+      "noise": {
+        "name": "Noise"
+      },
+      "maximum_noise": {
+        "name": "Noise (Maximum)"
+      },
+      "radon": {
+        "name": "Radon"
+      },
+      "industrial_volatile_organic_compounds": {
+        "name": "VOCs (Industrial)"
+      },
+      "virus_index": {
+        "name": "Virus Index"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airthings/manifest.json b/homeassistant/components/airthings/manifest.json
index 6e30048d844dab..da7f30679c63a9 100644
--- a/homeassistant/components/airthings/manifest.json
+++ b/homeassistant/components/airthings/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airthings",
   "iot_class": "cloud_polling",
   "loggers": ["airthings"],
-  "requirements": ["airthings_cloud==0.1.0"]
+  "requirements": ["airthings-cloud==0.1.0"]
 }
diff --git a/homeassistant/components/airthings/sensor.py b/homeassistant/components/airthings/sensor.py
index 5212ff51fe8820..9c9859306ca2a2 100644
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -35,62 +35,56 @@
     "radonShortTermAvg": SensorEntityDescription(
         key="radonShortTermAvg",
         native_unit_of_measurement="Bq/m³",
-        name="Radon",
+        translation_key="radon",
     ),
     "temp": SensorEntityDescription(
         key="temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        name="Temperature",
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
-        name="Humidity",
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
-        name="Pressure",
     ),
     "battery": SensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Battery",
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        name="CO2",
     ),
     "voc": SensorEntityDescription(
         key="voc",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        name="VOC",
     ),
     "light": SensorEntityDescription(
         key="light",
         native_unit_of_measurement=PERCENTAGE,
-        name="Light",
+        translation_key="light",
     ),
     "virusRisk": SensorEntityDescription(
         key="virusRisk",
-        name="Virus Risk",
+        translation_key="virus_risk",
     ),
     "mold": SensorEntityDescription(
         key="mold",
-        name="Mold",
+        translation_key="mold",
     ),
     "rssi": SensorEntityDescription(
         key="rssi",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        name="RSSI",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -98,13 +92,11 @@
         key="pm1",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
-        name="PM1",
     ),
     "pm25": SensorEntityDescription(
         key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
-        name="PM25",
     ),
 }
 
@@ -134,6 +126,7 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):
     """Representation of a Airthings Sensor device."""
 
     _attr_state_class = SensorStateClass.MEASUREMENT
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -146,7 +139,6 @@ def __init__(
 
         self.entity_description = entity_description
 
-        self._attr_name = f"{airthings_device.name} {entity_description.name}"
         self._attr_unique_id = f"{airthings_device.device_id}_{entity_description.key}"
         self._id = airthings_device.device_id
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/airthings/strings.json b/homeassistant/components/airthings/strings.json
index af1200baa58cd0..610891fff10439 100644
--- a/homeassistant/components/airthings/strings.json
+++ b/homeassistant/components/airthings/strings.json
@@ -17,5 +17,21 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "radon": {
+        "name": "Radon"
+      },
+      "light": {
+        "name": "Light"
+      },
+      "virus_risk": {
+        "name": "Virus Risk"
+      },
+      "mold": {
+        "name": "Mold"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airthings_ble/sensor.py b/homeassistant/components/airthings_ble/sensor.py
index b6c8c25491b643..98190df6b8dc50 100644
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -39,26 +39,26 @@
 SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
     "radon_1day_avg": SensorEntityDescription(
         key="radon_1day_avg",
+        translation_key="radon_1day_avg",
         native_unit_of_measurement=VOLUME_BECQUEREL,
-        name="Radon 1-day average",
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:radioactive",
     ),
     "radon_longterm_avg": SensorEntityDescription(
         key="radon_longterm_avg",
+        translation_key="radon_longterm_avg",
         native_unit_of_measurement=VOLUME_BECQUEREL,
-        name="Radon longterm average",
         state_class=SensorStateClass.MEASUREMENT,
         icon="mdi:radioactive",
     ),
     "radon_1day_level": SensorEntityDescription(
         key="radon_1day_level",
-        name="Radon 1-day level",
+        translation_key="radon_1day_level",
         icon="mdi:radioactive",
     ),
     "radon_longterm_level": SensorEntityDescription(
         key="radon_longterm_level",
-        name="Radon longterm level",
+        translation_key="radon_longterm_level",
         icon="mdi:radioactive",
     ),
     "temperature": SensorEntityDescription(
@@ -66,21 +66,18 @@
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Temperature",
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Humidity",
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Pressure",
     ),
     "battery": SensorEntityDescription(
         key="battery",
@@ -88,20 +85,18 @@
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Battery",
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        name="co2",
     ),
     "voc": SensorEntityDescription(
         key="voc",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
-        name="VOC",
         icon="mdi:cloud",
     ),
     "illuminance": SensorEntityDescription(
@@ -109,7 +104,6 @@
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement=LIGHT_LUX,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Illuminance",
     ),
 }
 
diff --git a/homeassistant/components/airthings_ble/strings.json b/homeassistant/components/airthings_ble/strings.json
index 1cfc4ccd592ea5..b1159e6f251255 100644
--- a/homeassistant/components/airthings_ble/strings.json
+++ b/homeassistant/components/airthings_ble/strings.json
@@ -19,5 +19,21 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "radon_1day_avg": {
+        "name": "Radon 1-day average"
+      },
+      "radon_longterm_avg": {
+        "name": "Radon longterm average"
+      },
+      "radon_1day_level": {
+        "name": "Radon 1-day level"
+      },
+      "radon_longterm_level": {
+        "name": "Radon longterm level"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airvisual/strings.json b/homeassistant/components/airvisual/strings.json
index 18183eee197a86..0ba99c0984a575 100644
--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -17,7 +17,7 @@
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
           "country": "Country",
-          "state": "state"
+          "state": "State"
         }
       },
       "reauth_confirm": {
diff --git a/homeassistant/components/airzone/climate.py b/homeassistant/components/airzone/climate.py
index fda007cdc823e4..74a564fa2de1c9 100644
--- a/homeassistant/components/airzone/climate.py
+++ b/homeassistant/components/airzone/climate.py
@@ -131,8 +131,6 @@ def __init__(
         self._attr_unique_id = f"{self._attr_unique_id}_{system_zone_id}"
         self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
         self._attr_target_temperature_step = API_TEMPERATURE_STEP
-        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
-        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
         self._attr_temperature_unit = TEMP_UNIT_LIB_TO_HASS[
             self.get_airzone_value(AZD_TEMP_UNIT)
         ]
@@ -195,6 +193,8 @@ async def async_set_fan_mode(self, fan_mode: str) -> None:
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
+        slave_raise = False
+
         params = {}
         if hvac_mode == HVACMode.OFF:
             params[API_ON] = 0
@@ -204,12 +204,13 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
                 if self.get_airzone_value(AZD_MASTER):
                     params[API_MODE] = mode
                 else:
-                    raise HomeAssistantError(
-                        f"Mode can't be changed on slave zone {self.name}"
-                    )
+                    slave_raise = True
             params[API_ON] = 1
         await self._async_update_hvac_params(params)
 
+        if slave_raise:
+            raise HomeAssistantError(f"Mode can't be changed on slave zone {self.name}")
+
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         params = {}
@@ -240,6 +241,8 @@ def _async_update_attrs(self) -> None:
             ]
         else:
             self._attr_hvac_mode = HVACMode.OFF
+        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
+        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
         self._attr_target_temperature = self.get_airzone_value(AZD_TEMP_SET)
         if self.supported_features & ClimateEntityFeature.FAN_MODE:
             self._attr_fan_mode = self._speeds.get(self.get_airzone_value(AZD_SPEED))
diff --git a/homeassistant/components/airzone/entity.py b/homeassistant/components/airzone/entity.py
index a05b8cd6181a1c..9ee923ba1af9c2 100644
--- a/homeassistant/components/airzone/entity.py
+++ b/homeassistant/components/airzone/entity.py
@@ -7,6 +7,7 @@
 from aioairzone.const import (
     API_SYSTEM_ID,
     API_ZONE_ID,
+    AZD_AVAILABLE,
     AZD_FIRMWARE,
     AZD_FULL_NAME,
     AZD_ID,
@@ -66,6 +67,11 @@ def __init__(
         )
         self._attr_unique_id = entry.unique_id or entry.entry_id
 
+    @property
+    def available(self) -> bool:
+        """Return system availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
     def get_airzone_value(self, key: str) -> Any:
         """Return system value by key."""
         value = None
@@ -130,6 +136,11 @@ def __init__(
         )
         self._attr_unique_id = entry.unique_id or entry.entry_id
 
+    @property
+    def available(self) -> bool:
+        """Return zone availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
     def get_airzone_value(self, key: str) -> Any:
         """Return zone value by key."""
         value = None
diff --git a/homeassistant/components/airzone/manifest.json b/homeassistant/components/airzone/manifest.json
index d55ffd187fd881..88b918f699c836 100644
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==0.5.6"]
+  "requirements": ["aioairzone==0.6.4"]
 }
diff --git a/homeassistant/components/airzone/select.py b/homeassistant/components/airzone/select.py
index 023015121d7205..1a0d577bb35f7a 100644
--- a/homeassistant/components/airzone/select.py
+++ b/homeassistant/components/airzone/select.py
@@ -1,7 +1,7 @@
 """Support for the Airzone sensors."""
 from __future__ import annotations
 
-from dataclasses import dataclass, replace
+from dataclasses import dataclass
 from typing import Any, Final
 
 from aioairzone.common import GrilleAngle, SleepTimeout
@@ -41,14 +41,14 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription
 
 
 GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
-    "90º": GrilleAngle.DEG_90,
-    "50º": GrilleAngle.DEG_50,
-    "45º": GrilleAngle.DEG_45,
-    "40º": GrilleAngle.DEG_40,
+    "90deg": GrilleAngle.DEG_90,
+    "50deg": GrilleAngle.DEG_50,
+    "45deg": GrilleAngle.DEG_45,
+    "40deg": GrilleAngle.DEG_40,
 }
 
 SLEEP_DICT: Final[dict[str, int]] = {
-    "Off": SleepTimeout.SLEEP_OFF,
+    "off": SleepTimeout.SLEEP_OFF,
     "30m": SleepTimeout.SLEEP_30,
     "60m": SleepTimeout.SLEEP_60,
     "90m": SleepTimeout.SLEEP_90,
@@ -61,21 +61,27 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription
         entity_category=EntityCategory.CONFIG,
         key=AZD_COLD_ANGLE,
         name="Cold Angle",
+        options=list(GRILLE_ANGLE_DICT),
         options_dict=GRILLE_ANGLE_DICT,
+        translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_HEAT_ANGLE,
         entity_category=EntityCategory.CONFIG,
         key=AZD_HEAT_ANGLE,
         name="Heat Angle",
+        options=list(GRILLE_ANGLE_DICT),
         options_dict=GRILLE_ANGLE_DICT,
+        translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_SLEEP,
         entity_category=EntityCategory.CONFIG,
         key=AZD_SLEEP,
         name="Sleep",
+        options=list(SLEEP_DICT),
         options_dict=SLEEP_DICT,
+        translation_key="sleep_times",
     ),
 )
 
@@ -91,14 +97,10 @@ async def async_setup_entry(
     for system_zone_id, zone_data in coordinator.data[AZD_ZONES].items():
         for description in ZONE_SELECT_TYPES:
             if description.key in zone_data:
-                _desc = replace(
-                    description,
-                    options=list(description.options_dict.keys()),
-                )
                 entities.append(
                     AirzoneZoneSelect(
                         coordinator,
-                        _desc,
+                        description,
                         entry,
                         system_zone_id,
                         zone_data,
diff --git a/homeassistant/components/airzone/strings.json b/homeassistant/components/airzone/strings.json
index 306e63da36c0d0..037ebe52d782bf 100644
--- a/homeassistant/components/airzone/strings.json
+++ b/homeassistant/components/airzone/strings.json
@@ -23,5 +23,25 @@
         }
       }
     }
+  },
+  "entity": {
+    "select": {
+      "grille_angles": {
+        "state": {
+          "90deg": "90°",
+          "50deg": "50°",
+          "45deg": "45°",
+          "40deg": "40°"
+        }
+      },
+      "sleep_times": {
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "30m": "30 minutes",
+          "60m": "60 minutes",
+          "90m": "90 minutes"
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/airzone_cloud/__init__.py b/homeassistant/components/airzone_cloud/__init__.py
new file mode 100644
index 00000000000000..732f159c38178f
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/__init__.py
@@ -0,0 +1,51 @@
+"""The Airzone Cloud integration."""
+from __future__ import annotations
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.common import ConnectionOptions
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+
+PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Airzone Cloud from a config entry."""
+    options = ConnectionOptions(
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_PASSWORD],
+    )
+
+    airzone = AirzoneCloudApi(aiohttp_client.async_get_clientsession(hass), options)
+    await airzone.login()
+    inst_list = await airzone.list_installations()
+    for inst in inst_list:
+        if inst.get_id() == entry.data[CONF_ID]:
+            airzone.select_installation(inst)
+            await airzone.update_installation(inst)
+
+    coordinator = AirzoneUpdateCoordinator(hass, airzone)
+    await coordinator.async_config_entry_first_refresh()
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/airzone_cloud/binary_sensor.py b/homeassistant/components/airzone_cloud/binary_sensor.py
new file mode 100644
index 00000000000000..29b550463d0f82
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/binary_sensor.py
@@ -0,0 +1,110 @@
+"""Support for the Airzone Cloud binary sensors."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Final
+
+from aioairzone_cloud.const import AZD_ACTIVE, AZD_PROBLEMS, AZD_WARNINGS, AZD_ZONES
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import AirzoneEntity, AirzoneZoneEntity
+
+
+@dataclass
+class AirzoneBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """A class that describes Airzone Cloud binary sensor entities."""
+
+    attributes: dict[str, str] | None = None
+
+
+ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]] = (
+    AirzoneBinarySensorEntityDescription(
+        device_class=BinarySensorDeviceClass.RUNNING,
+        key=AZD_ACTIVE,
+    ),
+    AirzoneBinarySensorEntityDescription(
+        attributes={
+            "warnings": AZD_WARNINGS,
+        },
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        key=AZD_PROBLEMS,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone Cloud binary sensors from a config_entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    binary_sensors: list[AirzoneBinarySensor] = []
+
+    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
+        for description in ZONE_BINARY_SENSOR_TYPES:
+            if description.key in zone_data:
+                binary_sensors.append(
+                    AirzoneZoneBinarySensor(
+                        coordinator,
+                        description,
+                        zone_id,
+                        zone_data,
+                    )
+                )
+
+    async_add_entities(binary_sensors)
+
+
+class AirzoneBinarySensor(AirzoneEntity, BinarySensorEntity):
+    """Define an Airzone Cloud binary sensor."""
+
+    entity_description: AirzoneBinarySensorEntityDescription
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Update attributes when the coordinator updates."""
+        self._async_update_attrs()
+        super()._handle_coordinator_update()
+
+    @callback
+    def _async_update_attrs(self) -> None:
+        """Update binary sensor attributes."""
+        self._attr_is_on = self.get_airzone_value(self.entity_description.key)
+        if self.entity_description.attributes:
+            self._attr_extra_state_attributes = {
+                key: self.get_airzone_value(val)
+                for key, val in self.entity_description.attributes.items()
+            }
+
+
+class AirzoneZoneBinarySensor(AirzoneZoneEntity, AirzoneBinarySensor):
+    """Define an Airzone Cloud Zone binary sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: AirzoneBinarySensorEntityDescription,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, zone_id, zone_data)
+
+        self._attr_unique_id = f"{zone_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
diff --git a/homeassistant/components/airzone_cloud/config_flow.py b/homeassistant/components/airzone_cloud/config_flow.py
new file mode 100644
index 00000000000000..32274d4e8efc18
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/config_flow.py
@@ -0,0 +1,116 @@
+"""Config flow for Airzone Cloud."""
+from __future__ import annotations
+
+from typing import Any
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.common import ConnectionOptions
+from aioairzone_cloud.const import AZD_ID, AZD_NAME, AZD_WEBSERVERS
+from aioairzone_cloud.exceptions import AirzoneCloudError, LoginError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
+
+from .const import DOMAIN
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle config flow for an Airzone Cloud device."""
+
+    airzone: AirzoneCloudApi
+
+    async def async_step_inst_pick(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the installation selection."""
+        errors = {}
+        options: dict[str, str] = {}
+
+        inst_desc = None
+        inst_id = None
+        if user_input is not None:
+            inst_id = user_input[CONF_ID]
+
+        try:
+            inst_list = await self.airzone.list_installations()
+        except AirzoneCloudError:
+            errors["base"] = "cannot_connect"
+        else:
+            for inst in inst_list:
+                _data = inst.data()
+                _id = _data[AZD_ID]
+                options[_id] = f"{_data[AZD_NAME]} {_data[AZD_WEBSERVERS][0]} ({_id})"
+                if _id is not None and _id == inst_id:
+                    inst_desc = options[_id]
+
+        if user_input is not None and inst_desc is not None:
+            await self.async_set_unique_id(inst_id)
+            self._abort_if_unique_id_configured()
+
+            user_input[CONF_USERNAME] = self.airzone.options.username
+            user_input[CONF_PASSWORD] = self.airzone.options.password
+
+            return self.async_create_entry(title=inst_desc, data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_ID): SelectSelector(
+                        SelectSelectorConfig(
+                            options=[
+                                SelectOptionDict(value=k, label=v)
+                                for k, v in options.items()
+                            ],
+                            mode=SelectSelectorMode.DROPDOWN,
+                        )
+                    ),
+                }
+            ),
+            errors=errors,
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors = {}
+
+        if user_input is not None:
+            if CONF_ID in user_input:
+                return await self.async_step_inst_pick(user_input)
+
+            self.airzone = AirzoneCloudApi(
+                aiohttp_client.async_get_clientsession(self.hass),
+                ConnectionOptions(
+                    user_input[CONF_USERNAME],
+                    user_input[CONF_PASSWORD],
+                ),
+            )
+
+            try:
+                await self.airzone.login()
+            except (AirzoneCloudError, LoginError):
+                errors["base"] = "cannot_connect"
+            else:
+                return await self.async_step_inst_pick()
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_USERNAME): str,
+                    vol.Required(CONF_PASSWORD): str,
+                }
+            ),
+            errors=errors,
+        )
diff --git a/homeassistant/components/airzone_cloud/const.py b/homeassistant/components/airzone_cloud/const.py
new file mode 100644
index 00000000000000..625d897188de36
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/const.py
@@ -0,0 +1,8 @@
+"""Constants for the Airzone Cloud integration."""
+
+from typing import Final
+
+DOMAIN: Final[str] = "airzone_cloud"
+MANUFACTURER: Final[str] = "Airzone"
+
+AIOAIRZONE_CLOUD_TIMEOUT_SEC: Final[int] = 30
diff --git a/homeassistant/components/airzone_cloud/coordinator.py b/homeassistant/components/airzone_cloud/coordinator.py
new file mode 100644
index 00000000000000..edd99355092072
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/coordinator.py
@@ -0,0 +1,43 @@
+"""The Airzone Cloud integration coordinator."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.exceptions import AirzoneCloudError
+import async_timeout
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import AIOAIRZONE_CLOUD_TIMEOUT_SEC, DOMAIN
+
+SCAN_INTERVAL = timedelta(seconds=60)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Class to manage fetching data from the Airzone Cloud device."""
+
+    def __init__(self, hass: HomeAssistant, airzone: AirzoneCloudApi) -> None:
+        """Initialize."""
+        self.airzone = airzone
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Update data via library."""
+        async with async_timeout.timeout(AIOAIRZONE_CLOUD_TIMEOUT_SEC):
+            try:
+                await self.airzone.update()
+            except AirzoneCloudError as error:
+                raise UpdateFailed(error) from error
+            return self.airzone.data()
diff --git a/homeassistant/components/airzone_cloud/diagnostics.py b/homeassistant/components/airzone_cloud/diagnostics.py
new file mode 100644
index 00000000000000..a86f95d6187b4c
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/diagnostics.py
@@ -0,0 +1,144 @@
+"""Support for the Airzone Cloud diagnostics."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any
+
+from aioairzone_cloud.const import (
+    API_CITY,
+    API_GROUP_ID,
+    API_LOCATION_ID,
+    API_OLD_ID,
+    API_PIN,
+    API_STAT_AP_MAC,
+    API_STAT_SSID,
+    API_USER_ID,
+    AZD_WIFI_MAC,
+    RAW_DEVICES_STATUS,
+    RAW_INSTALLATIONS,
+    RAW_WEBSERVERS,
+)
+
+from homeassistant.components.diagnostics.util import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+
+TO_REDACT_API = [
+    API_CITY,
+    API_GROUP_ID,
+    API_LOCATION_ID,
+    API_OLD_ID,
+    API_PIN,
+    API_STAT_AP_MAC,
+    API_STAT_SSID,
+    API_USER_ID,
+]
+
+TO_REDACT_CONFIG = [
+    CONF_PASSWORD,
+    CONF_USERNAME,
+]
+
+TO_REDACT_COORD = [
+    AZD_WIFI_MAC,
+]
+
+
+def gather_ids(api_data: dict[str, Any]) -> dict[str, Any]:
+    """Return dict with IDs."""
+    ids: dict[str, Any] = {}
+
+    dev_idx = 1
+    for dev_id in api_data[RAW_DEVICES_STATUS]:
+        if dev_id not in ids:
+            ids[dev_id] = f"device{dev_idx}"
+            dev_idx += 1
+
+    inst_idx = 1
+    for inst_id in api_data[RAW_INSTALLATIONS]:
+        if inst_id not in ids:
+            ids[inst_id] = f"installation{inst_idx}"
+            inst_idx += 1
+
+    ws_idx = 1
+    for ws_id in api_data[RAW_WEBSERVERS]:
+        if ws_id not in ids:
+            ids[ws_id] = f"webserver{ws_idx}"
+            ws_idx += 1
+
+    return ids
+
+
+def redact_keys(data: Any, ids: dict[str, Any]) -> Any:
+    """Redact sensitive keys in a dict."""
+    if not isinstance(data, (Mapping, list)):
+        return data
+
+    if isinstance(data, list):
+        return [redact_keys(val, ids) for val in data]
+
+    redacted = {**data}
+
+    keys = list(redacted)
+    for key in keys:
+        if key in ids:
+            redacted[ids[key]] = redacted.pop(key)
+        elif isinstance(redacted[key], Mapping):
+            redacted[key] = redact_keys(redacted[key], ids)
+        elif isinstance(redacted[key], list):
+            redacted[key] = [redact_keys(item, ids) for item in redacted[key]]
+
+    return redacted
+
+
+def redact_values(data: Any, ids: dict[str, Any]) -> Any:
+    """Redact sensitive values in a dict."""
+    if not isinstance(data, (Mapping, list)):
+        if data in ids:
+            return ids[data]
+        return data
+
+    if isinstance(data, list):
+        return [redact_values(val, ids) for val in data]
+
+    redacted = {**data}
+
+    for key, value in redacted.items():
+        if value is None:
+            continue
+        if isinstance(value, Mapping):
+            redacted[key] = redact_values(value, ids)
+        elif isinstance(value, list):
+            redacted[key] = [redact_values(item, ids) for item in value]
+        elif value in ids:
+            redacted[key] = ids[value]
+
+    return redacted
+
+
+def redact_all(
+    data: dict[str, Any], ids: dict[str, Any], to_redact: list[str]
+) -> dict[str, Any]:
+    """Redact sensitive data."""
+    _data = redact_keys(data, ids)
+    _data = redact_values(_data, ids)
+    return async_redact_data(_data, to_redact)
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    raw_data = coordinator.airzone.raw_data()
+    ids = gather_ids(raw_data)
+
+    return {
+        "api_data": redact_all(raw_data, ids, TO_REDACT_API),
+        "config_entry": redact_all(config_entry.as_dict(), ids, TO_REDACT_CONFIG),
+        "coord_data": redact_all(coordinator.data, ids, TO_REDACT_COORD),
+    }
diff --git a/homeassistant/components/airzone_cloud/entity.py b/homeassistant/components/airzone_cloud/entity.py
new file mode 100644
index 00000000000000..9b3dfdae06cba6
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/entity.py
@@ -0,0 +1,125 @@
+"""Entity classes for the Airzone Cloud integration."""
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import Any
+
+from aioairzone_cloud.const import (
+    AZD_AIDOOS,
+    AZD_AVAILABLE,
+    AZD_FIRMWARE,
+    AZD_NAME,
+    AZD_SYSTEM_ID,
+    AZD_WEBSERVER,
+    AZD_WEBSERVERS,
+    AZD_ZONES,
+)
+
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN, MANUFACTURER
+from .coordinator import AirzoneUpdateCoordinator
+
+
+class AirzoneEntity(CoordinatorEntity[AirzoneUpdateCoordinator], ABC):
+    """Define an Airzone Cloud entity."""
+
+    @property
+    def available(self) -> bool:
+        """Return Airzone Cloud entity availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
+    @abstractmethod
+    def get_airzone_value(self, key: str) -> Any:
+        """Return Airzone Cloud entity value by key."""
+
+
+class AirzoneAidooEntity(AirzoneEntity):
+    """Define an Airzone Cloud Aidoo entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        aidoo_id: str,
+        aidoo_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.aidoo_id = aidoo_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, aidoo_id)},
+            manufacturer=MANUFACTURER,
+            name=aidoo_data[AZD_NAME],
+            via_device=(DOMAIN, aidoo_data[AZD_WEBSERVER]),
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return Aidoo value by key."""
+        value = None
+        if aidoo := self.coordinator.data[AZD_AIDOOS].get(self.aidoo_id):
+            value = aidoo.get(key)
+        return value
+
+
+class AirzoneWebServerEntity(AirzoneEntity):
+    """Define an Airzone Cloud WebServer entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        ws_id: str,
+        ws_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.ws_id = ws_id
+
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, ws_id)},
+            identifiers={(DOMAIN, ws_id)},
+            manufacturer=MANUFACTURER,
+            name=ws_data[AZD_NAME],
+            sw_version=ws_data[AZD_FIRMWARE],
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return WebServer value by key."""
+        value = None
+        if webserver := self.coordinator.data[AZD_WEBSERVERS].get(self.ws_id):
+            value = webserver.get(key)
+        return value
+
+
+class AirzoneZoneEntity(AirzoneEntity):
+    """Define an Airzone Cloud Zone entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.system_id = zone_data[AZD_SYSTEM_ID]
+        self.zone_id = zone_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, zone_id)},
+            manufacturer=MANUFACTURER,
+            name=zone_data[AZD_NAME],
+            via_device=(DOMAIN, self.system_id),
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return zone value by key."""
+        value = None
+        if zone := self.coordinator.data[AZD_ZONES].get(self.zone_id):
+            value = zone.get(key)
+        return value
diff --git a/homeassistant/components/airzone_cloud/manifest.json b/homeassistant/components/airzone_cloud/manifest.json
new file mode 100644
index 00000000000000..8602dfa14cf20d
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "airzone_cloud",
+  "name": "Airzone Cloud",
+  "codeowners": ["@Noltari"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
+  "iot_class": "cloud_polling",
+  "loggers": ["aioairzone_cloud"],
+  "requirements": ["aioairzone-cloud==0.2.0"]
+}
diff --git a/homeassistant/components/airzone_cloud/sensor.py b/homeassistant/components/airzone_cloud/sensor.py
new file mode 100644
index 00000000000000..c33838029b41f2
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/sensor.py
@@ -0,0 +1,201 @@
+"""Support for the Airzone Cloud sensors."""
+from __future__ import annotations
+
+from typing import Any, Final
+
+from aioairzone_cloud.const import (
+    AZD_AIDOOS,
+    AZD_HUMIDITY,
+    AZD_TEMP,
+    AZD_WEBSERVERS,
+    AZD_WIFI_RSSI,
+    AZD_ZONES,
+)
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    EntityCategory,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import (
+    AirzoneAidooEntity,
+    AirzoneEntity,
+    AirzoneWebServerEntity,
+    AirzoneZoneEntity,
+)
+
+AIDOO_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.TEMPERATURE,
+        key=AZD_TEMP,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        key=AZD_WIFI_RSSI,
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.TEMPERATURE,
+        key=AZD_TEMP,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.HUMIDITY,
+        key=AZD_HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone Cloud sensors from a config_entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    sensors: list[AirzoneSensor] = []
+
+    # Aidoos
+    for aidoo_id, aidoo_data in coordinator.data.get(AZD_AIDOOS, {}).items():
+        for description in AIDOO_SENSOR_TYPES:
+            if description.key in aidoo_data:
+                sensors.append(
+                    AirzoneAidooSensor(
+                        coordinator,
+                        description,
+                        aidoo_id,
+                        aidoo_data,
+                    )
+                )
+
+    # WebServers
+    for ws_id, ws_data in coordinator.data.get(AZD_WEBSERVERS, {}).items():
+        for description in WEBSERVER_SENSOR_TYPES:
+            if description.key in ws_data:
+                sensors.append(
+                    AirzoneWebServerSensor(
+                        coordinator,
+                        description,
+                        ws_id,
+                        ws_data,
+                    )
+                )
+
+    # Zones
+    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
+        for description in ZONE_SENSOR_TYPES:
+            if description.key in zone_data:
+                sensors.append(
+                    AirzoneZoneSensor(
+                        coordinator,
+                        description,
+                        zone_id,
+                        zone_data,
+                    )
+                )
+
+    async_add_entities(sensors)
+
+
+class AirzoneSensor(AirzoneEntity, SensorEntity):
+    """Define an Airzone Cloud sensor."""
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Update attributes when the coordinator updates."""
+        self._async_update_attrs()
+        super()._handle_coordinator_update()
+
+    @callback
+    def _async_update_attrs(self) -> None:
+        """Update sensor attributes."""
+        self._attr_native_value = self.get_airzone_value(self.entity_description.key)
+
+
+class AirzoneAidooSensor(AirzoneAidooEntity, AirzoneSensor):
+    """Define an Airzone Cloud Aidoo sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        aidoo_id: str,
+        aidoo_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, aidoo_id, aidoo_data)
+
+        self._attr_unique_id = f"{aidoo_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
+
+
+class AirzoneWebServerSensor(AirzoneWebServerEntity, AirzoneSensor):
+    """Define an Airzone Cloud WebServer sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        ws_id: str,
+        ws_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, ws_id, ws_data)
+
+        self._attr_unique_id = f"{ws_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
+
+
+class AirzoneZoneSensor(AirzoneZoneEntity, AirzoneSensor):
+    """Define an Airzone Cloud Zone sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, zone_id, zone_data)
+
+        self._attr_unique_id = f"{zone_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
diff --git a/homeassistant/components/airzone_cloud/strings.json b/homeassistant/components/airzone_cloud/strings.json
new file mode 100644
index 00000000000000..12f155b4486835
--- /dev/null
+++ b/homeassistant/components/airzone_cloud/strings.json
@@ -0,0 +1,19 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "id": "Installation",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/aladdin_connect/cover.py b/homeassistant/components/aladdin_connect/cover.py
index 32eb34333c9b84..25d601cf299cc8 100644
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -40,26 +40,24 @@ class AladdinDevice(CoverEntity):
 
     _attr_device_class = CoverDeviceClass.GARAGE
     _attr_supported_features = SUPPORTED_FEATURES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, acc: AladdinConnectClient, device: DoorDevice, entry: ConfigEntry
     ) -> None:
         """Initialize the Aladdin Connect cover."""
         self._acc = acc
-        self._entry_id = entry.entry_id
         self._device_id = device["device_id"]
         self._number = device["door_number"]
-        self._name = device["name"]
         self._serial = device["serial"]
-        self._model = device["model"]
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{self._device_id}-{self._number}")},
-            name=self._name,
+            name=device["name"],
             manufacturer="Overhead Door",
-            model=self._model,
+            model=device["model"],
         )
-        self._attr_has_entity_name = True
         self._attr_unique_id = f"{self._device_id}-{self._number}"
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/aladdin_connect/sensor.py b/homeassistant/components/aladdin_connect/sensor.py
index 51ae515430242c..395bbbb04a82bf 100644
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -40,7 +40,6 @@ class AccSensorEntityDescription(
 SENSORS: tuple[AccSensorEntityDescription, ...] = (
     AccSensorEntityDescription(
         key="battery_level",
-        name="Battery level",
         device_class=SensorDeviceClass.BATTERY,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=PERCENTAGE,
@@ -49,7 +48,7 @@ class AccSensorEntityDescription(
     ),
     AccSensorEntityDescription(
         key="rssi",
-        name="Wi-Fi RSSI",
+        translation_key="wifi_strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -58,7 +57,7 @@ class AccSensorEntityDescription(
     ),
     AccSensorEntityDescription(
         key="ble_strength",
-        name="BLE Strength",
+        translation_key="ble_strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_registry_enabled_default=False,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
@@ -89,8 +88,8 @@ async def async_setup_entry(
 class AladdinConnectSensor(SensorEntity):
     """A sensor implementation for Aladdin Connect devices."""
 
-    _device: AladdinConnectSensor
     entity_description: AccSensorEntityDescription
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -101,24 +100,20 @@ def __init__(
         """Initialize a sensor for an Aladdin Connect device."""
         self._device_id = device["device_id"]
         self._number = device["door_number"]
-        self._name = device["name"]
-        self._model = device["model"]
         self._acc = acc
         self.entity_description = description
         self._attr_unique_id = f"{self._device_id}-{self._number}-{description.key}"
-        self._attr_has_entity_name = True
-        if self._model == "01" and description.key in ("battery_level", "ble_strength"):
-            self._attr_entity_registry_enabled_default = True
-
-    @property
-    def device_info(self) -> DeviceInfo | None:
-        """Device information for Aladdin Connect sensors."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{self._device_id}-{self._number}")},
-            name=self._name,
+            name=device["name"],
             manufacturer="Overhead Door",
-            model=self._model,
+            model=device["model"],
         )
+        if device["model"] == "01" and description.key in (
+            "battery_level",
+            "ble_strength",
+        ):
+            self._attr_entity_registry_enabled_default = True
 
     @property
     def native_value(self) -> float | None:
diff --git a/homeassistant/components/aladdin_connect/strings.json b/homeassistant/components/aladdin_connect/strings.json
index ff42ca14bc38ad..bfe932b039cf35 100644
--- a/homeassistant/components/aladdin_connect/strings.json
+++ b/homeassistant/components/aladdin_connect/strings.json
@@ -25,5 +25,15 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "wifi_strength": {
+        "name": "Wi-Fi RSSI"
+      },
+      "ble_strength": {
+        "name": "BLE Strength"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/alarm_control_panel/device_action.py b/homeassistant/components/alarm_control_panel/device_action.py
index de4f3df257a0d3..e453be88934a47 100644
--- a/homeassistant/components/alarm_control_panel/device_action.py
+++ b/homeassistant/components/alarm_control_panel/device_action.py
@@ -5,6 +5,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_CODE,
     ATTR_ENTITY_ID,
@@ -44,15 +45,22 @@
     "trigger",
 }
 
-ACTION_SCHEMA: Final = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA: Final = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Optional(CONF_CODE): cv.string,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -70,7 +78,7 @@ async def async_get_actions(
         base_action: dict = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         # Add actions for each entity that belongs to this integration
@@ -124,7 +132,9 @@ async def async_get_action_capabilities(
     """List action capabilities."""
     # We need to refer to the state directly because ATTR_CODE_ARM_REQUIRED is not a
     # capability attribute
-    state = hass.states.get(config[CONF_ENTITY_ID])
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+    state = hass.states.get(entity_id) if entity_id else None
     code_required = state.attributes.get(ATTR_CODE_ARM_REQUIRED) if state else False
 
     if config[CONF_TYPE] == "trigger" or (
diff --git a/homeassistant/components/alarm_control_panel/device_condition.py b/homeassistant/components/alarm_control_panel/device_condition.py
index a097aa98535a02..ee8cb57f568a84 100644
--- a/homeassistant/components/alarm_control_panel/device_condition.py
+++ b/homeassistant/components/alarm_control_panel/device_condition.py
@@ -58,7 +58,7 @@
 
 CONDITION_SCHEMA: Final = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -83,7 +83,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [
@@ -126,8 +126,11 @@ def async_condition_from_config(
     elif config[CONF_TYPE] == CONDITION_ARMED_CUSTOM_BYPASS:
         state = STATE_ALARM_ARMED_CUSTOM_BYPASS
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/alarm_control_panel/device_trigger.py b/homeassistant/components/alarm_control_panel/device_trigger.py
index 9106942c5e5524..fc3850dce30ff0 100644
--- a/homeassistant/components/alarm_control_panel/device_trigger.py
+++ b/homeassistant/components/alarm_control_panel/device_trigger.py
@@ -46,7 +46,7 @@
 
 TRIGGER_SCHEMA: Final = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -72,7 +72,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         triggers += [
diff --git a/homeassistant/components/alexa/auth.py b/homeassistant/components/alexa/auth.py
index 2dbda64568f0b4..86c038e2da8748 100644
--- a/homeassistant/components/alexa/auth.py
+++ b/homeassistant/components/alexa/auth.py
@@ -12,7 +12,7 @@
 from homeassistant.core import callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.storage import Store
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -95,12 +95,12 @@ def is_token_valid(self):
         if not self._prefs[STORAGE_ACCESS_TOKEN]:
             return False
 
-        expire_time = dt.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
+        expire_time = dt_util.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
         preemptive_expire_time = expire_time - timedelta(
             seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS
         )
 
-        return dt.utcnow() < preemptive_expire_time
+        return dt_util.utcnow() < preemptive_expire_time
 
     async def _async_request_new_token(self, lwa_params):
         try:
@@ -130,7 +130,7 @@ async def _async_request_new_token(self, lwa_params):
         access_token = response_json["access_token"]
         refresh_token = response_json["refresh_token"]
         expires_in = response_json["expires_in"]
-        expire_time = dt.utcnow() + timedelta(seconds=expires_in)
+        expire_time = dt_util.utcnow() + timedelta(seconds=expires_in)
 
         await self._async_update_preferences(
             access_token, refresh_token, expire_time.isoformat()
diff --git a/homeassistant/components/alexa/config.py b/homeassistant/components/alexa/config.py
index e086d525cf125e..d47a548979e939 100644
--- a/homeassistant/components/alexa/config.py
+++ b/homeassistant/components/alexa/config.py
@@ -1,4 +1,6 @@
 """Config helpers for Alexa."""
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 import asyncio
 import logging
@@ -17,15 +19,15 @@
 class AbstractConfig(ABC):
     """Hold the configuration for Alexa."""
 
+    _store: AlexaConfigStore
     _unsub_proactive_report: CALLBACK_TYPE | None = None
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize abstract config."""
         self.hass = hass
         self._enable_proactive_mode_lock = asyncio.Lock()
-        self._store = None
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Perform async initialization of config."""
         self._store = AlexaConfigStore(self.hass)
         await self._store.async_load()
@@ -65,7 +67,7 @@ def is_reporting_states(self):
     def user_identifier(self):
         """Return an identifier for the user that represents this config."""
 
-    async def async_enable_proactive_mode(self):
+    async def async_enable_proactive_mode(self) -> None:
         """Enable proactive mode."""
         _LOGGER.debug("Enable proactive mode")
         async with self._enable_proactive_mode_lock:
@@ -75,7 +77,7 @@ async def async_enable_proactive_mode(self):
                 self.hass, self
             )
 
-    async def async_disable_proactive_mode(self):
+    async def async_disable_proactive_mode(self) -> None:
         """Disable proactive mode."""
         _LOGGER.debug("Disable proactive mode")
         if unsub_func := self._unsub_proactive_report:
@@ -105,7 +107,7 @@ def authorized(self):
         """Return authorization status."""
         return self._store.authorized
 
-    async def set_authorized(self, authorized):
+    async def set_authorized(self, authorized) -> None:
         """Set authorization status.
 
         - Set when an incoming message is received from Alexa.
diff --git a/homeassistant/components/alexa/state_report.py b/homeassistant/components/alexa/state_report.py
index a189c364c02d7e..ebab3bcee8ce1d 100644
--- a/homeassistant/components/alexa/state_report.py
+++ b/homeassistant/components/alexa/state_report.py
@@ -5,7 +5,7 @@
 from http import HTTPStatus
 import json
 import logging
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 import aiohttp
 import async_timeout
@@ -23,6 +23,9 @@
 from .errors import NoTokenAvailable, RequireRelink
 from .messages import AlexaResponse
 
+if TYPE_CHECKING:
+    from .config import AbstractConfig
+
 _LOGGER = logging.getLogger(__name__)
 DEFAULT_TIMEOUT = 10
 
@@ -188,7 +191,9 @@ async def async_send_changereport_message(
     )
 
 
-async def async_send_add_or_update_message(hass, config, entity_ids):
+async def async_send_add_or_update_message(
+    hass: HomeAssistant, config: AbstractConfig, entity_ids: list[str]
+) -> aiohttp.ClientResponse:
     """Send an AddOrUpdateReport message for entities.
 
     https://developer.amazon.com/docs/device-apis/alexa-discovery.html#add-or-update-report
@@ -223,7 +228,9 @@ async def async_send_add_or_update_message(hass, config, entity_ids):
     )
 
 
-async def async_send_delete_message(hass, config, entity_ids):
+async def async_send_delete_message(
+    hass: HomeAssistant, config: AbstractConfig, entity_ids: list[str]
+) -> aiohttp.ClientResponse:
     """Send an DeleteReport message for entities.
 
     https://developer.amazon.com/docs/device-apis/alexa-discovery.html#deletereport-event
diff --git a/homeassistant/components/alpha_vantage/manifest.json b/homeassistant/components/alpha_vantage/manifest.json
index 66de4b6a5f8271..c94da6bf4874c6 100644
--- a/homeassistant/components/alpha_vantage/manifest.json
+++ b/homeassistant/components/alpha_vantage/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/alpha_vantage",
   "iot_class": "cloud_polling",
   "loggers": ["alpha_vantage"],
-  "requirements": ["alpha_vantage==2.3.1"]
+  "requirements": ["alpha-vantage==2.3.1"]
 }
diff --git a/homeassistant/components/amazon_polly/tts.py b/homeassistant/components/amazon_polly/tts.py
index 97e0af7f18eda9..5db46fc019e08f 100644
--- a/homeassistant/components/amazon_polly/tts.py
+++ b/homeassistant/components/amazon_polly/tts.py
@@ -167,12 +167,9 @@ def get_tts_audio(
         self,
         message: str,
         language: str,
-        options: dict[str, Any] | None = None,
+        options: dict[str, Any],
     ) -> TtsAudioType:
         """Request TTS file from Polly."""
-        if options is None or language is None:
-            _LOGGER.debug("language and/or options were missing")
-            return None, None
         voice_id = options.get(CONF_VOICE, self.default_voice)
         voice_in_dict = self.all_voices[voice_id]
         if language != voice_in_dict.get("LanguageCode"):
diff --git a/homeassistant/components/ambiclimate/climate.py b/homeassistant/components/ambiclimate/climate.py
index 2bb2b441430aa2..516ed319d0152e 100644
--- a/homeassistant/components/ambiclimate/climate.py
+++ b/homeassistant/components/ambiclimate/climate.py
@@ -98,7 +98,7 @@ async def async_setup_entry(
 
     tasks = []
     for heater in data_connection.get_devices():
-        tasks.append(heater.update_device_info())
+        tasks.append(asyncio.create_task(heater.update_device_info()))
     await asyncio.wait(tasks)
 
     devs = []
diff --git a/homeassistant/components/ambiclimate/manifest.json b/homeassistant/components/ambiclimate/manifest.json
index f2fd0ea5d7731c..315490b2d62bba 100644
--- a/homeassistant/components/ambiclimate/manifest.json
+++ b/homeassistant/components/ambiclimate/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ambiclimate",
   "iot_class": "cloud_polling",
   "loggers": ["ambiclimate"],
-  "requirements": ["ambiclimate==0.2.1"]
+  "requirements": ["Ambiclimate==0.2.1"]
 }
diff --git a/homeassistant/components/amcrest/helpers.py b/homeassistant/components/amcrest/helpers.py
index ff1a283769dc4f..306c24a94ac9c8 100644
--- a/homeassistant/components/amcrest/helpers.py
+++ b/homeassistant/components/amcrest/helpers.py
@@ -3,6 +3,8 @@
 
 import logging
 
+from homeassistant.helpers.typing import UndefinedType
+
 from .const import DOMAIN
 
 
@@ -14,7 +16,7 @@ def service_signal(service: str, *args: str) -> str:
 def log_update_error(
     logger: logging.Logger,
     action: str,
-    name: str | None,
+    name: str | UndefinedType | None,
     entity_type: str,
     error: Exception,
     level: int = logging.ERROR,
diff --git a/homeassistant/components/analytics/__init__.py b/homeassistant/components/analytics/__init__.py
index c02c1a3a3b6e99..ee36aa78e63fb1 100644
--- a/homeassistant/components/analytics/__init__.py
+++ b/homeassistant/components/analytics/__init__.py
@@ -6,12 +6,15 @@
 from homeassistant.components import websocket_api
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
 from homeassistant.core import Event, HassJob, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
 from .analytics import Analytics
 from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, INTERVAL, PREFERENCE_SCHEMA
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
     """Set up the analytics integration."""
diff --git a/homeassistant/components/analytics/analytics.py b/homeassistant/components/analytics/analytics.py
index 9419f00e41e394..19e6b5ec7b3be2 100644
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -21,12 +21,22 @@
     DOMAIN as RECORDER_DOMAIN,
     get_instance as get_recorder_instance,
 )
+import homeassistant.config as conf_util
+from homeassistant.config_entries import (
+    SOURCE_IGNORE,
+)
 from homeassistant.const import ATTR_DOMAIN, __version__ as HA_VERSION
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.entity_registry as er
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.system_info import async_get_system_info
-from homeassistant.loader import IntegrationNotFound, async_get_integrations
+from homeassistant.loader import (
+    Integration,
+    IntegrationNotFound,
+    async_get_integrations,
+)
 from homeassistant.setup import async_get_loaded_integrations
 
 from .const import (
@@ -206,8 +216,25 @@ async def send_analytics(self, _: datetime | None = None) -> None:
         if self.preferences.get(ATTR_USAGE, False) or self.preferences.get(
             ATTR_STATISTICS, False
         ):
+            ent_reg = er.async_get(self.hass)
+
+            try:
+                yaml_configuration = await conf_util.async_hass_config_yaml(self.hass)
+            except HomeAssistantError as err:
+                LOGGER.error(err)
+                return
+
+            configuration_set = set(yaml_configuration)
+            er_platforms = {
+                entity.platform
+                for entity in ent_reg.entities.values()
+                if not entity.disabled
+            }
+
             domains = async_get_loaded_integrations(self.hass)
             configured_integrations = await async_get_integrations(self.hass, domains)
+            enabled_domains = set(configured_integrations)
+
             for integration in configured_integrations.values():
                 if isinstance(integration, IntegrationNotFound):
                     continue
@@ -215,7 +242,11 @@ async def send_analytics(self, _: datetime | None = None) -> None:
                 if isinstance(integration, BaseException):
                     raise integration
 
-                if integration.disabled:
+                if not self._async_should_report_integration(
+                    integration=integration,
+                    yaml_domains=configuration_set,
+                    entity_registry_platforms=er_platforms,
+                ):
                     continue
 
                 if not integration.is_built_in:
@@ -253,12 +284,12 @@ async def send_analytics(self, _: datetime | None = None) -> None:
             if supervisor_info is not None:
                 payload[ATTR_ADDONS] = addons
 
-            if ENERGY_DOMAIN in integrations:
+            if ENERGY_DOMAIN in enabled_domains:
                 payload[ATTR_ENERGY] = {
                     ATTR_CONFIGURED: await energy_is_configured(self.hass)
                 }
 
-            if RECORDER_DOMAIN in integrations:
+            if RECORDER_DOMAIN in enabled_domains:
                 instance = get_recorder_instance(self.hass)
                 engine = instance.database_engine
                 if engine and engine.version is not None:
@@ -306,3 +337,34 @@ async def send_analytics(self, _: datetime | None = None) -> None:
             LOGGER.error(
                 "Error sending analytics to %s: %r", ANALYTICS_ENDPOINT_URL, err
             )
+
+    @callback
+    def _async_should_report_integration(
+        self,
+        integration: Integration,
+        yaml_domains: set[str],
+        entity_registry_platforms: set[str],
+    ) -> bool:
+        """Return a bool to indicate if this integration should be reported."""
+        if integration.disabled:
+            return False
+
+        # Check if the integration is defined in YAML or in the entity registry
+        if (
+            integration.domain in yaml_domains
+            or integration.domain in entity_registry_platforms
+        ):
+            return True
+
+        # Check if the integration provide a config flow
+        if not integration.config_flow:
+            return False
+
+        entries = self.hass.config_entries.async_entries(integration.domain)
+
+        # Filter out ignored and disabled entries
+        return any(
+            entry
+            for entry in entries
+            if entry.source != SOURCE_IGNORE and entry.disabled_by is None
+        )
diff --git a/homeassistant/components/android_ip_webcam/strings.json b/homeassistant/components/android_ip_webcam/strings.json
index 6f6639cecb41a7..db21a69098477e 100644
--- a/homeassistant/components/android_ip_webcam/strings.json
+++ b/homeassistant/components/android_ip_webcam/strings.json
@@ -17,11 +17,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Android IP Webcam YAML configuration is being removed",
-      "description": "Configuring Android IP Webcam using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the Android IP Webcam YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index 563b8f07b2a09a..f4fbe4a498f403 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -296,7 +296,6 @@ async def async_added_to_hass(self) -> None:
                 self._process_config,
             )
         )
-        return
 
     @property
     def media_image_hash(self) -> str | None:
diff --git a/homeassistant/components/androidtv_remote/config_flow.py b/homeassistant/components/androidtv_remote/config_flow.py
index 24b64c622a9960..f7e1078d3fa68c 100644
--- a/homeassistant/components/androidtv_remote/config_flow.py
+++ b/homeassistant/components/androidtv_remote/config_flow.py
@@ -135,7 +135,8 @@ async def async_step_zeroconf(
         self.host = discovery_info.host
         self.name = discovery_info.name.removesuffix("._androidtvremote2._tcp.local.")
         self.mac = discovery_info.properties.get("bt")
-        assert self.mac
+        if not self.mac:
+            return self.async_abort(reason="cannot_connect")
         await self.async_set_unique_id(format_mac(self.mac))
         self._abort_if_unique_id_configured(
             updates={CONF_HOST: self.host, CONF_NAME: self.name}
diff --git a/homeassistant/components/androidtv_remote/entity.py b/homeassistant/components/androidtv_remote/entity.py
index 862f317ee82d66..5a99805da62b04 100644
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -16,6 +16,7 @@
 class AndroidTVRemoteBaseEntity(Entity):
     """Android TV Remote Base Entity."""
 
+    _attr_name = None
     _attr_has_entity_name = True
     _attr_should_poll = False
 
diff --git a/homeassistant/components/androidtv_remote/manifest.json b/homeassistant/components/androidtv_remote/manifest.json
index 9273e82a51b7f3..c728ea0a682735 100644
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
   "quality_scale": "platinum",
-  "requirements": ["androidtvremote2==0.0.8"],
+  "requirements": ["androidtvremote2==0.0.9"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }
diff --git a/homeassistant/components/anel_pwrctrl/manifest.json b/homeassistant/components/anel_pwrctrl/manifest.json
index f1de40bc89e45a..48cc3b96ec0884 100644
--- a/homeassistant/components/anel_pwrctrl/manifest.json
+++ b/homeassistant/components/anel_pwrctrl/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/anel_pwrctrl",
   "iot_class": "local_polling",
   "loggers": ["anel_pwrctrl"],
-  "requirements": ["anel_pwrctrl-homeassistant==0.0.1.dev2"]
+  "requirements": ["anel-pwrctrl-homeassistant==0.0.1.dev2"]
 }
diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py
index 2ab23ff2d37b6b..038e71750ddeb5 100644
--- a/homeassistant/components/anthemav/media_player.py
+++ b/homeassistant/components/anthemav/media_player.py
@@ -80,6 +80,7 @@ def __init__(
             self._attr_name = f"zone {zone_number}"
             self._attr_unique_id = f"{mac_address}_{zone_number}"
         else:
+            self._attr_name = None
             self._attr_unique_id = mac_address
 
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/apcupsd/sensor.py b/homeassistant/components/apcupsd/sensor.py
index 4e0e46f6392f15..8b7034357dfda5 100644
--- a/homeassistant/components/apcupsd/sensor.py
+++ b/homeassistant/components/apcupsd/sensor.py
@@ -3,8 +3,6 @@
 
 import logging
 
-from apcaccess.status import ALL_UNITS
-
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -379,7 +377,6 @@
         key="stesti",
         name="UPS Self Test Interval",
         icon="mdi:information-outline",
-        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     "timeleft": SensorEntityDescription(
         key="timeleft",
@@ -427,18 +424,26 @@
     ),
 }
 
-SPECIFIC_UNITS = {"ITEMP": UnitOfTemperature.CELSIUS}
 INFERRED_UNITS = {
     " Minutes": UnitOfTime.MINUTES,
     " Seconds": UnitOfTime.SECONDS,
     " Percent": PERCENTAGE,
     " Volts": UnitOfElectricPotential.VOLT,
     " Ampere": UnitOfElectricCurrent.AMPERE,
+    " Amps": UnitOfElectricCurrent.AMPERE,
     " Volt-Ampere": UnitOfApparentPower.VOLT_AMPERE,
+    " VA": UnitOfApparentPower.VOLT_AMPERE,
     " Watts": UnitOfPower.WATT,
     " Hz": UnitOfFrequency.HERTZ,
     " C": UnitOfTemperature.CELSIUS,
+    # APCUPSd reports data for "itemp" field (eventually represented by UPS Internal
+    # Temperature sensor in this integration) with a trailing "Internal", e.g.,
+    # "34.6 C Internal". Here we create a fake unit " C Internal" to handle this case.
+    " C Internal": UnitOfTemperature.CELSIUS,
     " Percent Load Capacity": PERCENTAGE,
+    # "stesti" field (Self Test Interval) field could report a "days" unit, e.g.,
+    # "7 days", so here we add support for it.
+    " days": UnitOfTime.DAYS,
 }
 
 
@@ -466,15 +471,16 @@ async def async_setup_entry(
 
 
 def infer_unit(value: str) -> tuple[str, str | None]:
-    """If the value ends with any of the units from ALL_UNITS.
+    """If the value ends with any of the units from supported units.
 
     Split the unit off the end of the value and return the value, unit tuple
     pair. Else return the original value and None as the unit.
     """
 
-    for unit in ALL_UNITS:
+    for unit, ha_unit in INFERRED_UNITS.items():
         if value.endswith(unit):
-            return value.removesuffix(unit), INFERRED_UNITS.get(unit, unit.strip())
+            return value.removesuffix(unit), ha_unit
+
     return value, None
 
 
diff --git a/homeassistant/components/apcupsd/strings.json b/homeassistant/components/apcupsd/strings.json
index aef33a6f8bf805..c7ebf8a0a3bc5b 100644
--- a/homeassistant/components/apcupsd/strings.json
+++ b/homeassistant/components/apcupsd/strings.json
@@ -16,11 +16,5 @@
         "description": "Enter the host and port on which the apcupsd NIS is being served."
       }
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The APC UPS Daemon YAML configuration is being removed",
-      "description": "Configuring APC UPS Daemon using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the APC UPS Daemon YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/api/__init__.py b/homeassistant/components/api/__init__.py
index 5c0a60ecef7fe0..6538bd345de427 100644
--- a/homeassistant/components/api/__init__.py
+++ b/homeassistant/components/api/__init__.py
@@ -28,7 +28,7 @@
 import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotFound, TemplateError, Unauthorized
-from homeassistant.helpers import template
+from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.service import async_get_all_descriptions
 from homeassistant.helpers.typing import ConfigType
@@ -49,6 +49,8 @@
 STREAM_PING_PAYLOAD = "ping"
 STREAM_PING_INTERVAL = 50  # seconds
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Register the API with the HTTP interface."""
diff --git a/homeassistant/components/apple_tv/config_flow.py b/homeassistant/components/apple_tv/config_flow.py
index 9b80d992cdd923..8a2130faca076e 100644
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -407,8 +407,9 @@ async def async_pair_next_protocol(self):
 
         # Protocol specific arguments
         pair_args = {}
-        if self.protocol == Protocol.DMAP:
+        if self.protocol in {Protocol.AirPlay, Protocol.Companion, Protocol.DMAP}:
             pair_args["name"] = "Home Assistant"
+        if self.protocol == Protocol.DMAP:
             pair_args["zeroconf"] = await zeroconf.async_get_instance(self.hass)
 
         # Initiate the pairing process
diff --git a/homeassistant/components/apple_tv/manifest.json b/homeassistant/components/apple_tv/manifest.json
index c534c635317c98..4ead41e86e9758 100644
--- a/homeassistant/components/apple_tv/manifest.json
+++ b/homeassistant/components/apple_tv/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.11.0"],
+  "requirements": ["pyatv==0.13.2"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",
diff --git a/homeassistant/components/apple_tv/media_player.py b/homeassistant/components/apple_tv/media_player.py
index 06618e4f2a3548..a70a30656f2d4c 100644
--- a/homeassistant/components/apple_tv/media_player.py
+++ b/homeassistant/components/apple_tv/media_player.py
@@ -138,6 +138,9 @@ def async_device_connected(self, atv: AppleTV) -> None:
         # Listen to power updates
         self.atv.power.listener = self
 
+        # Listen to volume updates
+        self.atv.audio.listener = self
+
         if self.atv.features.in_state(FeatureState.Available, FeatureName.AppList):
             self.hass.create_task(self._update_app_list())
 
@@ -203,6 +206,11 @@ def powerstate_update(self, old_state: PowerState, new_state: PowerState) -> Non
         """Update power state when it changes."""
         self.async_write_ha_state()
 
+    @callback
+    def volume_update(self, old_level: float, new_level: float) -> None:
+        """Update volume when it changes."""
+        self.async_write_ha_state()
+
     @property
     def app_id(self) -> str | None:
         """ID of the current running app."""
@@ -274,7 +282,7 @@ async def async_play_media(
         """Send the play_media command to the media player."""
         # If input (file) has a file format supported by pyatv, then stream it with
         # RAOP. Otherwise try to play it with regular AirPlay.
-        if media_type == MediaType.APP:
+        if media_type in {MediaType.APP, MediaType.URL}:
             await self.atv.apps.launch_app(media_id)
             return
 
diff --git a/homeassistant/components/apple_tv/strings.json b/homeassistant/components/apple_tv/strings.json
index 1420c0ffefcf60..e5948a54a8d924 100644
--- a/homeassistant/components/apple_tv/strings.json
+++ b/homeassistant/components/apple_tv/strings.json
@@ -49,6 +49,7 @@
     },
     "abort": {
       "ipv6_not_supported": "IPv6 is not supported.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "device_did_not_pair": "No attempt to finish pairing process was made from the device.",
diff --git a/homeassistant/components/application_credentials/__init__.py b/homeassistant/components/application_credentials/__init__.py
index f1471f29666509..679ff9bfac4544 100644
--- a/homeassistant/components/application_credentials/__init__.py
+++ b/homeassistant/components/application_credentials/__init__.py
@@ -57,6 +57,8 @@
 }
 UPDATE_FIELDS: dict = {}  # Not supported
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @dataclass
 class ClientCredential:
diff --git a/homeassistant/components/apprise/manifest.json b/homeassistant/components/apprise/manifest.json
index 9a56f5d91ebb16..04dcef052025aa 100644
--- a/homeassistant/components/apprise/manifest.json
+++ b/homeassistant/components/apprise/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/apprise",
   "iot_class": "cloud_push",
   "loggers": ["apprise"],
-  "requirements": ["apprise==1.4.0"]
+  "requirements": ["apprise==1.4.5"]
 }
diff --git a/homeassistant/components/aquostv/manifest.json b/homeassistant/components/aquostv/manifest.json
index 1bac2bdfb5ff8a..011b8e67a19c57 100644
--- a/homeassistant/components/aquostv/manifest.json
+++ b/homeassistant/components/aquostv/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aquostv",
   "iot_class": "local_polling",
   "loggers": ["sharp_aquos_rc"],
-  "requirements": ["sharp_aquos_rc==0.3.2"]
+  "requirements": ["sharp-aquos-rc==0.3.2"]
 }
diff --git a/homeassistant/components/aranet/sensor.py b/homeassistant/components/aranet/sensor.py
index 4596a7fd8af1fa..5c223940915b49 100644
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -1,6 +1,8 @@
 """Support for Aranet sensors."""
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 from aranet4.client import Aranet4Advertisement
 from bleak.backends.device import BLEDevice
 
@@ -23,53 +25,66 @@
     ATTR_SW_VERSION,
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
+    EntityCategory,
     UnitOfPressure,
     UnitOfTemperature,
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME, DeviceInfo
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
 
+
+@dataclass
+class AranetSensorEntityDescription(SensorEntityDescription):
+    """Class to describe an Aranet sensor entity."""
+
+    # PassiveBluetoothDataUpdate does not support UNDEFINED
+    # Restrict the type to satisfy the type checker and catch attempts
+    # to use UNDEFINED in the entity descriptions.
+    name: str | None = None
+
+
 SENSOR_DESCRIPTIONS = {
-    "temperature": SensorEntityDescription(
+    "temperature": AranetSensorEntityDescription(
         key="temperature",
         name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "humidity": SensorEntityDescription(
+    "humidity": AranetSensorEntityDescription(
         key="humidity",
         name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "pressure": SensorEntityDescription(
+    "pressure": AranetSensorEntityDescription(
         key="pressure",
         name="Pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.HPA,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "co2": SensorEntityDescription(
+    "co2": AranetSensorEntityDescription(
         key="co2",
         name="Carbon Dioxide",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "battery": SensorEntityDescription(
+    "battery": AranetSensorEntityDescription(
         key="battery",
         name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    "interval": SensorEntityDescription(
+    "interval": AranetSensorEntityDescription(
         key="update_interval",
         name="Update Interval",
         device_class=SensorDeviceClass.DURATION,
@@ -77,6 +92,7 @@
         state_class=SensorStateClass.MEASUREMENT,
         # The interval setting is not a generally useful entity for most users.
         entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
 }
 
@@ -105,13 +121,6 @@ def sensor_update_to_bluetooth_data_update(
     adv: Aranet4Advertisement,
 ) -> PassiveBluetoothDataUpdate:
     """Convert a sensor update to a Bluetooth data update."""
-    entity_names: dict[PassiveBluetoothEntityKey, str | None] = {}
-    for key, desc in SENSOR_DESCRIPTIONS.items():
-        # PassiveBluetoothDataUpdate does not support DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME in the entity descriptions.
-        assert desc.name is not DEVICE_CLASS_NAME
-        entity_names[_device_key_to_bluetooth_entity_key(adv.device, key)] = desc.name
     return PassiveBluetoothDataUpdate(
         devices={adv.device.address: _sensor_device_info_to_hass(adv)},
         entity_descriptions={
@@ -124,7 +133,10 @@ def sensor_update_to_bluetooth_data_update(
             )
             for key in SENSOR_DESCRIPTIONS
         },
-        entity_names=entity_names,
+        entity_names={
+            _device_key_to_bluetooth_entity_key(adv.device, key): desc.name
+            for key, desc in SENSOR_DESCRIPTIONS.items()
+        },
     )
 
 
diff --git a/homeassistant/components/arcam_fmj/device_trigger.py b/homeassistant/components/arcam_fmj/device_trigger.py
index ecaec0e0e7dfe1..ef83217ee26d62 100644
--- a/homeassistant/components/arcam_fmj/device_trigger.py
+++ b/homeassistant/components/arcam_fmj/device_trigger.py
@@ -3,7 +3,9 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -22,7 +24,7 @@
 TRIGGER_TYPES = {"turn_on"}
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -43,7 +45,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_on",
                 }
             )
@@ -62,7 +64,8 @@ async def async_attach_trigger(
     job = HassJob(action)
 
     if config[CONF_TYPE] == "turn_on":
-        entity_id = config[CONF_ENTITY_ID]
+        registry = er.async_get(hass)
+        entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
 
         @callback
         def _handle_event(event: Event) -> None:
@@ -71,9 +74,10 @@ def _handle_event(event: Event) -> None:
                     job,
                     {
                         "trigger": {
-                            **trigger_data,  # type: ignore[arg-type]  # https://github.com/python/mypy/issues/9117
+                            **trigger_data,
                             **config,
                             "description": f"{DOMAIN} - {entity_id}",
+                            "entity_id": entity_id,
                         }
                     },
                     event.context,
diff --git a/homeassistant/components/arcam_fmj/manifest.json b/homeassistant/components/arcam_fmj/manifest.json
index 9a76d4843f03f0..2c9b64b00ce184 100644
--- a/homeassistant/components/arcam_fmj/manifest.json
+++ b/homeassistant/components/arcam_fmj/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.3.0"],
+  "requirements": ["arcam-fmj==1.4.0"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",
diff --git a/homeassistant/components/arest/switch.py b/homeassistant/components/arest/switch.py
index 6efa24c5a0f5ab..1c67723fc02865 100644
--- a/homeassistant/components/arest/switch.py
+++ b/homeassistant/components/arest/switch.py
@@ -161,16 +161,13 @@ def update(self) -> None:
 class ArestSwitchPin(ArestSwitchBase):
     """Representation of an aREST switch. Based on digital I/O."""
 
-    def __init__(self, resource, location, name, pin, invert):
+    def __init__(self, resource, location, name, pin, invert) -> None:
         """Initialize the switch."""
         super().__init__(resource, location, name)
         self._pin = pin
         self.invert = invert
 
-        request = requests.get(f"{resource}/mode/{pin}/o", timeout=10)
-        if request.status_code != HTTPStatus.OK:
-            _LOGGER.error("Can't set mode")
-            self._attr_available = False
+        self.__set_pin_output()
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
@@ -200,7 +197,15 @@ def update(self) -> None:
             request = requests.get(f"{self._resource}/digital/{self._pin}", timeout=10)
             status_value = int(self.invert)
             self._attr_is_on = request.json()["return_value"] != status_value
-            self._attr_available = True
+            if self._attr_available is False:
+                self._attr_available = True
+                self.__set_pin_output()
         except requests.exceptions.ConnectionError:
             _LOGGER.warning("No route to device %s", self._resource)
             self._attr_available = False
+
+    def __set_pin_output(self) -> None:
+        request = requests.get(f"{self._resource}/mode/{self._pin}/o", timeout=10)
+        if request.status_code != HTTPStatus.OK:
+            _LOGGER.error("Can't set mode")
+            self._attr_available = False
diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py
index 7af379804e1d88..55b192a730ae1d 100644
--- a/homeassistant/components/assist_pipeline/__init__.py
+++ b/homeassistant/components/assist_pipeline/__init__.py
@@ -5,6 +5,7 @@
 
 from homeassistant.components import stt
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -33,8 +34,11 @@
     "Pipeline",
     "PipelineEvent",
     "PipelineEventType",
+    "PipelineNotFound",
 )
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Assist pipeline integration."""
@@ -53,28 +57,26 @@ async def async_pipeline_from_audio_stream(
     pipeline_id: str | None = None,
     conversation_id: str | None = None,
     tts_audio_output: str | None = None,
+    device_id: str | None = None,
 ) -> None:
-    """Create an audio pipeline from an audio stream."""
-    pipeline = async_get_pipeline(hass, pipeline_id=pipeline_id)
-    if pipeline is None:
-        raise PipelineNotFound(
-            "pipeline_not_found", f"Pipeline {pipeline_id} not found"
-        )
+    """Create an audio pipeline from an audio stream.
 
+    Raises PipelineNotFound if no pipeline is found.
+    """
     pipeline_input = PipelineInput(
         conversation_id=conversation_id,
+        device_id=device_id,
         stt_metadata=stt_metadata,
         stt_stream=stt_stream,
         run=PipelineRun(
             hass,
             context=context,
-            pipeline=pipeline,
+            pipeline=async_get_pipeline(hass, pipeline_id=pipeline_id),
             start_stage=PipelineStage.STT,
             end_stage=PipelineStage.TTS,
             event_callback=event_callback,
             tts_audio_output=tts_audio_output,
         ),
     )
-
     await pipeline_input.validate()
     await pipeline_input.execute()
diff --git a/homeassistant/components/assist_pipeline/error.py b/homeassistant/components/assist_pipeline/error.py
index fa26d916eeb788..c5ffdcaf2d346c 100644
--- a/homeassistant/components/assist_pipeline/error.py
+++ b/homeassistant/components/assist_pipeline/error.py
@@ -19,7 +19,7 @@ class PipelineNotFound(PipelineError):
 
 
 class SpeechToTextError(PipelineError):
-    """Error in speech to text portion of pipeline."""
+    """Error in speech-to-text portion of pipeline."""
 
 
 class IntentRecognitionError(PipelineError):
@@ -27,4 +27,4 @@ class IntentRecognitionError(PipelineError):
 
 
 class TextToSpeechError(PipelineError):
-    """Error in text to speech portion of pipeline."""
+    """Error in text-to-speech portion of pipeline."""
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index 6a4bbdf61e690d..891fc639feee15 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -36,6 +36,7 @@
 from .error import (
     IntentRecognitionError,
     PipelineError,
+    PipelineNotFound,
     SpeechToTextError,
     TextToSpeechError,
 )
@@ -125,7 +126,7 @@ async def _async_resolve_default_pipeline_settings(
             stt_language = stt_languages[0]
         else:
             _LOGGER.debug(
-                "Speech to text engine '%s' does not support language '%s'",
+                "Speech-to-text engine '%s' does not support language '%s'",
                 stt_engine_id,
                 pipeline_language,
             )
@@ -152,7 +153,7 @@ async def _async_resolve_default_pipeline_settings(
                 tts_voice = tts_voices[0].voice_id
         else:
             _LOGGER.debug(
-                "Text to speech engine '%s' does not support language '%s'",
+                "Text-to-speech engine '%s' does not support language '%s'",
                 tts_engine_id,
                 pipeline_language,
             )
@@ -208,9 +209,7 @@ async def async_create_default_pipeline(
 
 
 @callback
-def async_get_pipeline(
-    hass: HomeAssistant, pipeline_id: str | None = None
-) -> Pipeline | None:
+def async_get_pipeline(hass: HomeAssistant, pipeline_id: str | None = None) -> Pipeline:
     """Get a pipeline by id or the preferred pipeline."""
     pipeline_data: PipelineData = hass.data[DOMAIN]
 
@@ -218,7 +217,15 @@ def async_get_pipeline(
         # A pipeline was not specified, use the preferred one
         pipeline_id = pipeline_data.pipeline_store.async_get_preferred_item()
 
-    return pipeline_data.pipeline_store.data.get(pipeline_id)
+    pipeline = pipeline_data.pipeline_store.data.get(pipeline_id)
+
+    # If invalid pipeline ID was specified
+    if pipeline is None:
+        raise PipelineNotFound(
+            "pipeline_not_found", f"Pipeline {pipeline_id} not found"
+        )
+
+    return pipeline
 
 
 @callback
@@ -387,7 +394,7 @@ def end(self) -> None:
         )
 
     async def prepare_speech_to_text(self, metadata: stt.SpeechMetadata) -> None:
-        """Prepare speech to text."""
+        """Prepare speech-to-text."""
         # pipeline.stt_engine can't be None or this function is not called
         stt_provider = stt.async_get_speech_to_text_engine(
             self.hass,
@@ -398,7 +405,7 @@ async def prepare_speech_to_text(self, metadata: stt.SpeechMetadata) -> None:
             engine = self.pipeline.stt_engine
             raise SpeechToTextError(
                 code="stt-provider-missing",
-                message=f"No speech to text provider for: {engine}",
+                message=f"No speech-to-text provider for: {engine}",
             )
 
         metadata.language = self.pipeline.stt_language or self.language
@@ -419,7 +426,7 @@ async def speech_to_text(
         metadata: stt.SpeechMetadata,
         stream: AsyncIterable[bytes],
     ) -> str:
-        """Run speech to text portion of pipeline. Returns the spoken text."""
+        """Run speech-to-text portion of pipeline. Returns the spoken text."""
         if isinstance(self.stt_provider, stt.Provider):
             engine = self.stt_provider.name
         else:
@@ -441,10 +448,10 @@ async def speech_to_text(
                 metadata, stream
             )
         except Exception as src_error:
-            _LOGGER.exception("Unexpected error during speech to text")
+            _LOGGER.exception("Unexpected error during speech-to-text")
             raise SpeechToTextError(
                 code="stt-stream-failed",
-                message="Unexpected error during speech to text",
+                message="Unexpected error during speech-to-text",
             ) from src_error
 
         _LOGGER.debug("speech-to-text result %s", result)
@@ -452,7 +459,7 @@ async def speech_to_text(
         if result.result != stt.SpeechResultState.SUCCESS:
             raise SpeechToTextError(
                 code="stt-stream-failed",
-                message="Speech to text failed",
+                message="speech-to-text failed",
             )
 
         if not result.text:
@@ -492,7 +499,7 @@ async def prepare_recognize_intent(self) -> None:
         self.intent_agent = agent_info.id
 
     async def recognize_intent(
-        self, intent_input: str, conversation_id: str | None
+        self, intent_input: str, conversation_id: str | None, device_id: str | None
     ) -> str:
         """Run intent recognition portion of pipeline. Returns text to speak."""
         if self.intent_agent is None:
@@ -505,6 +512,8 @@ async def recognize_intent(
                     "engine": self.intent_agent,
                     "language": self.pipeline.conversation_language,
                     "intent_input": intent_input,
+                    "conversation_id": conversation_id,
+                    "device_id": device_id,
                 },
             )
         )
@@ -514,6 +523,7 @@ async def recognize_intent(
                 hass=self.hass,
                 text=intent_input,
                 conversation_id=conversation_id,
+                device_id=device_id,
                 context=self.context,
                 language=self.pipeline.conversation_language,
                 agent_id=self.intent_agent,
@@ -541,7 +551,7 @@ async def recognize_intent(
         return speech
 
     async def prepare_text_to_speech(self) -> None:
-        """Prepare text to speech."""
+        """Prepare text-to-speech."""
         # pipeline.tts_engine can't be None or this function is not called
         engine = cast(str, self.pipeline.tts_engine)
 
@@ -562,13 +572,13 @@ async def prepare_text_to_speech(self) -> None:
         except HomeAssistantError as err:
             raise TextToSpeechError(
                 code="tts-not-supported",
-                message=f"Text to speech engine '{engine}' not found",
+                message=f"Text-to-speech engine '{engine}' not found",
             ) from err
         if not options_supported:
             raise TextToSpeechError(
                 code="tts-not-supported",
                 message=(
-                    f"Text to speech engine {engine} "
+                    f"Text-to-speech engine {engine} "
                     f"does not support language {self.pipeline.tts_language} or options {tts_options}"
                 ),
             )
@@ -577,7 +587,7 @@ async def prepare_text_to_speech(self) -> None:
         self.tts_options = tts_options
 
     async def text_to_speech(self, tts_input: str) -> str:
-        """Run text to speech portion of pipeline. Returns URL of TTS audio."""
+        """Run text-to-speech portion of pipeline. Returns URL of TTS audio."""
         self.process_event(
             PipelineEvent(
                 PipelineEventType.TTS_START,
@@ -605,10 +615,10 @@ async def text_to_speech(self, tts_input: str) -> str:
                 None,
             )
         except Exception as src_error:
-            _LOGGER.exception("Unexpected error during text to speech")
+            _LOGGER.exception("Unexpected error during text-to-speech")
             raise TextToSpeechError(
                 code="tts-failed",
-                message="Unexpected error during text to speech",
+                message="Unexpected error during text-to-speech",
             ) from src_error
 
         _LOGGER.debug("TTS result %s", tts_media)
@@ -644,17 +654,19 @@ class PipelineInput:
     """Input for conversation agent. Required when start_stage = intent."""
 
     tts_input: str | None = None
-    """Input for text to speech. Required when start_stage = tts."""
+    """Input for text-to-speech. Required when start_stage = tts."""
 
     conversation_id: str | None = None
 
+    device_id: str | None = None
+
     async def execute(self) -> None:
         """Run pipeline."""
         self.run.start()
         current_stage = self.run.start_stage
 
         try:
-            # Speech to text
+            # speech-to-text
             intent_input = self.intent_input
             if current_stage == PipelineStage.STT:
                 assert self.stt_metadata is not None
@@ -671,7 +683,9 @@ async def execute(self) -> None:
                 if current_stage == PipelineStage.INTENT:
                     assert intent_input is not None
                     tts_input = await self.run.recognize_intent(
-                        intent_input, self.conversation_id
+                        intent_input,
+                        self.conversation_id,
+                        self.device_id,
                     )
                     current_stage = PipelineStage.TTS
 
@@ -696,15 +710,15 @@ async def validate(self) -> None:
         if self.run.start_stage == PipelineStage.STT:
             if self.run.pipeline.stt_engine is None:
                 raise PipelineRunValidationError(
-                    "the pipeline does not support speech to text"
+                    "the pipeline does not support speech-to-text"
                 )
             if self.stt_metadata is None:
                 raise PipelineRunValidationError(
-                    "stt_metadata is required for speech to text"
+                    "stt_metadata is required for speech-to-text"
                 )
             if self.stt_stream is None:
                 raise PipelineRunValidationError(
-                    "stt_stream is required for speech to text"
+                    "stt_stream is required for speech-to-text"
                 )
         elif self.run.start_stage == PipelineStage.INTENT:
             if self.intent_input is None:
@@ -714,26 +728,39 @@ async def validate(self) -> None:
         elif self.run.start_stage == PipelineStage.TTS:
             if self.tts_input is None:
                 raise PipelineRunValidationError(
-                    "tts_input is required for text to speech"
+                    "tts_input is required for text-to-speech"
                 )
         if self.run.end_stage == PipelineStage.TTS:
             if self.run.pipeline.tts_engine is None:
                 raise PipelineRunValidationError(
-                    "the pipeline does not support text to speech"
+                    "the pipeline does not support text-to-speech"
                 )
 
         start_stage_index = PIPELINE_STAGE_ORDER.index(self.run.start_stage)
+        end_stage_index = PIPELINE_STAGE_ORDER.index(self.run.end_stage)
 
         prepare_tasks = []
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.STT):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.STT)
+            <= end_stage_index
+        ):
             # self.stt_metadata can't be None or we'd raise above
             prepare_tasks.append(self.run.prepare_speech_to_text(self.stt_metadata))  # type: ignore[arg-type]
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT)
+            <= end_stage_index
+        ):
             prepare_tasks.append(self.run.prepare_recognize_intent())
 
-        if start_stage_index <= PIPELINE_STAGE_ORDER.index(PipelineStage.TTS):
+        if (
+            start_stage_index
+            <= PIPELINE_STAGE_ORDER.index(PipelineStage.TTS)
+            <= end_stage_index
+        ):
             prepare_tasks.append(self.run.prepare_text_to_speech())
 
         if prepare_tasks:
@@ -937,6 +964,7 @@ class PipelineData:
 
     pipeline_runs: dict[str, LimitedSizeDict[str, PipelineRunDebug]]
     pipeline_store: PipelineStorageCollection
+    pipeline_devices: set[str] = field(default_factory=set, init=False)
 
 
 @dataclass
diff --git a/homeassistant/components/assist_pipeline/select.py b/homeassistant/components/assist_pipeline/select.py
index 9ac1d6b5888325..2ae46fcb9ac591 100644
--- a/homeassistant/components/assist_pipeline/select.py
+++ b/homeassistant/components/assist_pipeline/select.py
@@ -10,7 +10,8 @@
 from homeassistant.helpers import collection, entity_registry as er, restore_state
 
 from .const import DOMAIN
-from .pipeline import PipelineStorageCollection
+from .pipeline import PipelineData, PipelineStorageCollection
+from .vad import VadSensitivity
 
 OPTION_PREFERRED = "preferred"
 
@@ -38,6 +39,25 @@ def get_chosen_pipeline(
     )
 
 
+@callback
+def get_vad_sensitivity(
+    hass: HomeAssistant, domain: str, unique_id_prefix: str
+) -> VadSensitivity:
+    """Get the chosen vad sensitivity for a domain."""
+    ent_reg = er.async_get(hass)
+    sensitivity_entity_id = ent_reg.async_get_entity_id(
+        Platform.SELECT, domain, f"{unique_id_prefix}-vad_sensitivity"
+    )
+    if sensitivity_entity_id is None:
+        return VadSensitivity.DEFAULT
+
+    state = hass.states.get(sensitivity_entity_id)
+    if state is None:
+        return VadSensitivity.DEFAULT
+
+    return VadSensitivity(state.state)
+
+
 class AssistPipelineSelect(SelectEntity, restore_state.RestoreEntity):
     """Entity to represent a pipeline selector."""
 
@@ -60,15 +80,24 @@ async def async_added_to_hass(self) -> None:
         """When entity is added to Home Assistant."""
         await super().async_added_to_hass()
 
-        pipeline_store: PipelineStorageCollection = self.hass.data[
-            DOMAIN
-        ].pipeline_store
-        pipeline_store.async_add_change_set_listener(self._pipelines_updated)
+        pipeline_data: PipelineData = self.hass.data[DOMAIN]
+        pipeline_store = pipeline_data.pipeline_store
+        self.async_on_remove(
+            pipeline_store.async_add_change_set_listener(self._pipelines_updated)
+        )
 
         state = await self.async_get_last_state()
         if state is not None and state.state in self.options:
             self._attr_current_option = state.state
 
+        if self.registry_entry and (device_id := self.registry_entry.device_id):
+            pipeline_data.pipeline_devices.add(device_id)
+            self.async_on_remove(
+                lambda: pipeline_data.pipeline_devices.discard(
+                    device_id  # type: ignore[arg-type]
+                )
+            )
+
     async def async_select_option(self, option: str) -> None:
         """Select an option."""
         self._attr_current_option = option
@@ -93,3 +122,34 @@ def _update_options(self) -> None:
 
         if self._attr_current_option not in options:
             self._attr_current_option = OPTION_PREFERRED
+
+
+class VadSensitivitySelect(SelectEntity, restore_state.RestoreEntity):
+    """Entity to represent VAD sensitivity."""
+
+    entity_description = SelectEntityDescription(
+        key="vad_sensitivity",
+        translation_key="vad_sensitivity",
+        entity_category=EntityCategory.CONFIG,
+    )
+    _attr_should_poll = False
+    _attr_current_option = VadSensitivity.DEFAULT.value
+    _attr_options = [vs.value for vs in VadSensitivity]
+
+    def __init__(self, hass: HomeAssistant, unique_id_prefix: str) -> None:
+        """Initialize a pipeline selector."""
+        self._attr_unique_id = f"{unique_id_prefix}-vad_sensitivity"
+        self.hass = hass
+
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to Home Assistant."""
+        await super().async_added_to_hass()
+
+        state = await self.async_get_last_state()
+        if state is not None and state.state in self.options:
+            self._attr_current_option = state.state
+
+    async def async_select_option(self, option: str) -> None:
+        """Select an option."""
+        self._attr_current_option = option
+        self.async_write_ha_state()
diff --git a/homeassistant/components/assist_pipeline/strings.json b/homeassistant/components/assist_pipeline/strings.json
index d85eb1aaed9893..8fa67879fc3883 100644
--- a/homeassistant/components/assist_pipeline/strings.json
+++ b/homeassistant/components/assist_pipeline/strings.json
@@ -11,6 +11,14 @@
         "state": {
           "preferred": "Preferred"
         }
+      },
+      "vad_sensitivity": {
+        "name": "Finished speaking detection",
+        "state": {
+          "default": "Default",
+          "aggressive": "Aggressive",
+          "relaxed": "Relaxed"
+        }
       }
     }
   }
diff --git a/homeassistant/components/assist_pipeline/vad.py b/homeassistant/components/assist_pipeline/vad.py
index c5f87f1336ad5e..a737490f22f18a 100644
--- a/homeassistant/components/assist_pipeline/vad.py
+++ b/homeassistant/components/assist_pipeline/vad.py
@@ -1,11 +1,35 @@
 """Voice activity detection."""
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 
 import webrtcvad
 
+from homeassistant.backports.enum import StrEnum
+
 _SAMPLE_RATE = 16000
 
 
+class VadSensitivity(StrEnum):
+    """How quickly the end of a voice command is detected."""
+
+    DEFAULT = "default"
+    RELAXED = "relaxed"
+    AGGRESSIVE = "aggressive"
+
+    @staticmethod
+    def to_seconds(sensitivity: VadSensitivity | str) -> float:
+        """Return seconds of silence for sensitivity level."""
+        sensitivity = VadSensitivity(sensitivity)
+        if sensitivity == VadSensitivity.RELAXED:
+            return 2.0
+
+        if sensitivity == VadSensitivity.AGGRESSIVE:
+            return 0.5
+
+        return 1.0
+
+
 @dataclass
 class VoiceCommandSegmenter:
     """Segments an audio stream into voice commands using webrtcvad."""
@@ -113,16 +137,15 @@ def _process_chunk(self, chunk: bytes) -> bool:
                 self._reset_seconds_left -= self._seconds_per_chunk
                 if self._reset_seconds_left <= 0:
                     self._speech_seconds_left = self.speech_seconds
+        elif not is_speech:
+            self._reset_seconds_left = self.reset_seconds
+            self._silence_seconds_left -= self._seconds_per_chunk
+            if self._silence_seconds_left <= 0:
+                return False
         else:
-            if not is_speech:
-                self._reset_seconds_left = self.reset_seconds
-                self._silence_seconds_left -= self._seconds_per_chunk
-                if self._silence_seconds_left <= 0:
-                    return False
-            else:
-                # Reset if enough speech
-                self._reset_seconds_left -= self._seconds_per_chunk
-                if self._reset_seconds_left <= 0:
-                    self._silence_seconds_left = self.silence_seconds
+            # Reset if enough speech
+            self._reset_seconds_left -= self._seconds_per_chunk
+            if self._reset_seconds_left <= 0:
+                self._silence_seconds_left = self.silence_seconds
 
         return True
diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py
index 6c1dbe3dbce921..ea3aacf43a4124 100644
--- a/homeassistant/components/assist_pipeline/websocket_api.py
+++ b/homeassistant/components/assist_pipeline/websocket_api.py
@@ -17,6 +17,7 @@
 from homeassistant.util import language as language_util
 
 from .const import DOMAIN
+from .error import PipelineNotFound
 from .pipeline import (
     PipelineData,
     PipelineError,
@@ -55,6 +56,7 @@ def async_register_websocket_api(hass: HomeAssistant) -> None:
                 vol.Optional("input"): dict,
                 vol.Optional("pipeline"): str,
                 vol.Optional("conversation_id"): vol.Any(str, None),
+                vol.Optional("device_id"): vol.Any(str, None),
                 vol.Optional("timeout"): vol.Any(float, int),
             },
         ),
@@ -85,8 +87,9 @@ async def websocket_run(
 ) -> None:
     """Run a pipeline."""
     pipeline_id = msg.get("pipeline")
-    pipeline = async_get_pipeline(hass, pipeline_id=pipeline_id)
-    if pipeline is None:
+    try:
+        pipeline = async_get_pipeline(hass, pipeline_id=pipeline_id)
+    except PipelineNotFound:
         connection.send_error(
             msg["id"],
             "pipeline-not-found",
@@ -103,6 +106,7 @@ async def websocket_run(
     # Arguments to PipelineInput
     input_args: dict[str, Any] = {
         "conversation_id": msg.get("conversation_id"),
+        "device_id": msg.get("device_id"),
     }
 
     if start_stage == PipelineStage.STT:
@@ -151,7 +155,7 @@ def handle_binary(
         # Input to conversation agent
         input_args["intent_input"] = msg["input"]["text"]
     elif start_stage == PipelineStage.TTS:
-        # Input to text to speech system
+        # Input to text-to-speech system
         input_args["tts_input"] = msg["input"]["text"]
 
     input_args["run"] = PipelineRun(
@@ -278,7 +282,6 @@ def websocket_get_run(
     )
 
 
-@callback
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "assist_pipeline/language/list",
diff --git a/homeassistant/components/asterisk_mbox/manifest.json b/homeassistant/components/asterisk_mbox/manifest.json
index 8348e40ba6b9aa..840c48aff2aa29 100644
--- a/homeassistant/components/asterisk_mbox/manifest.json
+++ b/homeassistant/components/asterisk_mbox/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/asterisk_mbox",
   "iot_class": "local_push",
   "loggers": ["asterisk_mbox"],
-  "requirements": ["asterisk_mbox==0.5.0"]
+  "requirements": ["asterisk-mbox==0.5.0"]
 }
diff --git a/homeassistant/components/asuswrt/bridge.py b/homeassistant/components/asuswrt/bridge.py
new file mode 100644
index 00000000000000..9e6da0ea8f779c
--- /dev/null
+++ b/homeassistant/components/asuswrt/bridge.py
@@ -0,0 +1,273 @@
+"""aioasuswrt and pyasuswrt bridge classes."""
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from collections import namedtuple
+import logging
+from typing import Any, cast
+
+from aioasuswrt.asuswrt import AsusWrt as AsusWrtLegacy
+
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MODE,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_PROTOCOL,
+    CONF_USERNAME,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.update_coordinator import UpdateFailed
+
+from .const import (
+    CONF_DNSMASQ,
+    CONF_INTERFACE,
+    CONF_REQUIRE_IP,
+    CONF_SSH_KEY,
+    DEFAULT_DNSMASQ,
+    DEFAULT_INTERFACE,
+    KEY_METHOD,
+    KEY_SENSORS,
+    PROTOCOL_TELNET,
+    SENSORS_BYTES,
+    SENSORS_LOAD_AVG,
+    SENSORS_RATES,
+    SENSORS_TEMPERATURES,
+)
+
+SENSORS_TYPE_BYTES = "sensors_bytes"
+SENSORS_TYPE_COUNT = "sensors_count"
+SENSORS_TYPE_LOAD_AVG = "sensors_load_avg"
+SENSORS_TYPE_RATES = "sensors_rates"
+SENSORS_TYPE_TEMPERATURES = "sensors_temperatures"
+
+WrtDevice = namedtuple("WrtDevice", ["ip", "name", "connected_to"])
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def _get_dict(keys: list, values: list) -> dict[str, Any]:
+    """Create a dict from a list of keys and values."""
+    return dict(zip(keys, values))
+
+
+class AsusWrtBridge(ABC):
+    """The Base Bridge abstract class."""
+
+    @staticmethod
+    def get_bridge(
+        hass: HomeAssistant, conf: dict[str, Any], options: dict[str, Any] | None = None
+    ) -> AsusWrtBridge:
+        """Get Bridge instance."""
+        return AsusWrtLegacyBridge(conf, options)
+
+    def __init__(self, host: str) -> None:
+        """Initialize Bridge."""
+        self._host = host
+        self._firmware: str | None = None
+        self._label_mac: str | None = None
+        self._model: str | None = None
+
+    @property
+    def host(self) -> str:
+        """Return hostname."""
+        return self._host
+
+    @property
+    def firmware(self) -> str | None:
+        """Return firmware information."""
+        return self._firmware
+
+    @property
+    def label_mac(self) -> str | None:
+        """Return label mac information."""
+        return self._label_mac
+
+    @property
+    def model(self) -> str | None:
+        """Return model information."""
+        return self._model
+
+    @property
+    @abstractmethod
+    def is_connected(self) -> bool:
+        """Get connected status."""
+
+    @abstractmethod
+    async def async_connect(self) -> None:
+        """Connect to the device."""
+
+    @abstractmethod
+    async def async_disconnect(self) -> None:
+        """Disconnect to the device."""
+
+    @abstractmethod
+    async def async_get_connected_devices(self) -> dict[str, WrtDevice]:
+        """Get list of connected devices."""
+
+    @abstractmethod
+    async def async_get_available_sensors(self) -> dict[str, dict[str, Any]]:
+        """Return a dictionary of available sensors for this bridge."""
+
+
+class AsusWrtLegacyBridge(AsusWrtBridge):
+    """The Bridge that use legacy library."""
+
+    def __init__(
+        self, conf: dict[str, Any], options: dict[str, Any] | None = None
+    ) -> None:
+        """Initialize Bridge."""
+        super().__init__(conf[CONF_HOST])
+        self._protocol: str = conf[CONF_PROTOCOL]
+        self._api: AsusWrtLegacy = self._get_api(conf, options)
+
+    @staticmethod
+    def _get_api(
+        conf: dict[str, Any], options: dict[str, Any] | None = None
+    ) -> AsusWrtLegacy:
+        """Get the AsusWrtLegacy API."""
+        opt = options or {}
+
+        return AsusWrtLegacy(
+            conf[CONF_HOST],
+            conf.get(CONF_PORT),
+            conf[CONF_PROTOCOL] == PROTOCOL_TELNET,
+            conf[CONF_USERNAME],
+            conf.get(CONF_PASSWORD, ""),
+            conf.get(CONF_SSH_KEY, ""),
+            conf[CONF_MODE],
+            opt.get(CONF_REQUIRE_IP, True),
+            interface=opt.get(CONF_INTERFACE, DEFAULT_INTERFACE),
+            dnsmasq=opt.get(CONF_DNSMASQ, DEFAULT_DNSMASQ),
+        )
+
+    @property
+    def is_connected(self) -> bool:
+        """Get connected status."""
+        return cast(bool, self._api.is_connected)
+
+    async def async_connect(self) -> None:
+        """Connect to the device."""
+        await self._api.connection.async_connect()
+
+        # get main router properties
+        if self._label_mac is None:
+            await self._get_label_mac()
+        if self._firmware is None:
+            await self._get_firmware()
+        if self._model is None:
+            await self._get_model()
+
+    async def async_disconnect(self) -> None:
+        """Disconnect to the device."""
+        if self._api is not None and self._protocol == PROTOCOL_TELNET:
+            self._api.connection.disconnect()
+
+    async def async_get_connected_devices(self) -> dict[str, WrtDevice]:
+        """Get list of connected devices."""
+        try:
+            api_devices = await self._api.async_get_connected_devices()
+        except OSError as exc:
+            raise UpdateFailed(exc) from exc
+        return {
+            format_mac(mac): WrtDevice(dev.ip, dev.name, None)
+            for mac, dev in api_devices.items()
+        }
+
+    async def _get_nvram_info(self, info_type: str) -> dict[str, Any]:
+        """Get AsusWrt router info from nvram."""
+        info = {}
+        try:
+            info = await self._api.async_get_nvram(info_type)
+        except OSError as exc:
+            _LOGGER.warning(
+                "Error calling method async_get_nvram(%s): %s", info_type, exc
+            )
+
+        return info
+
+    async def _get_label_mac(self) -> None:
+        """Get label mac information."""
+        label_mac = await self._get_nvram_info("LABEL_MAC")
+        if label_mac and "label_mac" in label_mac:
+            self._label_mac = format_mac(label_mac["label_mac"])
+
+    async def _get_firmware(self) -> None:
+        """Get firmware information."""
+        firmware = await self._get_nvram_info("FIRMWARE")
+        if firmware and "firmver" in firmware:
+            firmver: str = firmware["firmver"]
+            if "buildno" in firmware:
+                firmver += f" (build {firmware['buildno']})"
+            self._firmware = firmver
+
+    async def _get_model(self) -> None:
+        """Get model information."""
+        model = await self._get_nvram_info("MODEL")
+        if model and "model" in model:
+            self._model = model["model"]
+
+    async def async_get_available_sensors(self) -> dict[str, dict[str, Any]]:
+        """Return a dictionary of available sensors for this bridge."""
+        sensors_temperatures = await self._get_available_temperature_sensors()
+        sensors_types = {
+            SENSORS_TYPE_BYTES: {
+                KEY_SENSORS: SENSORS_BYTES,
+                KEY_METHOD: self._get_bytes,
+            },
+            SENSORS_TYPE_LOAD_AVG: {
+                KEY_SENSORS: SENSORS_LOAD_AVG,
+                KEY_METHOD: self._get_load_avg,
+            },
+            SENSORS_TYPE_RATES: {
+                KEY_SENSORS: SENSORS_RATES,
+                KEY_METHOD: self._get_rates,
+            },
+            SENSORS_TYPE_TEMPERATURES: {
+                KEY_SENSORS: sensors_temperatures,
+                KEY_METHOD: self._get_temperatures,
+            },
+        }
+        return sensors_types
+
+    async def _get_available_temperature_sensors(self) -> list[str]:
+        """Check which temperature information is available on the router."""
+        availability = await self._api.async_find_temperature_commands()
+        return [SENSORS_TEMPERATURES[i] for i in range(3) if availability[i]]
+
+    async def _get_bytes(self) -> dict[str, Any]:
+        """Fetch byte information from the router."""
+        try:
+            datas = await self._api.async_get_bytes_total()
+        except (IndexError, OSError, ValueError) as exc:
+            raise UpdateFailed(exc) from exc
+
+        return _get_dict(SENSORS_BYTES, datas)
+
+    async def _get_rates(self) -> dict[str, Any]:
+        """Fetch rates information from the router."""
+        try:
+            rates = await self._api.async_get_current_transfer_rates()
+        except (IndexError, OSError, ValueError) as exc:
+            raise UpdateFailed(exc) from exc
+
+        return _get_dict(SENSORS_RATES, rates)
+
+    async def _get_load_avg(self) -> dict[str, Any]:
+        """Fetch load average information from the router."""
+        try:
+            avg = await self._api.async_get_loadavg()
+        except (IndexError, OSError, ValueError) as exc:
+            raise UpdateFailed(exc) from exc
+
+        return _get_dict(SENSORS_LOAD_AVG, avg)
+
+    async def _get_temperatures(self) -> dict[str, Any]:
+        """Fetch temperatures information from the router."""
+        try:
+            temperatures: dict[str, Any] = await self._api.async_get_temperature()
+        except (OSError, ValueError) as exc:
+            raise UpdateFailed(exc) from exc
+
+        return temperatures
diff --git a/homeassistant/components/asuswrt/config_flow.py b/homeassistant/components/asuswrt/config_flow.py
index 6b0056b14faab9..56569d4f23bc5a 100644
--- a/homeassistant/components/asuswrt/config_flow.py
+++ b/homeassistant/components/asuswrt/config_flow.py
@@ -25,13 +25,13 @@
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaCommonFlowHandler,
     SchemaFlowFormStep,
     SchemaOptionsFlowHandler,
 )
 
+from .bridge import AsusWrtBridge
 from .const import (
     CONF_DNSMASQ,
     CONF_INTERFACE,
@@ -47,7 +47,6 @@
     PROTOCOL_SSH,
     PROTOCOL_TELNET,
 )
-from .router import get_api, get_nvram_info
 
 LABEL_MAC = "LABEL_MAC"
 
@@ -143,16 +142,15 @@ def _show_setup_form(
             errors=errors or {},
         )
 
-    @staticmethod
     async def _async_check_connection(
-        user_input: dict[str, Any]
+        self, user_input: dict[str, Any]
     ) -> tuple[str, str | None]:
         """Attempt to connect the AsusWrt router."""
 
         host: str = user_input[CONF_HOST]
-        api = get_api(user_input)
+        api = AsusWrtBridge.get_bridge(self.hass, user_input)
         try:
-            await api.connection.async_connect()
+            await api.async_connect()
 
         except OSError:
             _LOGGER.error("Error connecting to the AsusWrt router at %s", host)
@@ -168,14 +166,9 @@ async def _async_check_connection(
             _LOGGER.error("Error connecting to the AsusWrt router at %s", host)
             return RESULT_CONN_ERROR, None
 
-        label_mac = await get_nvram_info(api, LABEL_MAC)
-        conf_protocol = user_input[CONF_PROTOCOL]
-        if conf_protocol == PROTOCOL_TELNET:
-            api.connection.disconnect()
+        unique_id = api.label_mac
+        await api.async_disconnect()
 
-        unique_id = None
-        if label_mac and "label_mac" in label_mac:
-            unique_id = format_mac(label_mac["label_mac"])
         return RESULT_SUCCESS, unique_id
 
     async def async_step_user(
diff --git a/homeassistant/components/asuswrt/const.py b/homeassistant/components/asuswrt/const.py
index f80643f078d4d2..1733d4c09c3765 100644
--- a/homeassistant/components/asuswrt/const.py
+++ b/homeassistant/components/asuswrt/const.py
@@ -13,6 +13,10 @@
 DEFAULT_INTERFACE = "eth0"
 DEFAULT_TRACK_UNKNOWN = False
 
+KEY_COORDINATOR = "coordinator"
+KEY_METHOD = "method"
+KEY_SENSORS = "sensors"
+
 MODE_AP = "ap"
 MODE_ROUTER = "router"
 
diff --git a/homeassistant/components/asuswrt/router.py b/homeassistant/components/asuswrt/router.py
index 4291c21d0ed1ac..c782a8f0f3b036 100644
--- a/homeassistant/components/asuswrt/router.py
+++ b/homeassistant/components/asuswrt/router.py
@@ -6,22 +6,12 @@
 import logging
 from typing import Any
 
-from aioasuswrt.asuswrt import AsusWrt, Device as WrtDevice
-
 from homeassistant.components.device_tracker import (
     CONF_CONSIDER_HOME,
     DEFAULT_CONSIDER_HOME,
     DOMAIN as TRACKER_DOMAIN,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_MODE,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_PROTOCOL,
-    CONF_USERNAME,
-)
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import entity_registry as er
@@ -32,55 +22,36 @@
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
+from .bridge import AsusWrtBridge, WrtDevice
 from .const import (
     CONF_DNSMASQ,
     CONF_INTERFACE,
     CONF_REQUIRE_IP,
-    CONF_SSH_KEY,
     CONF_TRACK_UNKNOWN,
     DEFAULT_DNSMASQ,
     DEFAULT_INTERFACE,
     DEFAULT_TRACK_UNKNOWN,
     DOMAIN,
-    PROTOCOL_TELNET,
-    SENSORS_BYTES,
+    KEY_COORDINATOR,
+    KEY_METHOD,
+    KEY_SENSORS,
     SENSORS_CONNECTED_DEVICE,
-    SENSORS_LOAD_AVG,
-    SENSORS_RATES,
-    SENSORS_TEMPERATURES,
 )
 
 CONF_REQ_RELOAD = [CONF_DNSMASQ, CONF_INTERFACE, CONF_REQUIRE_IP]
 DEFAULT_NAME = "Asuswrt"
 
-KEY_COORDINATOR = "coordinator"
-KEY_SENSORS = "sensors"
-
 SCAN_INTERVAL = timedelta(seconds=30)
 
-SENSORS_TYPE_BYTES = "sensors_bytes"
 SENSORS_TYPE_COUNT = "sensors_count"
-SENSORS_TYPE_LOAD_AVG = "sensors_load_avg"
-SENSORS_TYPE_RATES = "sensors_rates"
-SENSORS_TYPE_TEMPERATURES = "sensors_temperatures"
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def _get_dict(keys: list, values: list) -> dict[str, Any]:
-    """Create a dict from a list of keys and values."""
-    ret_dict: dict[str, Any] = dict.fromkeys(keys)
-
-    for index, key in enumerate(ret_dict):
-        ret_dict[key] = values[index]
-
-    return ret_dict
-
-
 class AsusWrtSensorDataHandler:
     """Data handler for AsusWrt sensor."""
 
-    def __init__(self, hass: HomeAssistant, api: AsusWrt) -> None:
+    def __init__(self, hass: HomeAssistant, api: AsusWrtBridge) -> None:
         """Initialize a AsusWrt sensor data handler."""
         self._hass = hass
         self._api = api
@@ -90,42 +61,6 @@ async def _get_connected_devices(self) -> dict[str, int]:
         """Return number of connected devices."""
         return {SENSORS_CONNECTED_DEVICE[0]: self._connected_devices}
 
-    async def _get_bytes(self) -> dict[str, Any]:
-        """Fetch byte information from the router."""
-        try:
-            datas = await self._api.async_get_bytes_total()
-        except (OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return _get_dict(SENSORS_BYTES, datas)
-
-    async def _get_rates(self) -> dict[str, Any]:
-        """Fetch rates information from the router."""
-        try:
-            rates = await self._api.async_get_current_transfer_rates()
-        except (OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return _get_dict(SENSORS_RATES, rates)
-
-    async def _get_load_avg(self) -> dict[str, Any]:
-        """Fetch load average information from the router."""
-        try:
-            avg = await self._api.async_get_loadavg()
-        except (OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return _get_dict(SENSORS_LOAD_AVG, avg)
-
-    async def _get_temperatures(self) -> dict[str, Any]:
-        """Fetch temperatures information from the router."""
-        try:
-            temperatures: dict[str, Any] = await self._api.async_get_temperature()
-        except (OSError, ValueError) as exc:
-            raise UpdateFailed(exc) from exc
-
-        return temperatures
-
     def update_device_count(self, conn_devices: int) -> bool:
         """Update connected devices attribute."""
         if self._connected_devices == conn_devices:
@@ -134,19 +69,17 @@ def update_device_count(self, conn_devices: int) -> bool:
         return True
 
     async def get_coordinator(
-        self, sensor_type: str, should_poll: bool = True
+        self,
+        sensor_type: str,
+        update_method: Callable[[], Any] | None = None,
     ) -> DataUpdateCoordinator:
         """Get the coordinator for a specific sensor type."""
+        should_poll = True
         if sensor_type == SENSORS_TYPE_COUNT:
+            should_poll = False
             method = self._get_connected_devices
-        elif sensor_type == SENSORS_TYPE_BYTES:
-            method = self._get_bytes
-        elif sensor_type == SENSORS_TYPE_LOAD_AVG:
-            method = self._get_load_avg
-        elif sensor_type == SENSORS_TYPE_RATES:
-            method = self._get_rates
-        elif sensor_type == SENSORS_TYPE_TEMPERATURES:
-            method = self._get_temperatures
+        elif update_method is not None:
+            method = update_method
         else:
             raise RuntimeError(f"Invalid sensor type: {sensor_type}")
 
@@ -226,12 +159,6 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         self.hass = hass
         self._entry = entry
 
-        self._api: AsusWrt = None
-        self._protocol: str = entry.data[CONF_PROTOCOL]
-        self._host: str = entry.data[CONF_HOST]
-        self._model: str = "Asus Router"
-        self._sw_v: str | None = None
-
         self._devices: dict[str, AsusWrtDevInfo] = {}
         self._connected_devices: int = 0
         self._connect_error: bool = False
@@ -248,26 +175,19 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         }
         self._options.update(entry.options)
 
+        self._api: AsusWrtBridge = AsusWrtBridge.get_bridge(
+            self.hass, dict(self._entry.data), self._options
+        )
+
     async def setup(self) -> None:
         """Set up a AsusWrt router."""
-        self._api = get_api(dict(self._entry.data), self._options)
-
         try:
-            await self._api.connection.async_connect()
-        except OSError as exp:
-            raise ConfigEntryNotReady from exp
-
+            await self._api.async_connect()
+        except OSError as exc:
+            raise ConfigEntryNotReady from exc
         if not self._api.is_connected:
             raise ConfigEntryNotReady
 
-        # System
-        model = await get_nvram_info(self._api, "MODEL")
-        if model and "model" in model:
-            self._model = model["model"]
-        firmware = await get_nvram_info(self._api, "FIRMWARE")
-        if firmware and "firmver" in firmware and "buildno" in firmware:
-            self._sw_v = f"{firmware['firmver']} (build {firmware['buildno']})"
-
         # Load tracked entities from registry
         entity_reg = er.async_get(self.hass)
         track_entries = er.async_entries_for_config_entry(
@@ -312,24 +232,24 @@ async def update_all(self, now: datetime | None = None) -> None:
     async def update_devices(self) -> None:
         """Update AsusWrt devices tracker."""
         new_device = False
-        _LOGGER.debug("Checking devices for ASUS router %s", self._host)
+        _LOGGER.debug("Checking devices for ASUS router %s", self.host)
         try:
-            api_devices = await self._api.async_get_connected_devices()
-        except OSError as exc:
+            wrt_devices = await self._api.async_get_connected_devices()
+        except UpdateFailed as exc:
             if not self._connect_error:
                 self._connect_error = True
                 _LOGGER.error(
                     "Error connecting to ASUS router %s for device update: %s",
-                    self._host,
+                    self.host,
                     exc,
                 )
             return
 
         if self._connect_error:
             self._connect_error = False
-            _LOGGER.info("Reconnected to ASUS router %s", self._host)
+            _LOGGER.info("Reconnected to ASUS router %s", self.host)
 
-        self._connected_devices = len(api_devices)
+        self._connected_devices = len(wrt_devices)
         consider_home: int = self._options.get(
             CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME.total_seconds()
         )
@@ -337,7 +257,6 @@ async def update_devices(self) -> None:
             CONF_TRACK_UNKNOWN, DEFAULT_TRACK_UNKNOWN
         )
 
-        wrt_devices = {format_mac(mac): dev for mac, dev in api_devices.items()}
         for device_mac, device in self._devices.items():
             dev_info = wrt_devices.pop(device_mac, None)
             device.update(dev_info, consider_home)
@@ -363,19 +282,14 @@ async def init_sensors_coordinator(self) -> None:
         self._sensors_data_handler = AsusWrtSensorDataHandler(self.hass, self._api)
         self._sensors_data_handler.update_device_count(self._connected_devices)
 
-        sensors_types: dict[str, list[str]] = {
-            SENSORS_TYPE_BYTES: SENSORS_BYTES,
-            SENSORS_TYPE_COUNT: SENSORS_CONNECTED_DEVICE,
-            SENSORS_TYPE_LOAD_AVG: SENSORS_LOAD_AVG,
-            SENSORS_TYPE_RATES: SENSORS_RATES,
-            SENSORS_TYPE_TEMPERATURES: await self._get_available_temperature_sensors(),
-        }
+        sensors_types = await self._api.async_get_available_sensors()
+        sensors_types[SENSORS_TYPE_COUNT] = {KEY_SENSORS: SENSORS_CONNECTED_DEVICE}
 
-        for sensor_type, sensor_names in sensors_types.items():
-            if not sensor_names:
+        for sensor_type, sensor_def in sensors_types.items():
+            if not (sensor_names := sensor_def.get(KEY_SENSORS)):
                 continue
             coordinator = await self._sensors_data_handler.get_coordinator(
-                sensor_type, sensor_type != SENSORS_TYPE_COUNT
+                sensor_type, update_method=sensor_def.get(KEY_METHOD)
             )
             self._sensors_coordinator[sensor_type] = {
                 KEY_COORDINATOR: coordinator,
@@ -392,31 +306,10 @@ async def _update_unpolled_sensors(self) -> None:
             if self._sensors_data_handler.update_device_count(self._connected_devices):
                 await coordinator.async_refresh()
 
-    async def _get_available_temperature_sensors(self) -> list[str]:
-        """Check which temperature information is available on the router."""
-        try:
-            availability = await self._api.async_find_temperature_commands()
-            available_sensors = [
-                SENSORS_TEMPERATURES[i] for i in range(3) if availability[i]
-            ]
-        except Exception as exc:  # pylint: disable=broad-except
-            _LOGGER.debug(
-                (
-                    "Failed checking temperature sensor availability for ASUS router"
-                    " %s. Exception: %s"
-                ),
-                self._host,
-                exc,
-            )
-            return []
-
-        return available_sensors
-
     async def close(self) -> None:
         """Close the connection."""
-        if self._api is not None and self._protocol == PROTOCOL_TELNET:
-            self._api.connection.disconnect()
-        self._api = None
+        if self._api is not None:
+            await self._api.async_disconnect()
 
         for func in self._on_close:
             func()
@@ -443,14 +336,17 @@ def update_options(self, new_options: dict[str, Any]) -> bool:
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device information."""
-        return DeviceInfo(
+        info = DeviceInfo(
             identifiers={(DOMAIN, self.unique_id or "AsusWRT")},
-            name=self._host,
-            model=self._model,
+            name=self.host,
+            model=self._api.model or "Asus Router",
             manufacturer="Asus",
-            sw_version=self._sw_v,
-            configuration_url=f"http://{self._host}",
+            configuration_url=f"http://{self.host}",
         )
+        if self._api.firmware:
+            info["sw_version"] = self._api.firmware
+
+        return info
 
     @property
     def signal_device_new(self) -> str:
@@ -465,7 +361,7 @@ def signal_device_update(self) -> str:
     @property
     def host(self) -> str:
         """Return router hostname."""
-        return self._host
+        return self._api.host
 
     @property
     def unique_id(self) -> str | None:
@@ -475,7 +371,7 @@ def unique_id(self) -> str | None:
     @property
     def name(self) -> str:
         """Return router name."""
-        return self._host if self.unique_id else DEFAULT_NAME
+        return self.host if self.unique_id else DEFAULT_NAME
 
     @property
     def devices(self) -> dict[str, AsusWrtDevInfo]:
@@ -486,32 +382,3 @@ def devices(self) -> dict[str, AsusWrtDevInfo]:
     def sensors_coordinator(self) -> dict[str, Any]:
         """Return sensors coordinators."""
         return self._sensors_coordinator
-
-
-async def get_nvram_info(api: AsusWrt, info_type: str) -> dict[str, Any]:
-    """Get AsusWrt router info from nvram."""
-    info = {}
-    try:
-        info = await api.async_get_nvram(info_type)
-    except OSError as exc:
-        _LOGGER.warning("Error calling method async_get_nvram(%s): %s", info_type, exc)
-
-    return info
-
-
-def get_api(conf: dict[str, Any], options: dict[str, Any] | None = None) -> AsusWrt:
-    """Get the AsusWrt API."""
-    opt = options or {}
-
-    return AsusWrt(
-        conf[CONF_HOST],
-        conf.get(CONF_PORT),
-        conf[CONF_PROTOCOL] == PROTOCOL_TELNET,
-        conf[CONF_USERNAME],
-        conf.get(CONF_PASSWORD, ""),
-        conf.get(CONF_SSH_KEY, ""),
-        conf[CONF_MODE],
-        opt.get(CONF_REQUIRE_IP, True),
-        interface=opt.get(CONF_INTERFACE, DEFAULT_INTERFACE),
-        dnsmasq=opt.get(CONF_DNSMASQ, DEFAULT_DNSMASQ),
-    )
diff --git a/homeassistant/components/asuswrt/sensor.py b/homeassistant/components/asuswrt/sensor.py
index 95724ec3bb5599..accd1eba59bece 100644
--- a/homeassistant/components/asuswrt/sensor.py
+++ b/homeassistant/components/asuswrt/sensor.py
@@ -26,13 +26,15 @@
 from .const import (
     DATA_ASUSWRT,
     DOMAIN,
+    KEY_COORDINATOR,
+    KEY_SENSORS,
     SENSORS_BYTES,
     SENSORS_CONNECTED_DEVICE,
     SENSORS_LOAD_AVG,
     SENSORS_RATES,
     SENSORS_TEMPERATURES,
 )
-from .router import KEY_COORDINATOR, KEY_SENSORS, AsusWrtRouter
+from .router import AsusWrtRouter
 
 
 @dataclass
diff --git a/homeassistant/components/atag/climate.py b/homeassistant/components/atag/climate.py
index ce52bd4fd6539a..9b2729f141e75c 100644
--- a/homeassistant/components/atag/climate.py
+++ b/homeassistant/components/atag/climate.py
@@ -15,6 +15,7 @@
 from homeassistant.const import ATTR_TEMPERATURE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util.enum import try_parse_enum
 
 from . import DOMAIN, AtagEntity
 
@@ -52,14 +53,12 @@ def __init__(self, coordinator, atag_id):
         self._attr_temperature_unit = coordinator.data.climate.temp_unit
 
     @property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
-        if self.coordinator.data.climate.hvac_mode in HVAC_MODES:
-            return self.coordinator.data.climate.hvac_mode
-        return None
+        return try_parse_enum(HVACMode, self.coordinator.data.climate.hvac_mode)
 
     @property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation."""
         is_active = self.coordinator.data.climate.status
         return HVACAction.HEATING if is_active else HVACAction.IDLE
diff --git a/homeassistant/components/atome/manifest.json b/homeassistant/components/atome/manifest.json
index 236bf6cb082e0f..cafe24e2e1349b 100644
--- a/homeassistant/components/atome/manifest.json
+++ b/homeassistant/components/atome/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/atome",
   "iot_class": "cloud_polling",
   "loggers": ["pyatome"],
-  "requirements": ["pyatome==0.1.1"]
+  "requirements": ["pyAtome==0.1.1"]
 }
diff --git a/homeassistant/components/august/__init__.py b/homeassistant/components/august/__init__.py
index 8be7d8dd2d19b2..8738b58dab9d3a 100644
--- a/homeassistant/components/august/__init__.py
+++ b/homeassistant/components/august/__init__.py
@@ -23,7 +23,7 @@
     ConfigEntryNotReady,
     HomeAssistantError,
 )
-from homeassistant.helpers import device_registry as dr, discovery_flow
+from homeassistant.helpers import aiohttp_client, device_registry as dr, discovery_flow
 
 from .activity import ActivityStream
 from .const import CONF_BRAND, DOMAIN, MIN_TIME_BETWEEN_DETAIL_UPDATES, PLATFORMS
@@ -44,8 +44,11 @@
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up August from a config entry."""
-
-    august_gateway = AugustGateway(hass)
+    # Create an aiohttp session instead of using the default one since the
+    # default one is likely to trigger august's WAF if another integration
+    # is also using Cloudflare
+    session = aiohttp_client.async_create_clientsession(hass)
+    august_gateway = AugustGateway(hass, session)
 
     try:
         await august_gateway.async_setup(entry.data)
diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py
index d380ee11834028..c6f406a509499f 100644
--- a/homeassistant/components/august/binary_sensor.py
+++ b/homeassistant/components/august/binary_sensor.py
@@ -5,7 +5,6 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
-from typing import cast
 
 from yalexs.activity import (
     ACTION_DOORBELL_CALL_MISSED,
@@ -104,7 +103,16 @@ def _native_datetime() -> datetime:
 
 
 @dataclass
-class AugustRequiredKeysMixin:
+class AugustBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describes August binary_sensor entity."""
+
+    # AugustBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
+
+@dataclass
+class AugustDoorbellRequiredKeysMixin:
     """Mixin for required keys."""
 
     value_fn: Callable[[AugustData, DoorbellDetail], bool]
@@ -112,41 +120,45 @@ class AugustRequiredKeysMixin:
 
 
 @dataclass
-class AugustBinarySensorEntityDescription(
-    BinarySensorEntityDescription, AugustRequiredKeysMixin
+class AugustDoorbellBinarySensorEntityDescription(
+    BinarySensorEntityDescription, AugustDoorbellRequiredKeysMixin
 ):
     """Describes August binary_sensor entity."""
 
+    # AugustDoorbellBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
 
-SENSOR_TYPE_DOOR = BinarySensorEntityDescription(
+SENSOR_TYPE_DOOR = AugustBinarySensorEntityDescription(
     key="door_open",
     name="Open",
 )
 
 
-SENSOR_TYPES_DOORBELL: tuple[AugustBinarySensorEntityDescription, ...] = (
-    AugustBinarySensorEntityDescription(
+SENSOR_TYPES_DOORBELL: tuple[AugustDoorbellBinarySensorEntityDescription, ...] = (
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_ding",
         name="Ding",
         device_class=BinarySensorDeviceClass.OCCUPANCY,
         value_fn=_retrieve_ding_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_motion",
         name="Motion",
         device_class=BinarySensorDeviceClass.MOTION,
         value_fn=_retrieve_motion_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_image_capture",
         name="Image Capture",
         icon="mdi:file-image",
         value_fn=_retrieve_image_capture_state,
         is_time_based=True,
     ),
-    AugustBinarySensorEntityDescription(
+    AugustDoorbellBinarySensorEntityDescription(
         key="doorbell_online",
         name="Online",
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
@@ -199,7 +211,10 @@ class AugustDoorBinarySensor(AugustEntityMixin, BinarySensorEntity):
     _attr_device_class = BinarySensorDeviceClass.DOOR
 
     def __init__(
-        self, data: AugustData, device: Lock, description: BinarySensorEntityDescription
+        self,
+        data: AugustData,
+        device: Lock,
+        description: AugustBinarySensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(data, device)
@@ -207,9 +222,7 @@ def __init__(
         self._data = data
         self._device = device
         self._attr_name = f"{device.device_name} {description.name}"
-        self._attr_unique_id = (
-            f"{self._device_id}_{cast(str, description.name).lower()}"
-        )
+        self._attr_unique_id = f"{self._device_id}_{description.name.lower()}"
 
     @callback
     def _update_from_data(self):
@@ -243,13 +256,13 @@ async def async_added_to_hass(self) -> None:
 class AugustDoorbellBinarySensor(AugustEntityMixin, BinarySensorEntity):
     """Representation of an August binary sensor."""
 
-    entity_description: AugustBinarySensorEntityDescription
+    entity_description: AugustDoorbellBinarySensorEntityDescription
 
     def __init__(
         self,
         data: AugustData,
         device: Doorbell,
-        description: AugustBinarySensorEntityDescription,
+        description: AugustDoorbellBinarySensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(data, device)
@@ -257,9 +270,7 @@ def __init__(
         self._check_for_off_update_listener = None
         self._data = data
         self._attr_name = f"{device.device_name} {description.name}"
-        self._attr_unique_id = (
-            f"{self._device_id}_{cast(str, description.name).lower()}"
-        )
+        self._attr_unique_id = f"{self._device_id}_{description.name.lower()}"
 
     @callback
     def _update_from_data(self):
diff --git a/homeassistant/components/august/config_flow.py b/homeassistant/components/august/config_flow.py
index 58f1c2fc9764ce..670d16084210d1 100644
--- a/homeassistant/components/august/config_flow.py
+++ b/homeassistant/components/august/config_flow.py
@@ -4,13 +4,16 @@
 import logging
 from typing import Any
 
+import aiohttp
 import voluptuous as vol
 from yalexs.authenticator import ValidationResult
 from yalexs.const import BRANDS, DEFAULT_BRAND
 
 from homeassistant import config_entries
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import aiohttp_client
 
 from .const import (
     CONF_ACCESS_TOKEN_CACHE_FILE,
@@ -80,6 +83,7 @@ class AugustConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     def __init__(self):
         """Store an AugustGateway()."""
         self._august_gateway: AugustGateway | None = None
+        self._aiohttp_session: aiohttp.ClientSession | None = None
         self._user_auth_details: dict[str, Any] = {}
         self._needs_reset = True
         self._mode = None
@@ -87,7 +91,6 @@ def __init__(self):
 
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
-        self._august_gateway = AugustGateway(self.hass)
         return await self.async_step_user_validate()
 
     async def async_step_user_validate(self, user_input=None):
@@ -151,12 +154,30 @@ async def async_step_validation(
             },
         )
 
+    @callback
+    def _async_get_gateway(self) -> AugustGateway:
+        """Set up the gateway."""
+        if self._august_gateway is not None:
+            return self._august_gateway
+        # Create an aiohttp session instead of using the default one since the
+        # default one is likely to trigger august's WAF if another integration
+        # is also using Cloudflare
+        self._aiohttp_session = aiohttp_client.async_create_clientsession(self.hass)
+        self._august_gateway = AugustGateway(self.hass, self._aiohttp_session)
+        return self._august_gateway
+
+    @callback
+    def _async_shutdown_gateway(self) -> None:
+        """Shutdown the gateway."""
+        if self._aiohttp_session is not None:
+            self._aiohttp_session.detach()
+        self._august_gateway = None
+
     async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
         """Handle configuration by re-auth."""
         self._user_auth_details = dict(entry_data)
         self._mode = "reauth"
         self._needs_reset = True
-        self._august_gateway = AugustGateway(self.hass)
         return await self.async_step_reauth_validate()
 
     async def async_step_reauth_validate(self, user_input=None):
@@ -206,7 +227,7 @@ async def _async_reset_access_token_cache_if_needed(
     async def _async_auth_or_validate(self) -> ValidateResult:
         """Authenticate or validate."""
         user_auth_details = self._user_auth_details
-        gateway = self._august_gateway
+        gateway = self._async_get_gateway()
         assert gateway is not None
         await self._async_reset_access_token_cache_if_needed(
             gateway,
@@ -239,6 +260,8 @@ async def _async_auth_or_validate(self) -> ValidateResult:
 
     async def _async_update_or_create_entry(self, info: dict[str, Any]) -> FlowResult:
         """Update existing entry or create a new one."""
+        self._async_shutdown_gateway()
+
         existing_entry = await self.async_set_unique_id(
             self._user_auth_details[CONF_USERNAME]
         )
diff --git a/homeassistant/components/august/gateway.py b/homeassistant/components/august/gateway.py
index 9dcf96f057afa9..badff721d10940 100644
--- a/homeassistant/components/august/gateway.py
+++ b/homeassistant/components/august/gateway.py
@@ -7,7 +7,7 @@
 import os
 from typing import Any
 
-from aiohttp import ClientError, ClientResponseError
+from aiohttp import ClientError, ClientResponseError, ClientSession
 from yalexs.api_async import ApiAsync
 from yalexs.authenticator_async import AuthenticationState, AuthenticatorAsync
 from yalexs.authenticator_common import Authentication
@@ -16,7 +16,6 @@
 
 from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import aiohttp_client
 
 from .const import (
     CONF_ACCESS_TOKEN_CACHE_FILE,
@@ -35,12 +34,9 @@
 class AugustGateway:
     """Handle the connection to August."""
 
-    def __init__(self, hass: HomeAssistant) -> None:
+    def __init__(self, hass: HomeAssistant, aiohttp_session: ClientSession) -> None:
         """Init the connection."""
-        # Create an aiohttp session instead of using the default one since the
-        # default one is likely to trigger august's WAF if another integration
-        # is also using Cloudflare
-        self._aiohttp_session = aiohttp_client.async_create_clientsession(hass)
+        self._aiohttp_session = aiohttp_session
         self._token_refresh_lock = asyncio.Lock()
         self._access_token_cache_file: str | None = None
         self._hass: HomeAssistant = hass
diff --git a/homeassistant/components/august/manifest.json b/homeassistant/components/august/manifest.json
index eeaa5f6c6222a7..ca4e799f16b0dd 100644
--- a/homeassistant/components/august/manifest.json
+++ b/homeassistant/components/august/manifest.json
@@ -28,5 +28,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==1.5.1", "yalexs-ble==2.1.17"]
+  "requirements": ["yalexs==1.5.1", "yalexs-ble==2.1.18"]
 }
diff --git a/homeassistant/components/august/sensor.py b/homeassistant/components/august/sensor.py
index 6e0969a6724c10..169a344e2bd00a 100644
--- a/homeassistant/components/august/sensor.py
+++ b/homeassistant/components/august/sensor.py
@@ -172,6 +172,7 @@ async def _async_migrate_old_unique_ids(hass, devices):
             registry.async_update_entity(old_entity_id, new_unique_id=device.unique_id)
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AugustOperatorSensor(AugustEntityMixin, RestoreEntity, SensorEntity):
     """Representation of an August lock operation sensor."""
 
diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py
index bac402fe633246..db054910d9aa33 100644
--- a/homeassistant/components/aurora/__init__.py
+++ b/homeassistant/components/aurora/__init__.py
@@ -1,25 +1,15 @@
 """The aurora component."""
 
-from datetime import timedelta
 import logging
 
-from aiohttp import ClientError
 from auroranoaa import AuroraForecast
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
 
 from .const import (
-    ATTRIBUTION,
     AURORA_API,
     CONF_THRESHOLD,
     COORDINATOR,
@@ -27,6 +17,7 @@
     DEFAULT_THRESHOLD,
     DOMAIN,
 )
+from .coordinator import AuroraDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -79,71 +70,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class AuroraDataUpdateCoordinator(DataUpdateCoordinator):
-    """Class to manage fetching data from the NOAA Aurora API."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        name: str,
-        polling_interval: int,
-        api: str,
-        latitude: float,
-        longitude: float,
-        threshold: float,
-    ) -> None:
-        """Initialize the data updater."""
-
-        super().__init__(
-            hass=hass,
-            logger=_LOGGER,
-            name=name,
-            update_interval=timedelta(minutes=polling_interval),
-        )
-
-        self.api = api
-        self.name = name
-        self.latitude = int(latitude)
-        self.longitude = int(longitude)
-        self.threshold = int(threshold)
-
-    async def _async_update_data(self):
-        """Fetch the data from the NOAA Aurora Forecast."""
-
-        try:
-            return await self.api.get_forecast_data(self.longitude, self.latitude)
-        except ClientError as error:
-            raise UpdateFailed(f"Error updating from NOAA: {error}") from error
-
-
-class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]):
-    """Implementation of the base Aurora Entity."""
-
-    _attr_attribution = ATTRIBUTION
-
-    def __init__(
-        self,
-        coordinator: AuroraDataUpdateCoordinator,
-        name: str,
-        icon: str,
-    ) -> None:
-        """Initialize the Aurora Entity."""
-
-        super().__init__(coordinator=coordinator)
-
-        self._attr_name = name
-        self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}"
-        self._attr_icon = icon
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Define the device based on name."""
-        return DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, str(self.unique_id))},
-            manufacturer="NOAA",
-            model="Aurora Visibility Sensor",
-            name=self.coordinator.name,
-        )
diff --git a/homeassistant/components/aurora/binary_sensor.py b/homeassistant/components/aurora/binary_sensor.py
index ee2fc53691e929..a0e09685a0f7a4 100644
--- a/homeassistant/components/aurora/binary_sensor.py
+++ b/homeassistant/components/aurora/binary_sensor.py
@@ -4,8 +4,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AuroraEntity
 from .const import COORDINATOR, DOMAIN
+from .entity import AuroraEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/aurora/coordinator.py b/homeassistant/components/aurora/coordinator.py
new file mode 100644
index 00000000000000..c126e2a8c68d1c
--- /dev/null
+++ b/homeassistant/components/aurora/coordinator.py
@@ -0,0 +1,52 @@
+"""The aurora component."""
+
+from datetime import timedelta
+import logging
+
+from aiohttp import ClientError
+from auroranoaa import AuroraForecast
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import (
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AuroraDataUpdateCoordinator(DataUpdateCoordinator):
+    """Class to manage fetching data from the NOAA Aurora API."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        name: str,
+        polling_interval: int,
+        api: AuroraForecast,
+        latitude: float,
+        longitude: float,
+        threshold: float,
+    ) -> None:
+        """Initialize the data updater."""
+
+        super().__init__(
+            hass=hass,
+            logger=_LOGGER,
+            name=name,
+            update_interval=timedelta(minutes=polling_interval),
+        )
+
+        self.api = api
+        self.name = name
+        self.latitude = int(latitude)
+        self.longitude = int(longitude)
+        self.threshold = int(threshold)
+
+    async def _async_update_data(self):
+        """Fetch the data from the NOAA Aurora Forecast."""
+
+        try:
+            return await self.api.get_forecast_data(self.longitude, self.latitude)
+        except ClientError as error:
+            raise UpdateFailed(f"Error updating from NOAA: {error}") from error
diff --git a/homeassistant/components/aurora/entity.py b/homeassistant/components/aurora/entity.py
new file mode 100644
index 00000000000000..8948ff9c43cdaa
--- /dev/null
+++ b/homeassistant/components/aurora/entity.py
@@ -0,0 +1,48 @@
+"""The aurora component."""
+
+import logging
+
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+)
+
+from .const import (
+    ATTRIBUTION,
+    DOMAIN,
+)
+from .coordinator import AuroraDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]):
+    """Implementation of the base Aurora Entity."""
+
+    _attr_attribution = ATTRIBUTION
+
+    def __init__(
+        self,
+        coordinator: AuroraDataUpdateCoordinator,
+        name: str,
+        icon: str,
+    ) -> None:
+        """Initialize the Aurora Entity."""
+
+        super().__init__(coordinator=coordinator)
+
+        self._attr_name = name
+        self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}"
+        self._attr_icon = icon
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Define the device based on name."""
+        return DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, str(self.unique_id))},
+            manufacturer="NOAA",
+            model="Aurora Visibility Sensor",
+            name=self.coordinator.name,
+        )
diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py
index de5e566e2680c5..a5436e1e2190d6 100644
--- a/homeassistant/components/aurora/sensor.py
+++ b/homeassistant/components/aurora/sensor.py
@@ -5,8 +5,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AuroraEntity
 from .const import COORDINATOR, DOMAIN
+from .entity import AuroraEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/aurora_abb_powerone/aurora_device.py b/homeassistant/components/aurora_abb_powerone/aurora_device.py
index 5a524851bdfbbc..6d3260a45f4a86 100644
--- a/homeassistant/components/aurora_abb_powerone/aurora_device.py
+++ b/homeassistant/components/aurora_abb_powerone/aurora_device.py
@@ -47,10 +47,10 @@ def available(self) -> bool:
     @property
     def device_info(self) -> DeviceInfo:
         """Return device specific attributes."""
-        return {
-            "identifiers": {(DOMAIN, self._data[ATTR_SERIAL_NUMBER])},
-            "manufacturer": MANUFACTURER,
-            "model": self._data[ATTR_MODEL],
-            "name": self._data.get(ATTR_DEVICE_NAME, DEFAULT_DEVICE_NAME),
-            "sw_version": self._data[ATTR_FIRMWARE],
-        }
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._data[ATTR_SERIAL_NUMBER])},
+            manufacturer=MANUFACTURER,
+            model=self._data[ATTR_MODEL],
+            name=self._data.get(ATTR_DEVICE_NAME, DEFAULT_DEVICE_NAME),
+            sw_version=self._data[ATTR_FIRMWARE],
+        )
diff --git a/homeassistant/components/aurora_abb_powerone/sensor.py b/homeassistant/components/aurora_abb_powerone/sensor.py
index 27a8a65c27fda2..55f3be5d6dbc83 100644
--- a/homeassistant/components/aurora_abb_powerone/sensor.py
+++ b/homeassistant/components/aurora_abb_powerone/sensor.py
@@ -34,7 +34,7 @@
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Power Output",
+        translation_key="power_output",
     ),
     SensorEntityDescription(
         key="temp",
@@ -42,14 +42,13 @@
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        name="Temperature",
     ),
     SensorEntityDescription(
         key="totalenergy",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        name="Total Energy",
+        translation_key="total_energy",
     ),
 ]
 
@@ -75,6 +74,8 @@ async def async_setup_entry(
 class AuroraSensor(AuroraEntity, SensorEntity):
     """Representation of a Sensor on a Aurora ABB PowerOne Solar inverter."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         client: AuroraSerialClient,
diff --git a/homeassistant/components/aurora_abb_powerone/strings.json b/homeassistant/components/aurora_abb_powerone/strings.json
index bed403bd641b80..50b6e0db502d42 100644
--- a/homeassistant/components/aurora_abb_powerone/strings.json
+++ b/homeassistant/components/aurora_abb_powerone/strings.json
@@ -18,5 +18,15 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "no_serial_ports": "No com ports found.  Need a valid RS485 device to communicate."
     }
+  },
+  "entity": {
+    "sensor": {
+      "power_output": {
+        "name": "Power Output"
+      },
+      "total_energy": {
+        "name": "Total Energy"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/aussie_broadband/sensor.py b/homeassistant/components/aussie_broadband/sensor.py
index 1ed146b6237d25..fa407949b40572 100644
--- a/homeassistant/components/aussie_broadband/sensor.py
+++ b/homeassistant/components/aussie_broadband/sensor.py
@@ -35,7 +35,7 @@ class SensorValueEntityDescription(SensorEntityDescription):
     # Internet Services sensors
     SensorValueEntityDescription(
         key="usedMb",
-        name="Data used",
+        translation_key="data_used",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -43,7 +43,7 @@ class SensorValueEntityDescription(SensorEntityDescription):
     ),
     SensorValueEntityDescription(
         key="downloadedMb",
-        name="Downloaded",
+        translation_key="downloaded",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -51,7 +51,7 @@ class SensorValueEntityDescription(SensorEntityDescription):
     ),
     SensorValueEntityDescription(
         key="uploadedMb",
-        name="Uploaded",
+        translation_key="uploaded",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -60,21 +60,21 @@ class SensorValueEntityDescription(SensorEntityDescription):
     # Mobile Phone Services sensors
     SensorValueEntityDescription(
         key="national",
-        name="National calls",
+        translation_key="national_calls",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="mobile",
-        name="Mobile calls",
+        translation_key="mobile_calls",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="international",
-        name="International calls",
+        translation_key="international_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone-plus",
@@ -82,14 +82,14 @@ class SensorValueEntityDescription(SensorEntityDescription):
     ),
     SensorValueEntityDescription(
         key="sms",
-        name="SMS sent",
+        translation_key="sms_sent",
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:message-processing",
         value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="internet",
-        name="Data used",
+        translation_key="data_used",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfInformation.KILOBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
@@ -98,7 +98,7 @@ class SensorValueEntityDescription(SensorEntityDescription):
     ),
     SensorValueEntityDescription(
         key="voicemail",
-        name="Voicemail calls",
+        translation_key="voicemail_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
@@ -106,7 +106,7 @@ class SensorValueEntityDescription(SensorEntityDescription):
     ),
     SensorValueEntityDescription(
         key="other",
-        name="Other calls",
+        translation_key="other_calls",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
@@ -115,13 +115,13 @@ class SensorValueEntityDescription(SensorEntityDescription):
     # Generic sensors
     SensorValueEntityDescription(
         key="daysTotal",
-        name="Billing cycle length",
+        translation_key="billing_cycle_length",
         native_unit_of_measurement=UnitOfTime.DAYS,
         icon="mdi:calendar-range",
     ),
     SensorValueEntityDescription(
         key="daysRemaining",
-        name="Billing cycle remaining",
+        translation_key="billing_cycle_remaining",
         native_unit_of_measurement=UnitOfTime.DAYS,
         icon="mdi:calendar-clock",
     ),
diff --git a/homeassistant/components/aussie_broadband/strings.json b/homeassistant/components/aussie_broadband/strings.json
index c2052defa816fc..90e4f094ee6fb4 100644
--- a/homeassistant/components/aussie_broadband/strings.json
+++ b/homeassistant/components/aussie_broadband/strings.json
@@ -46,5 +46,42 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "data_used": {
+        "name": "Data used"
+      },
+      "downloaded": {
+        "name": "Downloaded"
+      },
+      "uploaded": {
+        "name": "Uploaded"
+      },
+      "national_calls": {
+        "name": "National calls"
+      },
+      "mobile_calls": {
+        "name": "Mobile calls"
+      },
+      "international_calls": {
+        "name": "International calls"
+      },
+      "sms_sent": {
+        "name": "SMS sent"
+      },
+      "voicemail_calls": {
+        "name": "Voicemail calls"
+      },
+      "other_calls": {
+        "name": "Other calls"
+      },
+      "billing_cycle_length": {
+        "name": "Billing cycle length"
+      },
+      "billing_cycle_remaining": {
+        "name": "Billing cycle remaining"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 1b47fb09393663..deaf3b7892d1d1 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -149,6 +149,7 @@
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.components.http.view import HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_entry_oauth2_flow import OAuth2AuthorizeCallbackView
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -161,6 +162,8 @@
 StoreResultType = Callable[[str, Credentials], str]
 RetrieveResultType = Callable[[str, str], Credentials | None]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @bind_hass
 def create_auth_code(
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 4712592edc7ff3..f4db7831235fb1 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -1,6 +1,7 @@
 """Allow to set up simple automation rules via the config file."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import asyncio
 from collections.abc import Callable, Mapping
 from dataclasses import dataclass
@@ -153,7 +154,7 @@ def _automations_with_x(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     return [
         automation_entity.entity_id
@@ -169,7 +170,7 @@ def _x_in_automation(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     if (automation_entity := component.get_entity(entity_id)) is None:
         return []
@@ -219,7 +220,7 @@ def automations_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     return [
         automation_entity.entity_id
@@ -228,9 +229,23 @@ def automations_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list
     ]
 
 
+@callback
+def blueprint_in_automation(hass: HomeAssistant, entity_id: str) -> str | None:
+    """Return the blueprint the automation is based on or None."""
+    if DOMAIN not in hass.data:
+        return None
+
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
+
+    if (automation_entity := component.get_entity(entity_id)) is None:
+        return None
+
+    return automation_entity.referenced_blueprint
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up all automations."""
-    hass.data[DOMAIN] = component = EntityComponent[AutomationEntity](
+    hass.data[DOMAIN] = component = EntityComponent[BaseAutomationEntity](
         LOGGER, DOMAIN, hass
     )
 
@@ -248,7 +263,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     await async_get_blueprints(hass).async_populate()
 
     async def trigger_service_handler(
-        entity: AutomationEntity, service_call: ServiceCall
+        entity: BaseAutomationEntity, service_call: ServiceCall
     ) -> None:
         """Handle forced automation trigger, e.g. from frontend."""
         await entity.async_trigger(
@@ -296,7 +311,103 @@ async def reload_service_handler(service_call: ServiceCall) -> None:
     return True
 
 
-class AutomationEntity(ToggleEntity, RestoreEntity):
+class BaseAutomationEntity(ToggleEntity, ABC):
+    """Base class for automation entities."""
+
+    raw_config: ConfigType | None
+
+    @property
+    def capability_attributes(self) -> dict[str, Any] | None:
+        """Return capability attributes."""
+        if self.unique_id is not None:
+            return {CONF_ID: self.unique_id}
+        return None
+
+    @property
+    @abstractmethod
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+
+    @property
+    @abstractmethod
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+
+    @property
+    @abstractmethod
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+
+    @property
+    @abstractmethod
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+
+    @abstractmethod
+    async def async_trigger(
+        self,
+        run_variables: dict[str, Any],
+        context: Context | None = None,
+        skip_condition: bool = False,
+    ) -> None:
+        """Trigger automation."""
+
+
+class UnavailableAutomationEntity(BaseAutomationEntity):
+    """A non-functional automation entity with its state set to unavailable.
+
+    This class is instatiated when an automation fails to validate.
+    """
+
+    _attr_should_poll = False
+    _attr_available = False
+
+    def __init__(
+        self,
+        automation_id: str | None,
+        name: str,
+        raw_config: ConfigType | None,
+    ) -> None:
+        """Initialize an automation entity."""
+        self._name = name
+        self._attr_unique_id = automation_id
+        self.raw_config = raw_config
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return set()
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        return None
+
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return set()
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return set()
+
+    async def async_trigger(
+        self,
+        run_variables: dict[str, Any],
+        context: Context | None = None,
+        skip_condition: bool = False,
+    ) -> None:
+        """Trigger automation."""
+
+
+class AutomationEntity(BaseAutomationEntity, RestoreEntity):
     """Entity to show status of entity."""
 
     _attr_should_poll = False
@@ -316,7 +427,7 @@ def __init__(
         trace_config: ConfigType,
     ) -> None:
         """Initialize an automation entity."""
-        self._attr_name = name
+        self._name = name
         self._trigger_config = trigger_config
         self._async_detach_triggers: CALLBACK_TYPE | None = None
         self._cond_func = cond_func
@@ -334,6 +445,11 @@ def __init__(
         self._trace_config = trace_config
         self._attr_unique_id = automation_id
 
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the entity state attributes."""
@@ -344,8 +460,6 @@ def extra_state_attributes(self) -> dict[str, Any]:
         }
         if self.action_script.supports_max:
             attrs[ATTR_MAX] = self.action_script.max_runs
-        if self.unique_id is not None:
-            attrs[CONF_ID] = self.unique_id
         return attrs
 
     @property
@@ -578,6 +692,14 @@ async def async_will_remove_from_hass(self) -> None:
         await super().async_will_remove_from_hass()
         await self.async_disable()
 
+    async def _async_enable_automation(self, event: Event) -> None:
+        """Start automation on startup."""
+        # Don't do anything if no longer enabled or already attached
+        if not self._is_enabled or self._async_detach_triggers is not None:
+            return
+
+        self._async_detach_triggers = await self._async_attach_triggers(True)
+
     async def async_enable(self) -> None:
         """Enable this automation entity.
 
@@ -594,16 +716,8 @@ async def async_enable(self) -> None:
             self.async_write_ha_state()
             return
 
-        async def async_enable_automation(event: Event) -> None:
-            """Start automation on startup."""
-            # Don't do anything if no longer enabled or already attached
-            if not self._is_enabled or self._async_detach_triggers is not None:
-                return
-
-            self._async_detach_triggers = await self._async_attach_triggers(True)
-
         self.hass.bus.async_listen_once(
-            EVENT_HOMEASSISTANT_STARTED, async_enable_automation
+            EVENT_HOMEASSISTANT_STARTED, self._async_enable_automation
         )
         self.async_write_ha_state()
 
@@ -667,6 +781,7 @@ class AutomationEntityConfig:
     list_no: int
     raw_blueprint_inputs: ConfigType | None
     raw_config: ConfigType | None
+    validation_failed: bool
 
 
 async def _prepare_automation_config(
@@ -681,9 +796,14 @@ async def _prepare_automation_config(
     for list_no, config_block in enumerate(conf):
         raw_config = cast(AutomationConfig, config_block).raw_config
         raw_blueprint_inputs = cast(AutomationConfig, config_block).raw_blueprint_inputs
+        validation_failed = cast(AutomationConfig, config_block).validation_failed
         automation_configs.append(
             AutomationEntityConfig(
-                config_block, list_no, raw_blueprint_inputs, raw_config
+                config_block,
+                list_no,
+                raw_blueprint_inputs,
+                raw_config,
+                validation_failed,
             )
         )
 
@@ -699,9 +819,9 @@ def _automation_name(automation_config: AutomationEntityConfig) -> str:
 
 async def _create_automation_entities(
     hass: HomeAssistant, automation_configs: list[AutomationEntityConfig]
-) -> list[AutomationEntity]:
+) -> list[BaseAutomationEntity]:
     """Create automation entities from prepared configuration."""
-    entities: list[AutomationEntity] = []
+    entities: list[BaseAutomationEntity] = []
 
     for automation_config in automation_configs:
         config_block = automation_config.config_block
@@ -709,6 +829,16 @@ async def _create_automation_entities(
         automation_id: str | None = config_block.get(CONF_ID)
         name = _automation_name(automation_config)
 
+        if automation_config.validation_failed:
+            entities.append(
+                UnavailableAutomationEntity(
+                    automation_id,
+                    name,
+                    automation_config.raw_config,
+                )
+            )
+            continue
+
         initial_state: bool | None = config_block.get(CONF_INITIAL_STATE)
 
         action_script = Script(
@@ -767,18 +897,18 @@ async def _create_automation_entities(
 async def _async_process_config(
     hass: HomeAssistant,
     config: dict[str, Any],
-    component: EntityComponent[AutomationEntity],
+    component: EntityComponent[BaseAutomationEntity],
 ) -> None:
     """Process config and add automations."""
 
     def automation_matches_config(
-        automation: AutomationEntity, config: AutomationEntityConfig
+        automation: BaseAutomationEntity, config: AutomationEntityConfig
     ) -> bool:
         name = _automation_name(config)
         return automation.name == name and automation.raw_config == config.raw_config
 
     def find_matches(
-        automations: list[AutomationEntity],
+        automations: list[BaseAutomationEntity],
         automation_configs: list[AutomationEntityConfig],
     ) -> tuple[set[int], set[int]]:
         """Find matches between a list of automation entities and a list of configurations.
@@ -824,7 +954,7 @@ def find_matches(
         return automation_matches, config_matches
 
     automation_configs = await _prepare_automation_config(hass, config)
-    automations: list[AutomationEntity] = list(component.entities)
+    automations: list[BaseAutomationEntity] = list(component.entities)
 
     # Find automations and configurations which have matches
     automation_matches, config_matches = find_matches(automations, automation_configs)
@@ -846,8 +976,6 @@ def find_matches(
     entities = await _create_automation_entities(hass, updated_automation_configs)
     await component.async_add_entities(entities)
 
-    return
-
 
 async def _async_process_if(
     hass: HomeAssistant, name: str, config: dict[str, Any]
@@ -951,7 +1079,7 @@ def websocket_config(
     msg: dict[str, Any],
 ) -> None:
     """Get automation config."""
-    component: EntityComponent[AutomationEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseAutomationEntity] = hass.data[DOMAIN]
 
     automation = component.get_entity(msg["entity_id"])
 
diff --git a/homeassistant/components/automation/config.py b/homeassistant/components/automation/config.py
index c127208377ff8a..ed801772e6dd76 100644
--- a/homeassistant/components/automation/config.py
+++ b/homeassistant/components/automation/config.py
@@ -41,7 +41,15 @@
 
 PACKAGE_MERGE_HINT = "list"
 
-_CONDITION_SCHEMA = vol.All(cv.ensure_list, [cv.CONDITION_SCHEMA])
+_MINIMAL_PLATFORM_SCHEMA = vol.Schema(
+    {
+        CONF_ID: str,
+        CONF_ALIAS: cv.string,
+        vol.Optional(CONF_DESCRIPTION): cv.string,
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
 
 PLATFORM_SCHEMA = vol.All(
     cv.deprecated(CONF_HIDE_ENTITY),
@@ -55,7 +63,7 @@
             vol.Optional(CONF_INITIAL_STATE): cv.boolean,
             vol.Optional(CONF_HIDE_ENTITY): cv.boolean,
             vol.Required(CONF_TRIGGER): cv.TRIGGER_SCHEMA,
-            vol.Optional(CONF_CONDITION): _CONDITION_SCHEMA,
+            vol.Optional(CONF_CONDITION): cv.CONDITIONS_SCHEMA,
             vol.Optional(CONF_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
             vol.Optional(CONF_TRIGGER_VARIABLES): cv.SCRIPT_VARIABLES_SCHEMA,
             vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA,
@@ -68,6 +76,7 @@
 async def _async_validate_config_item(
     hass: HomeAssistant,
     config: ConfigType,
+    raise_on_errors: bool,
     warn_on_errors: bool,
 ) -> AutomationConfig:
     """Validate config item."""
@@ -104,6 +113,15 @@ def _log_invalid_automation(
         )
         return
 
+    def _minimal_config() -> AutomationConfig:
+        """Try validating id, alias and description."""
+        minimal_config = _MINIMAL_PLATFORM_SCHEMA(config)
+        automation_config = AutomationConfig(minimal_config)
+        automation_config.raw_blueprint_inputs = raw_blueprint_inputs
+        automation_config.raw_config = raw_config
+        automation_config.validation_failed = True
+        return automation_config
+
     if blueprint.is_blueprint_instance_config(config):
         uses_blueprint = True
         blueprints = async_get_blueprints(hass)
@@ -115,7 +133,9 @@ def _log_invalid_automation(
                     "Failed to generate automation from blueprint: %s",
                     err,
                 )
-            raise
+            if raise_on_errors:
+                raise
+            return _minimal_config()
 
         raw_blueprint_inputs = blueprint_inputs.config_with_inputs
 
@@ -130,7 +150,9 @@ def _log_invalid_automation(
                     blueprint_inputs.inputs,
                     err,
                 )
-            raise HomeAssistantError from err
+            if raise_on_errors:
+                raise HomeAssistantError(err) from err
+            return _minimal_config()
 
     automation_name = "Unnamed automation"
     if isinstance(config, Mapping):
@@ -143,10 +165,16 @@ def _log_invalid_automation(
         validated_config = PLATFORM_SCHEMA(config)
     except vol.Invalid as err:
         _log_invalid_automation(err, automation_name, "could not be validated", config)
-        raise
+        if raise_on_errors:
+            raise
+        return _minimal_config()
+
+    automation_config = AutomationConfig(validated_config)
+    automation_config.raw_blueprint_inputs = raw_blueprint_inputs
+    automation_config.raw_config = raw_config
 
     try:
-        validated_config[CONF_TRIGGER] = await async_validate_trigger_config(
+        automation_config[CONF_TRIGGER] = await async_validate_trigger_config(
             hass, validated_config[CONF_TRIGGER]
         )
     except (
@@ -156,11 +184,14 @@ def _log_invalid_automation(
         _log_invalid_automation(
             err, automation_name, "failed to setup triggers", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        automation_config.validation_failed = True
+        return automation_config
 
     if CONF_CONDITION in validated_config:
         try:
-            validated_config[CONF_CONDITION] = await async_validate_conditions_config(
+            automation_config[CONF_CONDITION] = await async_validate_conditions_config(
                 hass, validated_config[CONF_CONDITION]
             )
         except (
@@ -170,10 +201,13 @@ def _log_invalid_automation(
             _log_invalid_automation(
                 err, automation_name, "failed to setup conditions", validated_config
             )
-            raise
+            if raise_on_errors:
+                raise
+            automation_config.validation_failed = True
+            return automation_config
 
     try:
-        validated_config[CONF_ACTION] = await script.async_validate_actions_config(
+        automation_config[CONF_ACTION] = await script.async_validate_actions_config(
             hass, validated_config[CONF_ACTION]
         )
     except (
@@ -183,11 +217,11 @@ def _log_invalid_automation(
         _log_invalid_automation(
             err, automation_name, "failed to setup actions", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        automation_config.validation_failed = True
+        return automation_config
 
-    automation_config = AutomationConfig(validated_config)
-    automation_config.raw_blueprint_inputs = raw_blueprint_inputs
-    automation_config.raw_config = raw_config
     return automation_config
 
 
@@ -196,6 +230,7 @@ class AutomationConfig(dict):
 
     raw_config: dict[str, Any] | None = None
     raw_blueprint_inputs: dict[str, Any] | None = None
+    validation_failed: bool = False
 
 
 async def _try_async_validate_config_item(
@@ -204,7 +239,7 @@ async def _try_async_validate_config_item(
 ) -> AutomationConfig | None:
     """Validate config item."""
     try:
-        return await _async_validate_config_item(hass, config, True)
+        return await _async_validate_config_item(hass, config, False, True)
     except (vol.Invalid, HomeAssistantError):
         return None
 
@@ -215,7 +250,7 @@ async def async_validate_config_item(
     config: dict[str, Any],
 ) -> AutomationConfig | None:
     """Validate config item, called by EditAutomationConfigView."""
-    return await _async_validate_config_item(hass, config, False)
+    return await _async_validate_config_item(hass, config, True, False)
 
 
 async def async_validate_config(hass: HomeAssistant, config: ConfigType) -> ConfigType:
diff --git a/homeassistant/components/awair/__init__.py b/homeassistant/components/awair/__init__.py
index cef2c7d1fd41c7..dca885ffe0d932 100644
--- a/homeassistant/components/awair/__init__.py
+++ b/homeassistant/components/awair/__init__.py
@@ -2,16 +2,22 @@
 from __future__ import annotations
 
 from asyncio import gather
+from dataclasses import dataclass
 from datetime import timedelta
 
 from aiohttp import ClientSession
 from async_timeout import timeout
 from python_awair import Awair, AwairLocal
+from python_awair.air_data import AirData
 from python_awair.devices import AwairBaseDevice, AwairLocalDevice
 from python_awair.exceptions import AuthError, AwairError
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, Platform
+from homeassistant.const import (
+    CONF_ACCESS_TOKEN,
+    CONF_HOST,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -23,7 +29,6 @@
     LOGGER,
     UPDATE_INTERVAL_CLOUD,
     UPDATE_INTERVAL_LOCAL,
-    AwairResult,
 )
 
 PLATFORMS = [Platform.SENSOR]
@@ -72,6 +77,14 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     return unload_ok
 
 
+@dataclass
+class AwairResult:
+    """Wrapper class to hold an awair device and set of air data."""
+
+    device: AwairBaseDevice
+    air_data: AirData
+
+
 class AwairDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AwairResult]]):
     """Define a wrapper class to update Awair data."""
 
diff --git a/homeassistant/components/awair/const.py b/homeassistant/components/awair/const.py
index d483df6429872d..19341ab605012f 100644
--- a/homeassistant/components/awair/const.py
+++ b/homeassistant/components/awair/const.py
@@ -1,28 +1,9 @@
 """Constants for the Awair component."""
 from __future__ import annotations
 
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
-from python_awair.air_data import AirData
-from python_awair.devices import AwairBaseDevice
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
-    PERCENTAGE,
-    UnitOfSoundPressure,
-    UnitOfTemperature,
-)
-
 API_CO2 = "carbon_dioxide"
 API_DUST = "dust"
 API_HUMID = "humidity"
@@ -39,109 +20,7 @@
 
 DOMAIN = "awair"
 
-DUST_ALIASES = [API_PM25, API_PM10]
-
 LOGGER = logging.getLogger(__package__)
 
 UPDATE_INTERVAL_CLOUD = timedelta(minutes=5)
 UPDATE_INTERVAL_LOCAL = timedelta(seconds=30)
-
-
-@dataclass
-class AwairRequiredKeysMixin:
-    """Mixin for required keys."""
-
-    unique_id_tag: str
-
-
-@dataclass
-class AwairSensorEntityDescription(SensorEntityDescription, AwairRequiredKeysMixin):
-    """Describes Awair sensor entity."""
-
-
-SENSOR_TYPE_SCORE = AwairSensorEntityDescription(
-    key=API_SCORE,
-    icon="mdi:blur",
-    native_unit_of_measurement=PERCENTAGE,
-    name="Score",
-    unique_id_tag="score",  # matches legacy format
-    state_class=SensorStateClass.MEASUREMENT,
-)
-
-SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
-    AwairSensorEntityDescription(
-        key=API_HUMID,
-        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        name="Humidity",
-        unique_id_tag="HUMID",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_LUX,
-        device_class=SensorDeviceClass.ILLUMINANCE,
-        native_unit_of_measurement=LIGHT_LUX,
-        name="Illuminance",
-        unique_id_tag="illuminance",
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_SPL_A,
-        device_class=SensorDeviceClass.SOUND_PRESSURE,
-        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
-        name="Sound level",
-        unique_id_tag="sound_level",
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_VOC,
-        icon="mdi:molecule",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        name="Volatile organic compounds",
-        unique_id_tag="VOC",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_TEMP,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        name="Temperature",
-        unique_id_tag="TEMP",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_CO2,
-        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        name="Carbon dioxide",
-        unique_id_tag="CO2",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-)
-
-SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
-    AwairSensorEntityDescription(
-        key=API_PM25,
-        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        name="PM2.5",
-        unique_id_tag="PM25",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AwairSensorEntityDescription(
-        key=API_PM10,
-        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        name="PM10",
-        unique_id_tag="PM10",  # matches legacy format
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-)
-
-
-@dataclass
-class AwairResult:
-    """Wrapper class to hold an awair device and set of air data."""
-
-    device: AwairBaseDevice
-    air_data: AirData
diff --git a/homeassistant/components/awair/manifest.json b/homeassistant/components/awair/manifest.json
index 19e3339cef6c4a..25257bc3e1c421 100644
--- a/homeassistant/components/awair/manifest.json
+++ b/homeassistant/components/awair/manifest.json
@@ -11,7 +11,7 @@
   "documentation": "https://www.home-assistant.io/integrations/awair",
   "iot_class": "local_polling",
   "loggers": ["python_awair"],
-  "requirements": ["python_awair==0.2.4"],
+  "requirements": ["python-awair==0.2.4"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/awair/sensor.py b/homeassistant/components/awair/sensor.py
index f42a46999fbfd9..ee0febf1455895 100644
--- a/homeassistant/components/awair/sensor.py
+++ b/homeassistant/components/awair/sensor.py
@@ -1,14 +1,30 @@
 """Support for Awair sensors."""
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any, cast
 
 from python_awair.air_data import AirData
 from python_awair.devices import AwairBaseDevice, AwairLocalDevice
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_CONNECTIONS, ATTR_SW_VERSION
+from homeassistant.const import (
+    ATTR_CONNECTIONS,
+    ATTR_SW_VERSION,
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    LIGHT_LUX,
+    PERCENTAGE,
+    UnitOfSoundPressure,
+    UnitOfTemperature,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo
@@ -17,18 +33,106 @@
 
 from . import AwairDataUpdateCoordinator, AwairResult
 from .const import (
+    API_CO2,
     API_DUST,
+    API_HUMID,
+    API_LUX,
+    API_PM10,
     API_PM25,
     API_SCORE,
+    API_SPL_A,
     API_TEMP,
     API_VOC,
     ATTRIBUTION,
     DOMAIN,
-    DUST_ALIASES,
-    SENSOR_TYPE_SCORE,
-    SENSOR_TYPES,
-    SENSOR_TYPES_DUST,
-    AwairSensorEntityDescription,
+)
+
+DUST_ALIASES = [API_PM25, API_PM10]
+
+
+@dataclass
+class AwairRequiredKeysMixin:
+    """Mixin for required keys."""
+
+    unique_id_tag: str
+
+
+@dataclass
+class AwairSensorEntityDescription(SensorEntityDescription, AwairRequiredKeysMixin):
+    """Describes Awair sensor entity."""
+
+
+SENSOR_TYPE_SCORE = AwairSensorEntityDescription(
+    key=API_SCORE,
+    icon="mdi:blur",
+    native_unit_of_measurement=PERCENTAGE,
+    translation_key="score",
+    unique_id_tag="score",  # matches legacy format
+    state_class=SensorStateClass.MEASUREMENT,
+)
+
+SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
+    AwairSensorEntityDescription(
+        key=API_HUMID,
+        device_class=SensorDeviceClass.HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
+        unique_id_tag="HUMID",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_LUX,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+        native_unit_of_measurement=LIGHT_LUX,
+        unique_id_tag="illuminance",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_SPL_A,
+        device_class=SensorDeviceClass.SOUND_PRESSURE,
+        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
+        translation_key="sound_level",
+        unique_id_tag="sound_level",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_VOC,
+        icon="mdi:molecule",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        unique_id_tag="VOC",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_TEMP,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        unique_id_tag="TEMP",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_CO2,
+        device_class=SensorDeviceClass.CO2,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        unique_id_tag="CO2",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
+    AwairSensorEntityDescription(
+        key=API_PM25,
+        device_class=SensorDeviceClass.PM25,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        unique_id_tag="PM25",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AwairSensorEntityDescription(
+        key=API_PM10,
+        device_class=SensorDeviceClass.PM10,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        unique_id_tag="PM10",  # matches legacy format
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
 )
 
 
diff --git a/homeassistant/components/awair/strings.json b/homeassistant/components/awair/strings.json
index 6040bc1d7b05bd..731cd5db8ddb71 100644
--- a/homeassistant/components/awair/strings.json
+++ b/homeassistant/components/awair/strings.json
@@ -48,5 +48,15 @@
       "unreachable": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "flow_title": "{model} ({device_id})"
+  },
+  "entity": {
+    "sensor": {
+      "score": {
+        "name": "Score"
+      },
+      "sound_level": {
+        "name": "Sound level"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 8d5f9764959cb6..8ce8bee779366c 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -1,6 +1,7 @@
 """The Backup integration."""
 from homeassistant.components.hassio import is_hassio
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, LOGGER
@@ -8,6 +9,8 @@
 from .manager import BackupManager
 from .websocket import async_register_websocket_handlers
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Backup integration."""
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index 1f8b70f4d35730..fe0d494a650984 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -18,7 +18,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import integration_platform
 from homeassistant.helpers.json import save_json
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.json import json_loads_object
 
 from .const import DOMAIN, EXCLUDE_FROM_BACKUP, LOGGER
@@ -176,7 +176,7 @@ async def generate_backup(self) -> Backup:
                     raise result
 
             backup_name = f"Core {HAVERSION}"
-            date_str = dt.now().isoformat()
+            date_str = dt_util.now().isoformat()
             slug = _generate_slug(date_str, backup_name)
 
             backup_data = {
diff --git a/homeassistant/components/baf/binary_sensor.py b/homeassistant/components/baf/binary_sensor.py
index fcfd0f3241d837..a68e80c3ac23e2 100644
--- a/homeassistant/components/baf/binary_sensor.py
+++ b/homeassistant/components/baf/binary_sensor.py
@@ -39,7 +39,6 @@ class BAFBinarySensorDescription(
 OCCUPANCY_SENSORS = (
     BAFBinarySensorDescription(
         key="occupancy",
-        name="Occupancy",
         device_class=BinarySensorDeviceClass.OCCUPANCY,
         value_fn=lambda device: cast(bool | None, device.fan_occupancy_detected),
     ),
@@ -70,7 +69,7 @@ class BAFBinarySensor(BAFEntity, BinarySensorEntity):
     def __init__(self, device: Device, description: BAFBinarySensorDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/climate.py b/homeassistant/components/baf/climate.py
index 6798639e7a8b12..531659e901f1cd 100644
--- a/homeassistant/components/baf/climate.py
+++ b/homeassistant/components/baf/climate.py
@@ -27,9 +27,7 @@ async def async_setup_entry(
     """Set up BAF fan auto comfort."""
     data: BAFData = hass.data[DOMAIN][entry.entry_id]
     if data.device.has_fan and data.device.has_auto_comfort:
-        async_add_entities(
-            [BAFAutoComfort(data.device, f"{data.device.name} Auto Comfort")]
-        )
+        async_add_entities([BAFAutoComfort(data.device)])
 
 
 class BAFAutoComfort(BAFEntity, ClimateEntity):
@@ -38,6 +36,7 @@ class BAFAutoComfort(BAFEntity, ClimateEntity):
     _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = [HVACMode.OFF, HVACMode.FAN_ONLY]
+    _attr_translation_key = "auto_comfort"
 
     @callback
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/baf/entity.py b/homeassistant/components/baf/entity.py
index 22054d0b16d01a..4aeb287b861702 100644
--- a/homeassistant/components/baf/entity.py
+++ b/homeassistant/components/baf/entity.py
@@ -13,12 +13,12 @@ class BAFEntity(Entity):
     """Base class for baf entities."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
-    def __init__(self, device: Device, name: str) -> None:
+    def __init__(self, device: Device) -> None:
         """Initialize the entity."""
         self._device = device
         self._attr_unique_id = format_mac(self._device.mac_address)
-        self._attr_name = name
         self._attr_device_info = DeviceInfo(
             connections={(dr.CONNECTION_NETWORK_MAC, self._device.mac_address)},
             name=self._device.name,
diff --git a/homeassistant/components/baf/fan.py b/homeassistant/components/baf/fan.py
index a166c346f12f16..059603fc589393 100644
--- a/homeassistant/components/baf/fan.py
+++ b/homeassistant/components/baf/fan.py
@@ -33,7 +33,7 @@ async def async_setup_entry(
     """Set up SenseME fans."""
     data: BAFData = hass.data[DOMAIN][entry.entry_id]
     if data.device.has_fan:
-        async_add_entities([BAFFan(data.device, data.device.name)])
+        async_add_entities([BAFFan(data.device)])
 
 
 class BAFFan(BAFEntity, FanEntity):
@@ -46,6 +46,7 @@ class BAFFan(BAFEntity, FanEntity):
     )
     _attr_preset_modes = [PRESET_MODE_AUTO]
     _attr_speed_count = SPEED_COUNT
+    _attr_name = None
 
     @callback
     def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/baf/light.py b/homeassistant/components/baf/light.py
index b177d383cd52ec..9557005e5ebe29 100644
--- a/homeassistant/components/baf/light.py
+++ b/homeassistant/components/baf/light.py
@@ -63,9 +63,11 @@ async def async_turn_off(self, **kwargs: Any) -> None:
 class BAFFanLight(BAFLight):
     """Representation of a Big Ass Fans light on a fan."""
 
+    _attr_name = None
+
     def __init__(self, device: Device) -> None:
         """Init a fan light."""
-        super().__init__(device, device.name)
+        super().__init__(device)
         self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
         self._attr_color_mode = ColorMode.BRIGHTNESS
 
@@ -75,7 +77,7 @@ class BAFStandaloneLight(BAFLight):
 
     def __init__(self, device: Device) -> None:
         """Init a standalone light."""
-        super().__init__(device, f"{device.name} Light")
+        super().__init__(device)
         self._attr_supported_color_modes = {ColorMode.COLOR_TEMP}
         self._attr_color_mode = ColorMode.COLOR_TEMP
         self._attr_min_mireds = color_temperature_kelvin_to_mired(
diff --git a/homeassistant/components/baf/manifest.json b/homeassistant/components/baf/manifest.json
index b5b5b76967e690..37fd5cee7c6645 100644
--- a/homeassistant/components/baf/manifest.json
+++ b/homeassistant/components/baf/manifest.json
@@ -5,7 +5,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/baf",
   "iot_class": "local_push",
-  "requirements": ["aiobafi6==0.8.0"],
+  "requirements": ["aiobafi6==0.8.2"],
   "zeroconf": [
     {
       "type": "_api._tcp.local.",
diff --git a/homeassistant/components/baf/number.py b/homeassistant/components/baf/number.py
index 020f34fefafbc8..7fd1c9ed290842 100644
--- a/homeassistant/components/baf/number.py
+++ b/homeassistant/components/baf/number.py
@@ -37,7 +37,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
 AUTO_COMFORT_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="comfort_min_speed",
-        name="Auto Comfort Minimum Speed",
+        translation_key="comfort_min_speed",
         native_step=1,
         native_min_value=0,
         native_max_value=SPEED_RANGE[1] - 1,
@@ -47,7 +47,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
     ),
     BAFNumberDescription(
         key="comfort_max_speed",
-        name="Auto Comfort Maximum Speed",
+        translation_key="comfort_max_speed",
         native_step=1,
         native_min_value=1,
         native_max_value=SPEED_RANGE[1],
@@ -57,7 +57,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
     ),
     BAFNumberDescription(
         key="comfort_heat_assist_speed",
-        name="Auto Comfort Heat Assist Speed",
+        translation_key="comfort_heat_assist_speed",
         native_step=1,
         native_min_value=SPEED_RANGE[0],
         native_max_value=SPEED_RANGE[1],
@@ -70,7 +70,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
 FAN_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="return_to_auto_timeout",
-        name="Return to Auto Timeout",
+        translation_key="return_to_auto_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=HALF_DAY_SECS,
@@ -81,7 +81,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
     ),
     BAFNumberDescription(
         key="motion_sense_timeout",
-        name="Motion Sense Timeout",
+        translation_key="motion_sense_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=ONE_DAY_SECS,
@@ -95,7 +95,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
 LIGHT_NUMBER_DESCRIPTIONS = (
     BAFNumberDescription(
         key="light_return_to_auto_timeout",
-        name="Light Return to Auto Timeout",
+        translation_key="light_return_to_auto_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=HALF_DAY_SECS,
@@ -106,7 +106,7 @@ class BAFNumberDescription(NumberEntityDescription, BAFNumberDescriptionMixin):
     ),
     BAFNumberDescription(
         key="light_auto_motion_timeout",
-        name="Light Motion Sense Timeout",
+        translation_key="light_auto_motion_timeout",
         native_step=1,
         native_min_value=ONE_MIN_SECS,
         native_max_value=ONE_DAY_SECS,
@@ -144,7 +144,7 @@ class BAFNumber(BAFEntity, NumberEntity):
     def __init__(self, device: Device, description: BAFNumberDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/sensor.py b/homeassistant/components/baf/sensor.py
index d8700886e0a53f..d811180414211f 100644
--- a/homeassistant/components/baf/sensor.py
+++ b/homeassistant/components/baf/sensor.py
@@ -46,7 +46,6 @@ class BAFSensorDescription(
 AUTO_COMFORT_SENSORS = (
     BAFSensorDescription(
         key="temperature",
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -57,7 +56,6 @@ class BAFSensorDescription(
 DEFINED_ONLY_SENSORS = (
     BAFSensorDescription(
         key="humidity",
-        name="Humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -68,7 +66,7 @@ class BAFSensorDescription(
 FAN_SENSORS = (
     BAFSensorDescription(
         key="current_rpm",
-        name="Current RPM",
+        translation_key="current_rpm",
         native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -76,7 +74,7 @@ class BAFSensorDescription(
     ),
     BAFSensorDescription(
         key="target_rpm",
-        name="Target RPM",
+        translation_key="target_rpm",
         native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -84,14 +82,14 @@ class BAFSensorDescription(
     ),
     BAFSensorDescription(
         key="wifi_ssid",
-        name="WiFi SSID",
+        translation_key="wifi_ssid",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: cast(int | None, device.wifi_ssid),
     ),
     BAFSensorDescription(
         key="ip_address",
-        name="IP Address",
+        translation_key="ip_address",
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: cast(str | None, device.ip_address),
@@ -128,7 +126,7 @@ class BAFSensor(BAFEntity, SensorEntity):
     def __init__(self, device: Device, description: BAFSensorDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baf/strings.json b/homeassistant/components/baf/strings.json
index 59a20ea400c502..cb322320675b2a 100644
--- a/homeassistant/components/baf/strings.json
+++ b/homeassistant/components/baf/strings.json
@@ -19,5 +19,81 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "climate": {
+      "auto_comfort": {
+        "name": "Auto comfort"
+      }
+    },
+    "number": {
+      "comfort_min_speed": {
+        "name": "Auto Comfort Minimum Speed"
+      },
+      "comfort_max_speed": {
+        "name": "Auto Comfort Maximum Speed"
+      },
+      "comfort_heat_assist_speed": {
+        "name": "Auto Comfort Heat Assist Speed"
+      },
+      "return_to_auto_timeout": {
+        "name": "Return to Auto Timeout"
+      },
+      "motion_sense_timeout": {
+        "name": "Motion Sense Timeout"
+      },
+      "light_return_to_auto_timeout": {
+        "name": "Light Return to Auto Timeout"
+      },
+      "light_auto_motion_timeout": {
+        "name": "Light Motion Sense Timeout"
+      }
+    },
+    "sensor": {
+      "current_rpm": {
+        "name": "Current RPM"
+      },
+      "target_rpm": {
+        "name": "Target RPM"
+      },
+      "wifi_ssid": {
+        "name": "Wi-Fi SSID"
+      },
+      "ip_address": {
+        "name": "IP Address"
+      }
+    },
+    "switch": {
+      "legacy_ir_remote_enable": {
+        "name": "Legacy IR Remote"
+      },
+      "led_indicators_enable": {
+        "name": "Led Indicators"
+      },
+      "comfort_heat_assist_enable": {
+        "name": "Auto Comfort Heat Assist"
+      },
+      "fan_beep_enable": {
+        "name": "Beep"
+      },
+      "eco_enable": {
+        "name": "Eco Mode"
+      },
+      "motion_sense_enable": {
+        "name": "Motion Sense"
+      },
+      "return_to_auto_enable": {
+        "name": "Return to Auto"
+      },
+      "whoosh_enable": {
+        "name": "Whoosh"
+      },
+      "light_dim_to_warm_enable": {
+        "name": "Dim to Warm"
+      },
+      "light_return_to_auto_enable": {
+        "name": "Light Return to Auto"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/baf/switch.py b/homeassistant/components/baf/switch.py
index d5236f9b861af1..ed4e635ece3459 100644
--- a/homeassistant/components/baf/switch.py
+++ b/homeassistant/components/baf/switch.py
@@ -36,13 +36,13 @@ class BAFSwitchDescription(
 BASE_SWITCHES = [
     BAFSwitchDescription(
         key="legacy_ir_remote_enable",
-        name="Legacy IR Remote",
+        translation_key="legacy_ir_remote_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.legacy_ir_remote_enable),
     ),
     BAFSwitchDescription(
         key="led_indicators_enable",
-        name="Led Indicators",
+        translation_key="led_indicators_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.led_indicators_enable),
     ),
@@ -51,7 +51,7 @@ class BAFSwitchDescription(
 AUTO_COMFORT_SWITCHES = [
     BAFSwitchDescription(
         key="comfort_heat_assist_enable",
-        name="Auto Comfort Heat Assist",
+        translation_key="comfort_heat_assist_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.comfort_heat_assist_enable),
     ),
@@ -60,31 +60,31 @@ class BAFSwitchDescription(
 FAN_SWITCHES = [
     BAFSwitchDescription(
         key="fan_beep_enable",
-        name="Beep",
+        translation_key="fan_beep_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.fan_beep_enable),
     ),
     BAFSwitchDescription(
         key="eco_enable",
-        name="Eco Mode",
+        translation_key="eco_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.eco_enable),
     ),
     BAFSwitchDescription(
         key="motion_sense_enable",
-        name="Motion Sense",
+        translation_key="motion_sense_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.motion_sense_enable),
     ),
     BAFSwitchDescription(
         key="return_to_auto_enable",
-        name="Return to Auto",
+        translation_key="return_to_auto_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.return_to_auto_enable),
     ),
     BAFSwitchDescription(
         key="whoosh_enable",
-        name="Whoosh",
+        translation_key="whoosh_enable",
         # Not a configuration switch
         value_fn=lambda device: cast(bool | None, device.whoosh_enable),
     ),
@@ -94,13 +94,13 @@ class BAFSwitchDescription(
 LIGHT_SWITCHES = [
     BAFSwitchDescription(
         key="light_dim_to_warm_enable",
-        name="Dim to Warm",
+        translation_key="light_dim_to_warm_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.light_dim_to_warm_enable),
     ),
     BAFSwitchDescription(
         key="light_return_to_auto_enable",
-        name="Light Return to Auto",
+        translation_key="light_return_to_auto_enable",
         entity_category=EntityCategory.CONFIG,
         value_fn=lambda device: cast(bool | None, device.light_return_to_auto_enable),
     ),
@@ -134,7 +134,7 @@ class BAFSwitch(BAFEntity, SwitchEntity):
     def __init__(self, device: Device, description: BAFSwitchDescription) -> None:
         """Initialize the entity."""
         self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
+        super().__init__(device)
         self._attr_unique_id = f"{self._device.mac_address}-{description.key}"
 
     @callback
diff --git a/homeassistant/components/baidu/tts.py b/homeassistant/components/baidu/tts.py
index 72694248fa1cf5..05e2956c10eca0 100644
--- a/homeassistant/components/baidu/tts.py
+++ b/homeassistant/components/baidu/tts.py
@@ -104,7 +104,7 @@ def supported_options(self):
         """Return a list of supported options."""
         return SUPPORTED_OPTIONS
 
-    def get_tts_audio(self, message, language, options=None):
+    def get_tts_audio(self, message, language, options):
         """Load TTS from BaiduTTS."""
 
         aip_speech = AipSpeech(
@@ -113,14 +113,11 @@ def get_tts_audio(self, message, language, options=None):
             self._app_data["secretkey"],
         )
 
-        if options is None:
-            result = aip_speech.synthesis(message, language, 1, self._speech_conf_data)
-        else:
-            speech_data = self._speech_conf_data.copy()
-            for key, value in options.items():
-                speech_data[_OPTIONS[key]] = value
+        speech_data = self._speech_conf_data.copy()
+        for key, value in options.items():
+            speech_data[_OPTIONS[key]] = value
 
-            result = aip_speech.synthesis(message, language, 1, speech_data)
+        result = aip_speech.synthesis(message, language, 1, speech_data)
 
         if isinstance(result, dict):
             _LOGGER.error(
diff --git a/homeassistant/components/balboa/binary_sensor.py b/homeassistant/components/balboa/binary_sensor.py
index 11a0cae0a01b76..9f363746a8fcdb 100644
--- a/homeassistant/components/balboa/binary_sensor.py
+++ b/homeassistant/components/balboa/binary_sensor.py
@@ -47,6 +47,10 @@ class BalboaBinarySensorEntityDescription(
 ):
     """A class that describes Balboa binary sensor entities."""
 
+    # BalboaBinarySensorEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
 
 FILTER_CYCLE_ICONS = ("mdi:sync", "mdi:sync-off")
 BINARY_SENSOR_DESCRIPTIONS = (
diff --git a/homeassistant/components/balboa/climate.py b/homeassistant/components/balboa/climate.py
index 06e8d26550282f..0d0fa9bd179ccb 100644
--- a/homeassistant/components/balboa/climate.py
+++ b/homeassistant/components/balboa/climate.py
@@ -78,7 +78,7 @@ def hvac_mode(self) -> HVACMode | None:
         return HEAT_HVAC_MODE_MAP.get(self._client.heat_mode.state)
 
     @property
-    def hvac_action(self) -> str:
+    def hvac_action(self) -> HVACAction:
         """Return the current operation mode."""
         return HEAT_STATE_HVAC_ACTION_MAP[self._client.heat_state]
 
diff --git a/homeassistant/components/balboa/entity.py b/homeassistant/components/balboa/entity.py
index 1b2c8d48f0bbda..e50c35db47777f 100644
--- a/homeassistant/components/balboa/entity.py
+++ b/homeassistant/components/balboa/entity.py
@@ -4,7 +4,7 @@
 from pybalboa import EVENT_UPDATE, SpaClient
 
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
-from homeassistant.helpers.entity import DeviceClassName, DeviceInfo, Entity
+from homeassistant.helpers.entity import DeviceInfo, Entity
 
 from .const import DOMAIN
 
@@ -12,9 +12,7 @@
 class BalboaBaseEntity(Entity):
     """Balboa base entity."""
 
-    def __init__(
-        self, client: SpaClient, name: str | DeviceClassName | None = None
-    ) -> None:
+    def __init__(self, client: SpaClient, name: str | None = None) -> None:
         """Initialize the control."""
         mac = client.mac_address
         model = client.model
diff --git a/homeassistant/components/beewi_smartclim/manifest.json b/homeassistant/components/beewi_smartclim/manifest.json
index f238c76d36652d..3555f9181bb6c8 100644
--- a/homeassistant/components/beewi_smartclim/manifest.json
+++ b/homeassistant/components/beewi_smartclim/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/beewi_smartclim",
   "iot_class": "local_polling",
   "loggers": ["beewi_smartclim"],
-  "requirements": ["beewi_smartclim==0.0.10"]
+  "requirements": ["beewi-smartclim==0.0.10"]
 }
diff --git a/homeassistant/components/binary_sensor/__init__.py b/homeassistant/components/binary_sensor/__init__.py
index d99f569ed591fa..1c2d6d779fba47 100644
--- a/homeassistant/components/binary_sensor/__init__.py
+++ b/homeassistant/components/binary_sensor/__init__.py
@@ -190,6 +190,13 @@ class BinarySensorEntity(Entity):
     _attr_is_on: bool | None = None
     _attr_state: None = None
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For binary sensors this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> BinarySensorDeviceClass | None:
         """Return the class of this entity."""
diff --git a/homeassistant/components/binary_sensor/device_condition.py b/homeassistant/components/binary_sensor/device_condition.py
index 4da9bd4567066f..81d2ebf26a2f0d 100644
--- a/homeassistant/components/binary_sensor/device_condition.py
+++ b/homeassistant/components/binary_sensor/device_condition.py
@@ -256,7 +256,7 @@
 
 CONDITION_SCHEMA = cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(IS_OFF + IS_ON),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -287,7 +287,7 @@ async def async_get_conditions(
                 **template,
                 "condition": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for template in templates
diff --git a/homeassistant/components/binary_sensor/device_trigger.py b/homeassistant/components/binary_sensor/device_trigger.py
index 969a52d15149c0..de6dbdbe0756a7 100644
--- a/homeassistant/components/binary_sensor/device_trigger.py
+++ b/homeassistant/components/binary_sensor/device_trigger.py
@@ -70,62 +70,6 @@
 CONF_NOT_OPENED = "not_opened"
 
 
-TURNED_ON = [
-    CONF_BAT_LOW,
-    CONF_CO,
-    CONF_COLD,
-    CONF_CONNECTED,
-    CONF_GAS,
-    CONF_HOT,
-    CONF_LIGHT,
-    CONF_NOT_LOCKED,
-    CONF_MOIST,
-    CONF_MOTION,
-    CONF_MOVING,
-    CONF_OCCUPIED,
-    CONF_OPENED,
-    CONF_PLUGGED_IN,
-    CONF_POWERED,
-    CONF_PRESENT,
-    CONF_PROBLEM,
-    CONF_RUNNING,
-    CONF_SMOKE,
-    CONF_SOUND,
-    CONF_UNSAFE,
-    CONF_UPDATE,
-    CONF_VIBRATION,
-    CONF_TAMPERED,
-    CONF_TURNED_ON,
-]
-
-TURNED_OFF = [
-    CONF_NOT_BAT_LOW,
-    CONF_NOT_COLD,
-    CONF_NOT_CONNECTED,
-    CONF_NOT_HOT,
-    CONF_LOCKED,
-    CONF_NOT_MOIST,
-    CONF_NOT_MOVING,
-    CONF_NOT_OCCUPIED,
-    CONF_NOT_OPENED,
-    CONF_NOT_PLUGGED_IN,
-    CONF_NOT_POWERED,
-    CONF_NOT_PRESENT,
-    CONF_NOT_TAMPERED,
-    CONF_NOT_UNSAFE,
-    CONF_NO_CO,
-    CONF_NO_GAS,
-    CONF_NO_LIGHT,
-    CONF_NO_MOTION,
-    CONF_NO_PROBLEM,
-    CONF_NOT_RUNNING,
-    CONF_NO_SMOKE,
-    CONF_NO_SOUND,
-    CONF_NO_VIBRATION,
-    CONF_TURNED_OFF,
-]
-
-
 ENTITY_TRIGGERS = {
     BinarySensorDeviceClass.BATTERY: [
         {CONF_TYPE: CONF_BAT_LOW},
@@ -168,8 +112,8 @@
         {CONF_TYPE: CONF_NO_LIGHT},
     ],
     BinarySensorDeviceClass.LOCK: [
-        {CONF_TYPE: CONF_LOCKED},
         {CONF_TYPE: CONF_NOT_LOCKED},
+        {CONF_TYPE: CONF_LOCKED},
     ],
     BinarySensorDeviceClass.MOISTURE: [
         {CONF_TYPE: CONF_MOIST},
@@ -245,10 +189,13 @@
     ],
 }
 
+TURNED_ON = [trigger[0][CONF_TYPE] for trigger in ENTITY_TRIGGERS.values()]
+TURNED_OFF = [trigger[1][CONF_TYPE] for trigger in ENTITY_TRIGGERS.values()]
+
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TURNED_OFF + TURNED_ON),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -307,7 +254,7 @@ async def async_get_triggers(
                 **automation,
                 "platform": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for automation in templates
diff --git a/homeassistant/components/binary_sensor/strings.json b/homeassistant/components/binary_sensor/strings.json
index f2bbc72e7a5f61..ee70420fec04a2 100644
--- a/homeassistant/components/binary_sensor/strings.json
+++ b/homeassistant/components/binary_sensor/strings.json
@@ -4,6 +4,8 @@
     "condition_type": {
       "is_bat_low": "{entity_name} battery is low",
       "is_not_bat_low": "{entity_name} battery is normal",
+      "is_charging": "{entity_name} is charging",
+      "is_not_charging": "{entity_name} is not charging",
       "is_co": "{entity_name} is detecting carbon monoxide",
       "is_no_co": "{entity_name} is not detecting carbon monoxide",
       "is_cold": "{entity_name} is cold",
@@ -56,6 +58,8 @@
     "trigger_type": {
       "bat_low": "{entity_name} battery low",
       "not_bat_low": "{entity_name} battery normal",
+      "charging": "{entity_name} charging",
+      "not_charging": "{entity_name} not charging",
       "co": "{entity_name} started detecting carbon monoxide",
       "no_co": "{entity_name} stopped detecting carbon monoxide",
       "cold": "{entity_name} became cold",
@@ -298,7 +302,7 @@
     }
   },
   "device_class": {
-    "co": "carbon_monoxide",
+    "co": "carbon monoxide",
     "cold": "cold",
     "gas": "gas",
     "heat": "heat",
diff --git a/homeassistant/components/blebox/manifest.json b/homeassistant/components/blebox/manifest.json
index 8cb7ddb5c1e37e..b639e28d6980ed 100644
--- a/homeassistant/components/blebox/manifest.json
+++ b/homeassistant/components/blebox/manifest.json
@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/blebox",
   "iot_class": "local_polling",
   "loggers": ["blebox_uniapi"],
-  "requirements": ["blebox_uniapi==2.1.4"],
+  "requirements": ["blebox-uniapi==2.1.4"],
   "zeroconf": ["_bbxsrv._tcp.local."]
 }
diff --git a/homeassistant/components/blink/__init__.py b/homeassistant/components/blink/__init__.py
index 668a7f99c02512..b94a77fbf18397 100644
--- a/homeassistant/components/blink/__init__.py
+++ b/homeassistant/components/blink/__init__.py
@@ -8,7 +8,13 @@
 
 from homeassistant.components import persistent_notification
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
-from homeassistant.const import CONF_FILENAME, CONF_NAME, CONF_PIN, CONF_SCAN_INTERVAL
+from homeassistant.const import (
+    CONF_FILE_PATH,
+    CONF_FILENAME,
+    CONF_NAME,
+    CONF_PIN,
+    CONF_SCAN_INTERVAL,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
@@ -18,6 +24,7 @@
     DOMAIN,
     PLATFORMS,
     SERVICE_REFRESH,
+    SERVICE_SAVE_RECENT_CLIPS,
     SERVICE_SAVE_VIDEO,
     SERVICE_SEND_PIN,
 )
@@ -28,6 +35,9 @@
     {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILENAME): cv.string}
 )
 SERVICE_SEND_PIN_SCHEMA = vol.Schema({vol.Optional(CONF_PIN): cv.string})
+SERVICE_SAVE_RECENT_CLIPS_SCHEMA = vol.Schema(
+    {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILE_PATH): cv.string}
+)
 
 
 def _blink_startup_wrapper(hass: HomeAssistant, entry: ConfigEntry) -> Blink:
@@ -100,6 +110,10 @@ async def async_save_video(call):
         """Call save video service handler."""
         await async_handle_save_video_service(hass, entry, call)
 
+    async def async_save_recent_clips(call):
+        """Call save recent clips service handler."""
+        await async_handle_save_recent_clips_service(hass, entry, call)
+
     def send_pin(call):
         """Call blink to send new pin."""
         pin = call.data[CONF_PIN]
@@ -112,6 +126,12 @@ def send_pin(call):
     hass.services.async_register(
         DOMAIN, SERVICE_SAVE_VIDEO, async_save_video, schema=SERVICE_SAVE_VIDEO_SCHEMA
     )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SAVE_RECENT_CLIPS,
+        async_save_recent_clips,
+        schema=SERVICE_SAVE_RECENT_CLIPS_SCHEMA,
+    )
     hass.services.async_register(
         DOMAIN, SERVICE_SEND_PIN, send_pin, schema=SERVICE_SEND_PIN_SCHEMA
     )
@@ -164,13 +184,33 @@ async def async_handle_save_video_service(hass, entry, call):
         _LOGGER.error("Can't write %s, no access to path!", video_path)
         return
 
-    def _write_video(camera_name, video_path):
+    def _write_video(name, file_path):
         """Call video write."""
         all_cameras = hass.data[DOMAIN][entry.entry_id].cameras
-        if camera_name in all_cameras:
-            all_cameras[camera_name].video_to_file(video_path)
+        if name in all_cameras:
+            all_cameras[name].video_to_file(file_path)
 
     try:
         await hass.async_add_executor_job(_write_video, camera_name, video_path)
     except OSError as err:
         _LOGGER.error("Can't write image to file: %s", err)
+
+
+async def async_handle_save_recent_clips_service(hass, entry, call):
+    """Save multiple recent clips to output directory."""
+    camera_name = call.data[CONF_NAME]
+    clips_dir = call.data[CONF_FILE_PATH]
+    if not hass.config.is_allowed_path(clips_dir):
+        _LOGGER.error("Can't write to directory %s, no access to path!", clips_dir)
+        return
+
+    def _save_recent_clips(name, output_dir):
+        """Call save recent clips."""
+        all_cameras = hass.data[DOMAIN][entry.entry_id].cameras
+        if name in all_cameras:
+            all_cameras[name].save_recent_clips(output_dir=output_dir)
+
+    try:
+        await hass.async_add_executor_job(_save_recent_clips, camera_name, clips_dir)
+    except OSError as err:
+        _LOGGER.error("Can't write recent clips to directory: %s", err)
diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py
index 22a142ff44cb78..5d0ea67f31df76 100644
--- a/homeassistant/components/blink/alarm_control_panel.py
+++ b/homeassistant/components/blink/alarm_control_panel.py
@@ -41,6 +41,7 @@ class BlinkSyncModule(AlarmControlPanelEntity):
 
     _attr_icon = ICON
     _attr_supported_features = AlarmControlPanelEntityFeature.ARM_AWAY
+    _attr_name = None
 
     def __init__(self, data, name, sync):
         """Initialize the alarm control panel."""
@@ -48,15 +49,23 @@ def __init__(self, data, name, sync):
         self.sync = sync
         self._name = name
         self._attr_unique_id = sync.serial
-        self._attr_name = f"{DOMAIN} {name}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, sync.serial)}, name=name, manufacturer=DEFAULT_BRAND
+            identifiers={(DOMAIN, sync.serial)},
+            name=f"{DOMAIN} {name}",
+            manufacturer=DEFAULT_BRAND,
         )
 
     def update(self) -> None:
         """Update the state of the device."""
-        _LOGGER.debug("Updating Blink Alarm Control Panel %s", self._name)
-        self.data.refresh()
+        if self.data.check_if_ok_to_update():
+            _LOGGER.debug(
+                "Initiating a blink.refresh() from BlinkSyncModule('%s') (%s)",
+                self._name,
+                self.data,
+            )
+            self.data.refresh()
+            _LOGGER.info("Updating State of Blink Alarm Control Panel '%s'", self._name)
+
         self._attr_state = (
             STATE_ALARM_ARMED_AWAY if self.sync.arm else STATE_ALARM_DISARMED
         )
diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py
index 9454daa85ec36e..c7daf0ec1e1d58 100644
--- a/homeassistant/components/blink/binary_sensor.py
+++ b/homeassistant/components/blink/binary_sensor.py
@@ -1,6 +1,8 @@
 """Support for Blink system camera control."""
 from __future__ import annotations
 
+import logging
+
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -20,20 +22,20 @@
     TYPE_MOTION_DETECTED,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key=TYPE_BATTERY,
-        name="Battery",
         device_class=BinarySensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key=TYPE_CAMERA_ARMED,
-        name="Camera Armed",
+        translation_key="camera_armed",
     ),
     BinarySensorEntityDescription(
         key=TYPE_MOTION_DETECTED,
-        name="Motion Detected",
         device_class=BinarySensorDeviceClass.MOTION,
     ),
 )
@@ -74,8 +76,13 @@ def __init__(
 
     def update(self) -> None:
         """Update sensor state."""
-        self.data.refresh()
         state = self._camera.attributes[self.entity_description.key]
+        _LOGGER.debug(
+            "'%s' %s = %s",
+            self._camera.attributes["name"],
+            self.entity_description.key,
+            state,
+        )
         if self.entity_description.key == TYPE_BATTERY:
             state = state != "ok"
         self._attr_is_on = state
diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py
index e500eb79e42147..e74555f8db909e 100644
--- a/homeassistant/components/blink/camera.py
+++ b/homeassistant/components/blink/camera.py
@@ -38,11 +38,12 @@ async def async_setup_entry(
 class BlinkCamera(Camera):
     """An implementation of a Blink Camera."""
 
+    _attr_name = None
+
     def __init__(self, data, name, camera):
         """Initialize a camera."""
         super().__init__()
         self.data = data
-        self._attr_name = f"{DOMAIN} {name}"
         self._camera = camera
         self._attr_unique_id = f"{camera.serial}-camera"
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/blink/const.py b/homeassistant/components/blink/const.py
index 8986782031fd3f..d58920562f4f1a 100644
--- a/homeassistant/components/blink/const.py
+++ b/homeassistant/components/blink/const.py
@@ -23,6 +23,7 @@
 SERVICE_REFRESH = "blink_update"
 SERVICE_TRIGGER = "trigger_camera"
 SERVICE_SAVE_VIDEO = "save_video"
+SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
 SERVICE_SEND_PIN = "send_pin"
 
 PLATFORMS = [
diff --git a/homeassistant/components/blink/manifest.json b/homeassistant/components/blink/manifest.json
index 3e061df32a29e7..302a9f1e86a0a7 100644
--- a/homeassistant/components/blink/manifest.json
+++ b/homeassistant/components/blink/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/blink",
   "iot_class": "cloud_polling",
   "loggers": ["blinkpy"],
-  "requirements": ["blinkpy==0.19.2"]
+  "requirements": ["blinkpy==0.21.0"]
 }
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index c051fef98f4fea..c996a90e54d047 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -25,14 +25,13 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=TYPE_TEMPERATURE,
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SensorEntityDescription(
         key=TYPE_WIFI_STRENGTH,
-        name="Wifi Signal",
+        translation_key="wifi_rssi",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -57,10 +56,11 @@ async def async_setup_entry(
 class BlinkSensor(SensorEntity):
     """A Blink camera sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(self, data, camera, description: SensorEntityDescription) -> None:
         """Initialize sensors from Blink camera."""
         self.entity_description = description
-        self._attr_name = f"{DOMAIN} {camera} {description.name}"
         self.data = data
         self._camera = data.cameras[camera]
         self._attr_unique_id = f"{self._camera.serial}-{description.key}"
@@ -71,16 +71,21 @@ def __init__(self, data, camera, description: SensorEntityDescription) -> None:
         )
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._camera.serial)},
-            name=camera,
+            name=f"{DOMAIN} {camera}",
             manufacturer=DEFAULT_BRAND,
             model=self._camera.camera_type,
         )
 
     def update(self) -> None:
         """Retrieve sensor data from the camera."""
-        self.data.refresh()
         try:
             self._attr_native_value = self._camera.attributes[self._sensor_key]
+            _LOGGER.debug(
+                "'%s' %s = %s",
+                self._camera.attributes["name"],
+                self._sensor_key,
+                self._attr_native_value,
+            )
         except KeyError:
             self._attr_native_value = None
             _LOGGER.error(
diff --git a/homeassistant/components/blink/services.yaml b/homeassistant/components/blink/services.yaml
index 89af4799c858a2..3d51ba2f7bbe56 100644
--- a/homeassistant/components/blink/services.yaml
+++ b/homeassistant/components/blink/services.yaml
@@ -25,12 +25,31 @@ save_video:
         text:
     filename:
       name: File name
-      description: Filename to writable path (directory may need to be included in whitelist_dirs in config)
+      description: Filename to writable path (directory may need to be included in allowlist_external_dirs in config)
       required: true
       example: "/tmp/video.mp4"
       selector:
         text:
 
+save_recent_clips:
+  name: Save recent clips
+  description: 'Save all recent video clips to local directory with file pattern "%Y%m%d_%H%M%S_{name}.mp4"'
+  fields:
+    name:
+      name: Name
+      description: Name of camera to grab recent clips from.
+      required: true
+      example: "Living Room"
+      selector:
+        text:
+    file_path:
+      name: Output directory
+      description: Directory name of writable path (directory may need to be included in allowlist_external_dirs in config)
+      required: true
+      example: "/tmp"
+      selector:
+        text:
+
 send_pin:
   name: Send pin
   description: Send a new PIN to blink for 2FA.
diff --git a/homeassistant/components/blink/strings.json b/homeassistant/components/blink/strings.json
index ae04f37714be8c..61c9a21af37043 100644
--- a/homeassistant/components/blink/strings.json
+++ b/homeassistant/components/blink/strings.json
@@ -34,5 +34,17 @@
         "description": "Configure Blink integration"
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "wifi_rssi": {
+        "name": "Wi-Fi RSSI"
+      }
+    },
+    "binary_sensor": {
+      "camera_armed": {
+        "name": "Camera armed"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/blinksticklight/manifest.json b/homeassistant/components/blinksticklight/manifest.json
index 70e5c2a4672819..e3a6638f2a9e55 100644
--- a/homeassistant/components/blinksticklight/manifest.json
+++ b/homeassistant/components/blinksticklight/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/blinksticklight",
   "iot_class": "local_polling",
   "loggers": ["blinkstick"],
-  "requirements": ["blinkstick==1.2.0"]
+  "requirements": ["BlinkStick==1.2.0"]
 }
diff --git a/homeassistant/components/blueprint/__init__.py b/homeassistant/components/blueprint/__init__.py
index 3087309f36ae45..1fe1ad8e189fac 100644
--- a/homeassistant/components/blueprint/__init__.py
+++ b/homeassistant/components/blueprint/__init__.py
@@ -1,5 +1,6 @@
 """The blueprint integration."""
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from . import websocket_api
@@ -15,6 +16,8 @@
 from .models import Blueprint, BlueprintInputs, DomainBlueprints  # noqa: F401
 from .schemas import is_blueprint_instance_config  # noqa: F401
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the blueprint integration."""
diff --git a/homeassistant/components/blueprint/importer.py b/homeassistant/components/blueprint/importer.py
index d857992a13cee8..4517d134e69d7d 100644
--- a/homeassistant/components/blueprint/importer.py
+++ b/homeassistant/components/blueprint/importer.py
@@ -1,6 +1,8 @@
 """Import logic for blueprint."""
+
 from __future__ import annotations
 
+from contextlib import suppress
 from dataclasses import dataclass
 import html
 import re
@@ -28,6 +30,10 @@
     r"^https://github.com/(?P<repository>.+)/blob/(?P<path>.+)$"
 )
 
+WEBSITE_PATTERN = re.compile(
+    r"^https://(?P<subdomain>[a-z0-9-]+)\.home-assistant\.io/(?P<path>.+).yaml$"
+)
+
 COMMUNITY_TOPIC_SCHEMA = vol.Schema(
     {
         "slug": str,
@@ -219,18 +225,37 @@ async def fetch_blueprint_from_github_gist_url(
     )
 
 
+async def fetch_blueprint_from_website_url(
+    hass: HomeAssistant, url: str
+) -> ImportedBlueprint:
+    """Get a blueprint from our website."""
+    if (WEBSITE_PATTERN.match(url)) is None:
+        raise UnsupportedUrl("Not a Home Assistant website URL")
+
+    session = aiohttp_client.async_get_clientsession(hass)
+
+    resp = await session.get(url, raise_for_status=True)
+    raw_yaml = await resp.text()
+    data = yaml.parse_yaml(raw_yaml)
+    assert isinstance(data, dict)
+    blueprint = Blueprint(data)
+
+    parsed_import_url = yarl.URL(url)
+    suggested_filename = f"homeassistant/{parsed_import_url.parts[-1][:-5]}"
+    return ImportedBlueprint(suggested_filename, raw_yaml, blueprint)
+
+
 async def fetch_blueprint_from_url(hass: HomeAssistant, url: str) -> ImportedBlueprint:
     """Get a blueprint from a url."""
     for func in (
         fetch_blueprint_from_community_post,
         fetch_blueprint_from_github_url,
         fetch_blueprint_from_github_gist_url,
+        fetch_blueprint_from_website_url,
     ):
-        try:
+        with suppress(UnsupportedUrl):
             imported_bp = await func(hass, url)
             imported_bp.blueprint.update_metadata(source_url=url)
             return imported_bp
-        except UnsupportedUrl:
-            pass
 
-    raise HomeAssistantError("Unsupported url")
+    raise HomeAssistantError("Unsupported URL")
diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index 2c48b473b73dab..bf4dbf81f01724 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -6,7 +6,6 @@
 import platform
 from typing import TYPE_CHECKING
 
-from awesomeversion import AwesomeVersion
 from bleak_retry_connector import BleakSlotManager
 from bluetooth_adapters import (
     ADAPTER_ADDRESS,
@@ -25,22 +24,18 @@
 from home_assistant_bluetooth import BluetoothServiceInfo, BluetoothServiceInfoBleak
 
 from homeassistant.components import usb
-from homeassistant.config_entries import (
-    SOURCE_IGNORE,
-    SOURCE_INTEGRATION_DISCOVERY,
-    ConfigEntry,
-)
-from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP
+from homeassistant.config_entries import SOURCE_INTEGRATION_DISCOVERY, ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HassJob, HomeAssistant, callback as hass_callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, discovery_flow
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    discovery_flow,
+)
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.event import async_call_later
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
+from homeassistant.helpers.issue_registry import async_delete_issue
 from homeassistant.loader import async_get_bluetooth
 
 from . import models
@@ -81,7 +76,7 @@
     BluetoothScanningMode,
     HaBluetoothConnector,
 )
-from .scanner import HaScanner, ScannerStartError
+from .scanner import MONOTONIC_TIME, HaScanner, ScannerStartError
 from .storage import BluetoothStorage
 
 if TYPE_CHECKING:
@@ -113,11 +108,12 @@
     "HaBluetoothConnector",
     "SOURCE_LOCAL",
     "FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS",
+    "MONOTONIC_TIME",
 ]
 
 _LOGGER = logging.getLogger(__name__)
 
-RECOMMENDED_MIN_HAOS_VERSION = AwesomeVersion("9.0.dev0")
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
 async def _async_get_adapter_from_address(
@@ -127,43 +123,6 @@ async def _async_get_adapter_from_address(
     return await _get_manager(hass).async_get_adapter_from_address(address)
 
 
-@hass_callback
-def _async_haos_is_new_enough(hass: HomeAssistant) -> bool:
-    """Check if the version of Home Assistant Operating System is new enough."""
-    # Only warn if a USB adapter is plugged in
-    if not any(
-        entry
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.source != SOURCE_IGNORE
-    ):
-        return True
-    if (
-        not hass.components.hassio.is_hassio()
-        or not (os_info := hass.components.hassio.get_os_info())
-        or not (haos_version := os_info.get("version"))
-        or AwesomeVersion(haos_version) >= RECOMMENDED_MIN_HAOS_VERSION
-    ):
-        return True
-    return False
-
-
-@hass_callback
-def _async_check_haos(hass: HomeAssistant) -> None:
-    """Create or delete an the haos_outdated issue."""
-    if _async_haos_is_new_enough(hass):
-        async_delete_issue(hass, DOMAIN, "haos_outdated")
-        return
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "haos_outdated",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        learn_more_url="/config/updates",
-        translation_key="haos_outdated",
-    )
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the bluetooth integration."""
     integration_matcher = IntegrationMatcher(await async_get_bluetooth(hass))
@@ -236,12 +195,7 @@ def _async_trigger_discovery() -> None:
         EVENT_HOMEASSISTANT_STOP, hass_callback(lambda event: cancel())
     )
 
-    # Wait to check until after start to make sure
-    # that the system info is available.
-    hass.bus.async_listen_once(
-        EVENT_HOMEASSISTANT_STARTED,
-        hass_callback(lambda event: _async_check_haos(hass)),
-    )
+    async_delete_issue(hass, DOMAIN, "haos_outdated")
     return True
 
 
diff --git a/homeassistant/components/bluetooth/base_scanner.py b/homeassistant/components/bluetooth/base_scanner.py
index 8f7750fe322054..e8de285138e8ac 100644
--- a/homeassistant/components/bluetooth/base_scanner.py
+++ b/homeassistant/components/bluetooth/base_scanner.py
@@ -299,10 +299,10 @@ def _async_on_advertisement(
         manufacturer_data: dict[int, bytes],
         tx_power: int | None,
         details: dict[Any, Any],
+        advertisement_monotonic_time: float,
     ) -> None:
         """Call the registered callback."""
-        now = MONOTONIC_TIME()
-        self._last_detection = now
+        self._last_detection = advertisement_monotonic_time
         if prev_discovery := self._discovered_device_advertisement_datas.get(address):
             # Merge the new data with the old data
             # to function the same as BlueZ which
@@ -365,7 +365,7 @@ def _async_on_advertisement(
             device,
             advertisement_data,
         )
-        self._discovered_device_timestamps[address] = now
+        self._discovered_device_timestamps[address] = advertisement_monotonic_time
         self._new_info_callback(
             BluetoothServiceInfoBleak(
                 name=local_name or address,
@@ -378,7 +378,7 @@ def _async_on_advertisement(
                 device=device,
                 advertisement=advertisement_data,
                 connectable=self.connectable,
-                time=now,
+                time=advertisement_monotonic_time,
             )
         )
 
diff --git a/homeassistant/components/bluetooth/manager.py b/homeassistant/components/bluetooth/manager.py
index 3210822e795274..d1fcb115180cbb 100644
--- a/homeassistant/components/bluetooth/manager.py
+++ b/homeassistant/components/bluetooth/manager.py
@@ -246,9 +246,12 @@ def async_scanner_devices_by_address(
         self, address: str, connectable: bool
     ) -> list[BluetoothScannerDevice]:
         """Get BluetoothScannerDevice by address."""
-        scanners = self._get_scanners_by_type(True)
         if not connectable:
-            scanners.extend(self._get_scanners_by_type(False))
+            scanners: Iterable[BaseHaScanner] = itertools.chain(
+                self._connectable_scanners, self._non_connectable_scanners
+            )
+        else:
+            scanners = self._connectable_scanners
         return [
             BluetoothScannerDevice(scanner, *device_adv)
             for scanner in scanners
@@ -267,21 +270,19 @@ def _async_all_discovered_addresses(self, connectable: bool) -> Iterable[str]:
         """
         yield from itertools.chain.from_iterable(
             scanner.discovered_devices_and_advertisement_data
-            for scanner in self._get_scanners_by_type(True)
+            for scanner in self._connectable_scanners
         )
         if not connectable:
             yield from itertools.chain.from_iterable(
                 scanner.discovered_devices_and_advertisement_data
-                for scanner in self._get_scanners_by_type(False)
+                for scanner in self._non_connectable_scanners
             )
 
     @hass_callback
     def async_discovered_devices(self, connectable: bool) -> list[BLEDevice]:
         """Return all of combined best path to discovered from all the scanners."""
-        return [
-            history.device
-            for history in self._get_history_by_type(connectable).values()
-        ]
+        histories = self._connectable_history if connectable else self._all_history
+        return [history.device for history in histories.values()]
 
     @hass_callback
     def async_setup_unavailable_tracking(self) -> None:
@@ -303,7 +304,10 @@ def _async_check_unavailable(self, now: datetime) -> None:
         intervals = tracker.intervals
 
         for connectable in (True, False):
-            unavailable_callbacks = self._get_unavailable_callbacks_by_type(connectable)
+            if connectable:
+                unavailable_callbacks = self._connectable_unavailable_callbacks
+            else:
+                unavailable_callbacks = self._unavailable_callbacks
             history = connectable_history if connectable else all_history
             disappeared = set(history).difference(
                 self._async_all_discovered_addresses(connectable)
@@ -409,23 +413,20 @@ def scanner_adv_received(self, service_info: BluetoothServiceInfoBleak) -> None:
 
         # Pre-filter noisy apple devices as they can account for 20-35% of the
         # traffic on a typical network.
-        advertisement_data = service_info.advertisement
-        manufacturer_data = advertisement_data.manufacturer_data
         if (
-            len(manufacturer_data) == 1
-            and (apple_data := manufacturer_data.get(APPLE_MFR_ID))
-            and apple_data[0] not in APPLE_START_BYTES_WANTED
-            and not advertisement_data.service_data
+            (manufacturer_data := service_info.manufacturer_data)
+            and APPLE_MFR_ID in manufacturer_data
+            and manufacturer_data[APPLE_MFR_ID][0] not in APPLE_START_BYTES_WANTED
+            and len(manufacturer_data) == 1
+            and not service_info.service_data
         ):
             return
 
-        device = service_info.device
-        address = device.address
+        address = service_info.device.address
         all_history = self._all_history
         connectable = service_info.connectable
         connectable_history = self._connectable_history
         old_connectable_service_info = connectable and connectable_history.get(address)
-
         source = service_info.source
         # This logic is complex due to the many combinations of scanners
         # that are supported.
@@ -540,13 +541,17 @@ def scanner_adv_received(self, service_info: BluetoothServiceInfoBleak) -> None:
                 "%s: %s %s match: %s",
                 self._async_describe_source(service_info),
                 address,
-                advertisement_data,
+                service_info.advertisement,
                 matched_domains,
             )
 
-        if connectable or old_connectable_service_info:
+        if (connectable or old_connectable_service_info) and (
+            bleak_callbacks := self._bleak_callbacks
+        ):
             # Bleak callbacks must get a connectable device
-            for callback_filters in self._bleak_callbacks:
+            device = service_info.device
+            advertisement_data = service_info.advertisement
+            for callback_filters in bleak_callbacks:
                 _dispatch_bleak_callback(*callback_filters, device, advertisement_data)
 
         for match in self._callback_index.match_callbacks(service_info):
@@ -583,7 +588,10 @@ def async_track_unavailable(
         connectable: bool,
     ) -> Callable[[], None]:
         """Register a callback."""
-        unavailable_callbacks = self._get_unavailable_callbacks_by_type(connectable)
+        if connectable:
+            unavailable_callbacks = self._connectable_unavailable_callbacks
+        else:
+            unavailable_callbacks = self._unavailable_callbacks
         unavailable_callbacks.setdefault(address, []).append(callback)
 
         @hass_callback
@@ -620,13 +628,13 @@ def _async_remove_callback() -> None:
         # If we have history for the subscriber, we can trigger the callback
         # immediately with the last packet so the subscriber can see the
         # device.
-        all_history = self._get_history_by_type(connectable)
+        history = self._connectable_history if connectable else self._all_history
         service_infos: Iterable[BluetoothServiceInfoBleak] = []
         if address := callback_matcher.get(ADDRESS):
-            if service_info := all_history.get(address):
+            if service_info := history.get(address):
                 service_infos = [service_info]
         else:
-            service_infos = all_history.values()
+            service_infos = history.values()
 
         for service_info in service_infos:
             if ble_device_matches(callback_matcher, service_info):
@@ -642,29 +650,32 @@ def async_ble_device_from_address(
         self, address: str, connectable: bool
     ) -> BLEDevice | None:
         """Return the BLEDevice if present."""
-        all_history = self._get_history_by_type(connectable)
-        if history := all_history.get(address):
+        histories = self._connectable_history if connectable else self._all_history
+        if history := histories.get(address):
             return history.device
         return None
 
     @hass_callback
     def async_address_present(self, address: str, connectable: bool) -> bool:
         """Return if the address is present."""
-        return address in self._get_history_by_type(connectable)
+        histories = self._connectable_history if connectable else self._all_history
+        return address in histories
 
     @hass_callback
     def async_discovered_service_info(
         self, connectable: bool
     ) -> Iterable[BluetoothServiceInfoBleak]:
         """Return all the discovered services info."""
-        return self._get_history_by_type(connectable).values()
+        histories = self._connectable_history if connectable else self._all_history
+        return histories.values()
 
     @hass_callback
     def async_last_service_info(
         self, address: str, connectable: bool
     ) -> BluetoothServiceInfoBleak | None:
         """Return the last service info for an address."""
-        return self._get_history_by_type(connectable).get(address)
+        histories = self._connectable_history if connectable else self._all_history
+        return histories.get(address)
 
     def _async_trigger_matching_discovery(
         self, service_info: BluetoothServiceInfoBleak
@@ -688,26 +699,6 @@ def async_rediscover_address(self, address: str) -> None:
         if service_info := self._all_history.get(address):
             self._async_trigger_matching_discovery(service_info)
 
-    def _get_scanners_by_type(self, connectable: bool) -> list[BaseHaScanner]:
-        """Return the scanners by type."""
-        if connectable:
-            return self._connectable_scanners
-        return self._non_connectable_scanners
-
-    def _get_unavailable_callbacks_by_type(
-        self, connectable: bool
-    ) -> dict[str, list[Callable[[BluetoothServiceInfoBleak], None]]]:
-        """Return the unavailable callbacks by type."""
-        if connectable:
-            return self._connectable_unavailable_callbacks
-        return self._unavailable_callbacks
-
-    def _get_history_by_type(
-        self, connectable: bool
-    ) -> dict[str, BluetoothServiceInfoBleak]:
-        """Return the history by type."""
-        return self._connectable_history if connectable else self._all_history
-
     def async_register_scanner(
         self,
         scanner: BaseHaScanner,
@@ -716,7 +707,10 @@ def async_register_scanner(
     ) -> CALLBACK_TYPE:
         """Register a new scanner."""
         _LOGGER.debug("Registering scanner %s", scanner.name)
-        scanners = self._get_scanners_by_type(connectable)
+        if connectable:
+            scanners = self._connectable_scanners
+        else:
+            scanners = self._non_connectable_scanners
 
         def _unregister_scanner() -> None:
             _LOGGER.debug("Unregistering scanner %s", scanner.name)
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index e7f95a2b63a3ef..dbe8ac3f1ab7df 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -1,7 +1,6 @@
 {
   "domain": "bluetooth",
   "name": "Bluetooth",
-  "after_dependencies": ["hassio"],
   "codeowners": ["@bdraco"],
   "config_flow": true,
   "dependencies": ["logger", "usb"],
@@ -19,7 +18,7 @@
     "bleak-retry-connector==3.0.2",
     "bluetooth-adapters==0.15.3",
     "bluetooth-auto-recovery==1.2.0",
-    "bluetooth-data-tools==0.4.0",
+    "bluetooth-data-tools==1.3.0",
     "dbus-fast==1.86.0"
   ]
 }
diff --git a/homeassistant/components/bluetooth/strings.json b/homeassistant/components/bluetooth/strings.json
index a988477778d97e..cae88ef24c19c8 100644
--- a/homeassistant/components/bluetooth/strings.json
+++ b/homeassistant/components/bluetooth/strings.json
@@ -1,10 +1,4 @@
 {
-  "issues": {
-    "haos_outdated": {
-      "title": "Update to Home Assistant Operating System 9.0 or later",
-      "description": "To improve Bluetooth reliability and performance, we highly recommend you update to version 9.0 or later of the Home Assistant Operating System."
-    }
-  },
   "config": {
     "flow_title": "{name}",
     "step": {
diff --git a/homeassistant/components/bluetooth_adapters/__init__.py b/homeassistant/components/bluetooth_adapters/__init__.py
index c2af10d5455bcd..3d5580aabf170f 100644
--- a/homeassistant/components/bluetooth_adapters/__init__.py
+++ b/homeassistant/components/bluetooth_adapters/__init__.py
@@ -2,10 +2,13 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "bluetooth_adapters"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Bluetooth Adapters from a config entry.
diff --git a/homeassistant/components/bluetooth_tracker/device_tracker.py b/homeassistant/components/bluetooth_tracker/device_tracker.py
index 659243df733016..f4fc6a8df08ee4 100644
--- a/homeassistant/components/bluetooth_tracker/device_tracker.py
+++ b/homeassistant/components/bluetooth_tracker/device_tracker.py
@@ -173,7 +173,11 @@ async def perform_bluetooth_update() -> None:
                     rssi = await hass.async_add_executor_job(client.request_rssi)
                     client.close()
 
-                tasks.append(see_device(hass, async_see, mac, friendly_name, rssi))
+                tasks.append(
+                    asyncio.create_task(
+                        see_device(hass, async_see, mac, friendly_name, rssi)
+                    )
+                )
 
             if tasks:
                 await asyncio.wait(tasks)
diff --git a/homeassistant/components/bluetooth_tracker/manifest.json b/homeassistant/components/bluetooth_tracker/manifest.json
index b1411a41f87d1d..0a0356e666964d 100644
--- a/homeassistant/components/bluetooth_tracker/manifest.json
+++ b/homeassistant/components/bluetooth_tracker/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bluetooth_tracker",
   "iot_class": "local_polling",
   "loggers": ["bluetooth", "bt_proximity"],
-  "requirements": ["bt_proximity==0.2.1", "pybluez==0.22"]
+  "requirements": ["bt-proximity==0.2.1", "PyBluez==0.22"]
 }
diff --git a/homeassistant/components/bmw_connected_drive/binary_sensor.py b/homeassistant/components/bmw_connected_drive/binary_sensor.py
index 640f4e3653beeb..c3be7ae189b6df 100644
--- a/homeassistant/components/bmw_connected_drive/binary_sensor.py
+++ b/homeassistant/components/bmw_connected_drive/binary_sensor.py
@@ -37,6 +37,7 @@
     "TIRE_WEAR_REAR",
     "VEHICLE_CHECK",
     "VEHICLE_TUV",
+    "WASHING_FLUID",
 }
 LOGGED_CONDITION_BASED_SERVICE_WARNINGS: set[str] = set()
 
@@ -122,7 +123,7 @@ class BMWBinarySensorEntityDescription(
 SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
     BMWBinarySensorEntityDescription(
         key="lids",
-        name="Lids",
+        translation_key="lids",
         device_class=BinarySensorDeviceClass.OPENING,
         icon="mdi:car-door-lock",
         # device class opening: On means open, Off means closed
@@ -133,7 +134,7 @@ class BMWBinarySensorEntityDescription(
     ),
     BMWBinarySensorEntityDescription(
         key="windows",
-        name="Windows",
+        translation_key="windows",
         device_class=BinarySensorDeviceClass.OPENING,
         icon="mdi:car-door",
         # device class opening: On means open, Off means closed
@@ -144,7 +145,7 @@ class BMWBinarySensorEntityDescription(
     ),
     BMWBinarySensorEntityDescription(
         key="door_lock_state",
-        name="Door lock state",
+        translation_key="door_lock_state",
         device_class=BinarySensorDeviceClass.LOCK,
         icon="mdi:car-key",
         # device class lock: On means unlocked, Off means locked
@@ -157,7 +158,7 @@ class BMWBinarySensorEntityDescription(
     ),
     BMWBinarySensorEntityDescription(
         key="condition_based_services",
-        name="Condition based services",
+        translation_key="condition_based_services",
         device_class=BinarySensorDeviceClass.PROBLEM,
         icon="mdi:wrench",
         # device class problem: On means problem detected, Off means no problem
@@ -166,7 +167,7 @@ class BMWBinarySensorEntityDescription(
     ),
     BMWBinarySensorEntityDescription(
         key="check_control_messages",
-        name="Check control messages",
+        translation_key="check_control_messages",
         device_class=BinarySensorDeviceClass.PROBLEM,
         icon="mdi:car-tire-alert",
         # device class problem: On means problem detected, Off means no problem
@@ -176,7 +177,7 @@ class BMWBinarySensorEntityDescription(
     # electric
     BMWBinarySensorEntityDescription(
         key="charging_status",
-        name="Charging status",
+        translation_key="charging_status",
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
         icon="mdi:ev-station",
         # device class power: On means power detected, Off means no power
@@ -184,14 +185,14 @@ class BMWBinarySensorEntityDescription(
     ),
     BMWBinarySensorEntityDescription(
         key="connection_status",
-        name="Connection status",
+        translation_key="connection_status",
         device_class=BinarySensorDeviceClass.PLUG,
         icon="mdi:car-electric",
         value_fn=lambda v: v.fuel_and_battery.is_charger_connected,
     ),
     BMWBinarySensorEntityDescription(
         key="is_pre_entry_climatization_enabled",
-        name="Pre entry climatization",
+        translation_key="is_pre_entry_climatization_enabled",
         icon="mdi:car-seat-heater",
         value_fn=lambda v: v.charging_profile.is_pre_entry_climatization_enabled
         if v.charging_profile
diff --git a/homeassistant/components/bmw_connected_drive/button.py b/homeassistant/components/bmw_connected_drive/button.py
index 0ecc07357fed76..6edb1a3f2acbda 100644
--- a/homeassistant/components/bmw_connected_drive/button.py
+++ b/homeassistant/components/bmw_connected_drive/button.py
@@ -6,12 +6,14 @@
 import logging
 from typing import TYPE_CHECKING, Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.remote_services import RemoteServiceStatus
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import BMWBaseEntity
@@ -32,37 +34,45 @@ class BMWButtonEntityDescription(ButtonEntityDescription):
         [MyBMWVehicle], Coroutine[Any, Any, RemoteServiceStatus]
     ] | None = None
     account_function: Callable[[BMWDataUpdateCoordinator], Coroutine] | None = None
+    is_available: Callable[[MyBMWVehicle], bool] = lambda _: True
 
 
 BUTTON_TYPES: tuple[BMWButtonEntityDescription, ...] = (
     BMWButtonEntityDescription(
         key="light_flash",
+        translation_key="light_flash",
         icon="mdi:car-light-alert",
-        name="Flash lights",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_light_flash(),
     ),
     BMWButtonEntityDescription(
         key="sound_horn",
+        translation_key="sound_horn",
         icon="mdi:bullhorn",
-        name="Sound horn",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_horn(),
     ),
     BMWButtonEntityDescription(
         key="activate_air_conditioning",
+        translation_key="activate_air_conditioning",
         icon="mdi:hvac",
-        name="Activate air conditioning",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_air_conditioning(),
     ),
+    BMWButtonEntityDescription(
+        key="deactivate_air_conditioning",
+        icon="mdi:hvac-off",
+        name="Deactivate air conditioning",
+        remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_air_conditioning_stop(),
+        is_available=lambda vehicle: vehicle.is_remote_climate_stop_enabled,
+    ),
     BMWButtonEntityDescription(
         key="find_vehicle",
+        translation_key="find_vehicle",
         icon="mdi:crosshairs-question",
-        name="Find vehicle",
         remote_function=lambda vehicle: vehicle.remote_services.trigger_remote_vehicle_finder(),
     ),
     BMWButtonEntityDescription(
         key="refresh",
+        translation_key="refresh",
         icon="mdi:refresh",
-        name="Refresh from cloud",
         account_function=lambda coordinator: coordinator.async_request_refresh(),
         enabled_when_read_only=True,
     ),
@@ -84,7 +94,7 @@ async def async_setup_entry(
             [
                 BMWButton(coordinator, vehicle, description)
                 for description in BUTTON_TYPES
-                if not coordinator.read_only
+                if (not coordinator.read_only and description.is_available(vehicle))
                 or (coordinator.read_only and description.enabled_when_read_only)
             ]
         )
@@ -111,7 +121,10 @@ def __init__(
     async def async_press(self) -> None:
         """Press the button."""
         if self.entity_description.remote_function:
-            await self.entity_description.remote_function(self.vehicle)
+            try:
+                await self.entity_description.remote_function(self.vehicle)
+            except MyBMWAPIError as ex:
+                raise HomeAssistantError(ex) from ex
         elif self.entity_description.account_function:
             _LOGGER.warning(
                 "The 'Refresh from cloud' button is deprecated. Use the"
@@ -120,9 +133,9 @@ async def async_press(self) -> None:
                 " https://www.home-assistant.io/integrations/bmw_connected_drive/#update-the-state--refresh-from-api"
                 " for details"
             )
-            await self.entity_description.account_function(self.coordinator)
+            try:
+                await self.entity_description.account_function(self.coordinator)
+            except MyBMWAPIError as ex:
+                raise HomeAssistantError(ex) from ex
 
-        # Always update HA states after a button was executed.
-        # BMW remote services that change the vehicle's state update the local object
-        # when executing the service, so only the HA state machine needs further updates.
         self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bmw_connected_drive/const.py b/homeassistant/components/bmw_connected_drive/const.py
index 37225fc052fbf3..96ef152307d1e7 100644
--- a/homeassistant/components/bmw_connected_drive/const.py
+++ b/homeassistant/components/bmw_connected_drive/const.py
@@ -21,3 +21,9 @@
     "LITERS": UnitOfVolume.LITERS,
     "GALLONS": UnitOfVolume.GALLONS,
 }
+
+SCAN_INTERVALS = {
+    "china": 300,
+    "north_america": 600,
+    "rest_of_world": 300,
+}
diff --git a/homeassistant/components/bmw_connected_drive/coordinator.py b/homeassistant/components/bmw_connected_drive/coordinator.py
index f6354422312d4c..4a586aab3730e7 100644
--- a/homeassistant/components/bmw_connected_drive/coordinator.py
+++ b/homeassistant/components/bmw_connected_drive/coordinator.py
@@ -15,10 +15,8 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_GCID, CONF_READ_ONLY, CONF_REFRESH_TOKEN, DOMAIN
+from .const import CONF_GCID, CONF_READ_ONLY, CONF_REFRESH_TOKEN, DOMAIN, SCAN_INTERVALS
 
-DEFAULT_SCAN_INTERVAL_SECONDS = 300
-SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL_SECONDS)
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -50,7 +48,7 @@ def __init__(self, hass: HomeAssistant, *, entry: ConfigEntry) -> None:
             hass,
             _LOGGER,
             name=f"{DOMAIN}-{entry.data['username']}",
-            update_interval=SCAN_INTERVAL,
+            update_interval=timedelta(seconds=SCAN_INTERVALS[entry.data[CONF_REGION]]),
         )
 
     async def _async_update_data(self) -> None:
diff --git a/homeassistant/components/bmw_connected_drive/lock.py b/homeassistant/components/bmw_connected_drive/lock.py
index ffc6cf6d8b73d6..6608206a0ee0c4 100644
--- a/homeassistant/components/bmw_connected_drive/lock.py
+++ b/homeassistant/components/bmw_connected_drive/lock.py
@@ -4,12 +4,14 @@
 import logging
 from typing import Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.doors_windows import LockState
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import BMWBaseEntity
@@ -44,7 +46,7 @@ async def async_setup_entry(
 class BMWLock(BMWBaseEntity, LockEntity):
     """Representation of a MyBMW vehicle lock."""
 
-    _attr_name = "Lock"
+    _attr_translation_key = "lock"
 
     def __init__(
         self,
@@ -66,7 +68,14 @@ async def async_lock(self, **kwargs: Any) -> None:
             # update callback response
             self._attr_is_locked = True
             self.async_write_ha_state()
-        await self.vehicle.remote_services.trigger_remote_door_lock()
+        try:
+            await self.vehicle.remote_services.trigger_remote_door_lock()
+        except MyBMWAPIError as ex:
+            self._attr_is_locked = False
+            self.async_write_ha_state()
+            raise HomeAssistantError(ex) from ex
+
+        self.coordinator.async_update_listeners()
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the car."""
@@ -77,7 +86,14 @@ async def async_unlock(self, **kwargs: Any) -> None:
             # update callback response
             self._attr_is_locked = False
             self.async_write_ha_state()
-        await self.vehicle.remote_services.trigger_remote_door_unlock()
+        try:
+            await self.vehicle.remote_services.trigger_remote_door_unlock()
+        except MyBMWAPIError as ex:
+            self._attr_is_locked = True
+            self.async_write_ha_state()
+            raise HomeAssistantError(ex) from ex
+
+        self.coordinator.async_update_listeners()
 
     @callback
     def _handle_coordinator_update(self) -> None:
diff --git a/homeassistant/components/bmw_connected_drive/manifest.json b/homeassistant/components/bmw_connected_drive/manifest.json
index c9612d00c64319..82426fbce08336 100644
--- a/homeassistant/components/bmw_connected_drive/manifest.json
+++ b/homeassistant/components/bmw_connected_drive/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
   "iot_class": "cloud_polling",
   "loggers": ["bimmer_connected"],
-  "requirements": ["bimmer_connected==0.13.6"]
+  "requirements": ["bimmer-connected==0.13.8"]
 }
diff --git a/homeassistant/components/bmw_connected_drive/notify.py b/homeassistant/components/bmw_connected_drive/notify.py
index 036d5147c4fdf8..4a9f7679dc4568 100644
--- a/homeassistant/components/bmw_connected_drive/notify.py
+++ b/homeassistant/components/bmw_connected_drive/notify.py
@@ -4,6 +4,7 @@
 import logging
 from typing import Any, cast
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 
 from homeassistant.components.notify import (
@@ -19,6 +20,7 @@
     CONF_ENTITY_ID,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
@@ -87,7 +89,11 @@ async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
                         if k in ATTR_LOCATION_ATTRIBUTES
                     }
                 )
-
-                await vehicle.remote_services.trigger_send_poi(location_dict)
+                try:
+                    await vehicle.remote_services.trigger_send_poi(location_dict)
+                except TypeError as ex:
+                    raise ValueError(str(ex)) from ex
+                except MyBMWAPIError as ex:
+                    raise HomeAssistantError(ex) from ex
             else:
                 raise ValueError(f"'data.{ATTR_LOCATION}' is required.")
diff --git a/homeassistant/components/bmw_connected_drive/number.py b/homeassistant/components/bmw_connected_drive/number.py
index 820257f616329a..f37f7627140c5f 100644
--- a/homeassistant/components/bmw_connected_drive/number.py
+++ b/homeassistant/components/bmw_connected_drive/number.py
@@ -45,7 +45,7 @@ class BMWNumberEntityDescription(NumberEntityDescription, BMWRequiredKeysMixin):
 NUMBER_TYPES: list[BMWNumberEntityDescription] = [
     BMWNumberEntityDescription(
         key="target_soc",
-        name="Target SoC",
+        translation_key="target_soc",
         device_class=NumberDeviceClass.BATTERY,
         is_available=lambda v: v.is_remote_set_target_soc_enabled,
         native_max_value=100.0,
@@ -116,3 +116,5 @@ async def async_set_native_value(self, value: float) -> None:
             await self.entity_description.remote_service(self.vehicle, value)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(ex) from ex
+
+        self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bmw_connected_drive/select.py b/homeassistant/components/bmw_connected_drive/select.py
index 52d35b477a2d23..3467322a4af051 100644
--- a/homeassistant/components/bmw_connected_drive/select.py
+++ b/homeassistant/components/bmw_connected_drive/select.py
@@ -4,6 +4,7 @@
 import logging
 from typing import Any
 
+from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
 from bimmer_connected.vehicle.charging_profile import ChargingMode
 
@@ -11,6 +12,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfElectricCurrent
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import BMWBaseEntity
@@ -39,7 +41,7 @@ class BMWSelectEntityDescription(SelectEntityDescription, BMWRequiredKeysMixin):
 SELECT_TYPES: dict[str, BMWSelectEntityDescription] = {
     "ac_limit": BMWSelectEntityDescription(
         key="ac_limit",
-        name="AC Charging Limit",
+        translation_key="ac_limit",
         is_available=lambda v: v.is_remote_set_ac_limit_enabled,
         dynamic_options=lambda v: [
             str(lim) for lim in v.charging_profile.ac_available_limits  # type: ignore[union-attr]
@@ -53,7 +55,7 @@ class BMWSelectEntityDescription(SelectEntityDescription, BMWRequiredKeysMixin):
     ),
     "charging_mode": BMWSelectEntityDescription(
         key="charging_mode",
-        name="Charging Mode",
+        translation_key="charging_mode",
         is_available=lambda v: v.is_charging_plan_supported,
         options=[c.value for c in ChargingMode if c != ChargingMode.UNKNOWN],
         current_option=lambda v: str(v.charging_profile.charging_mode.value),  # type: ignore[union-attr]
@@ -123,4 +125,9 @@ async def async_select_option(self, option: str) -> None:
             self.vehicle.vin,
             option,
         )
-        await self.entity_description.remote_service(self.vehicle, option)
+        try:
+            await self.entity_description.remote_service(self.vehicle, option)
+        except MyBMWAPIError as ex:
+            raise HomeAssistantError(ex) from ex
+
+        self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index 314ff47c14cf65..8f5b4fb8608a4c 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -55,7 +55,7 @@ def convert_and_round(
     # --- Generic ---
     "ac_current_limit": BMWSensorEntityDescription(
         key="ac_current_limit",
-        name="AC current limit",
+        translation_key="ac_current_limit",
         key_class="charging_profile",
         unit_type=UnitOfElectricCurrent.AMPERE,
         icon="mdi:current-ac",
@@ -63,34 +63,34 @@ def convert_and_round(
     ),
     "charging_start_time": BMWSensorEntityDescription(
         key="charging_start_time",
-        name="Charging start time",
+        translation_key="charging_start_time",
         key_class="fuel_and_battery",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_registry_enabled_default=False,
     ),
     "charging_end_time": BMWSensorEntityDescription(
         key="charging_end_time",
-        name="Charging end time",
+        translation_key="charging_end_time",
         key_class="fuel_and_battery",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     "charging_status": BMWSensorEntityDescription(
         key="charging_status",
-        name="Charging status",
+        translation_key="charging_status",
         key_class="fuel_and_battery",
         icon="mdi:ev-station",
         value=lambda x, y: x.value,
     ),
     "charging_target": BMWSensorEntityDescription(
         key="charging_target",
-        name="Charging target",
+        translation_key="charging_target",
         key_class="fuel_and_battery",
         icon="mdi:battery-charging-high",
         unit_type=PERCENTAGE,
     ),
     "remaining_battery_percent": BMWSensorEntityDescription(
         key="remaining_battery_percent",
-        name="Remaining battery percent",
+        translation_key="remaining_battery_percent",
         key_class="fuel_and_battery",
         unit_type=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
@@ -98,14 +98,14 @@ def convert_and_round(
     # --- Specific ---
     "mileage": BMWSensorEntityDescription(
         key="mileage",
-        name="Mileage",
+        translation_key="mileage",
         icon="mdi:speedometer",
         unit_type=LENGTH,
         value=lambda x, hass: convert_and_round(x, hass.config.units.length, 2),
     ),
     "remaining_range_total": BMWSensorEntityDescription(
         key="remaining_range_total",
-        name="Remaining range total",
+        translation_key="remaining_range_total",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -113,7 +113,7 @@ def convert_and_round(
     ),
     "remaining_range_electric": BMWSensorEntityDescription(
         key="remaining_range_electric",
-        name="Remaining range electric",
+        translation_key="remaining_range_electric",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -121,7 +121,7 @@ def convert_and_round(
     ),
     "remaining_range_fuel": BMWSensorEntityDescription(
         key="remaining_range_fuel",
-        name="Remaining range fuel",
+        translation_key="remaining_range_fuel",
         key_class="fuel_and_battery",
         icon="mdi:map-marker-distance",
         unit_type=LENGTH,
@@ -129,7 +129,7 @@ def convert_and_round(
     ),
     "remaining_fuel": BMWSensorEntityDescription(
         key="remaining_fuel",
-        name="Remaining fuel",
+        translation_key="remaining_fuel",
         key_class="fuel_and_battery",
         icon="mdi:gas-station",
         unit_type=VOLUME,
@@ -137,7 +137,7 @@ def convert_and_round(
     ),
     "remaining_fuel_percent": BMWSensorEntityDescription(
         key="remaining_fuel_percent",
-        name="Remaining fuel percent",
+        translation_key="remaining_fuel_percent",
         key_class="fuel_and_battery",
         icon="mdi:gas-station",
         unit_type=PERCENTAGE,
diff --git a/homeassistant/components/bmw_connected_drive/strings.json b/homeassistant/components/bmw_connected_drive/strings.json
index 506175becd9187..af73417b1a93e8 100644
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -26,5 +26,114 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "lids": {
+        "name": "Lids"
+      },
+      "windows": {
+        "name": "Windows"
+      },
+      "door_lock_state": {
+        "name": "Door lock state"
+      },
+      "condition_based_services": {
+        "name": "Condition based services"
+      },
+      "check_control_messages": {
+        "name": "Check control messages"
+      },
+      "charging_status": {
+        "name": "Charging status"
+      },
+      "connection_status": {
+        "name": "Connection status"
+      },
+      "is_pre_entry_climatization_enabled": {
+        "name": "Pre entry climatization"
+      }
+    },
+    "button": {
+      "light_flash": {
+        "name": "Flash lights"
+      },
+      "sound_horn": {
+        "name": "Sound horn"
+      },
+      "activate_air_conditioning": {
+        "name": "Activate air conditioning"
+      },
+      "find_vehicle": {
+        "name": "Find vehicle"
+      },
+      "refresh": {
+        "name": "Refresh from cloud"
+      }
+    },
+    "lock": {
+      "lock": {
+        "name": "[%key:component::lock::title%]"
+      }
+    },
+    "number": {
+      "target_soc": {
+        "name": "Target SoC"
+      }
+    },
+    "select": {
+      "ac_limit": {
+        "name": "AC Charging Limit"
+      },
+      "charging_mode": {
+        "name": "Charging Mode"
+      }
+    },
+    "sensor": {
+      "ac_current_limit": {
+        "name": "AC current limit"
+      },
+      "charging_start_time": {
+        "name": "Charging start time"
+      },
+      "charging_end_time": {
+        "name": "Charging end time"
+      },
+      "charging_status": {
+        "name": "Charging status"
+      },
+      "charging_target": {
+        "name": "Charging target"
+      },
+      "remaining_battery_percent": {
+        "name": "Remaining battery percent"
+      },
+      "mileage": {
+        "name": "Mileage"
+      },
+      "remaining_range_total": {
+        "name": "Remaining range total"
+      },
+      "remaining_range_electric": {
+        "name": "Remaining range electric"
+      },
+      "remaining_range_fuel": {
+        "name": "Remaining range fuel"
+      },
+      "remaining_fuel": {
+        "name": "Remaining fuel"
+      },
+      "remaining_fuel_percent": {
+        "name": "Remaining fuel percent"
+      }
+    },
+    "switch": {
+      "climate": {
+        "name": "Climate"
+      },
+      "charging": {
+        "name": "Charging"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/bmw_connected_drive/switch.py b/homeassistant/components/bmw_connected_drive/switch.py
index af7a42b35b0a69..298338dc9fa339 100644
--- a/homeassistant/components/bmw_connected_drive/switch.py
+++ b/homeassistant/components/bmw_connected_drive/switch.py
@@ -7,6 +7,7 @@
 
 from bimmer_connected.models import MyBMWAPIError
 from bimmer_connected.vehicle import MyBMWVehicle
+from bimmer_connected.vehicle.fuel_and_battery import ChargingState
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
@@ -38,16 +39,34 @@ class BMWSwitchEntityDescription(SwitchEntityDescription, BMWRequiredKeysMixin):
     dynamic_options: Callable[[MyBMWVehicle], list[str]] | None = None
 
 
+CHARGING_STATE_ON = {
+    ChargingState.CHARGING,
+    ChargingState.COMPLETE,
+    ChargingState.FULLY_CHARGED,
+    ChargingState.FINISHED_FULLY_CHARGED,
+    ChargingState.FINISHED_NOT_FULL,
+    ChargingState.TARGET_REACHED,
+}
+
 NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
     BMWSwitchEntityDescription(
         key="climate",
-        name="Climate",
+        translation_key="climate",
         is_available=lambda v: v.is_remote_climate_stop_enabled,
         value_fn=lambda v: v.climate.is_climate_on,
         remote_service_on=lambda v: v.remote_services.trigger_remote_air_conditioning(),
         remote_service_off=lambda v: v.remote_services.trigger_remote_air_conditioning_stop(),
         icon="mdi:fan",
     ),
+    BMWSwitchEntityDescription(
+        key="charging",
+        translation_key="charging",
+        is_available=lambda v: v.is_remote_charge_stop_enabled,
+        value_fn=lambda v: v.fuel_and_battery.charging_status in CHARGING_STATE_ON,
+        remote_service_on=lambda v: v.remote_services.trigger_charge_start(),
+        remote_service_off=lambda v: v.remote_services.trigger_charge_stop(),
+        icon="mdi:ev-station",
+    ),
 ]
 
 
@@ -101,9 +120,13 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         except MyBMWAPIError as ex:
             raise HomeAssistantError(ex) from ex
 
+        self.coordinator.async_update_listeners()
+
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         try:
             await self.entity_description.remote_service_off(self.vehicle)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(ex) from ex
+
+        self.coordinator.async_update_listeners()
diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py
index d3fc58a35beaf4..1109cf0d311470 100644
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -35,9 +35,8 @@ class BondButtonEntityDescription(
 ):
     """Class to describe a Bond Button entity."""
 
-    # BondEntity does not support DEVICE_CLASS_NAME
-    # Restrict the type to satisfy the type checker and catch attempts
-    # to use DEVICE_CLASS_NAME in the entity descriptions.
+    # BondEntity does not support UNDEFINED,
+    # restrict the type to str | None
     name: str | None = None
 
 
diff --git a/homeassistant/components/bosch_shc/manifest.json b/homeassistant/components/bosch_shc/manifest.json
index 905589365922e2..9fd1055dd60403 100644
--- a/homeassistant/components/bosch_shc/manifest.json
+++ b/homeassistant/components/bosch_shc/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/bosch_shc",
   "iot_class": "local_push",
   "loggers": ["boschshcpy"],
-  "requirements": ["boschshcpy==0.2.35"],
+  "requirements": ["boschshcpy==0.2.57"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/bosch_shc/sensor.py b/homeassistant/components/bosch_shc/sensor.py
index b310799323a87b..73307d9ea0a407 100644
--- a/homeassistant/components/bosch_shc/sensor.py
+++ b/homeassistant/components/bosch_shc/sensor.py
@@ -117,7 +117,7 @@ async def async_setup_entry(
         )
 
     for sensor in (
-        session.device_helper.smart_plugs + session.device_helper.light_switches
+        session.device_helper.smart_plugs + session.device_helper.light_switches_bsm
     ):
         entities.append(
             PowerSensor(
diff --git a/homeassistant/components/bosch_shc/switch.py b/homeassistant/components/bosch_shc/switch.py
index 6fe06213d759ab..3b3b6e2ffd47f2 100644
--- a/homeassistant/components/bosch_shc/switch.py
+++ b/homeassistant/components/bosch_shc/switch.py
@@ -111,7 +111,7 @@ async def async_setup_entry(
             )
         )
 
-    for switch in session.device_helper.light_switches:
+    for switch in session.device_helper.light_switches_bsm:
         entities.append(
             SHCSwitch(
                 device=switch,
diff --git a/homeassistant/components/braviatv/media_player.py b/homeassistant/components/braviatv/media_player.py
index ff5691f9aed216..cfa388fcce7e5d 100644
--- a/homeassistant/components/braviatv/media_player.py
+++ b/homeassistant/components/braviatv/media_player.py
@@ -40,6 +40,7 @@ async def async_setup_entry(
 class BraviaTVMediaPlayer(BraviaTVEntity, MediaPlayerEntity):
     """Representation of a Bravia TV Media Player."""
 
+    _attr_name = None
     _attr_assumed_state = True
     _attr_device_class = MediaPlayerDeviceClass.TV
     _attr_supported_features = (
diff --git a/homeassistant/components/braviatv/remote.py b/homeassistant/components/braviatv/remote.py
index f45b2d740041b8..f9e3f464dcbb0a 100644
--- a/homeassistant/components/braviatv/remote.py
+++ b/homeassistant/components/braviatv/remote.py
@@ -30,6 +30,8 @@ async def async_setup_entry(
 class BraviaTVRemote(BraviaTVEntity, RemoteEntity):
     """Representation of a Bravia TV Remote."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return true if device is on."""
diff --git a/homeassistant/components/broadlink/__init__.py b/homeassistant/components/broadlink/__init__.py
index 3b1312a64c5ce9..e6a769fd2c4644 100644
--- a/homeassistant/components/broadlink/__init__.py
+++ b/homeassistant/components/broadlink/__init__.py
@@ -5,12 +5,15 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
 from .device import BroadlinkDevice
 from .heartbeat import BroadlinkHeartbeat
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 @dataclass
 class BroadlinkData:
diff --git a/homeassistant/components/broadlink/remote.py b/homeassistant/components/broadlink/remote.py
index 4bbb3fe1513698..c0fb80971ca1e8 100644
--- a/homeassistant/components/broadlink/remote.py
+++ b/homeassistant/components/broadlink/remote.py
@@ -39,7 +39,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.storage import Store
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 from .entity import BroadlinkEntity
@@ -107,6 +107,7 @@ class BroadlinkRemote(BroadlinkEntity, RemoteEntity, RestoreEntity):
     """Representation of a Broadlink remote."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device, codes, flags):
         """Initialize the remote."""
@@ -330,8 +331,8 @@ async def _async_learn_ir_command(self, command):
         )
 
         try:
-            start_time = dt.utcnow()
-            while (dt.utcnow() - start_time) < LEARNING_TIMEOUT:
+            start_time = dt_util.utcnow()
+            while (dt_util.utcnow() - start_time) < LEARNING_TIMEOUT:
                 await asyncio.sleep(1)
                 try:
                     code = await device.async_request(device.api.check_data)
@@ -368,8 +369,8 @@ async def _async_learn_rf_command(self, command):
         )
 
         try:
-            start_time = dt.utcnow()
-            while (dt.utcnow() - start_time) < LEARNING_TIMEOUT:
+            start_time = dt_util.utcnow()
+            while (dt_util.utcnow() - start_time) < LEARNING_TIMEOUT:
                 await asyncio.sleep(1)
                 found = await device.async_request(device.api.check_frequency)
                 if found:
@@ -403,8 +404,8 @@ async def _async_learn_rf_command(self, command):
         )
 
         try:
-            start_time = dt.utcnow()
-            while (dt.utcnow() - start_time) < LEARNING_TIMEOUT:
+            start_time = dt_util.utcnow()
+            while (dt_util.utcnow() - start_time) < LEARNING_TIMEOUT:
                 await asyncio.sleep(1)
                 try:
                     code = await device.async_request(device.api.check_data)
diff --git a/homeassistant/components/broadlink/sensor.py b/homeassistant/components/broadlink/sensor.py
index 50c58d41667ec6..747418e1e7961a 100644
--- a/homeassistant/components/broadlink/sensor.py
+++ b/homeassistant/components/broadlink/sensor.py
@@ -25,18 +25,16 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="air_quality",
-        translation_key="air_quality",
+        device_class=SensorDeviceClass.AQI,
     ),
     SensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -51,21 +49,18 @@
     ),
     SensorEntityDescription(
         key="power",
-        translation_key="power",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volt",
-        translation_key="voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="current",
-        translation_key="current",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/broadlink/strings.json b/homeassistant/components/broadlink/strings.json
index adff2303c74156..87567bcb7b173a 100644
--- a/homeassistant/components/broadlink/strings.json
+++ b/homeassistant/components/broadlink/strings.json
@@ -46,30 +46,12 @@
   },
   "entity": {
     "sensor": {
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "air_quality": {
-        "name": "[%key:component::sensor::entity_component::aqi::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
       "light": {
         "name": "[%key:component::sensor::entity_component::illuminance::name%]"
       },
       "noise": {
         "name": "Noise"
       },
-      "power": {
-        "name": "[%key:component::sensor::entity_component::power::name%]"
-      },
-      "voltage": {
-        "name": "[%key:component::sensor::entity_component::voltage::name%]"
-      },
-      "current": {
-        "name": "[%key:component::sensor::entity_component::current::name%]"
-      },
       "overload": {
         "name": "Overload"
       },
diff --git a/homeassistant/components/broadlink/switch.py b/homeassistant/components/broadlink/switch.py
index 009536a9adb1b5..b87448658981c2 100644
--- a/homeassistant/components/broadlink/switch.py
+++ b/homeassistant/components/broadlink/switch.py
@@ -221,6 +221,7 @@ class BroadlinkSP2Switch(BroadlinkSP1Switch):
 
     _attr_assumed_state = False
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device, *args, **kwargs):
         """Initialize the switch."""
diff --git a/homeassistant/components/broadlink/updater.py b/homeassistant/components/broadlink/updater.py
index f3837c732633fd..da8461bf90fc49 100644
--- a/homeassistant/components/broadlink/updater.py
+++ b/homeassistant/components/broadlink/updater.py
@@ -6,7 +6,7 @@
 from broadlink.exceptions import AuthorizationError, BroadlinkException
 
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -64,7 +64,7 @@ async def async_update(self):
 
         except (BroadlinkException, OSError) as err:
             if self.available and (
-                dt.utcnow() - self.last_update > self.SCAN_INTERVAL * 3
+                dt_util.utcnow() - self.last_update > self.SCAN_INTERVAL * 3
                 or isinstance(err, (AuthorizationError, OSError))
             ):
                 self.available = False
@@ -84,7 +84,7 @@ async def async_update(self):
                 self.device.api.host[0],
             )
         self.available = True
-        self.last_update = dt.utcnow()
+        self.last_update = dt_util.utcnow()
         return data
 
     @abstractmethod
diff --git a/homeassistant/components/brottsplatskartan/sensor.py b/homeassistant/components/brottsplatskartan/sensor.py
index ca6173d2ef596f..5512bcd1176ff8 100644
--- a/homeassistant/components/brottsplatskartan/sensor.py
+++ b/homeassistant/components/brottsplatskartan/sensor.py
@@ -47,7 +47,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.7.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -83,6 +83,7 @@ class BrottsplatskartanSensor(SensorEntity):
 
     _attr_attribution = ATTRIBUTION
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, bpk: BrottsplatsKartan, name: str, entry_id: str) -> None:
         """Initialize the Brottsplatskartan sensor."""
diff --git a/homeassistant/components/browser/__init__.py b/homeassistant/components/browser/__init__.py
index 954621ed66ff8a..b01f04fa1401d2 100644
--- a/homeassistant/components/browser/__init__.py
+++ b/homeassistant/components/browser/__init__.py
@@ -4,6 +4,7 @@
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 ATTR_URL = "url"
@@ -20,6 +21,8 @@
     }
 )
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 def _browser_url(service: ServiceCall) -> None:
     """Browse to URL."""
diff --git a/homeassistant/components/brunt/cover.py b/homeassistant/components/brunt/cover.py
index 1df34929b1cbed..3fb328ab7fbc5c 100644
--- a/homeassistant/components/brunt/cover.py
+++ b/homeassistant/components/brunt/cover.py
@@ -88,7 +88,7 @@ def __init__(
         self._attr_attribution = ATTRIBUTION
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._attr_unique_id)},  # type: ignore[arg-type]
-            name=self._thing.name,
+            name=self._attr_name,
             via_device=(DOMAIN, self._entry_id),
             manufacturer="Brunt",
             sw_version=self._thing.fw_version,
diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py
index cbc6dd00471b24..dc403611da2e2e 100644
--- a/homeassistant/components/bsblan/climate.py
+++ b/homeassistant/components/bsblan/climate.py
@@ -23,6 +23,7 @@
     CoordinatorEntity,
     DataUpdateCoordinator,
 )
+from homeassistant.util.enum import try_parse_enum
 
 from . import HomeAssistantBSBLANData
 from .const import ATTR_TARGET_TEMPERATURE, DOMAIN, LOGGER
@@ -70,6 +71,7 @@ class BSBLANClimate(
     """Defines a BSBLAN climate device."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     # Determine preset modes
     _attr_supported_features = (
         ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.PRESET_MODE
@@ -112,12 +114,11 @@ def target_temperature(self) -> float | None:
         return float(self.coordinator.data.target_temperature.value)
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
         if self.coordinator.data.hvac_mode.value == PRESET_ECO:
             return HVACMode.AUTO
-
-        return self.coordinator.data.hvac_mode.value
+        return try_parse_enum(HVACMode, self.coordinator.data.hvac_mode.value)
 
     @property
     def preset_mode(self) -> str | None:
diff --git a/homeassistant/components/bt_smarthub/manifest.json b/homeassistant/components/bt_smarthub/manifest.json
index 90f5d92a0a22d6..8f2dc631e8061a 100644
--- a/homeassistant/components/bt_smarthub/manifest.json
+++ b/homeassistant/components/bt_smarthub/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bt_smarthub",
   "iot_class": "local_polling",
   "loggers": ["btsmarthub_devicelist"],
-  "requirements": ["btsmarthub_devicelist==0.2.3"]
+  "requirements": ["btsmarthub-devicelist==0.2.3"]
 }
diff --git a/homeassistant/components/bthome/manifest.json b/homeassistant/components/bthome/manifest.json
index ef3d9bc002d108..91f4940a4e57c9 100644
--- a/homeassistant/components/bthome/manifest.json
+++ b/homeassistant/components/bthome/manifest.json
@@ -20,5 +20,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bthome",
   "iot_class": "local_push",
-  "requirements": ["bthome-ble==2.11.3"]
+  "requirements": ["bthome-ble==2.12.0"]
 }
diff --git a/homeassistant/components/bthome/sensor.py b/homeassistant/components/bthome/sensor.py
index f8693c5fb348bf..fc8673e801bfea 100644
--- a/homeassistant/components/bthome/sensor.py
+++ b/homeassistant/components/bthome/sensor.py
@@ -47,6 +47,15 @@
 from .device import device_key_to_bluetooth_entity_key
 
 SENSOR_DESCRIPTIONS = {
+    # Acceleration (m/s²)
+    (
+        BTHomeSensorDeviceClass.ACCELERATION,
+        Units.ACCELERATION_METERS_PER_SQUARE_SECOND,
+    ): SensorEntityDescription(
+        key=f"{BTHomeSensorDeviceClass.ACCELERATION}_{Units.ACCELERATION_METERS_PER_SQUARE_SECOND}",
+        native_unit_of_measurement=Units.ACCELERATION_METERS_PER_SQUARE_SECOND,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # Battery (percent)
     (BTHomeSensorDeviceClass.BATTERY, Units.PERCENTAGE): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.BATTERY}_{Units.PERCENTAGE}",
@@ -131,6 +140,15 @@
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         state_class=SensorStateClass.TOTAL,
     ),
+    # Gyroscope (°/s)
+    (
+        BTHomeSensorDeviceClass.GYROSCOPE,
+        Units.GYROSCOPE_DEGREES_PER_SECOND,
+    ): SensorEntityDescription(
+        key=f"{BTHomeSensorDeviceClass.GYROSCOPE}_{Units.GYROSCOPE_DEGREES_PER_SECOND}",
+        native_unit_of_measurement=Units.GYROSCOPE_DEGREES_PER_SECOND,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # Humidity in (percent)
     (BTHomeSensorDeviceClass.HUMIDITY, Units.PERCENTAGE): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.HUMIDITY}_{Units.PERCENTAGE}",
@@ -242,6 +260,15 @@
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    # Timestamp (datetime object)
+    (
+        BTHomeSensorDeviceClass.TIMESTAMP,
+        None,
+    ): SensorEntityDescription(
+        key=f"{BTHomeSensorDeviceClass.TIMESTAMP}",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     # UV index (-)
     (
         BTHomeSensorDeviceClass.UV_INDEX,
diff --git a/homeassistant/components/buienradar/const.py b/homeassistant/components/buienradar/const.py
index 6af579dd74f65f..8111f63c923f70 100644
--- a/homeassistant/components/buienradar/const.py
+++ b/homeassistant/components/buienradar/const.py
@@ -18,3 +18,49 @@
 SCHEDULE_OK = 10
 """When an error occurred, new call after (minutes)."""
 SCHEDULE_NOK = 2
+
+STATE_CONDITIONS = ["clear", "cloudy", "fog", "rainy", "snowy", "lightning"]
+
+STATE_DETAILED_CONDITIONS = [
+    "clear",
+    "partlycloudy",
+    "partlycloudy-fog",
+    "partlycloudy-light-rain",
+    "partlycloudy-rain",
+    "cloudy",
+    "fog",
+    "rainy",
+    "light-rain",
+    "light-snow",
+    "partlycloudy-light-snow",
+    "partlycloudy-snow",
+    "partlycloudy-lightning",
+    "snowy",
+    "snowy-rainy",
+    "lightning",
+]
+
+STATE_CONDITION_CODES = [
+    "a",
+    "b",
+    "j",
+    "o",
+    "r",
+    "c",
+    "p",
+    "d",
+    "n",
+    "f",
+    "h",
+    "k",
+    "l",
+    "q",
+    "w",
+    "m",
+    "u",
+    "i",
+    "v",
+    "t",
+    "g",
+    "s",
+]
diff --git a/homeassistant/components/buienradar/sensor.py b/homeassistant/components/buienradar/sensor.py
index 06b97cdedadb2b..b5c6e9cf32c667 100644
--- a/homeassistant/components/buienradar/sensor.py
+++ b/homeassistant/components/buienradar/sensor.py
@@ -48,7 +48,14 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from .const import CONF_TIMEFRAME, DEFAULT_TIMEFRAME, DOMAIN
+from .const import (
+    CONF_TIMEFRAME,
+    DEFAULT_TIMEFRAME,
+    DOMAIN,
+    STATE_CONDITION_CODES,
+    STATE_CONDITIONS,
+    STATE_DETAILED_CONDITIONS,
+)
 from .util import BrData
 
 _LOGGER = logging.getLogger(__name__)
@@ -67,584 +74,620 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="stationname",
-        name=STATIONNAME_LABEL,
+        translation_key="stationname",
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="barometerfc",
-        name="Barometer value",
+        translation_key="barometerfc",
         icon="mdi:gauge",
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="barometerfcname",
-        name="Barometer",
+        translation_key="barometerfcname",
         icon="mdi:gauge",
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="barometerfcnamenl",
-        name="Barometer",
+        translation_key="barometerfcnamenl",
         icon="mdi:gauge",
     ),
     SensorEntityDescription(
         key="condition",
-        name="Condition",
+        translation_key="condition",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditioncode",
-        name="Condition code",
+        translation_key="conditioncode",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditiondetailed",
-        name="Detailed condition",
+        translation_key="conditiondetailed",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditionexact",
-        name="Full condition",
+        translation_key="conditionexact",
     ),
     SensorEntityDescription(
         key="symbol",
-        name="Symbol",
+        translation_key="symbol",
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="feeltemperature",
-        name="Feel temperature",
+        translation_key="feeltemperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="humidity",
-        name="Humidity",
+        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:water-percent",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="temperature",
-        name="Temperature",
+        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="groundtemperature",
-        name="Ground temperature",
+        translation_key="groundtemperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="windspeed",
-        name="Wind speed",
+        translation_key="windspeed",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="windforce",
-        name="Wind force",
+        translation_key="windforce",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="winddirection",
-        name="Wind direction",
+        translation_key="winddirection",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth",
-        name="Wind direction azimuth",
+        translation_key="windazimuth",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="pressure",
-        name="Pressure",
+        translation_key="pressure",
         native_unit_of_measurement=UnitOfPressure.HPA,
         icon="mdi:gauge",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="visibility",
-        name="Visibility",
+        translation_key="visibility",
         native_unit_of_measurement=UnitOfLength.KILOMETERS,
         device_class=SensorDeviceClass.DISTANCE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="windgust",
-        name="Wind gust",
+        translation_key="windgust",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="precipitation",
-        name="Precipitation",
+        translation_key="precipitation",
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
     ),
     SensorEntityDescription(
         key="irradiance",
-        name="Irradiance",
+        translation_key="irradiance",
         device_class=SensorDeviceClass.IRRADIANCE,
         native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="precipitation_forecast_average",
-        name="Precipitation forecast average",
+        translation_key="precipitation_forecast_average",
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
     ),
     SensorEntityDescription(
         key="precipitation_forecast_total",
-        name="Precipitation forecast total",
+        translation_key="precipitation_forecast_total",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="rainlast24hour",
-        name="Rain last 24h",
+        translation_key="rainlast24hour",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="rainlasthour",
-        name="Rain last hour",
+        translation_key="rainlasthour",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="temperature_1d",
-        name="Temperature 1d",
+        translation_key="temperature_1d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="temperature_2d",
-        name="Temperature 2d",
+        translation_key="temperature_2d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="temperature_3d",
-        name="Temperature 3d",
+        translation_key="temperature_3d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="temperature_4d",
-        name="Temperature 4d",
+        translation_key="temperature_4d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="temperature_5d",
-        name="Temperature 5d",
+        translation_key="temperature_5d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="mintemp_1d",
-        name="Minimum temperature 1d",
+        translation_key="mintemp_1d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="mintemp_2d",
-        name="Minimum temperature 2d",
+        translation_key="mintemp_2d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="mintemp_3d",
-        name="Minimum temperature 3d",
+        translation_key="mintemp_3d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="mintemp_4d",
-        name="Minimum temperature 4d",
+        translation_key="mintemp_4d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="mintemp_5d",
-        name="Minimum temperature 5d",
+        translation_key="mintemp_5d",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
     ),
     SensorEntityDescription(
         key="rain_1d",
-        name="Rain 1d",
+        translation_key="rain_1d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="rain_2d",
-        name="Rain 2d",
+        translation_key="rain_2d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="rain_3d",
-        name="Rain 3d",
+        translation_key="rain_3d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="rain_4d",
-        name="Rain 4d",
+        translation_key="rain_4d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="rain_5d",
-        name="Rain 5d",
+        translation_key="rain_5d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="minrain_1d",
-        name="Minimum rain 1d",
+        translation_key="minrain_1d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="minrain_2d",
-        name="Minimum rain 2d",
+        translation_key="minrain_2d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="minrain_3d",
-        name="Minimum rain 3d",
+        translation_key="minrain_3d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="minrain_4d",
-        name="Minimum rain 4d",
+        translation_key="minrain_4d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="minrain_5d",
-        name="Minimum rain 5d",
+        translation_key="minrain_5d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     # new in json api (>1.0.0):
     SensorEntityDescription(
         key="maxrain_1d",
-        name="Maximum rain 1d",
+        translation_key="maxrain_1d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="maxrain_2d",
-        name="Maximum rain 2d",
+        translation_key="maxrain_2d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="maxrain_3d",
-        name="Maximum rain 3d",
+        translation_key="maxrain_3d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="maxrain_4d",
-        name="Maximum rain 4d",
+        translation_key="maxrain_4d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="maxrain_5d",
-        name="Maximum rain 5d",
+        translation_key="maxrain_5d",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     SensorEntityDescription(
         key="rainchance_1d",
-        name="Rainchance 1d",
+        translation_key="rainchance_1d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-pouring",
     ),
     SensorEntityDescription(
         key="rainchance_2d",
-        name="Rainchance 2d",
+        translation_key="rainchance_2d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-pouring",
     ),
     SensorEntityDescription(
         key="rainchance_3d",
-        name="Rainchance 3d",
+        translation_key="rainchance_3d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-pouring",
     ),
     SensorEntityDescription(
         key="rainchance_4d",
-        name="Rainchance 4d",
+        translation_key="rainchance_4d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-pouring",
     ),
     SensorEntityDescription(
         key="rainchance_5d",
-        name="Rainchance 5d",
+        translation_key="rainchance_5d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-pouring",
     ),
     SensorEntityDescription(
         key="sunchance_1d",
-        name="Sunchance 1d",
+        translation_key="sunchance_1d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-partly-cloudy",
     ),
     SensorEntityDescription(
         key="sunchance_2d",
-        name="Sunchance 2d",
+        translation_key="sunchance_2d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-partly-cloudy",
     ),
     SensorEntityDescription(
         key="sunchance_3d",
-        name="Sunchance 3d",
+        translation_key="sunchance_3d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-partly-cloudy",
     ),
     SensorEntityDescription(
         key="sunchance_4d",
-        name="Sunchance 4d",
+        translation_key="sunchance_4d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-partly-cloudy",
     ),
     SensorEntityDescription(
         key="sunchance_5d",
-        name="Sunchance 5d",
+        translation_key="sunchance_5d",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:weather-partly-cloudy",
     ),
     SensorEntityDescription(
         key="windforce_1d",
-        name="Wind force 1d",
+        translation_key="windforce_1d",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="windforce_2d",
-        name="Wind force 2d",
+        translation_key="windforce_2d",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="windforce_3d",
-        name="Wind force 3d",
+        translation_key="windforce_3d",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="windforce_4d",
-        name="Wind force 4d",
+        translation_key="windforce_4d",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="windforce_5d",
-        name="Wind force 5d",
+        translation_key="windforce_5d",
         native_unit_of_measurement="Bft",
         icon="mdi:weather-windy",
     ),
     SensorEntityDescription(
         key="windspeed_1d",
-        name="Wind speed 1d",
+        translation_key="windspeed_1d",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="windspeed_2d",
-        name="Wind speed 2d",
+        translation_key="windspeed_2d",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="windspeed_3d",
-        name="Wind speed 3d",
+        translation_key="windspeed_3d",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="windspeed_4d",
-        name="Wind speed 4d",
+        translation_key="windspeed_4d",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="windspeed_5d",
-        name="Wind speed 5d",
+        translation_key="windspeed_5d",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     SensorEntityDescription(
         key="winddirection_1d",
-        name="Wind direction 1d",
+        translation_key="winddirection_1d",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="winddirection_2d",
-        name="Wind direction 2d",
+        translation_key="winddirection_2d",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="winddirection_3d",
-        name="Wind direction 3d",
+        translation_key="winddirection_3d",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="winddirection_4d",
-        name="Wind direction 4d",
+        translation_key="winddirection_4d",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="winddirection_5d",
-        name="Wind direction 5d",
+        translation_key="winddirection_5d",
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth_1d",
-        name="Wind direction azimuth 1d",
+        translation_key="windazimuth_1d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth_2d",
-        name="Wind direction azimuth 2d",
+        translation_key="windazimuth_2d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth_3d",
-        name="Wind direction azimuth 3d",
+        translation_key="windazimuth_3d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth_4d",
-        name="Wind direction azimuth 4d",
+        translation_key="windazimuth_4d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="windazimuth_5d",
-        name="Wind direction azimuth 5d",
+        translation_key="windazimuth_5d",
         native_unit_of_measurement=DEGREE,
         icon="mdi:compass-outline",
     ),
     SensorEntityDescription(
         key="condition_1d",
-        name="Condition 1d",
+        translation_key="condition_1d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="condition_2d",
-        name="Condition 2d",
+        translation_key="condition_2d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="condition_3d",
-        name="Condition 3d",
+        translation_key="condition_3d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="condition_4d",
-        name="Condition 4d",
+        translation_key="condition_4d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="condition_5d",
-        name="Condition 5d",
+        translation_key="condition_5d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditioncode_1d",
-        name="Condition code 1d",
+        translation_key="conditioncode_1d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditioncode_2d",
-        name="Condition code 2d",
+        translation_key="conditioncode_2d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditioncode_3d",
-        name="Condition code 3d",
+        translation_key="conditioncode_3d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditioncode_4d",
-        name="Condition code 4d",
+        translation_key="conditioncode_4d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditioncode_5d",
-        name="Condition code 5d",
+        translation_key="conditioncode_5d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_CONDITION_CODES,
     ),
     SensorEntityDescription(
         key="conditiondetailed_1d",
-        name="Detailed condition 1d",
+        translation_key="conditiondetailed_1d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditiondetailed_2d",
-        name="Detailed condition 2d",
+        translation_key="conditiondetailed_2d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditiondetailed_3d",
-        name="Detailed condition 3d",
+        translation_key="conditiondetailed_3d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditiondetailed_4d",
-        name="Detailed condition 4d",
+        translation_key="conditiondetailed_4d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditiondetailed_5d",
-        name="Detailed condition 5d",
+        translation_key="conditiondetailed_5d",
+        device_class=SensorDeviceClass.ENUM,
+        options=STATE_DETAILED_CONDITIONS,
     ),
     SensorEntityDescription(
         key="conditionexact_1d",
-        name="Full condition 1d",
+        translation_key="conditionexact_1d",
     ),
     SensorEntityDescription(
         key="conditionexact_2d",
-        name="Full condition 2d",
+        translation_key="conditionexact_2d",
     ),
     SensorEntityDescription(
         key="conditionexact_3d",
-        name="Full condition 3d",
+        translation_key="conditionexact_3d",
     ),
     SensorEntityDescription(
         key="conditionexact_4d",
-        name="Full condition 4d",
+        translation_key="conditionexact_4d",
     ),
     SensorEntityDescription(
         key="conditionexact_5d",
-        name="Full condition 5d",
+        translation_key="conditionexact_5d",
     ),
     SensorEntityDescription(
         key="symbol_1d",
-        name="Symbol 1d",
+        translation_key="symbol_1d",
     ),
     SensorEntityDescription(
         key="symbol_2d",
-        name="Symbol 2d",
+        translation_key="symbol_2d",
     ),
     SensorEntityDescription(
         key="symbol_3d",
-        name="Symbol 3d",
+        translation_key="symbol_3d",
     ),
     SensorEntityDescription(
         key="symbol_4d",
-        name="Symbol 4d",
+        translation_key="symbol_4d",
     ),
     SensorEntityDescription(
         key="symbol_5d",
-        name="Symbol 5d",
+        translation_key="symbol_5d",
     ),
 )
 
@@ -689,17 +732,17 @@ async def async_setup_entry(
 
 
 class BrSensor(SensorEntity):
-    """Representation of an Buienradar sensor."""
+    """Representation of a Buienradar sensor."""
 
     _attr_entity_registry_enabled_default = False
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
     def __init__(
         self, client_name, coordinates, description: SensorEntityDescription
     ) -> None:
         """Initialize the sensor."""
         self.entity_description = description
-        self._attr_name = f"{client_name} {description.name}"
         self._measured = None
         self._attr_unique_id = "{:2.6f}{:2.6f}{}".format(
             coordinates[CONF_LATITUDE], coordinates[CONF_LONGITUDE], description.key
diff --git a/homeassistant/components/buienradar/strings.json b/homeassistant/components/buienradar/strings.json
index 740068a952bac7..bac4e63e288fe6 100644
--- a/homeassistant/components/buienradar/strings.json
+++ b/homeassistant/components/buienradar/strings.json
@@ -25,5 +25,483 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "stationname": {
+        "name": "Station name"
+      },
+      "barometerfc": {
+        "name": "Barometer value"
+      },
+      "barometerfcname": {
+        "name": "Barometer"
+      },
+      "barometerfcnamenl": {
+        "name": "Barometer"
+      },
+      "condition": {
+        "name": "Condition",
+        "state": {
+          "clear": "Clear",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditioncode": {
+        "name": "Condition code"
+      },
+      "conditiondetailed": {
+        "name": "Detailed condition",
+        "state": {
+          "clear": "Clear",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "Partly cloudy, fog",
+          "partlycloudy-light-rain": "Partly cloudy, light rain",
+          "partlycloudy-rain": "Partly cloudy, rain",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "Light rain",
+          "light-snow": "Light snow",
+          "partlycloudy-light-snow": "Partly cloudy, light snow",
+          "partlycloudy-snow": "Partly cloudy, snow",
+          "partlycloudy-lightning": "Partly cloudy, lightning",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "snowy-rainy": "[%key:component::weather::entity_component::_::state::snowy-rainy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditionexact": {
+        "name": "Full condition"
+      },
+      "symbol": {
+        "name": "Symbol"
+      },
+      "feeltemperature": {
+        "name": "Feel temperature"
+      },
+      "humidity": {
+        "name": "[%key:component::sensor::entity_component::humidity::name%]"
+      },
+      "temperature": {
+        "name": "[%key:component::sensor::entity_component::temperature::name%]"
+      },
+      "groundtemperature": {
+        "name": "Ground temperature"
+      },
+      "windspeed": {
+        "name": "[%key:component::sensor::entity_component::wind_speed::name%]"
+      },
+      "windforce": {
+        "name": "Wind force"
+      },
+      "winddirection": {
+        "name": "Wind direction"
+      },
+      "windazimuth": {
+        "name": "Wind direction azimuth"
+      },
+      "pressure": {
+        "name": "[%key:component::sensor::entity_component::pressure::name%]"
+      },
+      "visibility": {
+        "name": "[%key:component::weather::entity_component::_::state_attributes::visibility::name%]"
+      },
+      "windgust": {
+        "name": "Wind gust"
+      },
+      "precipitation": {
+        "name": "[%key:component::sensor::entity_component::precipitation::name%]"
+      },
+      "irradiance": {
+        "name": "[%key:component::sensor::entity_component::irradiance::name%]"
+      },
+      "precipitation_forecast_average": {
+        "name": "Precipitation forecast average"
+      },
+      "precipitation_forecast_total": {
+        "name": "Precipitation forecast total"
+      },
+      "rainlast24hour": {
+        "name": "Rain last 24h"
+      },
+      "rainlasthour": {
+        "name": "Rain last hour"
+      },
+      "temperature_1d": {
+        "name": "Temperature 1d"
+      },
+      "temperature_2d": {
+        "name": "Temperature 2d"
+      },
+      "temperature_3d": {
+        "name": "Temperature 3d"
+      },
+      "temperature_4d": {
+        "name": "Temperature 4d"
+      },
+      "temperature_5d": {
+        "name": "Temperature 5d"
+      },
+      "mintemp_1d": {
+        "name": "Minimum temperature 1d"
+      },
+      "mintemp_2d": {
+        "name": "Minimum temperature 2d"
+      },
+      "mintemp_3d": {
+        "name": "Minimum temperature 3d"
+      },
+      "mintemp_4d": {
+        "name": "Minimum temperature 4d"
+      },
+      "mintemp_5d": {
+        "name": "Minimum temperature 5d"
+      },
+      "rain_1d": {
+        "name": "Rain 1d"
+      },
+      "rain_2d": {
+        "name": "Rain 2d"
+      },
+      "rain_3d": {
+        "name": "Rain 3d"
+      },
+      "rain_4d": {
+        "name": "Rain 4d"
+      },
+      "rain_5d": {
+        "name": "Rain 5d"
+      },
+      "minrain_1d": {
+        "name": "Minimum rain 1d"
+      },
+      "minrain_2d": {
+        "name": "Minimum rain 2d"
+      },
+      "minrain_3d": {
+        "name": "Minimum rain 3d"
+      },
+      "minrain_4d": {
+        "name": "Minimum rain 4d"
+      },
+      "minrain_5d": {
+        "name": "Minimum rain 5d"
+      },
+      "maxrain_1d": {
+        "name": "Maximum rain 1d"
+      },
+      "maxrain_2d": {
+        "name": "Maximum rain 2d"
+      },
+      "maxrain_3d": {
+        "name": "Maximum rain 3d"
+      },
+      "maxrain_4d": {
+        "name": "Maximum rain 4d"
+      },
+      "maxrain_5d": {
+        "name": "Maximum rain 5d"
+      },
+      "rainchance_1d": {
+        "name": "Rainchance 1d"
+      },
+      "rainchance_2d": {
+        "name": "Rainchance 2d"
+      },
+      "rainchance_3d": {
+        "name": "Rainchance 3d"
+      },
+      "rainchance_4d": {
+        "name": "Rainchance 4d"
+      },
+      "rainchance_5d": {
+        "name": "Rainchance 5d"
+      },
+      "sunchance_1d": {
+        "name": "Sunchance 1d"
+      },
+      "sunchance_2d": {
+        "name": "Sunchance 2d"
+      },
+      "sunchance_3d": {
+        "name": "Sunchance 3d"
+      },
+      "sunchance_4d": {
+        "name": "Sunchance 4d"
+      },
+      "sunchance_5d": {
+        "name": "Sunchance 5d"
+      },
+      "windforce_1d": {
+        "name": "Wind force 1d"
+      },
+      "windforce_2d": {
+        "name": "Wind force 2d"
+      },
+      "windforce_3d": {
+        "name": "Wind force 3d"
+      },
+      "windforce_4d": {
+        "name": "Wind force 4d"
+      },
+      "windforce_5d": {
+        "name": "Wind force 5d"
+      },
+      "windspeed_1d": {
+        "name": "Wind speed 1d"
+      },
+      "windspeed_2d": {
+        "name": "Wind speed 2d"
+      },
+      "windspeed_3d": {
+        "name": "Wind speed 3d"
+      },
+      "windspeed_4d": {
+        "name": "Wind speed 4d"
+      },
+      "windspeed_5d": {
+        "name": "Wind speed 5d"
+      },
+      "winddirection_1d": {
+        "name": "Wind direction 1d"
+      },
+      "winddirection_2d": {
+        "name": "Wind direction 2d"
+      },
+      "winddirection_3d": {
+        "name": "Wind direction 3d"
+      },
+      "winddirection_4d": {
+        "name": "Wind direction 4d"
+      },
+      "winddirection_5d": {
+        "name": "Wind direction 5d"
+      },
+      "windazimuth_1d": {
+        "name": "Wind direction azimuth 1d"
+      },
+      "windazimuth_2d": {
+        "name": "Wind direction azimuth 2d"
+      },
+      "windazimuth_3d": {
+        "name": "Wind direction azimuth 3d"
+      },
+      "windazimuth_4d": {
+        "name": "Wind direction azimuth 4d"
+      },
+      "windazimuth_5d": {
+        "name": "Wind direction azimuth 5d"
+      },
+      "condition_1d": {
+        "name": "Condition 1d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::condition::state::clear%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "condition_2d": {
+        "name": "Condition 2d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::condition::state::clear%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "condition_3d": {
+        "name": "Condition 3d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::condition::state::clear%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "condition_4d": {
+        "name": "Condition 4d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::condition::state::clear%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "condition_5d": {
+        "name": "Condition 5d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::condition::state::clear%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditioncode_1d": {
+        "name": "Condition code 1d"
+      },
+      "conditioncode_2d": {
+        "name": "Condition code 2d"
+      },
+      "conditioncode_3d": {
+        "name": "Condition code 3d"
+      },
+      "conditioncode_4d": {
+        "name": "Condition code 4d"
+      },
+      "conditioncode_5d": {
+        "name": "Condition code 5d"
+      },
+      "conditiondetailed_1d": {
+        "name": "Detailed condition 1d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::clear%]",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-fog%]",
+          "partlycloudy-light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-rain%]",
+          "partlycloudy-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-rain%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-rain%]",
+          "light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-snow%]",
+          "partlycloudy-light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-snow%]",
+          "partlycloudy-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-snow%]",
+          "partlycloudy-lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-lightning%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "snowy-rainy": "[%key:component::weather::entity_component::_::state::snowy-rainy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditiondetailed_2d": {
+        "name": "Detailed condition 2d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::clear%]",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-fog%]",
+          "partlycloudy-light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-rain%]",
+          "partlycloudy-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-rain%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-rain%]",
+          "light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-snow%]",
+          "partlycloudy-light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-snow%]",
+          "partlycloudy-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-snow%]",
+          "partlycloudy-lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-lightning%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "snowy-rainy": "[%key:component::weather::entity_component::_::state::snowy-rainy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditiondetailed_3d": {
+        "name": "Detailed condition 3d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::clear%]",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-fog%]",
+          "partlycloudy-light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-rain%]",
+          "partlycloudy-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-rain%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-rain%]",
+          "light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-snow%]",
+          "partlycloudy-light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-snow%]",
+          "partlycloudy-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-snow%]",
+          "partlycloudy-lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-lightning%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "snowy-rainy": "[%key:component::weather::entity_component::_::state::snowy-rainy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditiondetailed_4d": {
+        "name": "Detailed condition 4d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::clear%]",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-fog%]",
+          "partlycloudy-light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-rain%]",
+          "partlycloudy-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-rain%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-rain%]",
+          "light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-snow%]",
+          "partlycloudy-light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-snow%]",
+          "partlycloudy-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-snow%]",
+          "partlycloudy-lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-lightning%]",
+          "snowy": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::snowy%]",
+          "snowy-rainy": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::snowy-rainy%]",
+          "lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::lightning%]"
+        }
+      },
+      "conditiondetailed_5d": {
+        "name": "Detailed condition 5d",
+        "state": {
+          "clear": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::clear%]",
+          "partlycloudy": "[%key:component::weather::entity_component::_::state::partlycloudy%]",
+          "partlycloudy-fog": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-fog%]",
+          "partlycloudy-light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-rain%]",
+          "partlycloudy-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-rain%]",
+          "cloudy": "[%key:component::weather::entity_component::_::state::cloudy%]",
+          "fog": "[%key:component::weather::entity_component::_::state::fog%]",
+          "rainy": "[%key:component::weather::entity_component::_::state::rainy%]",
+          "light-rain": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-rain%]",
+          "light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::light-snow%]",
+          "partlycloudy-light-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-light-snow%]",
+          "partlycloudy-snow": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-snow%]",
+          "partlycloudy-lightning": "[%key:component::buienradar::entity::sensor::conditiondetailed::state::partlycloudy-lightning%]",
+          "snowy": "[%key:component::weather::entity_component::_::state::snowy%]",
+          "snowy-rainy": "[%key:component::weather::entity_component::_::state::snowy-rainy%]",
+          "lightning": "[%key:component::weather::entity_component::_::state::lightning%]"
+        }
+      },
+      "conditionexact_1d": {
+        "name": "Full condition 1d"
+      },
+      "conditionexact_2d": {
+        "name": "Full condition 2d"
+      },
+      "conditionexact_3d": {
+        "name": "Full condition 3d"
+      },
+      "conditionexact_4d": {
+        "name": "Full condition 4d"
+      },
+      "conditionexact_5d": {
+        "name": "Full condition 5d"
+      },
+      "symbol_1d": {
+        "name": "Symbol 1d"
+      },
+      "symbol_2d": {
+        "name": "Symbol 2d"
+      },
+      "symbol_3d": {
+        "name": "Symbol 3d"
+      },
+      "symbol_4d": {
+        "name": "Symbol 4d"
+      },
+      "symbol_5d": {
+        "name": "Symbol 5d"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/button/__init__.py b/homeassistant/components/button/__init__.py
index 99fe02f7a9df1b..0e2790a2e85b4a 100644
--- a/homeassistant/components/button/__init__.py
+++ b/homeassistant/components/button/__init__.py
@@ -35,6 +35,7 @@
 class ButtonDeviceClass(StrEnum):
     """Device class for buttons."""
 
+    IDENTIFY = "identify"
     RESTART = "restart"
     UPDATE = "update"
 
@@ -88,6 +89,13 @@ class ButtonEntity(RestoreEntity):
     _attr_state: None = None
     __last_pressed: datetime | None = None
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For buttons this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> ButtonDeviceClass | None:
         """Return the class of this entity."""
diff --git a/homeassistant/components/button/device_action.py b/homeassistant/components/button/device_action.py
index 8398b4990cd64d..338b11e765bf1f 100644
--- a/homeassistant/components/button/device_action.py
+++ b/homeassistant/components/button/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,14 +20,21 @@
 
 ACTION_TYPES = {"press"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -36,7 +44,7 @@ async def async_get_actions(
         {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "press",
         }
         for entry in er.async_entries_for_device(registry, device_id)
diff --git a/homeassistant/components/button/device_trigger.py b/homeassistant/components/button/device_trigger.py
index fbf054996c3d35..1b206337f33555 100644
--- a/homeassistant/components/button/device_trigger.py
+++ b/homeassistant/components/button/device_trigger.py
@@ -26,7 +26,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -42,7 +42,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "pressed",
         }
         for entry in er.async_entries_for_device(registry, device_id)
diff --git a/homeassistant/components/button/strings.json b/homeassistant/components/button/strings.json
index 4fd88853893724..a92a5a0f38a7ad 100644
--- a/homeassistant/components/button/strings.json
+++ b/homeassistant/components/button/strings.json
@@ -12,6 +12,9 @@
     "_": {
       "name": "[%key:component::button::title%]"
     },
+    "identify": {
+      "name": "Identify"
+    },
     "restart": {
       "name": "Restart"
     },
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index 9a01cd2186fff2..e4892ae0383e4d 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -1,7 +1,7 @@
 """Support for WebDav Calendar."""
 from __future__ import annotations
 
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, time, timedelta
 from functools import partial
 import logging
 import re
@@ -29,7 +29,7 @@
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle, dt
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -204,8 +204,8 @@ async def async_get_events(
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
         """Get the latest data."""
-        start_of_today = dt.start_of_local_day()
-        start_of_tomorrow = dt.start_of_local_day() + timedelta(days=self.days)
+        start_of_today = dt_util.start_of_local_day()
+        start_of_tomorrow = dt_util.start_of_local_day() + timedelta(days=self.days)
 
         # We have to retrieve the results for the whole day as the server
         # won't return events that have already started
@@ -312,7 +312,7 @@ def is_all_day(vevent):
     @staticmethod
     def is_over(vevent):
         """Return if the event is over."""
-        return dt.now() >= WebDavCalendarData.to_datetime(
+        return dt_util.now() >= WebDavCalendarData.to_datetime(
             WebDavCalendarData.get_end_date(vevent)
         )
 
@@ -321,9 +321,7 @@ def to_datetime(obj):
         """Return a datetime."""
         if isinstance(obj, datetime):
             return WebDavCalendarData.to_local(obj)
-        return dt.dt.datetime.combine(obj, dt.dt.time.min).replace(
-            tzinfo=dt.DEFAULT_TIME_ZONE
-        )
+        return datetime.combine(obj, time.min).replace(tzinfo=dt_util.DEFAULT_TIME_ZONE)
 
     @staticmethod
     def to_local(obj: datetime | date) -> datetime | date:
@@ -334,7 +332,7 @@ def to_local(obj: datetime | date) -> datetime | date:
         used by the caldav client and dateutil so the datetime can be copied.
         """
         if isinstance(obj, datetime):
-            return dt.as_local(obj)
+            return dt_util.as_local(obj)
         return obj
 
     @staticmethod
diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py
index 0f047bf375853b..d56b2b0ddfae67 100644
--- a/homeassistant/components/calendar/__init__.py
+++ b/homeassistant/components/calendar/__init__.py
@@ -8,7 +8,7 @@
 from itertools import groupby
 import logging
 import re
-from typing import Any, cast, final
+from typing import Any, Final, cast, final
 
 from aiohttp import web
 from dateutil.rrule import rrulestr
@@ -19,7 +19,12 @@
 from homeassistant.components.websocket_api.connection import ActiveConnection
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import (  # noqa: F401
@@ -31,11 +36,13 @@
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.template import DATE_STR_FORMAT
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
+from homeassistant.util.json import JsonValueType
 
 from .const import (
     CONF_EVENT,
     EVENT_DESCRIPTION,
+    EVENT_DURATION,
     EVENT_END,
     EVENT_END_DATE,
     EVENT_END_DATETIME,
@@ -53,6 +60,7 @@
     EVENT_TIME_FIELDS,
     EVENT_TYPES,
     EVENT_UID,
+    LIST_EVENT_FIELDS,
     CalendarEntityFeature,
 )
 
@@ -117,7 +125,7 @@ def validate(obj: dict[str, Any]) -> dict[str, Any]:
         """Convert all keys that are datetime values to local timezone."""
         for k in keys:
             if (value := obj.get(k)) and isinstance(value, datetime.datetime):
-                obj[k] = dt.as_local(value)
+                obj[k] = dt_util.as_local(value)
         return obj
 
     return validate
@@ -250,6 +258,21 @@ def _validate_rrule(value: Any) -> str:
     extra=vol.ALLOW_EXTRA,
 )
 
+SERVICE_LIST_EVENTS: Final = "list_events"
+SERVICE_LIST_EVENTS_SCHEMA: Final = vol.All(
+    cv.has_at_least_one_key(EVENT_END_DATETIME, EVENT_DURATION),
+    cv.has_at_most_one_key(EVENT_END_DATETIME, EVENT_DURATION),
+    cv.make_entity_service_schema(
+        {
+            vol.Optional(EVENT_START_DATETIME): cv.datetime,
+            vol.Optional(EVENT_END_DATETIME): cv.datetime,
+            vol.Optional(EVENT_DURATION): vol.All(
+                cv.time_period, cv.positive_timedelta
+            ),
+        }
+    ),
+)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Track states and offer events for calendars."""
@@ -274,7 +297,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         async_create_event,
         required_features=[CalendarEntityFeature.CREATE_EVENT],
     )
-
+    component.async_register_entity_service(
+        SERVICE_LIST_EVENTS,
+        SERVICE_LIST_EVENTS_SCHEMA,
+        async_list_events_service,
+        supports_response=SupportsResponse.ONLY,
+    )
     await component.async_setup(config)
     return True
 
@@ -294,14 +322,14 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 def get_date(date: dict[str, Any]) -> datetime.datetime:
     """Get the dateTime from date or dateTime as a local."""
     if "date" in date:
-        parsed_date = dt.parse_date(date["date"])
+        parsed_date = dt_util.parse_date(date["date"])
         assert parsed_date
-        return dt.start_of_local_day(
+        return dt_util.start_of_local_day(
             datetime.datetime.combine(parsed_date, datetime.time.min)
         )
-    parsed_datetime = dt.parse_datetime(date["dateTime"])
+    parsed_datetime = dt_util.parse_datetime(date["dateTime"])
     assert parsed_datetime
-    return dt.as_local(parsed_datetime)
+    return dt_util.as_local(parsed_datetime)
 
 
 @dataclasses.dataclass
@@ -380,7 +408,7 @@ def _api_event_dict_factory(obj: Iterable[tuple[str, Any]]) -> dict[str, Any]:
     result: dict[str, Any] = {}
     for name, value in obj:
         if isinstance(value, datetime.datetime):
-            result[name] = {"dateTime": dt.as_local(value).isoformat()}
+            result[name] = {"dateTime": dt_util.as_local(value).isoformat()}
         elif isinstance(value, datetime.date):
             result[name] = {"date": value.isoformat()}
         else:
@@ -388,19 +416,30 @@ def _api_event_dict_factory(obj: Iterable[tuple[str, Any]]) -> dict[str, Any]:
     return result
 
 
+def _list_events_dict_factory(
+    obj: Iterable[tuple[str, Any]]
+) -> dict[str, JsonValueType]:
+    """Convert CalendarEvent dataclass items to dictionary of attributes."""
+    return {
+        name: value
+        for name, value in _event_dict_factory(obj).items()
+        if name in LIST_EVENT_FIELDS and value is not None
+    }
+
+
 def _get_datetime_local(
     dt_or_d: datetime.datetime | datetime.date,
 ) -> datetime.datetime:
     """Convert a calendar event date/datetime to a datetime if needed."""
     if isinstance(dt_or_d, datetime.datetime):
-        return dt.as_local(dt_or_d)
-    return dt.start_of_local_day(dt_or_d)
+        return dt_util.as_local(dt_or_d)
+    return dt_util.start_of_local_day(dt_or_d)
 
 
 def _get_api_date(dt_or_d: datetime.datetime | datetime.date) -> dict[str, str]:
     """Convert a calendar event date/datetime to a datetime if needed."""
     if isinstance(dt_or_d, datetime.datetime):
-        return {"dateTime": dt.as_local(dt_or_d).isoformat()}
+        return {"dateTime": dt_util.as_local(dt_or_d).isoformat()}
     return {"date": dt_or_d.isoformat()}
 
 
@@ -433,7 +472,7 @@ def is_offset_reached(
     """Have we reached the offset time specified in the event title."""
     if offset_time == datetime.timedelta():
         return False
-    return start + offset_time <= dt.now(start.tzinfo)
+    return start + offset_time <= dt_util.now(start.tzinfo)
 
 
 class CalendarEntity(Entity):
@@ -467,7 +506,7 @@ def state(self) -> str:
         if (event := self.event) is None:
             return STATE_OFF
 
-        now = dt.now()
+        now = dt_util.now()
 
         if event.start_datetime_local <= now < event.end_datetime_local:
             return STATE_ON
@@ -529,8 +568,8 @@ async def get(self, request: web.Request, entity_id: str) -> web.Response:
         if start is None or end is None:
             return web.Response(status=HTTPStatus.BAD_REQUEST)
         try:
-            start_date = dt.parse_datetime(start)
-            end_date = dt.parse_datetime(end)
+            start_date = dt_util.parse_datetime(start)
+            end_date = dt_util.parse_datetime(end)
         except (ValueError, AttributeError):
             return web.Response(status=HTTPStatus.BAD_REQUEST)
         if start_date is None or end_date is None:
@@ -540,7 +579,9 @@ async def get(self, request: web.Request, entity_id: str) -> web.Response:
 
         try:
             calendar_event_list = await entity.async_get_events(
-                request.app["hass"], dt.as_local(start_date), dt.as_local(end_date)
+                request.app["hass"],
+                dt_util.as_local(start_date),
+                dt_util.as_local(end_date),
             )
         except HomeAssistantError as err:
             _LOGGER.debug("Error reading events: %s", err)
@@ -741,3 +782,23 @@ async def async_create_event(entity: CalendarEntity, call: ServiceCall) -> None:
         EVENT_END: end,
     }
     await entity.async_create_event(**params)
+
+
+async def async_list_events_service(
+    calendar: CalendarEntity, service_call: ServiceCall
+) -> ServiceResponse:
+    """List events on a calendar during a time drange."""
+    start = service_call.data.get(EVENT_START_DATETIME, dt_util.now())
+    if EVENT_DURATION in service_call.data:
+        end = start + service_call.data[EVENT_DURATION]
+    else:
+        end = service_call.data[EVENT_END_DATETIME]
+    calendar_event_list = await calendar.async_get_events(
+        calendar.hass, dt_util.as_local(start), dt_util.as_local(end)
+    )
+    return {
+        "events": [
+            dataclasses.asdict(event, dict_factory=_list_events_dict_factory)
+            for event in calendar_event_list
+        ]
+    }
diff --git a/homeassistant/components/calendar/const.py b/homeassistant/components/calendar/const.py
index 3fbab6742a9806..e667510325bcd5 100644
--- a/homeassistant/components/calendar/const.py
+++ b/homeassistant/components/calendar/const.py
@@ -40,3 +40,13 @@ class CalendarEntityFeature(IntFlag):
     EVENT_IN,
 }
 EVENT_TYPES = "event_types"
+EVENT_DURATION = "duration"
+
+# Fields for the list events service
+LIST_EVENT_FIELDS = {
+    "start",
+    "end",
+    EVENT_SUMMARY,
+    EVENT_DESCRIPTION,
+    EVENT_LOCATION,
+}
diff --git a/homeassistant/components/calendar/services.yaml b/homeassistant/components/calendar/services.yaml
index 5d1a3ccf0f4093..1f4d6aa3152a65 100644
--- a/homeassistant/components/calendar/services.yaml
+++ b/homeassistant/components/calendar/services.yaml
@@ -4,6 +4,8 @@ create_event:
   target:
     entity:
       domain: calendar
+      supported_features:
+        - calendar.CalendarEntityFeature.CREATE_EVENT
   fields:
     summary:
       name: Summary
@@ -52,3 +54,27 @@ create_event:
       example: "Conference Room - F123, Bldg. 002"
       selector:
         text:
+list_events:
+  name: List event
+  description: List events on a calendar within a time range.
+  target:
+    entity:
+      domain: calendar
+  fields:
+    start_date_time:
+      name: Start time
+      description: Return active events after this time (exclusive). When not set, defaults to now.
+      example: "2022-03-22 20:00:00"
+      selector:
+        datetime:
+    end_date_time:
+      name: End time
+      description: Return active events before this time (exclusive). Cannot be used with 'duration'.
+      example: "2022-03-22 22:00:00"
+      selector:
+        datetime:
+    duration:
+      name: Duration
+      description: Return active events from start_date_time until the specified duration.
+      selector:
+        duration:
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index c09586848dffca..277aa10075e231 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -514,8 +514,8 @@ def frontend_stream_type(self) -> StreamType | None:
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        if self.stream and not self.stream.available:
-            return self.stream.available
+        if (stream := self.stream) and not stream.available:
+            return False
         return super().available
 
     async def async_create_stream(self) -> Stream | None:
@@ -673,7 +673,10 @@ def async_update_token(self) -> None:
     async def async_internal_added_to_hass(self) -> None:
         """Run when entity about to be added to hass."""
         await super().async_internal_added_to_hass()
-        await self.async_refresh_providers()
+        # Avoid calling async_refresh_providers() in here because it
+        # it will write state a second time since state is always
+        # written when an entity is added to hass.
+        self._rtsp_to_webrtc = await self._async_use_rtsp_to_webrtc()
 
     async def async_refresh_providers(self) -> None:
         """Determine if any of the registered providers are suitable for this entity.
diff --git a/homeassistant/components/camera/manifest.json b/homeassistant/components/camera/manifest.json
index a0ae9d925a89cf..b1df158a260904 100644
--- a/homeassistant/components/camera/manifest.json
+++ b/homeassistant/components/camera/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/camera",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["PyTurboJPEG==1.6.7"]
+  "requirements": ["PyTurboJPEG==1.7.1"]
 }
diff --git a/homeassistant/components/cast/__init__.py b/homeassistant/components/cast/__init__.py
index 4d1c00f967b4ed..aa0bdfa81187b5 100644
--- a/homeassistant/components/cast/__init__.py
+++ b/homeassistant/components/cast/__init__.py
@@ -1,14 +1,12 @@
 """Component to embed Google Cast."""
 from __future__ import annotations
 
-import logging
 from typing import Protocol
 
 from pychromecast import Chromecast
-import voluptuous as vol
 
 from homeassistant.components.media_player import BrowseMedia, MediaType
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -16,44 +14,14 @@
 from homeassistant.helpers.integration_platform import (
     async_process_integration_platforms,
 )
-from homeassistant.helpers.typing import ConfigType
 
 from . import home_assistant_cast
 from .const import DOMAIN
-from .media_player import ENTITY_SCHEMA
 
 CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
-
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Cast component."""
-    if (conf := config.get(DOMAIN)) is not None:
-        media_player_config_validated = []
-        media_player_config = conf.get("media_player", {})
-        if not isinstance(media_player_config, list):
-            media_player_config = [media_player_config]
-        for cfg in media_player_config:
-            try:
-                cfg = ENTITY_SCHEMA(cfg)
-                media_player_config_validated.append(cfg)
-            except vol.Error as ex:
-                _LOGGER.warning("Invalid config '%s': %s", cfg, ex)
-
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN,
-                context={"source": SOURCE_IMPORT},
-                data=media_player_config_validated,
-            )
-        )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Cast from a config entry."""
     await home_assistant_cast.async_setup_ha_cast(hass, entry)
diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index a5fc4360097070..e58bcb71b28e44 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -38,21 +38,6 @@ def async_get_options_flow(
         """Get the options flow for this handler."""
         return CastOptionsFlowHandler(config_entry)
 
-    async def async_step_import(self, import_data=None):
-        """Import data."""
-        if self._async_current_entries():
-            return self.async_abort(reason="single_instance_allowed")
-
-        media_player_config = import_data or []
-        for cfg in media_player_config:
-            if CONF_IGNORE_CEC in cfg:
-                self._ignore_cec.update(set(cfg[CONF_IGNORE_CEC]))
-            if CONF_UUID in cfg:
-                self._wanted_uuid.add(cfg[CONF_UUID])
-
-        data = self._get_data()
-        return self.async_create_entry(title="Google Cast", data=data)
-
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
         if self._async_current_entries():
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 48921303ce0457..7cf318f12a641a 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -14,6 +14,6 @@
   "documentation": "https://www.home-assistant.io/integrations/cast",
   "iot_class": "local_polling",
   "loggers": ["casttube", "pychromecast"],
-  "requirements": ["pychromecast==13.0.7"],
+  "requirements": ["PyChromecast==13.0.7"],
   "zeroconf": ["_googlecast._tcp.local."]
 }
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index b701890d85dbb7..d32ff07c261de1 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -23,7 +23,6 @@
     CONNECTION_STATUS_CONNECTED,
     CONNECTION_STATUS_DISCONNECTED,
 )
-import voluptuous as vol
 import yarl
 
 from homeassistant.components import media_source, zeroconf
@@ -47,7 +46,6 @@
 )
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -83,15 +81,6 @@
 
 CAST_SPLASH = "https://www.home-assistant.io/images/cast/splash.png"
 
-ENTITY_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Optional(CONF_UUID): cv.string,
-            vol.Optional(CONF_IGNORE_CEC): vol.All(cv.ensure_list, [cv.string]),
-        }
-    ),
-)
-
 
 @callback
 def _async_create_cast_device(hass: HomeAssistant, info: ChromecastInfo):
@@ -278,6 +267,7 @@ class CastMediaPlayerEntity(CastDevice, MediaPlayerEntity):
     """Representation of a Cast device on the network."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_media_image_remotely_accessible = True
     _mz_only = False
@@ -372,15 +362,7 @@ def new_media_status(self, media_status):
         ):
             external_url = None
             internal_url = None
-            tts_base_url = None
             url_description = ""
-            if "tts" in self.hass.config.components:
-                # pylint: disable-next=[import-outside-toplevel]
-                from homeassistant.components import tts
-
-                with suppress(KeyError):  # base_url not configured
-                    tts_base_url = tts.get_base_url(self.hass)
-
             with suppress(NoURLAvailableError):  # external_url not configured
                 external_url = get_url(self.hass, allow_internal=False)
 
@@ -388,8 +370,6 @@ def new_media_status(self, media_status):
                 internal_url = get_url(self.hass, allow_external=False)
 
             if media_status.content_id:
-                if tts_base_url and media_status.content_id.startswith(tts_base_url):
-                    url_description = f" from tts.base_url ({tts_base_url})"
                 if external_url and media_status.content_id.startswith(external_url):
                     url_description = f" from external_url ({external_url})"
                 if internal_url and media_status.content_id.startswith(internal_url):
diff --git a/homeassistant/components/cert_expiry/__init__.py b/homeassistant/components/cert_expiry/__init__.py
index 5f6152b7bc79be..4fc89bc918b790 100644
--- a/homeassistant/components/cert_expiry/__init__.py
+++ b/homeassistant/components/cert_expiry/__init__.py
@@ -8,10 +8,10 @@
 from homeassistant.const import (
     CONF_HOST,
     CONF_PORT,
-    EVENT_HOMEASSISTANT_STARTED,
     Platform,
 )
-from homeassistant.core import CoreState, HomeAssistant
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DEFAULT_PORT, DOMAIN
@@ -38,19 +38,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if entry.unique_id is None:
         hass.config_entries.async_update_entry(entry, unique_id=f"{host}:{port}")
 
-    async def async_finish_startup(_):
+    async def _async_finish_startup(_):
         await coordinator.async_refresh()
         await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
-    if hass.state == CoreState.running:
-        await async_finish_startup(None)
-    else:
-        entry.async_on_unload(
-            hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_STARTED, async_finish_startup
-            )
-        )
-
+    async_at_started(hass, _async_finish_startup)
     return True
 
 
diff --git a/homeassistant/components/cert_expiry/helper.py b/homeassistant/components/cert_expiry/helper.py
index 219b5425b5c0ba..0817025c703f27 100644
--- a/homeassistant/components/cert_expiry/helper.py
+++ b/homeassistant/components/cert_expiry/helper.py
@@ -1,9 +1,10 @@
 """Helper functions for the Cert Expiry platform."""
+from functools import cache
 import socket
 import ssl
 
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import TIMEOUT
 from .errors import (
@@ -14,12 +15,18 @@
 )
 
 
+@cache
+def _get_default_ssl_context():
+    """Return the default SSL context."""
+    return ssl.create_default_context()
+
+
 def get_cert(
     host: str,
     port: int,
 ):
     """Get the certificate for the host and port combination."""
-    ctx = ssl.create_default_context()
+    ctx = _get_default_ssl_context()
     address = (host, port)
     with socket.create_connection(address, timeout=TIMEOUT) as sock, ctx.wrap_socket(
         sock, server_hostname=address[0]
@@ -52,4 +59,4 @@ async def get_cert_expiry_timestamp(
         raise ValidationFailure(err.args[0]) from err
 
     ts_seconds = ssl.cert_time_to_seconds(cert["notAfter"])
-    return dt.utc_from_timestamp(ts_seconds)
+    return dt_util.utc_from_timestamp(ts_seconds)
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index ed0f8f2a4aac13..e62cb1143b5d80 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -214,9 +214,9 @@ class ClimateEntity(Entity):
     _attr_current_temperature: float | None = None
     _attr_fan_mode: str | None
     _attr_fan_modes: list[str] | None
-    _attr_hvac_action: HVACAction | str | None = None
-    _attr_hvac_mode: HVACMode | str | None
-    _attr_hvac_modes: list[HVACMode] | list[str]
+    _attr_hvac_action: HVACAction | None = None
+    _attr_hvac_mode: HVACMode | None
+    _attr_hvac_modes: list[HVACMode]
     _attr_is_aux_heat: bool | None
     _attr_max_humidity: int = DEFAULT_MAX_HUMIDITY
     _attr_max_temp: float
@@ -361,17 +361,17 @@ def target_humidity(self) -> int | None:
         return self._attr_target_humidity
 
     @property
-    def hvac_mode(self) -> HVACMode | str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
         return self._attr_hvac_mode
 
     @property
-    def hvac_modes(self) -> list[HVACMode] | list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return the list of available hvac operation modes."""
         return self._attr_hvac_modes
 
     @property
-    def hvac_action(self) -> HVACAction | str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation if supported."""
         return self._attr_hvac_action
 
@@ -534,6 +534,14 @@ async def async_turn_on(self) -> None:
             await self.hass.async_add_executor_job(self.turn_on)
             return
 
+        # If there are only two HVAC modes, and one of those modes is OFF,
+        # then we can just turn on the other mode.
+        if len(self.hvac_modes) == 2 and HVACMode.OFF in self.hvac_modes:
+            for mode in self.hvac_modes:
+                if mode != HVACMode.OFF:
+                    await self.async_set_hvac_mode(mode)
+                    return
+
         # Fake turn on
         for mode in (HVACMode.HEAT_COOL, HVACMode.HEAT, HVACMode.COOL):
             if mode not in self.hvac_modes:
diff --git a/homeassistant/components/climate/const.py b/homeassistant/components/climate/const.py
index 9ee561b9c1beb6..41d4646aeae718 100644
--- a/homeassistant/components/climate/const.py
+++ b/homeassistant/components/climate/const.py
@@ -96,6 +96,7 @@ class HVACAction(StrEnum):
     HEATING = "heating"
     IDLE = "idle"
     OFF = "off"
+    PREHEATING = "preheating"
 
 
 # These CURRENT_HVAC_* constants are deprecated as of Home Assistant 2022.5.
diff --git a/homeassistant/components/climate/device_action.py b/homeassistant/components/climate/device_action.py
index 0119ad658015c4..6714e0bf35a294 100644
--- a/homeassistant/components/climate/device_action.py
+++ b/homeassistant/components/climate/device_action.py
@@ -3,6 +3,10 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -24,7 +28,7 @@
 SET_HVAC_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_hvac_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_HVAC_MODE): vol.In(const.HVAC_MODES),
     }
 )
@@ -32,12 +36,19 @@
 SET_PRESET_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_preset_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_PRESET_MODE): str,
     }
 )
 
-ACTION_SCHEMA = vol.Any(SET_HVAC_MODE_SCHEMA, SET_PRESET_MODE_SCHEMA)
+_ACTION_SCHEMA = vol.Any(SET_HVAC_MODE_SCHEMA, SET_PRESET_MODE_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -57,7 +68,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "set_hvac_mode"})
@@ -93,23 +104,24 @@ async def async_get_action_capabilities(
 ) -> dict[str, vol.Schema]:
     """List action capabilities."""
     action_type = config[CONF_TYPE]
+    entity_id_or_uuid = config[CONF_ENTITY_ID]
 
     fields = {}
 
     if action_type == "set_hvac_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(hass, entity_id_or_uuid)
             hvac_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_HVAC_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_HVAC_MODES) or []
             )
         except HomeAssistantError:
             hvac_modes = []
         fields[vol.Required(const.ATTR_HVAC_MODE)] = vol.In(hvac_modes)
     elif action_type == "set_preset_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(hass, entity_id_or_uuid)
             preset_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_PRESET_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_PRESET_MODES) or []
             )
         except HomeAssistantError:
             preset_modes = []
diff --git a/homeassistant/components/climate/device_condition.py b/homeassistant/components/climate/device_condition.py
index 97dc27cfa090e7..d9f1b240a9ae5b 100644
--- a/homeassistant/components/climate/device_condition.py
+++ b/homeassistant/components/climate/device_condition.py
@@ -3,6 +3,9 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_CONDITION,
@@ -28,7 +31,7 @@
 
 HVAC_MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_hvac_mode",
         vol.Required(const.ATTR_HVAC_MODE): vol.In(const.HVAC_MODES),
     }
@@ -36,7 +39,7 @@
 
 PRESET_MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_preset_mode",
         vol.Required(const.ATTR_PRESET_MODE): str,
     }
@@ -63,7 +66,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions.append({**base_condition, CONF_TYPE: "is_hvac_mode"})
@@ -80,9 +83,12 @@ def async_condition_from_config(
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        if (state := hass.states.get(config[ATTR_ENTITY_ID])) is None:
+        if not entity_id or (state := hass.states.get(entity_id)) is None:
             return False
 
         if config[CONF_TYPE] == "is_hvac_mode":
@@ -106,9 +112,11 @@ async def async_get_condition_capabilities(
 
     if condition_type == "is_hvac_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             hvac_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_HVAC_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_HVAC_MODES) or []
             )
         except HomeAssistantError:
             hvac_modes = []
@@ -116,9 +124,11 @@ async def async_get_condition_capabilities(
 
     elif condition_type == "is_preset_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             preset_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_PRESET_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_PRESET_MODES) or []
             )
         except HomeAssistantError:
             preset_modes = []
diff --git a/homeassistant/components/climate/device_trigger.py b/homeassistant/components/climate/device_trigger.py
index 005e744b53ffc8..0afd2485517a06 100644
--- a/homeassistant/components/climate/device_trigger.py
+++ b/homeassistant/components/climate/device_trigger.py
@@ -34,7 +34,7 @@
 
 HVAC_MODE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "hvac_mode_changed",
         vol.Required(state_trigger.CONF_TO): vol.In(const.HVAC_MODES),
     }
@@ -43,7 +43,7 @@
 CURRENT_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 ["current_temperature_changed", "current_humidity_changed"]
             ),
@@ -77,7 +77,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         triggers.append(
@@ -142,7 +142,7 @@ async def async_attach_trigger(
         numeric_state_config[
             numeric_state_trigger.CONF_VALUE_TEMPLATE
         ] = "{{ state.attributes.current_temperature }}"
-    else:
+    else:  # trigger_type == "current_humidity_changed"
         numeric_state_config[
             numeric_state_trigger.CONF_VALUE_TEMPLATE
         ] = "{{ state.attributes.current_humidity }}"
diff --git a/homeassistant/components/climate/strings.json b/homeassistant/components/climate/strings.json
index 5e3fe15d56675e..8034799a6d0c5f 100644
--- a/homeassistant/components/climate/strings.json
+++ b/homeassistant/components/climate/strings.json
@@ -53,7 +53,8 @@
         "hvac_action": {
           "name": "Current action",
           "state": {
-            "off": "Off",
+            "off": "[%key:common::state::off%]",
+            "preheating": "Preheating",
             "heating": "Heating",
             "cooling": "Cooling",
             "drying": "Drying",
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 0af85fe9d4d092..40e5f264caf443 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -3,7 +3,7 @@
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from datetime import timedelta
+from datetime import datetime, timedelta
 from enum import Enum
 
 from hass_nabucasa import Cloud
@@ -18,7 +18,7 @@
     EVENT_HOMEASSISTANT_STOP,
     Platform,
 )
-from homeassistant.core import HassJob, HomeAssistant, ServiceCall, callback
+from homeassistant.core import Event, HassJob, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entityfilter
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -31,7 +31,6 @@
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
-from homeassistant.util.aiohttp import MockRequest
 
 from . import account_link, http_api
 from .client import CloudClient
@@ -184,8 +183,10 @@ async def async_create_cloudhook(hass: HomeAssistant, webhook_id: str) -> str:
     if not async_is_logged_in(hass):
         raise CloudNotAvailable
 
-    hook = await hass.data[DOMAIN].cloudhooks.async_create(webhook_id, True)
-    return hook["cloudhook_url"]
+    cloud: Cloud[CloudClient] = hass.data[DOMAIN]
+    hook = await cloud.cloudhooks.async_create(webhook_id, True)
+    cloudhook_url: str = hook["cloudhook_url"]
+    return cloudhook_url
 
 
 @bind_hass
@@ -213,14 +214,6 @@ def async_remote_ui_url(hass: HomeAssistant) -> str:
     return f"https://{remote_domain}"
 
 
-def is_cloudhook_request(request):
-    """Test if a request came from a cloudhook.
-
-    Async friendly.
-    """
-    return isinstance(request, MockRequest)
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize the Home Assistant cloud."""
     # Process configs
@@ -241,9 +234,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     websession = async_get_clientsession(hass)
     client = CloudClient(hass, prefs, websession, alexa_conf, google_conf)
     cloud = hass.data[DOMAIN] = Cloud(client, **kwargs)
-    cloud.iot.register_on_connect(client.on_cloud_connected)
 
-    async def _shutdown(event):
+    async def _shutdown(event: Event) -> None:
         """Shutdown event."""
         await cloud.stop()
 
@@ -263,7 +255,7 @@ async def _service_handler(service: ServiceCall) -> None:
         hass, DOMAIN, SERVICE_REMOTE_DISCONNECT, _service_handler
     )
 
-    async def async_startup_repairs(_=None) -> None:
+    async def async_startup_repairs(_: datetime) -> None:
         """Create repair issues after startup."""
         if not cloud.is_logged_in:
             return
@@ -273,7 +265,7 @@ async def async_startup_repairs(_=None) -> None:
 
     loaded = False
 
-    async def _on_start():
+    async def _on_start() -> None:
         """Discover platforms."""
         nonlocal loaded
 
@@ -292,19 +284,19 @@ async def _on_start():
         await async_load_platform(hass, Platform.TTS, DOMAIN, tts_info, config)
         await asyncio.gather(stt_platform_loaded.wait(), tts_platform_loaded.wait())
 
-    async def _on_connect():
+    async def _on_connect() -> None:
         """Handle cloud connect."""
         async_dispatcher_send(
             hass, SIGNAL_CLOUD_CONNECTION_STATE, CloudConnectionState.CLOUD_CONNECTED
         )
 
-    async def _on_disconnect():
+    async def _on_disconnect() -> None:
         """Handle cloud disconnect."""
         async_dispatcher_send(
             hass, SIGNAL_CLOUD_CONNECTION_STATE, CloudConnectionState.CLOUD_DISCONNECTED
         )
 
-    async def _on_initialized():
+    async def _on_initialized() -> None:
         """Update preferences."""
         await prefs.async_update(remote_domain=cloud.remote.instance_domain)
 
@@ -330,7 +322,7 @@ async def _on_initialized():
 
 
 @callback
-def _remote_handle_prefs_updated(cloud: Cloud) -> None:
+def _remote_handle_prefs_updated(cloud: Cloud[CloudClient]) -> None:
     """Handle remote preferences updated."""
     cur_pref = cloud.client.prefs.remote_enabled
     lock = asyncio.Lock()
diff --git a/homeassistant/components/cloud/account_link.py b/homeassistant/components/cloud/account_link.py
index e3b3c1231bbae9..1423330cb44f6d 100644
--- a/homeassistant/components/cloud/account_link.py
+++ b/homeassistant/components/cloud/account_link.py
@@ -1,5 +1,8 @@
 """Account linking via the cloud."""
+from __future__ import annotations
+
 import asyncio
+from datetime import datetime
 import logging
 from typing import Any
 
@@ -24,14 +27,16 @@
 
 
 @callback
-def async_setup(hass: HomeAssistant):
+def async_setup(hass: HomeAssistant) -> None:
     """Set up cloud account link."""
     config_entry_oauth2_flow.async_add_implementation_provider(
         hass, DOMAIN, async_provide_implementation
     )
 
 
-async def async_provide_implementation(hass: HomeAssistant, domain: str):
+async def async_provide_implementation(
+    hass: HomeAssistant, domain: str
+) -> list[config_entry_oauth2_flow.AbstractOAuth2Implementation]:
     """Provide an implementation for a domain."""
     services = await _get_services(hass)
 
@@ -55,9 +60,11 @@ async def async_provide_implementation(hass: HomeAssistant, domain: str):
     return []
 
 
-async def _get_services(hass):
+async def _get_services(hass: HomeAssistant) -> list[dict[str, Any]]:
     """Get the available services."""
-    if (services := hass.data.get(DATA_SERVICES)) is not None:
+    services: list[dict[str, Any]]
+    if DATA_SERVICES in hass.data:
+        services = hass.data[DATA_SERVICES]
         return services
 
     try:
@@ -68,7 +75,7 @@ async def _get_services(hass):
     hass.data[DATA_SERVICES] = services
 
     @callback
-    def clear_services(_now):
+    def clear_services(_now: datetime) -> None:
         """Clear services cache."""
         hass.data.pop(DATA_SERVICES, None)
 
@@ -102,7 +109,7 @@ async def async_generate_authorize_url(self, flow_id: str) -> str:
         )
         authorize_url = await helper.async_get_authorize_url()
 
-        async def await_tokens():
+        async def await_tokens() -> None:
             """Wait for tokens and pass them on when received."""
             try:
                 tokens = await helper.async_get_tokens()
@@ -125,7 +132,8 @@ async def await_tokens():
     async def async_resolve_external_data(self, external_data: Any) -> dict:
         """Resolve external data to tokens."""
         # We already passed in tokens
-        return external_data
+        dict_data: dict = external_data
+        return dict_data
 
     async def _async_refresh_token(self, token: dict) -> dict:
         """Refresh a token."""
diff --git a/homeassistant/components/cloud/alexa_config.py b/homeassistant/components/cloud/alexa_config.py
index 53bf44d8aa1240..8c1300f6228a76 100644
--- a/homeassistant/components/cloud/alexa_config.py
+++ b/homeassistant/components/cloud/alexa_config.py
@@ -4,9 +4,10 @@
 import asyncio
 from collections.abc import Callable
 from contextlib import suppress
-from datetime import timedelta
+from datetime import datetime, timedelta
 from http import HTTPStatus
 import logging
+from typing import TYPE_CHECKING, Any
 
 import aiohttp
 import async_timeout
@@ -29,10 +30,11 @@
 )
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import CLOUD_NEVER_EXPOSED_ENTITIES
-from homeassistant.core import HomeAssistant, callback, split_entity_id
+from homeassistant.core import Event, HomeAssistant, callback, split_entity_id
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er, start
 from homeassistant.helpers.entity import get_device_class
+from homeassistant.helpers.entityfilter import EntityFilter
 from homeassistant.helpers.event import async_call_later
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
@@ -47,6 +49,9 @@
 )
 from .prefs import ALEXA_SETTINGS_VERSION, CloudPreferences
 
+if TYPE_CHECKING:
+    from .client import CloudClient
+
 _LOGGER = logging.getLogger(__name__)
 
 CLOUD_ALEXA = f"{CLOUD_DOMAIN}.{ALEXA_DOMAIN}"
@@ -132,7 +137,7 @@ def __init__(
         config: dict,
         cloud_user: str,
         prefs: CloudPreferences,
-        cloud: Cloud,
+        cloud: Cloud[CloudClient],
     ) -> None:
         """Initialize the Alexa config."""
         super().__init__(hass)
@@ -141,13 +146,13 @@ def __init__(
         self._prefs = prefs
         self._cloud = cloud
         self._token = None
-        self._token_valid = None
+        self._token_valid: datetime | None = None
         self._cur_entity_prefs = async_get_assistant_settings(hass, CLOUD_ALEXA)
         self._alexa_sync_unsub: Callable[[], None] | None = None
-        self._endpoint = None
+        self._endpoint: Any = None
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Return if Alexa is enabled."""
         return (
             self._cloud.is_logged_in
@@ -156,12 +161,12 @@ def enabled(self):
         )
 
     @property
-    def supports_auth(self):
+    def supports_auth(self) -> bool:
         """Return if config supports auth."""
         return True
 
     @property
-    def should_report_state(self):
+    def should_report_state(self) -> bool:
         """Return if states should be proactively reported."""
         return (
             self._prefs.alexa_enabled
@@ -170,7 +175,7 @@ def should_report_state(self):
         )
 
     @property
-    def endpoint(self):
+    def endpoint(self) -> Any | None:
         """Endpoint for report state."""
         if self._endpoint is None:
             raise ValueError("No endpoint available. Fetch access token first")
@@ -178,22 +183,22 @@ def endpoint(self):
         return self._endpoint
 
     @property
-    def locale(self):
+    def locale(self) -> str:
         """Return config locale."""
         # Not clear how to determine locale atm.
         return "en-US"
 
     @property
-    def entity_config(self):
+    def entity_config(self) -> dict[str, Any]:
         """Return entity config."""
         return self._config.get(CONF_ENTITY_CONFIG) or {}
 
     @callback
-    def user_identifier(self):
+    def user_identifier(self) -> str:
         """Return an identifier for the user that represents this config."""
         return self._cloud_user
 
-    def _migrate_alexa_entity_settings_v1(self):
+    def _migrate_alexa_entity_settings_v1(self) -> None:
         """Migrate alexa entity settings to entity registry options."""
         if not self._config[CONF_FILTER].empty_filter:
             # Don't migrate if there's a YAML config
@@ -210,12 +215,17 @@ def _migrate_alexa_entity_settings_v1(self):
                 self._should_expose_legacy(entity_id),
             )
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Initialize the Alexa config."""
         await super().async_initialize()
 
-        async def on_hass_started(hass):
+        async def on_hass_started(hass: HomeAssistant) -> None:
             if self._prefs.alexa_settings_version != ALEXA_SETTINGS_VERSION:
+                _LOGGER.info(
+                    "Start migration of Alexa settings from v%s to v%s",
+                    self._prefs.alexa_settings_version,
+                    ALEXA_SETTINGS_VERSION,
+                )
                 if self._prefs.alexa_settings_version < 2 or (
                     # Recover from a bug we had in 2023.5.0 where entities didn't get exposed
                     self._prefs.alexa_settings_version < 3
@@ -228,6 +238,11 @@ async def on_hass_started(hass):
                 ):
                     self._migrate_alexa_entity_settings_v1()
 
+                _LOGGER.info(
+                    "Finished migration of Alexa settings from v%s to v%s",
+                    self._prefs.alexa_settings_version,
+                    ALEXA_SETTINGS_VERSION,
+                )
                 await self._prefs.async_update(
                     alexa_settings_version=ALEXA_SETTINGS_VERSION
                 )
@@ -235,7 +250,7 @@ async def on_hass_started(hass):
                 self.hass, CLOUD_ALEXA, self._async_exposed_entities_updated
             )
 
-        async def on_hass_start(hass):
+        async def on_hass_start(hass: HomeAssistant) -> None:
             if self.enabled and ALEXA_DOMAIN not in self.hass.config.components:
                 await async_setup_component(self.hass, ALEXA_DOMAIN, {})
 
@@ -248,14 +263,14 @@ async def on_hass_start(hass):
             self._handle_entity_registry_updated,
         )
 
-    def _should_expose_legacy(self, entity_id):
+    def _should_expose_legacy(self, entity_id: str) -> bool:
         """If an entity should be exposed."""
         if entity_id in CLOUD_NEVER_EXPOSED_ENTITIES:
             return False
 
         entity_configs = self._prefs.alexa_entity_configs
         entity_config = entity_configs.get(entity_id, {})
-        entity_expose = entity_config.get(PREF_SHOULD_EXPOSE)
+        entity_expose: bool | None = entity_config.get(PREF_SHOULD_EXPOSE)
         if entity_expose is not None:
             return entity_expose
 
@@ -279,21 +294,22 @@ def _should_expose_legacy(self, entity_id):
         )
 
     @callback
-    def should_expose(self, entity_id):
+    def should_expose(self, entity_id: str) -> bool:
         """If an entity should be exposed."""
-        if not self._config[CONF_FILTER].empty_filter:
+        entity_filter: EntityFilter = self._config[CONF_FILTER]
+        if not entity_filter.empty_filter:
             if entity_id in CLOUD_NEVER_EXPOSED_ENTITIES:
                 return False
-            return self._config[CONF_FILTER](entity_id)
+            return entity_filter(entity_id)
 
         return async_should_expose(self.hass, CLOUD_ALEXA, entity_id)
 
     @callback
-    def async_invalidate_access_token(self):
+    def async_invalidate_access_token(self) -> None:
         """Invalidate access token."""
         self._token_valid = None
 
-    async def async_get_access_token(self):
+    async def async_get_access_token(self) -> Any:
         """Get an access token."""
         if self._token_valid is not None and self._token_valid > utcnow():
             return self._token
@@ -380,7 +396,7 @@ def _async_exposed_entities_updated(self) -> None:
             self.hass, SYNC_DELAY, self._sync_prefs
         )
 
-    async def _sync_prefs(self, _now):
+    async def _sync_prefs(self, _now: datetime) -> None:
         """Sync the updated preferences to Alexa."""
         self._alexa_sync_unsub = None
         old_prefs = self._cur_entity_prefs
@@ -432,7 +448,7 @@ async def _sync_prefs(self, _now):
         if await self._sync_helper(to_update, to_remove):
             self._cur_entity_prefs = new_prefs
 
-    async def async_sync_entities(self):
+    async def async_sync_entities(self) -> bool:
         """Sync all entities to Alexa."""
         # Remove any pending sync
         if self._alexa_sync_unsub:
@@ -452,7 +468,7 @@ async def async_sync_entities(self):
 
         return await self._sync_helper(to_update, to_remove)
 
-    async def _sync_helper(self, to_update, to_remove) -> bool:
+    async def _sync_helper(self, to_update: list[str], to_remove: list[str]) -> bool:
         """Sync entities to Alexa.
 
         Return boolean if it was successful.
@@ -497,7 +513,7 @@ async def _sync_helper(self, to_update, to_remove) -> bool:
             _LOGGER.warning("Error trying to sync entities to Alexa: %s", err)
             return False
 
-    async def _handle_entity_registry_updated(self, event):
+    async def _handle_entity_registry_updated(self, event: Event) -> None:
         """Handle when entity registry updated."""
         if not self.enabled or not self._cloud.is_logged_in:
             return
diff --git a/homeassistant/components/cloud/binary_sensor.py b/homeassistant/components/cloud/binary_sensor.py
index 2d78ad8b512be8..e09122ac7bf59b 100644
--- a/homeassistant/components/cloud/binary_sensor.py
+++ b/homeassistant/components/cloud/binary_sensor.py
@@ -2,6 +2,10 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
+from typing import Any
+
+from hass_nabucasa import Cloud
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -13,6 +17,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .client import CloudClient
 from .const import DISPATCHER_REMOTE_UPDATE, DOMAIN
 
 WAIT_UNTIL_CHANGE = 3
@@ -41,10 +46,10 @@ class CloudRemoteBinary(BinarySensorEntity):
     _attr_unique_id = "cloud-remote-ui-connectivity"
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, cloud):
+    def __init__(self, cloud: Cloud[CloudClient]) -> None:
         """Initialize the binary sensor."""
         self.cloud = cloud
-        self._unsub_dispatcher = None
+        self._unsub_dispatcher: Callable[[], None] | None = None
 
     @property
     def is_on(self) -> bool:
@@ -59,7 +64,7 @@ def available(self) -> bool:
     async def async_added_to_hass(self) -> None:
         """Register update dispatcher."""
 
-        async def async_state_update(data):
+        async def async_state_update(data: Any) -> None:
             """Update callback."""
             await asyncio.sleep(WAIT_UNTIL_CHANGE)
             self.async_write_ha_state()
diff --git a/homeassistant/components/cloud/client.py b/homeassistant/components/cloud/client.py
index f3878fd68afb0b..236635a0bb80e0 100644
--- a/homeassistant/components/cloud/client.py
+++ b/homeassistant/components/cloud/client.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import asyncio
+from datetime import datetime
 from http import HTTPStatus
 import logging
 from pathlib import Path
@@ -16,6 +17,7 @@
     smart_home as alexa_smart_home,
 )
 from homeassistant.components.google_assistant import smart_home as ga
+from homeassistant.const import __version__ as HA_VERSION
 from homeassistant.core import Context, HassJob, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_call_later
@@ -95,7 +97,9 @@ async def get_alexa_config(self) -> alexa_config.CloudAlexaConfig:
         if self._alexa_config is None:
             async with self._alexa_config_init_lock:
                 if self._alexa_config is not None:
-                    return self._alexa_config
+                    # This is reachable if the config was set while we waited
+                    # for the lock
+                    return self._alexa_config  # type: ignore[unreachable]
 
                 cloud_user = await self._prefs.get_cloud_user()
 
@@ -132,11 +136,11 @@ async def get_google_config(self) -> google_config.CloudGoogleConfig:
 
         return self._google_config
 
-    async def on_cloud_connected(self) -> None:
+    async def cloud_connected(self) -> None:
         """When cloud is connected."""
         is_new_user = await self.prefs.async_set_username(self.cloud.username)
 
-        async def enable_alexa(_):
+        async def enable_alexa(_: Any) -> None:
             """Enable Alexa."""
             aconf = await self.get_alexa_config()
             try:
@@ -156,7 +160,7 @@ async def enable_alexa(_):
 
         enable_alexa_job = HassJob(enable_alexa, cancel_on_shutdown=True)
 
-        async def enable_google(_):
+        async def enable_google(_: datetime) -> None:
             """Enable Google."""
             gconf = await self.get_google_config()
 
@@ -179,6 +183,9 @@ async def enable_google(_):
         if tasks:
             await asyncio.gather(*(task(None) for task in tasks))
 
+    async def cloud_disconnected(self) -> None:
+        """When cloud disconnected."""
+
     async def cloud_started(self) -> None:
         """When cloud is started."""
 
@@ -206,11 +213,24 @@ async def async_cloud_connect_update(self, connect: bool) -> None:
         """Process cloud remote message to client."""
         await self._prefs.async_update(remote_enabled=connect)
 
+    async def async_cloud_connection_info(
+        self, payload: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Process cloud connection info message to client."""
+        return {
+            "remote": {
+                "connected": self.cloud.remote.is_connected,
+                "enabled": self._prefs.remote_enabled,
+                "instance_domain": self.cloud.remote.instance_domain,
+            },
+            "version": HA_VERSION,
+        }
+
     async def async_alexa_message(self, payload: dict[Any, Any]) -> dict[Any, Any]:
         """Process cloud alexa message to client."""
         cloud_user = await self._prefs.get_cloud_user()
         aconfig = await self.get_alexa_config()
-        return await alexa_smart_home.async_handle_message(
+        return await alexa_smart_home.async_handle_message(  # type: ignore[no-any-return, no-untyped-call]
             self._hass,
             aconfig,
             payload,
@@ -223,9 +243,11 @@ async def async_google_message(self, payload: dict[Any, Any]) -> dict[Any, Any]:
         gconf = await self.get_google_config()
 
         if not self._prefs.google_enabled:
-            return ga.api_disabled_response(payload, gconf.agent_user_id)
+            return ga.api_disabled_response(  # type: ignore[no-any-return, no-untyped-call]
+                payload, gconf.agent_user_id
+            )
 
-        return await ga.async_handle_message(
+        return await ga.async_handle_message(  # type: ignore[no-any-return, no-untyped-call]
             self._hass, gconf, gconf.cloud_user, payload, google_assistant.SOURCE_CLOUD
         )
 
diff --git a/homeassistant/components/cloud/google_config.py b/homeassistant/components/cloud/google_config.py
index 351de5d0e654e5..0a49c0b6ed6358 100644
--- a/homeassistant/components/cloud/google_config.py
+++ b/homeassistant/components/cloud/google_config.py
@@ -1,8 +1,10 @@
 """Google config for Cloud."""
+from __future__ import annotations
+
 import asyncio
 from http import HTTPStatus
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from hass_nabucasa import Cloud, cloud_api
 from hass_nabucasa.google_report_state import ErrorResponse
@@ -24,12 +26,14 @@
     CoreState,
     Event,
     HomeAssistant,
+    State,
     callback,
     split_entity_id,
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er, start
 from homeassistant.helpers.entity import get_device_class
+from homeassistant.helpers.entityfilter import EntityFilter
 from homeassistant.setup import async_setup_component
 
 from .const import (
@@ -42,6 +46,9 @@
 )
 from .prefs import GOOGLE_SETTINGS_VERSION, CloudPreferences
 
+if TYPE_CHECKING:
+    from .client import CloudClient
+
 _LOGGER = logging.getLogger(__name__)
 
 CLOUD_GOOGLE = f"{CLOUD_DOMAIN}.{GOOGLE_DOMAIN}"
@@ -101,7 +108,12 @@ def _supported_legacy(hass: HomeAssistant, entity_id: str) -> bool:
     if domain in SUPPORTED_DOMAINS:
         return True
 
-    device_class = get_device_class(hass, entity_id)
+    try:
+        device_class = get_device_class(hass, entity_id)
+    except HomeAssistantError:
+        # The entity no longer exists
+        return False
+
     if (
         domain == "binary_sensor"
         and device_class in SUPPORTED_BINARY_SENSOR_DEVICE_CLASSES
@@ -123,7 +135,7 @@ def __init__(
         config: dict[str, Any],
         cloud_user: str,
         prefs: CloudPreferences,
-        cloud: Cloud,
+        cloud: Cloud[CloudClient],
     ) -> None:
         """Initialize the Google config."""
         super().__init__(hass)
@@ -134,7 +146,7 @@ def __init__(
         self._sync_entities_lock = asyncio.Lock()
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Return if Google is enabled."""
         return (
             self._cloud.is_logged_in
@@ -143,34 +155,34 @@ def enabled(self):
         )
 
     @property
-    def entity_config(self):
+    def entity_config(self) -> dict[str, Any]:
         """Return entity config."""
         return self._config.get(CONF_ENTITY_CONFIG) or {}
 
     @property
-    def secure_devices_pin(self):
+    def secure_devices_pin(self) -> str | None:
         """Return entity config."""
         return self._prefs.google_secure_devices_pin
 
     @property
-    def should_report_state(self):
+    def should_report_state(self) -> bool:
         """Return if states should be proactively reported."""
         return self.enabled and self._prefs.google_report_state
 
-    def get_local_webhook_id(self, agent_user_id):
+    def get_local_webhook_id(self, agent_user_id: Any) -> str:
         """Return the webhook ID to be used for actions for a given agent user id via the local SDK."""
         return self._prefs.google_local_webhook_id
 
-    def get_local_agent_user_id(self, webhook_id):
+    def get_local_agent_user_id(self, webhook_id: Any) -> str:
         """Return the user ID to be used for actions received via the local SDK."""
         return self._user
 
     @property
-    def cloud_user(self):
+    def cloud_user(self) -> str:
         """Return Cloud User account."""
         return self._user
 
-    def _migrate_google_entity_settings_v1(self):
+    def _migrate_google_entity_settings_v1(self) -> None:
         """Migrate Google entity settings to entity registry options."""
         if not self._config[CONF_FILTER].empty_filter:
             # Don't migrate if there's a YAML config
@@ -195,12 +207,17 @@ def _migrate_google_entity_settings_v1(self):
                     _2fa_disabled,
                 )
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Perform async initialization of config."""
         await super().async_initialize()
 
         async def on_hass_started(hass: HomeAssistant) -> None:
             if self._prefs.google_settings_version != GOOGLE_SETTINGS_VERSION:
+                _LOGGER.info(
+                    "Start migration of Google Assistant settings from v%s to v%s",
+                    self._prefs.google_settings_version,
+                    GOOGLE_SETTINGS_VERSION,
+                )
                 if self._prefs.google_settings_version < 2 or (
                     # Recover from a bug we had in 2023.5.0 where entities didn't get exposed
                     self._prefs.google_settings_version < 3
@@ -213,6 +230,11 @@ async def on_hass_started(hass: HomeAssistant) -> None:
                 ):
                     self._migrate_google_entity_settings_v1()
 
+                _LOGGER.info(
+                    "Finished migration of Google Assistant settings from v%s to v%s",
+                    self._prefs.google_settings_version,
+                    GOOGLE_SETTINGS_VERSION,
+                )
                 await self._prefs.async_update(
                     google_settings_version=GOOGLE_SETTINGS_VERSION
                 )
@@ -246,18 +268,18 @@ async def on_hass_start(hass: HomeAssistant) -> None:
             self._handle_device_registry_updated,
         )
 
-    def should_expose(self, state):
+    def should_expose(self, state: State) -> bool:
         """If a state object should be exposed."""
         return self._should_expose_entity_id(state.entity_id)
 
-    def _should_expose_legacy(self, entity_id):
+    def _should_expose_legacy(self, entity_id: str) -> bool:
         """If an entity ID should be exposed."""
         if entity_id in CLOUD_NEVER_EXPOSED_ENTITIES:
             return False
 
         entity_configs = self._prefs.google_entity_configs
         entity_config = entity_configs.get(entity_id, {})
-        entity_expose = entity_config.get(PREF_SHOULD_EXPOSE)
+        entity_expose: bool | None = entity_config.get(PREF_SHOULD_EXPOSE)
         if entity_expose is not None:
             return entity_expose
 
@@ -282,36 +304,37 @@ def _should_expose_legacy(self, entity_id):
             and _supported_legacy(self.hass, entity_id)
         )
 
-    def _should_expose_entity_id(self, entity_id):
+    def _should_expose_entity_id(self, entity_id: str) -> bool:
         """If an entity should be exposed."""
-        if not self._config[CONF_FILTER].empty_filter:
+        entity_filter: EntityFilter = self._config[CONF_FILTER]
+        if not entity_filter.empty_filter:
             if entity_id in CLOUD_NEVER_EXPOSED_ENTITIES:
                 return False
-            return self._config[CONF_FILTER](entity_id)
+            return entity_filter(entity_id)
 
         return async_should_expose(self.hass, CLOUD_GOOGLE, entity_id)
 
     @property
-    def agent_user_id(self):
+    def agent_user_id(self) -> str:
         """Return Agent User Id to use for query responses."""
         return self._cloud.username
 
     @property
-    def has_registered_user_agent(self):
+    def has_registered_user_agent(self) -> bool:
         """Return if we have a Agent User Id registered."""
         return len(self._store.agent_user_ids) > 0
 
-    def get_agent_user_id(self, context):
+    def get_agent_user_id(self, context: Any) -> str:
         """Get agent user ID making request."""
         return self.agent_user_id
 
-    def _2fa_disabled_legacy(self, entity_id):
+    def _2fa_disabled_legacy(self, entity_id: str) -> bool | None:
         """If an entity should be checked for 2FA."""
         entity_configs = self._prefs.google_entity_configs
         entity_config = entity_configs.get(entity_id, {})
         return entity_config.get(PREF_DISABLE_2FA)
 
-    def should_2fa(self, state):
+    def should_2fa(self, state: State) -> bool:
         """If an entity should be checked for 2FA."""
         try:
             settings = async_get_entity_settings(self.hass, state.entity_id)
@@ -322,14 +345,14 @@ def should_2fa(self, state):
         assistant_options = settings.get(CLOUD_GOOGLE, {})
         return not assistant_options.get(PREF_DISABLE_2FA, DEFAULT_DISABLE_2FA)
 
-    async def async_report_state(self, message, agent_user_id: str):
+    async def async_report_state(self, message: Any, agent_user_id: str) -> None:
         """Send a state report to Google."""
         try:
             await self._cloud.google_report_state.async_send_message(message)
         except ErrorResponse as err:
             _LOGGER.warning("Error reporting state - %s: %s", err.code, err.message)
 
-    async def _async_request_sync_devices(self, agent_user_id: str):
+    async def _async_request_sync_devices(self, agent_user_id: str) -> int:
         """Trigger a sync with Google."""
         if self._sync_entities_lock.locked():
             return HTTPStatus.OK
@@ -338,7 +361,7 @@ async def _async_request_sync_devices(self, agent_user_id: str):
             resp = await cloud_api.async_google_actions_request_sync(self._cloud)
             return resp.status
 
-    async def _async_prefs_updated(self, prefs):
+    async def _async_prefs_updated(self, prefs: CloudPreferences) -> None:
         """Handle updated preferences."""
         if not self._cloud.is_logged_in:
             if self.is_reporting_state:
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index f5d5c98fe1acfa..84c348236d4b7c 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -1,14 +1,15 @@
 """The HTTP api to control the cloud integration."""
 import asyncio
-from collections.abc import Mapping
+from collections.abc import Awaitable, Callable, Coroutine, Mapping
 from contextlib import suppress
 import dataclasses
 from functools import wraps
 from http import HTTPStatus
 import logging
-from typing import Any
+from typing import Any, Concatenate, ParamSpec, TypeVar
 
 import aiohttp
+from aiohttp import web
 import async_timeout
 import attr
 from hass_nabucasa import Cloud, auth, thingtalk
@@ -32,6 +33,7 @@
 from homeassistant.util.location import async_detect_location_info
 
 from .alexa_config import entity_supported as entity_supported_by_alexa
+from .client import CloudClient
 from .const import (
     DOMAIN,
     PREF_ALEXA_REPORT_STATE,
@@ -50,7 +52,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-_CLOUD_ERRORS = {
+_CLOUD_ERRORS: dict[type[Exception], tuple[HTTPStatus, str]] = {
     asyncio.TimeoutError: (
         HTTPStatus.BAD_GATEWAY,
         "Unable to reach the Home Assistant cloud.",
@@ -62,7 +64,7 @@
 }
 
 
-async def async_setup(hass):
+async def async_setup(hass: HomeAssistant) -> None:
     """Initialize the HTTP API."""
     websocket_api.async_register_command(hass, websocket_cloud_status)
     websocket_api.async_register_command(hass, websocket_subscription)
@@ -107,11 +109,21 @@ async def async_setup(hass):
     )
 
 
-def _handle_cloud_errors(handler):
+_HassViewT = TypeVar("_HassViewT", bound=HomeAssistantView)
+_P = ParamSpec("_P")
+
+
+def _handle_cloud_errors(
+    handler: Callable[Concatenate[_HassViewT, web.Request, _P], Awaitable[web.Response]]
+) -> Callable[
+    Concatenate[_HassViewT, web.Request, _P], Coroutine[Any, Any, web.Response]
+]:
     """Webview decorator to handle auth errors."""
 
     @wraps(handler)
-    async def error_handler(view, request, *args, **kwargs):
+    async def error_handler(
+        view: _HassViewT, request: web.Request, *args: _P.args, **kwargs: _P.kwargs
+    ) -> web.Response:
         """Handle exceptions that raise from the wrapped request handler."""
         try:
             result = await handler(view, request, *args, **kwargs)
@@ -126,25 +138,37 @@ async def error_handler(view, request, *args, **kwargs):
     return error_handler
 
 
-def _ws_handle_cloud_errors(handler):
+def _ws_handle_cloud_errors(
+    handler: Callable[
+        [HomeAssistant, websocket_api.ActiveConnection, dict[str, Any]],
+        Coroutine[None, None, None],
+    ]
+) -> Callable[
+    [HomeAssistant, websocket_api.ActiveConnection, dict[str, Any]],
+    Coroutine[None, None, None],
+]:
     """Websocket decorator to handle auth errors."""
 
     @wraps(handler)
-    async def error_handler(hass, connection, msg):
+    async def error_handler(
+        hass: HomeAssistant,
+        connection: websocket_api.ActiveConnection,
+        msg: dict[str, Any],
+    ) -> None:
         """Handle exceptions that raise from the wrapped handler."""
         try:
             return await handler(hass, connection, msg)
 
         except Exception as err:  # pylint: disable=broad-except
             err_status, err_msg = _process_cloud_exception(err, msg["type"])
-            connection.send_error(msg["id"], err_status, err_msg)
+            connection.send_error(msg["id"], str(err_status), err_msg)
 
     return error_handler
 
 
-def _process_cloud_exception(exc, where):
+def _process_cloud_exception(exc: Exception, where: str) -> tuple[HTTPStatus, str]:
     """Process a cloud exception."""
-    err_info = None
+    err_info: tuple[HTTPStatus, str] | None = None
 
     for err, value_info in _CLOUD_ERRORS.items():
         if isinstance(exc, err):
@@ -165,10 +189,10 @@ class GoogleActionsSyncView(HomeAssistantView):
     name = "api:cloud:google_actions/sync"
 
     @_handle_cloud_errors
-    async def post(self, request):
+    async def post(self, request: web.Request) -> web.Response:
         """Trigger a Google Actions sync."""
         hass = request.app["hass"]
-        cloud: Cloud = hass.data[DOMAIN]
+        cloud: Cloud[CloudClient] = hass.data[DOMAIN]
         gconf = await cloud.client.get_google_config()
         status = await gconf.async_sync_entities(gconf.agent_user_id)
         return self.json({}, status_code=status)
@@ -184,7 +208,7 @@ class CloudLoginView(HomeAssistantView):
     @RequestDataValidator(
         vol.Schema({vol.Required("email"): str, vol.Required("password"): str})
     )
-    async def post(self, request, data):
+    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle login request."""
 
         def cloud_assist_pipeline(hass: HomeAssistant) -> str | None:
@@ -221,7 +245,7 @@ class CloudLogoutView(HomeAssistantView):
     name = "api:cloud:logout"
 
     @_handle_cloud_errors
-    async def post(self, request):
+    async def post(self, request: web.Request) -> web.Response:
         """Handle logout request."""
         hass = request.app["hass"]
         cloud = hass.data[DOMAIN]
@@ -247,7 +271,7 @@ class CloudRegisterView(HomeAssistantView):
             }
         )
     )
-    async def post(self, request, data):
+    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle registration request."""
         hass = request.app["hass"]
         cloud = hass.data[DOMAIN]
@@ -283,7 +307,7 @@ class CloudResendConfirmView(HomeAssistantView):
 
     @_handle_cloud_errors
     @RequestDataValidator(vol.Schema({vol.Required("email"): str}))
-    async def post(self, request, data):
+    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle resending confirm email code request."""
         hass = request.app["hass"]
         cloud = hass.data[DOMAIN]
@@ -302,7 +326,7 @@ class CloudForgotPasswordView(HomeAssistantView):
 
     @_handle_cloud_errors
     @RequestDataValidator(vol.Schema({vol.Required("email"): str}))
-    async def post(self, request, data):
+    async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
         """Handle forgot password request."""
         hass = request.app["hass"]
         cloud = hass.data[DOMAIN]
@@ -330,11 +354,20 @@ async def websocket_cloud_status(
     )
 
 
-def _require_cloud_login(handler):
+def _require_cloud_login(
+    handler: Callable[
+        [HomeAssistant, websocket_api.ActiveConnection, dict[str, Any]],
+        None,
+    ]
+) -> Callable[[HomeAssistant, websocket_api.ActiveConnection, dict[str, Any]], None,]:
     """Websocket decorator that requires cloud to be logged in."""
 
     @wraps(handler)
-    def with_cloud_auth(hass, connection, msg):
+    def with_cloud_auth(
+        hass: HomeAssistant,
+        connection: websocket_api.ActiveConnection,
+        msg: dict[str, Any],
+    ) -> None:
         """Require to be logged into the cloud."""
         cloud = hass.data[DOMAIN]
         if not cloud.is_logged_in:
@@ -467,7 +500,9 @@ async def websocket_hook_delete(
     connection.send_message(websocket_api.result_message(msg["id"]))
 
 
-async def _account_data(hass: HomeAssistant, cloud: Cloud):
+async def _account_data(
+    hass: HomeAssistant, cloud: Cloud[CloudClient]
+) -> dict[str, Any]:
     """Generate the auth data JSON response."""
 
     assert hass.config.api
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index d352b7226f0eba..d8fd2148b4d135 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -8,5 +8,5 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["hass_nabucasa"],
-  "requirements": ["hass-nabucasa==0.67.1"]
+  "requirements": ["hass-nabucasa==0.69.0"]
 }
diff --git a/homeassistant/components/cloud/prefs.py b/homeassistant/components/cloud/prefs.py
index 5ccc007e5241a8..8b6f773e5d95a6 100644
--- a/homeassistant/components/cloud/prefs.py
+++ b/homeassistant/components/cloud/prefs.py
@@ -1,14 +1,15 @@
 """Preference management for cloud."""
 from __future__ import annotations
 
+from collections.abc import Callable, Coroutine
 from typing import Any
 
 from homeassistant.auth.const import GROUP_ID_ADMIN
 from homeassistant.auth.models import User
 from homeassistant.components import webhook
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.storage import Store
-from homeassistant.helpers.typing import UNDEFINED
+from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.util.logging import async_create_catching_coro
 
 from .const import (
@@ -46,7 +47,7 @@
 
 
 class CloudPreferencesStore(Store):
-    """Store entity registry data."""
+    """Store cloud preferences."""
 
     async def _async_migrate_func(
         self, old_major_version: int, old_minor_version: int, old_data: dict[str, Any]
@@ -63,17 +64,20 @@ async def _async_migrate_func(
 class CloudPreferences:
     """Handle cloud preferences."""
 
-    def __init__(self, hass):
+    _prefs: dict[str, Any]
+
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize cloud prefs."""
         self._hass = hass
         self._store = CloudPreferencesStore(
             hass, STORAGE_VERSION, STORAGE_KEY, minor_version=STORAGE_VERSION_MINOR
         )
-        self._prefs = None
-        self._listeners = []
+        self._listeners: list[
+            Callable[[CloudPreferences], Coroutine[Any, Any, None]]
+        ] = []
         self.last_updated: set[str] = set()
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Finish initializing the preferences."""
         if (prefs := await self._store.async_load()) is None:
             prefs = self._empty_config("")
@@ -89,26 +93,28 @@ async def async_initialize(self):
             )
 
     @callback
-    def async_listen_updates(self, listener):
+    def async_listen_updates(
+        self, listener: Callable[[CloudPreferences], Coroutine[Any, Any, None]]
+    ) -> None:
         """Listen for updates to the preferences."""
         self._listeners.append(listener)
 
     async def async_update(
         self,
         *,
-        google_enabled=UNDEFINED,
-        alexa_enabled=UNDEFINED,
-        remote_enabled=UNDEFINED,
-        google_secure_devices_pin=UNDEFINED,
-        cloudhooks=UNDEFINED,
-        cloud_user=UNDEFINED,
-        alexa_report_state=UNDEFINED,
-        google_report_state=UNDEFINED,
-        tts_default_voice=UNDEFINED,
-        remote_domain=UNDEFINED,
-        alexa_settings_version=UNDEFINED,
-        google_settings_version=UNDEFINED,
-    ):
+        google_enabled: bool | UndefinedType = UNDEFINED,
+        alexa_enabled: bool | UndefinedType = UNDEFINED,
+        remote_enabled: bool | UndefinedType = UNDEFINED,
+        google_secure_devices_pin: str | None | UndefinedType = UNDEFINED,
+        cloudhooks: dict[str, dict[str, str | bool]] | UndefinedType = UNDEFINED,
+        cloud_user: str | UndefinedType = UNDEFINED,
+        alexa_report_state: bool | UndefinedType = UNDEFINED,
+        google_report_state: bool | UndefinedType = UNDEFINED,
+        tts_default_voice: tuple[str, str] | UndefinedType = UNDEFINED,
+        remote_domain: str | None | UndefinedType = UNDEFINED,
+        alexa_settings_version: int | UndefinedType = UNDEFINED,
+        google_settings_version: int | UndefinedType = UNDEFINED,
+    ) -> None:
         """Update user preferences."""
         prefs = {**self._prefs}
 
@@ -131,7 +137,7 @@ async def async_update(
 
         await self._save_prefs(prefs)
 
-    async def async_set_username(self, username) -> bool:
+    async def async_set_username(self, username: str | None) -> bool:
         """Set the username that is logged in."""
         # Logging out.
         if username is None:
@@ -154,7 +160,7 @@ async def async_set_username(self, username) -> bool:
 
         return True
 
-    def as_dict(self):
+    def as_dict(self) -> dict[str, Any]:
         """Return dictionary version."""
         return {
             PREF_ALEXA_DEFAULT_EXPOSE: self.alexa_default_expose,
@@ -170,7 +176,7 @@ def as_dict(self):
         }
 
     @property
-    def remote_enabled(self):
+    def remote_enabled(self) -> bool:
         """Return if remote is enabled on start."""
         if not self._prefs.get(PREF_ENABLE_REMOTE, False):
             return False
@@ -178,17 +184,18 @@ def remote_enabled(self):
         return True
 
     @property
-    def remote_domain(self):
+    def remote_domain(self) -> str | None:
         """Return remote domain."""
         return self._prefs.get(PREF_REMOTE_DOMAIN)
 
     @property
-    def alexa_enabled(self):
+    def alexa_enabled(self) -> bool:
         """Return if Alexa is enabled."""
-        return self._prefs[PREF_ENABLE_ALEXA]
+        alexa_enabled: bool = self._prefs[PREF_ENABLE_ALEXA]
+        return alexa_enabled
 
     @property
-    def alexa_report_state(self):
+    def alexa_report_state(self) -> bool:
         """Return if Alexa report state is enabled."""
         return self._prefs.get(PREF_ALEXA_REPORT_STATE, DEFAULT_ALEXA_REPORT_STATE)
 
@@ -201,44 +208,48 @@ def alexa_default_expose(self) -> list[str] | None:
         return self._prefs.get(PREF_ALEXA_DEFAULT_EXPOSE)
 
     @property
-    def alexa_entity_configs(self):
+    def alexa_entity_configs(self) -> dict[str, Any]:
         """Return Alexa Entity configurations."""
         return self._prefs.get(PREF_ALEXA_ENTITY_CONFIGS, {})
 
     @property
-    def alexa_settings_version(self):
+    def alexa_settings_version(self) -> int:
         """Return version of Alexa settings."""
-        return self._prefs[PREF_ALEXA_SETTINGS_VERSION]
+        alexa_settings_version: int = self._prefs[PREF_ALEXA_SETTINGS_VERSION]
+        return alexa_settings_version
 
     @property
-    def google_enabled(self):
+    def google_enabled(self) -> bool:
         """Return if Google is enabled."""
-        return self._prefs[PREF_ENABLE_GOOGLE]
+        google_enabled: bool = self._prefs[PREF_ENABLE_GOOGLE]
+        return google_enabled
 
     @property
-    def google_report_state(self):
+    def google_report_state(self) -> bool:
         """Return if Google report state is enabled."""
         return self._prefs.get(PREF_GOOGLE_REPORT_STATE, DEFAULT_GOOGLE_REPORT_STATE)
 
     @property
-    def google_secure_devices_pin(self):
+    def google_secure_devices_pin(self) -> str | None:
         """Return if Google is allowed to unlock locks."""
         return self._prefs.get(PREF_GOOGLE_SECURE_DEVICES_PIN)
 
     @property
-    def google_entity_configs(self):
+    def google_entity_configs(self) -> dict[str, dict[str, Any]]:
         """Return Google Entity configurations."""
         return self._prefs.get(PREF_GOOGLE_ENTITY_CONFIGS, {})
 
     @property
-    def google_settings_version(self):
+    def google_settings_version(self) -> int:
         """Return version of Google settings."""
-        return self._prefs[PREF_GOOGLE_SETTINGS_VERSION]
+        google_settings_version: int = self._prefs[PREF_GOOGLE_SETTINGS_VERSION]
+        return google_settings_version
 
     @property
-    def google_local_webhook_id(self):
+    def google_local_webhook_id(self) -> str:
         """Return Google webhook ID to receive local messages."""
-        return self._prefs[PREF_GOOGLE_LOCAL_WEBHOOK_ID]
+        google_local_webhook_id: str = self._prefs[PREF_GOOGLE_LOCAL_WEBHOOK_ID]
+        return google_local_webhook_id
 
     @property
     def google_default_expose(self) -> list[str] | None:
@@ -249,12 +260,12 @@ def google_default_expose(self) -> list[str] | None:
         return self._prefs.get(PREF_GOOGLE_DEFAULT_EXPOSE)
 
     @property
-    def cloudhooks(self):
+    def cloudhooks(self) -> dict[str, Any]:
         """Return the published cloud webhooks."""
         return self._prefs.get(PREF_CLOUDHOOKS, {})
 
     @property
-    def tts_default_voice(self):
+    def tts_default_voice(self) -> tuple[str, str]:
         """Return the default TTS voice."""
         return self._prefs.get(PREF_TTS_DEFAULT_VOICE, DEFAULT_TTS_DEFAULT_VOICE)
 
@@ -281,7 +292,7 @@ async def _load_cloud_user(self) -> User | None:
         # an image was restored without restoring the cloud prefs.
         return await self._hass.auth.async_get_user(user_id)
 
-    async def _save_prefs(self, prefs):
+    async def _save_prefs(self, prefs: dict[str, Any]) -> None:
         """Save preferences to disk."""
         self.last_updated = {
             key for key, value in prefs.items() if value != self._prefs.get(key)
@@ -294,7 +305,7 @@ async def _save_prefs(self, prefs):
 
     @callback
     @staticmethod
-    def _empty_config(username):
+    def _empty_config(username: str) -> dict[str, Any]:
         """Return an empty config."""
         return {
             PREF_ALEXA_DEFAULT_EXPOSE: DEFAULT_EXPOSED_DOMAINS,
diff --git a/homeassistant/components/cloud/repairs.py b/homeassistant/components/cloud/repairs.py
index 0864d8b48ad7fe..f7368731d926bd 100644
--- a/homeassistant/components/cloud/repairs.py
+++ b/homeassistant/components/cloud/repairs.py
@@ -12,6 +12,7 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import issue_registry as ir
 
+from .client import CloudClient
 from .const import DOMAIN
 from .subscription import async_migrate_paypal_agreement, async_subscription_info
 
@@ -67,7 +68,7 @@ async def async_step_confirm_change_plan(
     async def async_step_change_plan(self, _: None = None) -> FlowResult:
         """Wait for the user to authorize the app installation."""
 
-        cloud: Cloud = self.hass.data[DOMAIN]
+        cloud: Cloud[CloudClient] = self.hass.data[DOMAIN]
 
         async def _async_wait_for_plan_change() -> None:
             flow_manager = repairs_flow_manager(self.hass)
diff --git a/homeassistant/components/cloud/stt.py b/homeassistant/components/cloud/stt.py
index 84e1e088d47dc3..7b6da8b74039e2 100644
--- a/homeassistant/components/cloud/stt.py
+++ b/homeassistant/components/cloud/stt.py
@@ -18,15 +18,22 @@
     SpeechResult,
     SpeechResultState,
 )
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .client import CloudClient
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_get_engine(hass, config, discovery_info=None):
+async def async_get_engine(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> CloudProvider:
     """Set up Cloud speech component."""
-    cloud: Cloud = hass.data[DOMAIN]
+    cloud: Cloud[CloudClient] = hass.data[DOMAIN]
 
     cloud_provider = CloudProvider(cloud)
     if discovery_info is not None:
@@ -37,7 +44,7 @@ async def async_get_engine(hass, config, discovery_info=None):
 class CloudProvider(Provider):
     """NabuCasa speech API provider."""
 
-    def __init__(self, cloud: Cloud) -> None:
+    def __init__(self, cloud: Cloud[CloudClient]) -> None:
         """Home Assistant NabuCasa Speech to text."""
         self.cloud = cloud
 
diff --git a/homeassistant/components/cloud/subscription.py b/homeassistant/components/cloud/subscription.py
index b85a50b20cd4c3..633f0c95e1b768 100644
--- a/homeassistant/components/cloud/subscription.py
+++ b/homeassistant/components/cloud/subscription.py
@@ -9,12 +9,13 @@
 import async_timeout
 from hass_nabucasa import Cloud, cloud_api
 
+from .client import CloudClient
 from .const import REQUEST_TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_subscription_info(cloud: Cloud) -> dict[str, Any] | None:
+async def async_subscription_info(cloud: Cloud[CloudClient]) -> dict[str, Any] | None:
     """Fetch the subscription info."""
     try:
         async with async_timeout.timeout(REQUEST_TIMEOUT):
@@ -33,7 +34,9 @@ async def async_subscription_info(cloud: Cloud) -> dict[str, Any] | None:
     return None
 
 
-async def async_migrate_paypal_agreement(cloud: Cloud) -> dict[str, Any] | None:
+async def async_migrate_paypal_agreement(
+    cloud: Cloud[CloudClient],
+) -> dict[str, Any] | None:
     """Migrate a paypal agreement from legacy."""
     try:
         async with async_timeout.timeout(REQUEST_TIMEOUT):
diff --git a/homeassistant/components/cloud/system_health.py b/homeassistant/components/cloud/system_health.py
index 592338144f362d..0dfd69344f3e2d 100644
--- a/homeassistant/components/cloud/system_health.py
+++ b/homeassistant/components/cloud/system_health.py
@@ -1,4 +1,6 @@
 """Provide info to system health."""
+from typing import Any
+
 from hass_nabucasa import Cloud
 
 from homeassistant.components import system_health
@@ -16,12 +18,12 @@ def async_register(
     register.async_register_info(system_health_info, "/config/cloud")
 
 
-async def system_health_info(hass):
+async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     """Get info for the info page."""
-    cloud: Cloud = hass.data[DOMAIN]
-    client: CloudClient = cloud.client
+    cloud: Cloud[CloudClient] = hass.data[DOMAIN]
+    client = cloud.client
 
-    data = {
+    data: dict[str, Any] = {
         "logged_in": cloud.is_logged_in,
     }
 
diff --git a/homeassistant/components/cloud/tts.py b/homeassistant/components/cloud/tts.py
index fea2ffca9873be..88f24d1290f7bd 100644
--- a/homeassistant/components/cloud/tts.py
+++ b/homeassistant/components/cloud/tts.py
@@ -1,6 +1,8 @@
-"""Support for the cloud for text to speech service."""
+"""Support for the cloud for text-to-speech service."""
+from __future__ import annotations
 
 import logging
+from typing import Any
 
 from hass_nabucasa import Cloud
 from hass_nabucasa.voice import MAP_VOICE, TTS_VOICES, AudioOutput, VoiceError
@@ -12,11 +14,15 @@
     CONF_LANG,
     PLATFORM_SCHEMA,
     Provider,
+    TtsAudioType,
     Voice,
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .client import CloudClient
 from .const import DOMAIN
+from .prefs import CloudPreferences
 
 ATTR_GENDER = "gender"
 
@@ -25,7 +31,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-def validate_lang(value):
+def validate_lang(value: dict[str, Any]) -> dict[str, Any]:
     """Validate chosen gender or language."""
     if (lang := value.get(CONF_LANG)) is None:
         return value
@@ -52,10 +58,16 @@ def validate_lang(value):
 )
 
 
-async def async_get_engine(hass, config, discovery_info=None):
+async def async_get_engine(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> CloudProvider:
     """Set up Cloud speech component."""
-    cloud: Cloud = hass.data[DOMAIN]
+    cloud: Cloud[CloudClient] = hass.data[DOMAIN]
 
+    language: str | None
+    gender: str | None
     if discovery_info is not None:
         language = None
         gender = None
@@ -72,7 +84,9 @@ async def async_get_engine(hass, config, discovery_info=None):
 class CloudProvider(Provider):
     """NabuCasa Cloud speech API provider."""
 
-    def __init__(self, cloud: Cloud, language: str, gender: str) -> None:
+    def __init__(
+        self, cloud: Cloud[CloudClient], language: str | None, gender: str | None
+    ) -> None:
         """Initialize cloud provider."""
         self.cloud = cloud
         self.name = "Cloud"
@@ -85,22 +99,22 @@ def __init__(self, cloud: Cloud, language: str, gender: str) -> None:
         self._language, self._gender = cloud.client.prefs.tts_default_voice
         cloud.client.prefs.async_listen_updates(self._sync_prefs)
 
-    async def _sync_prefs(self, prefs):
+    async def _sync_prefs(self, prefs: CloudPreferences) -> None:
         """Sync preferences."""
         self._language, self._gender = prefs.tts_default_voice
 
     @property
-    def default_language(self):
+    def default_language(self) -> str | None:
         """Return the default language."""
         return self._language
 
     @property
-    def supported_languages(self):
+    def supported_languages(self) -> list[str]:
         """Return list of supported languages."""
         return SUPPORT_LANGUAGES
 
     @property
-    def supported_options(self):
+    def supported_options(self) -> list[str]:
         """Return list of supported options like voice, emotion."""
         return [ATTR_GENDER, ATTR_VOICE, ATTR_AUDIO_OUTPUT]
 
@@ -112,14 +126,16 @@ def async_get_supported_voices(self, language: str) -> list[Voice] | None:
         return [Voice(voice, voice) for voice in voices]
 
     @property
-    def default_options(self):
+    def default_options(self) -> dict[str, Any]:
         """Return a dict include default options."""
         return {
             ATTR_GENDER: self._gender,
             ATTR_AUDIO_OUTPUT: AudioOutput.MP3,
         }
 
-    async def async_get_tts_audio(self, message, language, options=None):
+    async def async_get_tts_audio(
+        self, message: str, language: str, options: dict[str, Any]
+    ) -> TtsAudioType:
         """Load TTS from NabuCasa Cloud."""
         # Process TTS
         try:
diff --git a/homeassistant/components/co2signal/manifest.json b/homeassistant/components/co2signal/manifest.json
index 801718b88a7760..b4dc01d03aa6d0 100644
--- a/homeassistant/components/co2signal/manifest.json
+++ b/homeassistant/components/co2signal/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/co2signal",
   "iot_class": "cloud_polling",
   "loggers": ["CO2Signal"],
-  "requirements": ["co2signal==0.4.2"]
+  "requirements": ["CO2Signal==0.4.2"]
 }
diff --git a/homeassistant/components/color_extractor/__init__.py b/homeassistant/components/color_extractor/__init__.py
index 61ec27b32419b2..d0a6b53964bd75 100644
--- a/homeassistant/components/color_extractor/__init__.py
+++ b/homeassistant/components/color_extractor/__init__.py
@@ -3,10 +3,10 @@
 import io
 import logging
 
-from PIL import UnidentifiedImageError
 import aiohttp
 import async_timeout
 from colorthief import ColorThief
+from PIL import UnidentifiedImageError
 import voluptuous as vol
 
 from homeassistant.components.light import (
@@ -24,6 +24,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 # Extend the existing light.turn_on service schema
 SERVICE_SCHEMA = vol.All(
     cv.has_at_least_one_key(ATTR_URL, ATTR_PATH),
diff --git a/homeassistant/components/command_line/__init__.py b/homeassistant/components/command_line/__init__.py
index fe0640d3efa782..6f536bf4744390 100644
--- a/homeassistant/components/command_line/__init__.py
+++ b/homeassistant/components/command_line/__init__.py
@@ -1 +1,224 @@
 """The command_line component."""
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Coroutine
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    DEVICE_CLASSES_SCHEMA as BINARY_SENSOR_DEVICE_CLASSES_SCHEMA,
+    DOMAIN as BINARY_SENSOR_DOMAIN,
+    SCAN_INTERVAL as BINARY_SENSOR_DEFAULT_SCAN_INTERVAL,
+)
+from homeassistant.components.cover import (
+    DOMAIN as COVER_DOMAIN,
+    SCAN_INTERVAL as COVER_DEFAULT_SCAN_INTERVAL,
+)
+from homeassistant.components.notify import DOMAIN as NOTIFY_DOMAIN
+from homeassistant.components.sensor import (
+    CONF_STATE_CLASS,
+    DEVICE_CLASSES_SCHEMA as SENSOR_DEVICE_CLASSES_SCHEMA,
+    DOMAIN as SENSOR_DOMAIN,
+    SCAN_INTERVAL as SENSOR_DEFAULT_SCAN_INTERVAL,
+    STATE_CLASSES_SCHEMA as SENSOR_STATE_CLASSES_SCHEMA,
+)
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SCAN_INTERVAL as SWITCH_DEFAULT_SCAN_INTERVAL,
+)
+from homeassistant.const import (
+    CONF_COMMAND,
+    CONF_COMMAND_CLOSE,
+    CONF_COMMAND_OFF,
+    CONF_COMMAND_ON,
+    CONF_COMMAND_OPEN,
+    CONF_COMMAND_STATE,
+    CONF_COMMAND_STOP,
+    CONF_DEVICE_CLASS,
+    CONF_ICON,
+    CONF_NAME,
+    CONF_PAYLOAD_OFF,
+    CONF_PAYLOAD_ON,
+    CONF_SCAN_INTERVAL,
+    CONF_UNIQUE_ID,
+    CONF_UNIT_OF_MEASUREMENT,
+    CONF_VALUE_TEMPLATE,
+    SERVICE_RELOAD,
+    Platform,
+)
+from homeassistant.core import Event, HomeAssistant, ServiceCall
+from homeassistant.helpers import discovery
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import async_get_platforms
+from homeassistant.helpers.reload import async_integration_yaml_config
+from homeassistant.helpers.service import async_register_admin_service
+from homeassistant.helpers.typing import ConfigType
+
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN
+
+BINARY_SENSOR_DEFAULT_NAME = "Binary Command Sensor"
+DEFAULT_PAYLOAD_ON = "ON"
+DEFAULT_PAYLOAD_OFF = "OFF"
+CONF_JSON_ATTRIBUTES = "json_attributes"
+SENSOR_DEFAULT_NAME = "Command Sensor"
+CONF_NOTIFIERS = "notifiers"
+
+PLATFORM_MAPPING = {
+    BINARY_SENSOR_DOMAIN: Platform.BINARY_SENSOR,
+    COVER_DOMAIN: Platform.COVER,
+    NOTIFY_DOMAIN: Platform.NOTIFY,
+    SENSOR_DOMAIN: Platform.SENSOR,
+    SWITCH_DOMAIN: Platform.SWITCH,
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+BINARY_SENSOR_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_COMMAND): cv.string,
+        vol.Optional(CONF_NAME, default=BINARY_SENSOR_DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
+        vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
+        vol.Optional(CONF_DEVICE_CLASS): BINARY_SENSOR_DEVICE_CLASSES_SCHEMA,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+        vol.Optional(CONF_UNIQUE_ID): cv.string,
+        vol.Optional(
+            CONF_SCAN_INTERVAL, default=BINARY_SENSOR_DEFAULT_SCAN_INTERVAL
+        ): vol.All(cv.time_period, cv.positive_timedelta),
+    }
+)
+COVER_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_COMMAND_CLOSE, default="true"): cv.string,
+        vol.Optional(CONF_COMMAND_OPEN, default="true"): cv.string,
+        vol.Optional(CONF_COMMAND_STATE): cv.string,
+        vol.Optional(CONF_COMMAND_STOP, default="true"): cv.string,
+        vol.Required(CONF_NAME): cv.string,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+        vol.Optional(CONF_UNIQUE_ID): cv.string,
+        vol.Optional(CONF_SCAN_INTERVAL, default=COVER_DEFAULT_SCAN_INTERVAL): vol.All(
+            cv.time_period, cv.positive_timedelta
+        ),
+    }
+)
+NOTIFY_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_COMMAND): cv.string,
+        vol.Optional(CONF_NAME): cv.string,
+        vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+    }
+)
+SENSOR_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_COMMAND): cv.string,
+        vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+        vol.Optional(CONF_JSON_ATTRIBUTES): cv.ensure_list_csv,
+        vol.Optional(CONF_NAME, default=SENSOR_DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_UNIQUE_ID): cv.string,
+        vol.Optional(CONF_DEVICE_CLASS): SENSOR_DEVICE_CLASSES_SCHEMA,
+        vol.Optional(CONF_STATE_CLASS): SENSOR_STATE_CLASSES_SCHEMA,
+        vol.Optional(CONF_SCAN_INTERVAL, default=SENSOR_DEFAULT_SCAN_INTERVAL): vol.All(
+            cv.time_period, cv.positive_timedelta
+        ),
+    }
+)
+SWITCH_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_COMMAND_OFF, default="true"): cv.string,
+        vol.Optional(CONF_COMMAND_ON, default="true"): cv.string,
+        vol.Optional(CONF_COMMAND_STATE): cv.string,
+        vol.Required(CONF_NAME): cv.string,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_ICON): cv.template,
+        vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+        vol.Optional(CONF_UNIQUE_ID): cv.string,
+        vol.Optional(CONF_SCAN_INTERVAL, default=SWITCH_DEFAULT_SCAN_INTERVAL): vol.All(
+            cv.time_period, cv.positive_timedelta
+        ),
+    }
+)
+COMBINED_SCHEMA = vol.Schema(
+    {
+        vol.Optional(BINARY_SENSOR_DOMAIN): BINARY_SENSOR_SCHEMA,
+        vol.Optional(COVER_DOMAIN): COVER_SCHEMA,
+        vol.Optional(NOTIFY_DOMAIN): NOTIFY_SCHEMA,
+        vol.Optional(SENSOR_DOMAIN): SENSOR_SCHEMA,
+        vol.Optional(SWITCH_DOMAIN): SWITCH_SCHEMA,
+    }
+)
+CONFIG_SCHEMA = vol.Schema(
+    {
+        vol.Optional(DOMAIN): vol.All(
+            cv.ensure_list,
+            [COMBINED_SCHEMA],
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up Command Line from yaml config."""
+
+    async def _reload_config(call: Event | ServiceCall) -> None:
+        """Reload Command Line."""
+        reload_config = await async_integration_yaml_config(hass, "command_line")
+        reset_platforms = async_get_platforms(hass, "command_line")
+        for reset_platform in reset_platforms:
+            _LOGGER.debug("Reload resetting platform: %s", reset_platform.domain)
+            await reset_platform.async_reset()
+        if not reload_config:
+            return
+        await async_load_platforms(hass, reload_config.get(DOMAIN, []), reload_config)
+
+    async_register_admin_service(hass, DOMAIN, SERVICE_RELOAD, _reload_config)
+
+    await async_load_platforms(hass, config.get(DOMAIN, []), config)
+
+    return True
+
+
+async def async_load_platforms(
+    hass: HomeAssistant,
+    command_line_config: list[dict[str, dict[str, Any]]],
+    config: ConfigType,
+) -> None:
+    """Load platforms from yaml."""
+    if not command_line_config:
+        return
+
+    _LOGGER.debug("Full config loaded: %s", command_line_config)
+
+    load_coroutines: list[Coroutine[Any, Any, None]] = []
+    platforms: list[Platform] = []
+    reload_configs: list[tuple] = []
+    for platform_config in command_line_config:
+        for platform, _config in platform_config.items():
+            if (mapped_platform := PLATFORM_MAPPING[platform]) not in platforms:
+                platforms.append(mapped_platform)
+            _LOGGER.debug(
+                "Loading config %s for platform %s",
+                platform_config,
+                PLATFORM_MAPPING[platform],
+            )
+            reload_configs.append((PLATFORM_MAPPING[platform], _config))
+            load_coroutines.append(
+                discovery.async_load_platform(
+                    hass,
+                    PLATFORM_MAPPING[platform],
+                    DOMAIN,
+                    _config,
+                    config,
+                )
+            )
+
+    if load_coroutines:
+        _LOGGER.debug("Loading platforms: %s", platforms)
+        await asyncio.gather(*load_coroutines)
diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py
index 0c2edb8f1912ef..f2097178a95f3f 100644
--- a/homeassistant/components/command_line/binary_sensor.py
+++ b/homeassistant/components/command_line/binary_sensor.py
@@ -1,12 +1,14 @@
 """Support for custom shell commands to retrieve values."""
 from __future__ import annotations
 
+import asyncio
 from datetime import timedelta
 
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASSES_SCHEMA,
+    DOMAIN as BINARY_SENSOR_DOMAIN,
     PLATFORM_SCHEMA,
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -17,17 +19,21 @@
     CONF_NAME,
     CONF_PAYLOAD_OFF,
     CONF_PAYLOAD_ON,
+    CONF_SCAN_INTERVAL,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
 
-from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, LOGGER
 from .sensor import CommandSensorData
 
 DEFAULT_NAME = "Binary Command Sensor"
@@ -59,60 +65,111 @@ async def async_setup_platform(
 ) -> None:
     """Set up the Command line Binary Sensor."""
 
-    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
-
-    name: str = config.get(CONF_NAME, DEFAULT_NAME)
-    command: str = config[CONF_COMMAND]
-    payload_off: str = config[CONF_PAYLOAD_OFF]
-    payload_on: str = config[CONF_PAYLOAD_ON]
-    device_class: BinarySensorDeviceClass | None = config.get(CONF_DEVICE_CLASS)
-    value_template: Template | None = config.get(CONF_VALUE_TEMPLATE)
-    command_timeout: int = config[CONF_COMMAND_TIMEOUT]
-    unique_id: str | None = config.get(CONF_UNIQUE_ID)
+    if binary_sensor_config := config:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_binary_sensor",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_platform_yaml",
+            translation_placeholders={"platform": BINARY_SENSOR_DOMAIN},
+        )
+    if discovery_info:
+        binary_sensor_config = discovery_info
+
+    name: str = binary_sensor_config.get(CONF_NAME, DEFAULT_NAME)
+    command: str = binary_sensor_config[CONF_COMMAND]
+    payload_off: str = binary_sensor_config[CONF_PAYLOAD_OFF]
+    payload_on: str = binary_sensor_config[CONF_PAYLOAD_ON]
+    device_class: BinarySensorDeviceClass | None = binary_sensor_config.get(
+        CONF_DEVICE_CLASS
+    )
+    value_template: Template | None = binary_sensor_config.get(CONF_VALUE_TEMPLATE)
+    command_timeout: int = binary_sensor_config[CONF_COMMAND_TIMEOUT]
+    unique_id: str | None = binary_sensor_config.get(CONF_UNIQUE_ID)
+    scan_interval: timedelta = binary_sensor_config.get(
+        CONF_SCAN_INTERVAL, SCAN_INTERVAL
+    )
     if value_template is not None:
         value_template.hass = hass
     data = CommandSensorData(hass, command, command_timeout)
 
+    trigger_entity_config = {
+        CONF_UNIQUE_ID: unique_id,
+        CONF_NAME: Template(name, hass),
+        CONF_DEVICE_CLASS: device_class,
+    }
+
     async_add_entities(
         [
             CommandBinarySensor(
                 data,
-                name,
-                device_class,
+                trigger_entity_config,
                 payload_on,
                 payload_off,
                 value_template,
-                unique_id,
+                scan_interval,
             )
         ],
-        True,
     )
 
 
-class CommandBinarySensor(BinarySensorEntity):
+class CommandBinarySensor(ManualTriggerEntity, BinarySensorEntity):
     """Representation of a command line binary sensor."""
 
+    _attr_should_poll = False
+
     def __init__(
         self,
         data: CommandSensorData,
-        name: str,
-        device_class: BinarySensorDeviceClass | None,
+        config: ConfigType,
         payload_on: str,
         payload_off: str,
         value_template: Template | None,
-        unique_id: str | None,
+        scan_interval: timedelta,
     ) -> None:
         """Initialize the Command line binary sensor."""
+        super().__init__(self.hass, config)
         self.data = data
-        self._attr_name = name
-        self._attr_device_class = device_class
         self._attr_is_on = None
         self._payload_on = payload_on
         self._payload_off = payload_off
         self._value_template = value_template
-        self._attr_unique_id = unique_id
+        self._scan_interval = scan_interval
+        self._process_updates: asyncio.Lock | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        await self._update_entity_state(None)
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self._update_entity_state,
+                self._scan_interval,
+                name=f"Command Line Binary Sensor - {self.name}",
+                cancel_on_shutdown=True,
+            ),
+        )
+
+    async def _update_entity_state(self, now) -> None:
+        """Update the state of the entity."""
+        if self._process_updates is None:
+            self._process_updates = asyncio.Lock()
+        if self._process_updates.locked():
+            LOGGER.warning(
+                "Updating Command Line Binary Sensor %s took longer than the scheduled update interval %s",
+                self.name,
+                self._scan_interval,
+            )
+            return
 
-    async def async_update(self) -> None:
+        async with self._process_updates:
+            await self._async_update()
+
+    async def _async_update(self) -> None:
         """Get the latest data and updates the state."""
         await self.hass.async_add_executor_job(self.data.update)
         value = self.data.value
@@ -126,3 +183,13 @@ async def async_update(self) -> None:
             self._attr_is_on = True
         elif value == self._payload_off:
             self._attr_is_on = False
+
+        self._process_manual_data(value)
+        self.async_write_ha_state()
+
+    async def async_update(self) -> None:
+        """Update the entity.
+
+        Only used by the generic entity update service.
+        """
+        await self._update_entity_state(dt_util.now())
diff --git a/homeassistant/components/command_line/const.py b/homeassistant/components/command_line/const.py
index 4394f3889105d9..ff51cb7e3313f9 100644
--- a/homeassistant/components/command_line/const.py
+++ b/homeassistant/components/command_line/const.py
@@ -1,7 +1,11 @@
 """Allows to configure custom shell commands to turn a value for a sensor."""
 
+import logging
+
 from homeassistant.const import Platform
 
+LOGGER = logging.getLogger(__package__)
+
 CONF_COMMAND_TIMEOUT = "command_timeout"
 DEFAULT_TIMEOUT = 15
 DOMAIN = "command_line"
diff --git a/homeassistant/components/command_line/cover.py b/homeassistant/components/command_line/cover.py
index e477affc8541a9..553af2f0c866d2 100644
--- a/homeassistant/components/command_line/cover.py
+++ b/homeassistant/components/command_line/cover.py
@@ -1,12 +1,17 @@
 """Support for command line covers."""
 from __future__ import annotations
 
-import logging
+import asyncio
+from datetime import timedelta
 from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
-from homeassistant.components.cover import PLATFORM_SCHEMA, CoverEntity
+from homeassistant.components.cover import (
+    DOMAIN as COVER_DOMAIN,
+    PLATFORM_SCHEMA,
+    CoverEntity,
+)
 from homeassistant.const import (
     CONF_COMMAND_CLOSE,
     CONF_COMMAND_OPEN,
@@ -14,20 +19,25 @@
     CONF_COMMAND_STOP,
     CONF_COVERS,
     CONF_FRIENDLY_NAME,
+    CONF_NAME,
+    CONF_SCAN_INTERVAL,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util, slugify
 
-from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, LOGGER
 from .utils import call_shell_with_timeout, check_output_or_log
 
-_LOGGER = logging.getLogger(__name__)
+SCAN_INTERVAL = timedelta(seconds=15)
 
 COVER_SCHEMA = vol.Schema(
     {
@@ -55,52 +65,75 @@ async def async_setup_platform(
 ) -> None:
     """Set up cover controlled by shell commands."""
 
-    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
-
-    devices: dict[str, Any] = config.get(CONF_COVERS, {})
     covers = []
+    if discovery_info:
+        entities: dict[str, Any] = {slugify(discovery_info[CONF_NAME]): discovery_info}
+    else:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_cover",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_platform_yaml",
+            translation_placeholders={"platform": COVER_DOMAIN},
+        )
+        entities = config.get(CONF_COVERS, {})
 
-    for device_name, device_config in devices.items():
+    for device_name, device_config in entities.items():
         value_template: Template | None = device_config.get(CONF_VALUE_TEMPLATE)
         if value_template is not None:
             value_template.hass = hass
 
+        if name := device_config.get(
+            CONF_FRIENDLY_NAME
+        ):  # Backward compatibility. Can be removed after deprecation
+            device_config[CONF_NAME] = name
+
+        trigger_entity_config = {
+            CONF_UNIQUE_ID: device_config.get(CONF_UNIQUE_ID),
+            CONF_NAME: Template(device_config.get(CONF_NAME, device_name), hass),
+        }
+
         covers.append(
             CommandCover(
-                device_config.get(CONF_FRIENDLY_NAME, device_name),
+                trigger_entity_config,
                 device_config[CONF_COMMAND_OPEN],
                 device_config[CONF_COMMAND_CLOSE],
                 device_config[CONF_COMMAND_STOP],
                 device_config.get(CONF_COMMAND_STATE),
                 value_template,
                 device_config[CONF_COMMAND_TIMEOUT],
-                device_config.get(CONF_UNIQUE_ID),
+                device_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL),
             )
         )
 
     if not covers:
-        _LOGGER.error("No covers added")
+        LOGGER.error("No covers added")
         return
 
     async_add_entities(covers)
 
 
-class CommandCover(CoverEntity):
+class CommandCover(ManualTriggerEntity, CoverEntity):
     """Representation a command line cover."""
 
+    _attr_should_poll = False
+
     def __init__(
         self,
-        name: str,
+        config: ConfigType,
         command_open: str,
         command_close: str,
         command_stop: str,
         command_state: str | None,
         value_template: Template | None,
         timeout: int,
-        unique_id: str | None,
+        scan_interval: timedelta,
     ) -> None:
         """Initialize the cover."""
-        self._attr_name = name
+        super().__init__(self.hass, config)
         self._state: int | None = None
         self._command_open = command_open
         self._command_close = command_close
@@ -108,18 +141,32 @@ def __init__(
         self._command_state = command_state
         self._value_template = value_template
         self._timeout = timeout
-        self._attr_unique_id = unique_id
-        self._attr_should_poll = bool(command_state)
+        self._scan_interval = scan_interval
+        self._process_updates: asyncio.Lock | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        if self._command_state:
+            self.async_on_remove(
+                async_track_time_interval(
+                    self.hass,
+                    self._update_entity_state,
+                    self._scan_interval,
+                    name=f"Command Line Cover - {self.name}",
+                    cancel_on_shutdown=True,
+                ),
+            )
 
     def _move_cover(self, command: str) -> bool:
         """Execute the actual commands."""
-        _LOGGER.info("Running command: %s", command)
+        LOGGER.info("Running command: %s", command)
 
         returncode = call_shell_with_timeout(command, self._timeout)
         success = returncode == 0
 
         if not success:
-            _LOGGER.error(
+            LOGGER.error(
                 "Command failed (with return code %s): %s", returncode, command
             )
 
@@ -143,12 +190,27 @@ def current_cover_position(self) -> int | None:
     def _query_state(self) -> str | None:
         """Query for the state."""
         if self._command_state:
-            _LOGGER.info("Running state value command: %s", self._command_state)
+            LOGGER.info("Running state value command: %s", self._command_state)
             return check_output_or_log(self._command_state, self._timeout)
         if TYPE_CHECKING:
             return None
 
-    async def async_update(self) -> None:
+    async def _update_entity_state(self, now) -> None:
+        """Update the state of the entity."""
+        if self._process_updates is None:
+            self._process_updates = asyncio.Lock()
+        if self._process_updates.locked():
+            LOGGER.warning(
+                "Updating Command Line Cover %s took longer than the scheduled update interval %s",
+                self.name,
+                self._scan_interval,
+            )
+            return
+
+        async with self._process_updates:
+            await self._async_update()
+
+    async def _async_update(self) -> None:
         """Update device state."""
         if self._command_state:
             payload = str(await self.hass.async_add_executor_job(self._query_state))
@@ -159,15 +221,27 @@ async def async_update(self) -> None:
             self._state = None
             if payload:
                 self._state = int(payload)
+            self._process_manual_data(payload)
+            self.async_write_ha_state()
+
+    async def async_update(self) -> None:
+        """Update the entity.
+
+        Only used by the generic entity update service.
+        """
+        await self._update_entity_state(dt_util.now())
 
-    def open_cover(self, **kwargs: Any) -> None:
+    async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        self._move_cover(self._command_open)
+        await self.hass.async_add_executor_job(self._move_cover, self._command_open)
+        await self._update_entity_state(None)
 
-    def close_cover(self, **kwargs: Any) -> None:
+    async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the cover."""
-        self._move_cover(self._command_close)
+        await self.hass.async_add_executor_job(self._move_cover, self._command_close)
+        await self._update_entity_state(None)
 
-    def stop_cover(self, **kwargs: Any) -> None:
+    async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
-        self._move_cover(self._command_stop)
+        await self.hass.async_add_executor_job(self._move_cover, self._command_stop)
+        await self._update_entity_state(None)
diff --git a/homeassistant/components/command_line/manifest.json b/homeassistant/components/command_line/manifest.json
index 998c02aad9ec1d..e99234bed1b9c8 100644
--- a/homeassistant/components/command_line/manifest.json
+++ b/homeassistant/components/command_line/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "command_line",
   "name": "Command Line",
-  "codeowners": [],
+  "codeowners": ["@gjohansson-ST"],
   "documentation": "https://www.home-assistant.io/integrations/command_line",
   "iot_class": "local_polling"
 }
diff --git a/homeassistant/components/command_line/notify.py b/homeassistant/components/command_line/notify.py
index 412456ff6e5fa7..d00926eb0ee5f3 100644
--- a/homeassistant/components/command_line/notify.py
+++ b/homeassistant/components/command_line/notify.py
@@ -7,14 +7,19 @@
 
 import voluptuous as vol
 
-from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService
+from homeassistant.components.notify import (
+    DOMAIN as NOTIFY_DOMAIN,
+    PLATFORM_SCHEMA,
+    BaseNotificationService,
+)
 from homeassistant.const import CONF_COMMAND, CONF_NAME
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.issue_registry import IssueSeverity, create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.process import kill_subprocess
 
-from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,8 +38,21 @@ def get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> CommandLineNotificationService:
     """Get the Command Line notification service."""
-    command: str = config[CONF_COMMAND]
-    timeout: int = config[CONF_COMMAND_TIMEOUT]
+    if notify_config := config:
+        create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_notify",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_platform_yaml",
+            translation_placeholders={"platform": NOTIFY_DOMAIN},
+        )
+    if discovery_info:
+        notify_config = discovery_info
+    command: str = notify_config[CONF_COMMAND]
+    timeout: int = notify_config[CONF_COMMAND_TIMEOUT]
 
     return CommandLineNotificationService(command, timeout)
 
@@ -54,7 +72,7 @@ def send_message(self, message: str = "", **kwargs: Any) -> None:
             universal_newlines=True,
             stdin=subprocess.PIPE,
             close_fds=False,  # required for posix_spawn
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
         ) as proc:
             try:
                 proc.communicate(input=message, timeout=self._timeout)
diff --git a/homeassistant/components/command_line/sensor.py b/homeassistant/components/command_line/sensor.py
index b6a2b8d83faae4..1b865827e697c9 100644
--- a/homeassistant/components/command_line/sensor.py
+++ b/homeassistant/components/command_line/sensor.py
@@ -1,24 +1,28 @@
 """Allows to configure custom shell commands to turn a value for a sensor."""
 from __future__ import annotations
 
+import asyncio
 from collections.abc import Mapping
 from datetime import timedelta
 import json
-import logging
+from typing import Any, cast
 
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
     CONF_STATE_CLASS,
     DEVICE_CLASSES_SCHEMA,
+    DOMAIN as SENSOR_DOMAIN,
     PLATFORM_SCHEMA,
     STATE_CLASSES_SCHEMA,
     SensorEntity,
+    SensorStateClass,
 )
 from homeassistant.const import (
     CONF_COMMAND,
     CONF_DEVICE_CLASS,
     CONF_NAME,
+    CONF_SCAN_INTERVAL,
     CONF_UNIQUE_ID,
     CONF_UNIT_OF_MEASUREMENT,
     CONF_VALUE_TEMPLATE,
@@ -27,15 +31,16 @@
 from homeassistant.exceptions import TemplateError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
+from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
 
-from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, LOGGER
 from .utils import check_output_or_log
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_JSON_ATTRIBUTES = "json_attributes"
 
 DEFAULT_NAME = "Command Sensor"
@@ -64,58 +69,116 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Command Sensor."""
+    if sensor_config := config:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_sensor",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_platform_yaml",
+            translation_placeholders={"platform": SENSOR_DOMAIN},
+        )
+    if discovery_info:
+        sensor_config = discovery_info
 
-    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
-
-    name: str = config[CONF_NAME]
-    command: str = config[CONF_COMMAND]
-    unit: str | None = config.get(CONF_UNIT_OF_MEASUREMENT)
-    value_template: Template | None = config.get(CONF_VALUE_TEMPLATE)
-    command_timeout: int = config[CONF_COMMAND_TIMEOUT]
-    unique_id: str | None = config.get(CONF_UNIQUE_ID)
+    name: str = sensor_config[CONF_NAME]
+    command: str = sensor_config[CONF_COMMAND]
+    unit: str | None = sensor_config.get(CONF_UNIT_OF_MEASUREMENT)
+    value_template: Template | None = sensor_config.get(CONF_VALUE_TEMPLATE)
+    command_timeout: int = sensor_config[CONF_COMMAND_TIMEOUT]
+    unique_id: str | None = sensor_config.get(CONF_UNIQUE_ID)
     if value_template is not None:
         value_template.hass = hass
-    json_attributes: list[str] | None = config.get(CONF_JSON_ATTRIBUTES)
+    json_attributes: list[str] | None = sensor_config.get(CONF_JSON_ATTRIBUTES)
+    scan_interval: timedelta = sensor_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
+    state_class: SensorStateClass | None = sensor_config.get(CONF_STATE_CLASS)
     data = CommandSensorData(hass, command, command_timeout)
 
+    trigger_entity_config = {
+        CONF_UNIQUE_ID: unique_id,
+        CONF_NAME: Template(name, hass),
+        CONF_DEVICE_CLASS: sensor_config.get(CONF_DEVICE_CLASS),
+    }
+
     async_add_entities(
         [
             CommandSensor(
                 data,
-                name,
+                trigger_entity_config,
                 unit,
+                state_class,
                 value_template,
                 json_attributes,
-                unique_id,
+                scan_interval,
             )
-        ],
-        True,
+        ]
     )
 
 
-class CommandSensor(SensorEntity):
+class CommandSensor(ManualTriggerEntity, SensorEntity):
     """Representation of a sensor that is using shell commands."""
 
+    _attr_should_poll = False
+
     def __init__(
         self,
         data: CommandSensorData,
-        name: str,
+        config: ConfigType,
         unit_of_measurement: str | None,
+        state_class: SensorStateClass | None,
         value_template: Template | None,
         json_attributes: list[str] | None,
-        unique_id: str | None,
+        scan_interval: timedelta,
     ) -> None:
         """Initialize the sensor."""
-        self._attr_name = name
+        super().__init__(self.hass, config)
         self.data = data
         self._attr_extra_state_attributes = {}
         self._json_attributes = json_attributes
         self._attr_native_value = None
         self._value_template = value_template
         self._attr_native_unit_of_measurement = unit_of_measurement
-        self._attr_unique_id = unique_id
+        self._attr_state_class = state_class
+        self._scan_interval = scan_interval
+        self._process_updates: asyncio.Lock | None = None
 
-    async def async_update(self) -> None:
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        """Return extra state attributes."""
+        return cast(dict, self._attr_extra_state_attributes)
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        await self._update_entity_state(None)
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self._update_entity_state,
+                self._scan_interval,
+                name=f"Command Line Sensor - {self.name}",
+                cancel_on_shutdown=True,
+            ),
+        )
+
+    async def _update_entity_state(self, now) -> None:
+        """Update the state of the entity."""
+        if self._process_updates is None:
+            self._process_updates = asyncio.Lock()
+        if self._process_updates.locked():
+            LOGGER.warning(
+                "Updating Command Line Sensor %s took longer than the scheduled update interval %s",
+                self.name,
+                self._scan_interval,
+            )
+            return
+
+        async with self._process_updates:
+            await self._async_update()
+
+    async def _async_update(self) -> None:
         """Get the latest data and updates the state."""
         await self.hass.async_add_executor_job(self.data.update)
         value = self.data.value
@@ -132,13 +195,14 @@ async def async_update(self) -> None:
                             if k in json_dict
                         }
                     else:
-                        _LOGGER.warning("JSON result was not a dictionary")
+                        LOGGER.warning("JSON result was not a dictionary")
                 except ValueError:
-                    _LOGGER.warning("Unable to parse output as JSON: %s", value)
+                    LOGGER.warning("Unable to parse output as JSON: %s", value)
             else:
-                _LOGGER.warning("Empty reply found when expecting JSON data")
+                LOGGER.warning("Empty reply found when expecting JSON data")
             if self._value_template is None:
                 self._attr_native_value = None
+                self._process_manual_data(value)
                 return
 
         if self._value_template is not None:
@@ -150,6 +214,15 @@ async def async_update(self) -> None:
             )
         else:
             self._attr_native_value = value
+        self._process_manual_data(value)
+        self.async_write_ha_state()
+
+    async def async_update(self) -> None:
+        """Update the entity.
+
+        Only used by the generic entity update service.
+        """
+        await self._update_entity_state(dt_util.now())
 
 
 class CommandSensorData:
@@ -179,7 +252,7 @@ def update(self) -> None:
                 args_to_render = {"arguments": args}
                 rendered_args = args_compiled.render(args_to_render)
             except TemplateError as ex:
-                _LOGGER.exception("Error rendering command template: %s", ex)
+                LOGGER.exception("Error rendering command template: %s", ex)
                 return
         else:
             rendered_args = None
@@ -191,5 +264,5 @@ def update(self) -> None:
             # Template used. Construct the string used in the shell
             command = f"{prog} {rendered_args}"
 
-        _LOGGER.debug("Running command: %s", command)
+        LOGGER.debug("Running command: %s", command)
         self.value = check_output_or_log(command, self.timeout)
diff --git a/homeassistant/components/command_line/strings.json b/homeassistant/components/command_line/strings.json
new file mode 100644
index 00000000000000..dab4a77a6ec37d
--- /dev/null
+++ b/homeassistant/components/command_line/strings.json
@@ -0,0 +1,8 @@
+{
+  "issues": {
+    "deprecated_platform_yaml": {
+      "title": "Command Line YAML configuration has moved",
+      "description": "Configuring Command Line `{platform}` using YAML has moved.\n\nConsult the documentation to move your YAML configuration to integration key and restart Home Assistant to fix this issue."
+    }
+  }
+}
diff --git a/homeassistant/components/command_line/switch.py b/homeassistant/components/command_line/switch.py
index bfb45f5b5c425e..8fbafd7a4d168a 100644
--- a/homeassistant/components/command_line/switch.py
+++ b/homeassistant/components/command_line/switch.py
@@ -1,12 +1,14 @@
 """Support for custom shell commands to turn a switch on/off."""
 from __future__ import annotations
 
-import logging
+import asyncio
+from datetime import timedelta
 from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
 from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
     ENTITY_ID_FORMAT,
     PLATFORM_SCHEMA,
     SwitchEntity,
@@ -19,6 +21,7 @@
     CONF_ICON,
     CONF_ICON_TEMPLATE,
     CONF_NAME,
+    CONF_SCAN_INTERVAL,
     CONF_SWITCHES,
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
@@ -26,15 +29,17 @@
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.template_entity import ManualTriggerEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util, slugify
 
-from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
+from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, LOGGER
 from .utils import call_shell_with_timeout, check_output_or_log
 
-_LOGGER = logging.getLogger(__name__)
+SCAN_INTERVAL = timedelta(seconds=30)
 
 SWITCH_SCHEMA = vol.Schema(
     {
@@ -62,16 +67,38 @@ async def async_setup_platform(
 ) -> None:
     """Find and return switches controlled by shell commands."""
 
-    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
+    if discovery_info:
+        entities: dict[str, Any] = {slugify(discovery_info[CONF_NAME]): discovery_info}
+    else:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_switch",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_platform_yaml",
+            translation_placeholders={"platform": SWITCH_DOMAIN},
+        )
+        entities = config.get(CONF_SWITCHES, {})
 
-    devices: dict[str, Any] = config.get(CONF_SWITCHES, {})
     switches = []
 
-    for object_id, device_config in devices.items():
+    for object_id, device_config in entities.items():
+        if name := device_config.get(
+            CONF_FRIENDLY_NAME
+        ):  # Backward compatibility. Can be removed after deprecation
+            device_config[CONF_NAME] = name
+
+        if icon := device_config.get(
+            CONF_ICON_TEMPLATE
+        ):  # Backward compatibility. Can be removed after deprecation
+            device_config[CONF_ICON] = icon
+
         trigger_entity_config = {
             CONF_UNIQUE_ID: device_config.get(CONF_UNIQUE_ID),
-            CONF_NAME: Template(device_config.get(CONF_FRIENDLY_NAME, object_id), hass),
-            CONF_ICON: device_config.get(CONF_ICON_TEMPLATE),
+            CONF_NAME: Template(device_config.get(CONF_NAME, object_id), hass),
+            CONF_ICON: device_config.get(CONF_ICON),
         }
 
         value_template: Template | None = device_config.get(CONF_VALUE_TEMPLATE)
@@ -88,11 +115,12 @@ async def async_setup_platform(
                 device_config.get(CONF_COMMAND_STATE),
                 value_template,
                 device_config[CONF_COMMAND_TIMEOUT],
+                device_config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL),
             )
         )
 
     if not switches:
-        _LOGGER.error("No switches added")
+        LOGGER.error("No switches added")
         return
 
     async_add_entities(switches)
@@ -101,6 +129,8 @@ async def async_setup_platform(
 class CommandSwitch(ManualTriggerEntity, SwitchEntity):
     """Representation a switch that can be toggled using shell commands."""
 
+    _attr_should_poll = False
+
     def __init__(
         self,
         config: ConfigType,
@@ -110,6 +140,7 @@ def __init__(
         command_state: str | None,
         value_template: Template | None,
         timeout: int,
+        scan_interval: timedelta,
     ) -> None:
         """Initialize the switch."""
         super().__init__(self.hass, config)
@@ -120,11 +151,26 @@ def __init__(
         self._command_state = command_state
         self._value_template = value_template
         self._timeout = timeout
-        self._attr_should_poll = bool(command_state)
+        self._scan_interval = scan_interval
+        self._process_updates: asyncio.Lock | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        if self._command_state:
+            self.async_on_remove(
+                async_track_time_interval(
+                    self.hass,
+                    self._update_entity_state,
+                    self._scan_interval,
+                    name=f"Command Line Cover - {self.name}",
+                    cancel_on_shutdown=True,
+                ),
+            )
 
     async def _switch(self, command: str) -> bool:
         """Execute the actual commands."""
-        _LOGGER.info("Running command: %s", command)
+        LOGGER.info("Running command: %s", command)
 
         success = (
             await self.hass.async_add_executor_job(
@@ -134,18 +180,18 @@ async def _switch(self, command: str) -> bool:
         )
 
         if not success:
-            _LOGGER.error("Command failed: %s", command)
+            LOGGER.error("Command failed: %s", command)
 
         return success
 
     def _query_state_value(self, command: str) -> str | None:
         """Execute state command for return value."""
-        _LOGGER.info("Running state value command: %s", command)
+        LOGGER.info("Running state value command: %s", command)
         return check_output_or_log(command, self._timeout)
 
     def _query_state_code(self, command: str) -> bool:
         """Execute state command for return code."""
-        _LOGGER.info("Running state code command: %s", command)
+        LOGGER.info("Running state code command: %s", command)
         return (
             call_shell_with_timeout(command, self._timeout, log_return_code=False) == 0
         )
@@ -164,7 +210,22 @@ def _query_state(self) -> str | int | None:
         if TYPE_CHECKING:
             return None
 
-    async def async_update(self) -> None:
+    async def _update_entity_state(self, now) -> None:
+        """Update the state of the entity."""
+        if self._process_updates is None:
+            self._process_updates = asyncio.Lock()
+        if self._process_updates.locked():
+            LOGGER.warning(
+                "Updating Command Line Switch %s took longer than the scheduled update interval %s",
+                self.name,
+                self._scan_interval,
+            )
+            return
+
+        async with self._process_updates:
+            await self._async_update()
+
+    async def _async_update(self) -> None:
         """Update device state."""
         if self._command_state:
             payload = str(await self.hass.async_add_executor_job(self._query_state))
@@ -177,15 +238,25 @@ async def async_update(self) -> None:
             if payload or value:
                 self._attr_is_on = (value or payload).lower() == "true"
             self._process_manual_data(payload)
+            self.async_write_ha_state()
+
+    async def async_update(self) -> None:
+        """Update the entity.
+
+        Only used by the generic entity update service.
+        """
+        await self._update_entity_state(dt_util.now())
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         if await self._switch(self._command_on) and not self._command_state:
             self._attr_is_on = True
             self.async_schedule_update_ha_state()
+        await self._update_entity_state(None)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         if await self._switch(self._command_off) and not self._command_state:
             self._attr_is_on = False
             self.async_schedule_update_ha_state()
+        await self._update_entity_state(None)
diff --git a/homeassistant/components/command_line/utils.py b/homeassistant/components/command_line/utils.py
index 2d42732190ef5f..66faa3a0bf828c 100644
--- a/homeassistant/components/command_line/utils.py
+++ b/homeassistant/components/command_line/utils.py
@@ -19,7 +19,7 @@ def call_shell_with_timeout(
         _LOGGER.debug("Running command: %s", command)
         subprocess.check_output(
             command,
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
             timeout=timeout,
             close_fds=False,  # required for posix_spawn
         )
@@ -45,7 +45,7 @@ def check_output_or_log(command: str, timeout: int) -> str | None:
     try:
         return_value = subprocess.check_output(
             command,
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S602 # shell by design
             timeout=timeout,
             close_fds=False,  # required for posix_spawn
         )
diff --git a/homeassistant/components/compensation/__init__.py b/homeassistant/components/compensation/__init__.py
index e36737c7d350fe..01003020108374 100644
--- a/homeassistant/components/compensation/__init__.py
+++ b/homeassistant/components/compensation/__init__.py
@@ -1,5 +1,6 @@
 """The Compensation integration."""
 import logging
+from operator import itemgetter
 
 import numpy as np
 import voluptuous as vol
@@ -7,6 +8,8 @@
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import (
     CONF_ATTRIBUTE,
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
     CONF_SOURCE,
     CONF_UNIQUE_ID,
     CONF_UNIT_OF_MEASUREMENT,
@@ -20,8 +23,10 @@
     CONF_COMPENSATION,
     CONF_DATAPOINTS,
     CONF_DEGREE,
+    CONF_LOWER_LIMIT,
     CONF_POLYNOMIAL,
     CONF_PRECISION,
+    CONF_UPPER_LIMIT,
     DATA_COMPENSATION,
     DEFAULT_DEGREE,
     DEFAULT_PRECISION,
@@ -50,6 +55,8 @@ def datapoints_greater_than_degree(value: dict) -> dict:
         ],
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_ATTRIBUTE): cv.string,
+        vol.Optional(CONF_UPPER_LIMIT, default=False): cv.boolean,
+        vol.Optional(CONF_LOWER_LIMIT, default=False): cv.boolean,
         vol.Optional(CONF_PRECISION, default=DEFAULT_PRECISION): cv.positive_int,
         vol.Optional(CONF_DEGREE, default=DEFAULT_DEGREE): vol.All(
             vol.Coerce(int),
@@ -78,8 +85,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
         degree = conf[CONF_DEGREE]
 
+        initial_coefficients: list[tuple[float, float]] = conf[CONF_DATAPOINTS]
+        sorted_coefficients = sorted(initial_coefficients, key=itemgetter(0))
+
         # get x values and y values from the x,y point pairs
-        x_values, y_values = zip(*conf[CONF_DATAPOINTS])
+        x_values, y_values = zip(*initial_coefficients)
 
         # try to get valid coefficients for a polynomial
         coefficients = None
@@ -99,6 +109,16 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             }
             data[CONF_POLYNOMIAL] = np.poly1d(coefficients)
 
+            if data[CONF_LOWER_LIMIT]:
+                data[CONF_MINIMUM] = sorted_coefficients[0]
+            else:
+                data[CONF_MINIMUM] = None
+
+            if data[CONF_UPPER_LIMIT]:
+                data[CONF_MAXIMUM] = sorted_coefficients[-1]
+            else:
+                data[CONF_MAXIMUM] = None
+
             hass.data[DATA_COMPENSATION][compensation] = data
 
             hass.async_create_task(
diff --git a/homeassistant/components/compensation/const.py b/homeassistant/components/compensation/const.py
index f116725883ecdb..d49a6982166d39 100644
--- a/homeassistant/components/compensation/const.py
+++ b/homeassistant/components/compensation/const.py
@@ -4,6 +4,8 @@
 SENSOR = "compensation"
 
 CONF_COMPENSATION = "compensation"
+CONF_LOWER_LIMIT = "lower_limit"
+CONF_UPPER_LIMIT = "upper_limit"
 CONF_DATAPOINTS = "data_points"
 CONF_DEGREE = "degree"
 CONF_PRECISION = "precision"
diff --git a/homeassistant/components/compensation/sensor.py b/homeassistant/components/compensation/sensor.py
index 16226974120036..4d6ff95b8107f8 100644
--- a/homeassistant/components/compensation/sensor.py
+++ b/homeassistant/components/compensation/sensor.py
@@ -10,6 +10,8 @@
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     CONF_ATTRIBUTE,
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
     CONF_SOURCE,
     CONF_UNIQUE_ID,
     CONF_UNIT_OF_MEASUREMENT,
@@ -64,6 +66,8 @@ async def async_setup_platform(
                 conf[CONF_PRECISION],
                 conf[CONF_POLYNOMIAL],
                 conf.get(CONF_UNIT_OF_MEASUREMENT),
+                conf[CONF_MINIMUM],
+                conf[CONF_MAXIMUM],
             )
         ]
     )
@@ -83,6 +87,8 @@ def __init__(
         precision: int,
         polynomial: np.poly1d,
         unit_of_measurement: str | None,
+        minimum: tuple[float, float] | None,
+        maximum: tuple[float, float] | None,
     ) -> None:
         """Initialize the Compensation sensor."""
         self._source_entity_id = source
@@ -93,6 +99,8 @@ def __init__(
         self._coefficients = polynomial.coefficients.tolist()
         self._attr_unique_id = unique_id
         self._attr_name = name
+        self._minimum = minimum
+        self._maximum = maximum
 
     async def async_added_to_hass(self) -> None:
         """Handle added to Hass."""
@@ -132,7 +140,14 @@ def _async_compensation_sensor_state_listener(self, event: Event) -> None:
         else:
             value = None if new_state.state == STATE_UNKNOWN else new_state.state
         try:
-            self._attr_native_value = round(self._poly(float(value)), self._precision)
+            x_value = float(value)
+            if self._minimum is not None and x_value <= self._minimum[0]:
+                y_value = self._minimum[1]
+            elif self._maximum is not None and x_value >= self._maximum[0]:
+                y_value = self._maximum[1]
+            else:
+                y_value = self._poly(x_value)
+            self._attr_native_value = round(y_value, self._precision)
 
         except (ValueError, TypeError):
             self._attr_native_value = None
diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index def7edd4950cf7..514154137e4c70 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -11,6 +11,7 @@
 from homeassistant.const import CONF_ID, EVENT_COMPONENT_LOADED
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import ATTR_COMPONENT
 from homeassistant.util.file import write_utf8_file_atomic
@@ -32,6 +33,8 @@
 ACTION_CREATE_UPDATE = "create_update"
 ACTION_DELETE = "delete"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the config component."""
diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
index 2e1ea72dfb4522..d58616ff38f4f0 100644
--- a/homeassistant/components/config/config_entries.py
+++ b/homeassistant/components/config/config_entries.py
@@ -41,9 +41,9 @@ async def async_setup(hass):
     hass.http.register_view(OptionManagerFlowIndexView(hass.config_entries.options))
     hass.http.register_view(OptionManagerFlowResourceView(hass.config_entries.options))
 
-    websocket_api.async_register_command(hass, config_entries_get_matching)
+    websocket_api.async_register_command(hass, config_entries_get)
     websocket_api.async_register_command(hass, config_entry_disable)
-    websocket_api.async_register_command(hass, config_entry_get)
+    websocket_api.async_register_command(hass, config_entry_get_single)
     websocket_api.async_register_command(hass, config_entry_update)
     websocket_api.async_register_command(hass, config_entries_subscribe)
     websocket_api.async_register_command(hass, config_entries_progress)
@@ -288,12 +288,12 @@ def get_entry(
 @websocket_api.require_admin
 @websocket_api.websocket_command(
     {
-        "type": "config_entries/get",
+        "type": "config_entries/get_single",
         "entry_id": str,
     }
 )
 @websocket_api.async_response
-async def config_entry_get(
+async def config_entry_get_single(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
     msg: dict[str, Any],
@@ -432,13 +432,13 @@ async def ignore_config_flow(
 
 @websocket_api.websocket_command(
     {
-        vol.Required("type"): "config_entries/get_matching",
+        vol.Required("type"): "config_entries/get",
         vol.Optional("type_filter"): vol.All(cv.ensure_list, [str]),
         vol.Optional("domain"): str,
     }
 )
 @websocket_api.async_response
-async def config_entries_get_matching(
+async def config_entries_get(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
     msg: dict[str, Any],
diff --git a/homeassistant/components/configurator/__init__.py b/homeassistant/components/configurator/__init__.py
index ea785b5cdfbe20..6fd3917cc9c869 100644
--- a/homeassistant/components/configurator/__init__.py
+++ b/homeassistant/components/configurator/__init__.py
@@ -15,6 +15,7 @@
 
 from homeassistant.const import ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME
 from homeassistant.core import HomeAssistant, ServiceCall, callback as async_callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
@@ -44,6 +45,8 @@
 
 ConfiguratorCallback = Callable[[list[dict[str, str]]], None]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @bind_hass
 @async_callback
diff --git a/homeassistant/components/control4/light.py b/homeassistant/components/control4/light.py
index fde9b00aba26bb..a2d1308be982ae 100644
--- a/homeassistant/components/control4/light.py
+++ b/homeassistant/components/control4/light.py
@@ -30,7 +30,7 @@
 
 CONTROL4_CATEGORY = "lights"
 CONTROL4_NON_DIMMER_VAR = "LIGHT_STATE"
-CONTROL4_DIMMER_VAR = "LIGHT_LEVEL"
+CONTROL4_DIMMER_VARS = ["LIGHT_LEVEL", "Brightness Percent"]
 
 
 async def async_setup_entry(
@@ -57,7 +57,7 @@ async def async_update_data_dimmer():
         """Fetch data from Control4 director for dimmer lights."""
         try:
             return await update_variables_for_config_entry(
-                hass, entry, {CONTROL4_DIMMER_VAR}
+                hass, entry, {*CONTROL4_DIMMER_VARS}
             )
         except C4Exception as err:
             raise UpdateFailed(f"Error communicating with API: {err}") from err
@@ -190,14 +190,19 @@ def _create_api_object(self):
     def is_on(self):
         """Return whether this light is on or off."""
         if self._is_dimmer:
-            return self.coordinator.data[self._idx][CONTROL4_DIMMER_VAR] > 0
+            for var in CONTROL4_DIMMER_VARS:
+                if var in self.coordinator.data[self._idx]:
+                    return self.coordinator.data[self._idx][var] > 0
+            raise RuntimeError("Dimmer Variable Not Found")
         return self.coordinator.data[self._idx][CONTROL4_NON_DIMMER_VAR] > 0
 
     @property
     def brightness(self):
         """Return the brightness of this light between 0..255."""
         if self._is_dimmer:
-            return round(self.coordinator.data[self._idx][CONTROL4_DIMMER_VAR] * 2.55)
+            for var in CONTROL4_DIMMER_VARS:
+                if var in self.coordinator.data[self._idx]:
+                    return round(self.coordinator.data[self._idx][var] * 2.55)
         return None
 
     @property
diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py
index f156acfd568c62..5b82b5dae72e0f 100644
--- a/homeassistant/components/conversation/__init__.py
+++ b/homeassistant/components/conversation/__init__.py
@@ -8,6 +8,7 @@
 import re
 from typing import Any, Literal
 
+from hassil.recognize import RecognizeResult
 import voluptuous as vol
 
 from homeassistant import core
@@ -16,6 +17,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import MATCH_ALL
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, intent, singleton
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -154,12 +156,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if config_intents := config.get(DOMAIN, {}).get("intents"):
         hass.data[DATA_CONFIG] = config_intents
 
-    async def handle_process(service: core.ServiceCall) -> None:
+    async def handle_process(service: core.ServiceCall) -> core.ServiceResponse:
         """Parse text into commands."""
         text = service.data[ATTR_TEXT]
         _LOGGER.debug("Processing: <%s>", text)
         try:
-            await async_converse(
+            result = await async_converse(
                 hass=hass,
                 text=text,
                 conversation_id=None,
@@ -168,7 +170,12 @@ async def handle_process(service: core.ServiceCall) -> None:
                 agent_id=service.data.get(ATTR_AGENT_ID),
             )
         except intent.IntentHandleError as err:
-            _LOGGER.error("Error processing %s: %s", text, err)
+            raise HomeAssistantError(f"Error processing {text}: {err}") from err
+
+        if service.return_response:
+            return result.as_dict()
+
+        return None
 
     async def handle_reload(service: core.ServiceCall) -> None:
         """Reload intents."""
@@ -176,7 +183,11 @@ async def handle_reload(service: core.ServiceCall) -> None:
         await agent.async_reload(language=service.data.get(ATTR_LANGUAGE))
 
     hass.services.async_register(
-        DOMAIN, SERVICE_PROCESS, handle_process, schema=SERVICE_PROCESS_SCHEMA
+        DOMAIN,
+        SERVICE_PROCESS,
+        handle_process,
+        schema=SERVICE_PROCESS_SCHEMA,
+        supports_response=core.SupportsResponse.OPTIONAL,
     )
     hass.services.async_register(
         DOMAIN, SERVICE_RELOAD, handle_reload, schema=SERVICE_RELOAD_SCHEMA
@@ -186,6 +197,7 @@ async def handle_reload(service: core.ServiceCall) -> None:
     websocket_api.async_register_command(hass, websocket_prepare)
     websocket_api.async_register_command(hass, websocket_get_agent_info)
     websocket_api.async_register_command(hass, websocket_list_agents)
+    websocket_api.async_register_command(hass, websocket_hass_agent_debug)
 
     return True
 
@@ -297,6 +309,107 @@ async def websocket_list_agents(
     connection.send_message(websocket_api.result_message(msg["id"], {"agents": agents}))
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "conversation/agent/homeassistant/debug",
+        vol.Required("sentences"): [str],
+        vol.Optional("language"): str,
+        vol.Optional("device_id"): vol.Any(str, None),
+    }
+)
+@websocket_api.async_response
+async def websocket_hass_agent_debug(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict
+) -> None:
+    """Return intents that would be matched by the default agent for a list of sentences."""
+    agent = await _get_agent_manager(hass).async_get_agent(HOME_ASSISTANT_AGENT)
+    assert isinstance(agent, DefaultAgent)
+    results = [
+        await agent.async_recognize(
+            ConversationInput(
+                text=sentence,
+                context=connection.context(msg),
+                conversation_id=None,
+                device_id=msg.get("device_id"),
+                language=msg.get("language", hass.config.language),
+            )
+        )
+        for sentence in msg["sentences"]
+    ]
+
+    # Return results for each sentence in the same order as the input.
+    connection.send_result(
+        msg["id"],
+        {
+            "results": [
+                {
+                    "intent": {
+                        "name": result.intent.name,
+                    },
+                    "entities": {
+                        entity_key: {
+                            "name": entity.name,
+                            "value": entity.value,
+                            "text": entity.text,
+                        }
+                        for entity_key, entity in result.entities.items()
+                    },
+                    "targets": {
+                        state.entity_id: {"matched": is_matched}
+                        for state, is_matched in _get_debug_targets(hass, result)
+                    },
+                }
+                if result is not None
+                else None
+                for result in results
+            ]
+        },
+    )
+
+
+def _get_debug_targets(
+    hass: HomeAssistant,
+    result: RecognizeResult,
+) -> Iterable[tuple[core.State, bool]]:
+    """Yield state/is_matched pairs for a hassil recognition."""
+    entities = result.entities
+
+    name: str | None = None
+    area_name: str | None = None
+    domains: set[str] | None = None
+    device_classes: set[str] | None = None
+    state_names: set[str] | None = None
+
+    if "name" in entities:
+        name = str(entities["name"].value)
+
+    if "area" in entities:
+        area_name = str(entities["area"].value)
+
+    if "domain" in entities:
+        domains = set(cv.ensure_list(entities["domain"].value))
+
+    if "device_class" in entities:
+        device_classes = set(cv.ensure_list(entities["device_class"].value))
+
+    if "state" in entities:
+        # HassGetState only
+        state_names = set(cv.ensure_list(entities["state"].value))
+
+    states = intent.async_match_states(
+        hass,
+        name=name,
+        area_name=area_name,
+        domains=domains,
+        device_classes=device_classes,
+    )
+
+    for state in states:
+        # For queries, a target is "matched" based on its state
+        is_matched = (state_names is None) or (state.state in state_names)
+        yield state, is_matched
+
+
 class ConversationProcessView(http.HomeAssistantView):
     """View to process text."""
 
@@ -362,6 +475,7 @@ async def async_converse(
     context: core.Context,
     language: str | None = None,
     agent_id: str | None = None,
+    device_id: str | None = None,
 ) -> ConversationResult:
     """Process text and get intent."""
     agent = await _get_agent_manager(hass).async_get_agent(agent_id)
@@ -375,6 +489,7 @@ async def async_converse(
             text=text,
             context=context,
             conversation_id=conversation_id,
+            device_id=device_id,
             language=language,
         )
     )
@@ -462,12 +577,8 @@ def async_is_valid_agent_id(self, agent_id: str) -> bool:
     def async_set_agent(self, agent_id: str, agent: AbstractConversationAgent) -> None:
         """Set the agent."""
         self._agents[agent_id] = agent
-        if self.default_agent == HOME_ASSISTANT_AGENT:
-            self.default_agent = agent_id
 
     @core.callback
     def async_unset_agent(self, agent_id: str) -> None:
         """Unset the agent."""
-        if self.default_agent == agent_id:
-            self.default_agent = HOME_ASSISTANT_AGENT
         self._agents.pop(agent_id, None)
diff --git a/homeassistant/components/conversation/agent.py b/homeassistant/components/conversation/agent.py
index 162338a6ff0072..99b9c9392d8fd9 100644
--- a/homeassistant/components/conversation/agent.py
+++ b/homeassistant/components/conversation/agent.py
@@ -16,6 +16,7 @@ class ConversationInput:
     text: str
     context: Context
     conversation_id: str | None
+    device_id: str | None
     language: str
 
 
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index dccf394ab3fa1a..336d6287f18913 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -3,8 +3,9 @@
 
 import asyncio
 from collections import defaultdict
-from collections.abc import Iterable
+from collections.abc import Awaitable, Callable, Iterable
 from dataclasses import dataclass
+import functools
 import logging
 from pathlib import Path
 import re
@@ -31,7 +32,7 @@
     template,
     translation,
 )
-from homeassistant.helpers.event import async_track_state_change
+from homeassistant.helpers.event import async_track_state_added_domain
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .agent import AbstractConversationAgent, ConversationInput, ConversationResult
@@ -42,6 +43,9 @@
 _ENTITY_REGISTRY_UPDATE_FIELDS = ["aliases", "name", "original_name"]
 
 REGEX_TYPE = type(re.compile(""))
+TRIGGER_CALLBACK_TYPE = Callable[  # pylint: disable=invalid-name
+    [str], Awaitable[str | None]
+]
 
 
 def json_load(fp: IO[str]) -> JsonObjectType:
@@ -60,6 +64,14 @@ class LanguageIntents:
     loaded_components: set[str]
 
 
+@dataclass(slots=True)
+class TriggerData:
+    """List of sentences and the callback for a trigger."""
+
+    sentences: list[str]
+    callback: TRIGGER_CALLBACK_TYPE
+
+
 def _get_language_variations(language: str) -> Iterable[str]:
     """Generate language codes with and without region."""
     yield language
@@ -83,22 +95,16 @@ def async_setup(hass: core.HomeAssistant) -> None:
         async_should_expose(hass, DOMAIN, entity_id)
 
     @core.callback
-    def async_entity_state_listener(
-        changed_entity: str,
-        old_state: core.State | None,
-        new_state: core.State | None,
-    ):
+    def async_entity_state_listener(event: core.Event) -> None:
         """Set expose flag on new entities."""
-        if old_state is not None or new_state is None:
-            return
-        async_should_expose(hass, DOMAIN, changed_entity)
+        async_should_expose(hass, DOMAIN, event.data["entity_id"])
 
     @core.callback
     def async_hass_started(hass: core.HomeAssistant) -> None:
         """Set expose flag on all entities."""
         for state in hass.states.async_all():
             async_should_expose(hass, DOMAIN, state.entity_id)
-        async_track_state_change(hass, MATCH_ALL, async_entity_state_listener)
+        async_track_state_added_domain(hass, MATCH_ALL, async_entity_state_listener)
 
     start.async_at_started(hass, async_hass_started)
 
@@ -116,6 +122,10 @@ def __init__(self, hass: core.HomeAssistant) -> None:
         self._config_intents: dict[str, Any] = {}
         self._slot_lists: dict[str, SlotList] | None = None
 
+        # Sentences that will trigger a callback (skipping intent recognition)
+        self._trigger_sentences: list[TriggerData] = []
+        self._trigger_intents: Intents | None = None
+
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
@@ -149,11 +159,12 @@ async def async_initialize(self, config_intents):
             self.hass, DOMAIN, self._async_exposed_entities_updated
         )
 
-    async def async_process(self, user_input: ConversationInput) -> ConversationResult:
-        """Process a sentence."""
+    async def async_recognize(
+        self, user_input: ConversationInput
+    ) -> RecognizeResult | None:
+        """Recognize intent from user input."""
         language = user_input.language or self.hass.config.language
         lang_intents = self._lang_intents.get(language)
-        conversation_id = None  # Not supported
 
         # Reload intents if missing or new components
         if lang_intents is None or (
@@ -165,21 +176,29 @@ async def async_process(self, user_input: ConversationInput) -> ConversationResu
         if lang_intents is None:
             # No intents loaded
             _LOGGER.warning("No intents were loaded for language: %s", language)
-            return _make_error_result(
-                language,
-                intent.IntentResponseErrorCode.NO_INTENT_MATCH,
-                _DEFAULT_ERROR_TEXT,
-                conversation_id,
-            )
+            return None
 
         slot_lists = self._make_slot_lists()
-
         result = await self.hass.async_add_executor_job(
             self._recognize,
             user_input,
             lang_intents,
             slot_lists,
         )
+
+        return result
+
+    async def async_process(self, user_input: ConversationInput) -> ConversationResult:
+        """Process a sentence."""
+        if trigger_result := await self._match_triggers(user_input.text):
+            return trigger_result
+
+        language = user_input.language or self.hass.config.language
+        conversation_id = None  # Not supported
+
+        result = await self.async_recognize(user_input)
+        lang_intents = self._lang_intents.get(language)
+
         if result is None:
             _LOGGER.debug("No intent was matched for '%s'", user_input.text)
             return _make_error_result(
@@ -189,6 +208,10 @@ async def async_process(self, user_input: ConversationInput) -> ConversationResu
                 conversation_id,
             )
 
+        # Will never happen because result will be None when no intents are
+        # loaded in async_recognize.
+        assert lang_intents is not None
+
         try:
             intent_response = await intent.async_handle(
                 self.hass,
@@ -284,13 +307,13 @@ async def _build_speech(
         all_states = matched + unmatched
         domains = {state.domain for state in all_states}
         translations = await translation.async_get_translations(
-            self.hass, language, "state", domains
+            self.hass, language, "entity_component", domains
         )
 
         # Use translated state names
         for state in all_states:
             device_class = state.attributes.get("device_class", "_")
-            key = f"component.{state.domain}.state.{device_class}.{state.state}"
+            key = f"component.{state.domain}.entity_component.{device_class}.state.{state.state}"
             state.state = translations.get(key, state.state)
 
         # Get first matched or unmatched state.
@@ -419,9 +442,18 @@ def _get_or_load_intents(
                             encoding="utf-8"
                         ) as custom_sentences_file:
                             # Merge custom sentences
-                            merge_dict(
-                                intents_dict, yaml.safe_load(custom_sentences_file)
-                            )
+                            if isinstance(
+                                custom_sentences_yaml := yaml.safe_load(
+                                    custom_sentences_file
+                                ),
+                                dict,
+                            ):
+                                merge_dict(intents_dict, custom_sentences_yaml)
+                            else:
+                                _LOGGER.warning(
+                                    "Custom sentences file does not match expected format path=%s",
+                                    custom_sentences_file.name,
+                                )
 
                         # Will need to recreate graph
                         intents_changed = True
@@ -582,13 +614,109 @@ def _make_slot_lists(self) -> dict[str, SlotList]:
         return self._slot_lists
 
     def _get_error_text(
-        self, response_type: ResponseType, lang_intents: LanguageIntents
+        self, response_type: ResponseType, lang_intents: LanguageIntents | None
     ) -> str:
         """Get response error text by type."""
+        if lang_intents is None:
+            return _DEFAULT_ERROR_TEXT
+
         response_key = response_type.value
         response_str = lang_intents.error_responses.get(response_key)
         return response_str or _DEFAULT_ERROR_TEXT
 
+    def register_trigger(
+        self,
+        sentences: list[str],
+        callback: TRIGGER_CALLBACK_TYPE,
+    ) -> core.CALLBACK_TYPE:
+        """Register a list of sentences that will trigger a callback when recognized."""
+        trigger_data = TriggerData(sentences=sentences, callback=callback)
+        self._trigger_sentences.append(trigger_data)
+
+        # Force rebuild on next use
+        self._trigger_intents = None
+
+        unregister = functools.partial(self._unregister_trigger, trigger_data)
+        return unregister
+
+    def _rebuild_trigger_intents(self) -> None:
+        """Rebuild the HassIL intents object from the current trigger sentences."""
+        intents_dict = {
+            "language": self.hass.config.language,
+            "intents": {
+                # Use trigger data index as a virtual intent name for HassIL.
+                # This works because the intents are rebuilt on every
+                # register/unregister.
+                str(trigger_id): {"data": [{"sentences": trigger_data.sentences}]}
+                for trigger_id, trigger_data in enumerate(self._trigger_sentences)
+            },
+        }
+
+        self._trigger_intents = Intents.from_dict(intents_dict)
+        _LOGGER.debug("Rebuilt trigger intents: %s", intents_dict)
+
+    def _unregister_trigger(self, trigger_data: TriggerData) -> None:
+        """Unregister a set of trigger sentences."""
+        self._trigger_sentences.remove(trigger_data)
+
+        # Force rebuild on next use
+        self._trigger_intents = None
+
+    async def _match_triggers(self, sentence: str) -> ConversationResult | None:
+        """Try to match sentence against registered trigger sentences.
+
+        Calls the registered callbacks if there's a match and returns a positive
+        conversation result.
+        """
+        if not self._trigger_sentences:
+            # No triggers registered
+            return None
+
+        if self._trigger_intents is None:
+            # Need to rebuild intents before matching
+            self._rebuild_trigger_intents()
+
+        assert self._trigger_intents is not None
+
+        matched_triggers: set[int] = set()
+        for result in recognize_all(sentence, self._trigger_intents):
+            trigger_id = int(result.intent.name)
+            if trigger_id in matched_triggers:
+                # Already matched a sentence from this trigger
+                break
+
+            matched_triggers.add(trigger_id)
+
+        if not matched_triggers:
+            # Sentence did not match any trigger sentences
+            return None
+
+        _LOGGER.debug(
+            "'%s' matched %s trigger(s): %s",
+            sentence,
+            len(matched_triggers),
+            matched_triggers,
+        )
+
+        # Gather callback responses in parallel
+        trigger_responses = await asyncio.gather(
+            *(
+                self._trigger_sentences[trigger_id].callback(sentence)
+                for trigger_id in matched_triggers
+            )
+        )
+
+        # Use last non-empty result as speech response
+        speech: str | None = None
+        for trigger_response in trigger_responses:
+            speech = speech or trigger_response
+
+        response = intent.IntentResponse(language=self.hass.config.language)
+        response.response_type = intent.IntentResponseType.ACTION_DONE
+        response.async_set_speech(speech or "")
+
+        return ConversationResult(response=response)
+
 
 def _make_error_result(
     language: str,
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
index 209f239df00bb1..aa2d0c32d16ee9 100644
--- a/homeassistant/components/conversation/manifest.json
+++ b/homeassistant/components/conversation/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["hassil==1.0.6", "home-assistant-intents==2023.4.26"]
+  "requirements": ["hassil==1.0.6", "home-assistant-intents==2023.6.28"]
 }
diff --git a/homeassistant/components/conversation/services.yaml b/homeassistant/components/conversation/services.yaml
index 6b031ff7142f6f..1a28044dcb5d9f 100644
--- a/homeassistant/components/conversation/services.yaml
+++ b/homeassistant/components/conversation/services.yaml
@@ -7,6 +7,7 @@ process:
       name: Text
       description: Transcribed text
       example: Turn all lights on
+      required: true
       selector:
         text:
     language:
@@ -20,4 +21,4 @@ process:
       description: Assist engine to process your request
       example: homeassistant
       selector:
-        text:
+        conversation_agent:
diff --git a/homeassistant/components/conversation/trigger.py b/homeassistant/components/conversation/trigger.py
new file mode 100644
index 00000000000000..b64b74c5fa69ba
--- /dev/null
+++ b/homeassistant/components/conversation/trigger.py
@@ -0,0 +1,72 @@
+"""Offer sentence based automation rules."""
+from __future__ import annotations
+
+from typing import Any
+
+from hassil.recognize import PUNCTUATION
+import voluptuous as vol
+
+from homeassistant.const import CONF_COMMAND, CONF_PLATFORM
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
+from homeassistant.helpers.typing import ConfigType
+
+from . import HOME_ASSISTANT_AGENT, _get_agent_manager
+from .const import DOMAIN
+from .default_agent import DefaultAgent
+
+
+def has_no_punctuation(value: list[str]) -> list[str]:
+    """Validate result does not contain punctuation."""
+    for sentence in value:
+        if PUNCTUATION.search(sentence):
+            raise vol.Invalid("sentence should not contain punctuation")
+
+    return value
+
+
+TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_PLATFORM): DOMAIN,
+        vol.Required(CONF_COMMAND): vol.All(
+            cv.ensure_list, [cv.string], has_no_punctuation
+        ),
+    }
+)
+
+
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
+) -> CALLBACK_TYPE:
+    """Listen for events based on configuration."""
+    trigger_data = trigger_info["trigger_data"]
+    sentences = config.get(CONF_COMMAND, [])
+
+    job = HassJob(action)
+
+    @callback
+    async def call_action(sentence: str) -> str | None:
+        """Call action with right context."""
+        trigger_input: dict[str, Any] = {  # Satisfy type checker
+            **trigger_data,
+            "platform": DOMAIN,
+            "sentence": sentence,
+        }
+
+        # Wait for the automation to complete
+        if future := hass.async_run_hass_job(
+            job,
+            {"trigger": trigger_input},
+        ):
+            await future
+
+        return "Done"
+
+    default_agent = await _get_agent_manager(hass).async_get_agent(HOME_ASSISTANT_AGENT)
+    assert isinstance(default_agent, DefaultAgent)
+
+    return default_agent.register_trigger(sentences, call_action)
diff --git a/homeassistant/components/coolmaster/binary_sensor.py b/homeassistant/components/coolmaster/binary_sensor.py
index 884cf98b742b24..29fd5797124535 100644
--- a/homeassistant/components/coolmaster/binary_sensor.py
+++ b/homeassistant/components/coolmaster/binary_sensor.py
@@ -32,12 +32,11 @@ async def async_setup_entry(
 class CoolmasterCleanFilter(CoolmasterEntity, BinarySensorEntity):
     """Representation of a unit's filter state (true means need to be cleaned)."""
 
-    _attr_has_entity_name = True
     entity_description = BinarySensorEntityDescription(
         key="clean_filter",
+        translation_key="clean_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Clean filter",
         icon="mdi:air-filter",
     )
 
diff --git a/homeassistant/components/coolmaster/button.py b/homeassistant/components/coolmaster/button.py
index a32a9833dd9478..e4dfb371a0b831 100644
--- a/homeassistant/components/coolmaster/button.py
+++ b/homeassistant/components/coolmaster/button.py
@@ -28,11 +28,10 @@ async def async_setup_entry(
 class CoolmasterResetFilter(CoolmasterEntity, ButtonEntity):
     """Reset the clean filter timer (once filter was cleaned)."""
 
-    _attr_has_entity_name = True
     entity_description = ButtonEntityDescription(
         key="reset_filter",
+        translation_key="reset_filter",
         entity_category=EntityCategory.CONFIG,
-        name="Reset filter",
         icon="mdi:air-filter",
     )
 
diff --git a/homeassistant/components/coolmaster/climate.py b/homeassistant/components/coolmaster/climate.py
index d27f776c655e93..6ae6613bcca87b 100644
--- a/homeassistant/components/coolmaster/climate.py
+++ b/homeassistant/components/coolmaster/climate.py
@@ -53,6 +53,8 @@ async def async_setup_entry(
 class CoolmasterClimate(CoolmasterEntity, ClimateEntity):
     """Representation of a coolmaster climate device."""
 
+    _attr_name = None
+
     def __init__(self, coordinator, unit_id, info, supported_modes):
         """Initialize the climate device."""
         super().__init__(coordinator, unit_id, info)
@@ -63,11 +65,6 @@ def unique_id(self):
         """Return unique ID for this device."""
         return self._unit_id
 
-    @property
-    def name(self):
-        """Return the name of the climate device."""
-        return self.unique_id
-
     @property
     def supported_features(self) -> ClimateEntityFeature:
         """Return the list of supported features."""
diff --git a/homeassistant/components/coolmaster/entity.py b/homeassistant/components/coolmaster/entity.py
index 65f21b77534592..1607e220a55194 100644
--- a/homeassistant/components/coolmaster/entity.py
+++ b/homeassistant/components/coolmaster/entity.py
@@ -12,6 +12,8 @@
 class CoolmasterEntity(CoordinatorEntity[CoolmasterDataUpdateCoordinator]):
     """Representation of a Coolmaster entity."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: CoolmasterDataUpdateCoordinator,
diff --git a/homeassistant/components/coolmaster/sensor.py b/homeassistant/components/coolmaster/sensor.py
index 59b0e71abb2008..5c6774e8c9238d 100644
--- a/homeassistant/components/coolmaster/sensor.py
+++ b/homeassistant/components/coolmaster/sensor.py
@@ -28,11 +28,10 @@ async def async_setup_entry(
 class CoolmasterCleanFilter(CoolmasterEntity, SensorEntity):
     """Representation of a unit's error code."""
 
-    _attr_has_entity_name = True
     entity_description = SensorEntityDescription(
         key="error_code",
+        translation_key="error_code",
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Error code",
         icon="mdi:alert",
     )
 
diff --git a/homeassistant/components/coolmaster/strings.json b/homeassistant/components/coolmaster/strings.json
index 6bba26b6bc9640..7baa6444c1dbb2 100644
--- a/homeassistant/components/coolmaster/strings.json
+++ b/homeassistant/components/coolmaster/strings.json
@@ -19,5 +19,22 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "no_units": "Could not find any HVAC units in CoolMasterNet host."
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "clean_filter": {
+        "name": "Clean filter"
+      }
+    },
+    "button": {
+      "reset_filter": {
+        "name": "Reset filter"
+      }
+    },
+    "sensor": {
+      "error_code": {
+        "name": "Error code"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/counter/__init__.py b/homeassistant/components/counter/__init__.py
index d2834b8991b76b..6f3d48fc1bbd4e 100644
--- a/homeassistant/components/counter/__init__.py
+++ b/homeassistant/components/counter/__init__.py
@@ -292,7 +292,7 @@ def async_configure(self, **kwargs) -> None:
             self.hass,
             DOMAIN,
             "deprecated_configure_service",
-            breaks_in_ha_version="2023.8.0",
+            breaks_in_ha_version="2023.12.0",
             is_fixable=True,
             is_persistent=True,
             severity=IssueSeverity.WARNING,
diff --git a/homeassistant/components/cover/device_action.py b/homeassistant/components/cover/device_action.py
index dd22821d5e462d..e34a623be937d8 100644
--- a/homeassistant/components/cover/device_action.py
+++ b/homeassistant/components/cover/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -42,21 +43,28 @@
 CMD_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(CMD_ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 POSITION_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(POSITION_ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Optional("position", default=0): vol.All(
             vol.Coerce(int), vol.Range(min=0, max=100)
         ),
     }
 )
 
-ACTION_SCHEMA = vol.Any(CMD_ACTION_SCHEMA, POSITION_ACTION_SCHEMA)
+_ACTION_SCHEMA = vol.Any(CMD_ACTION_SCHEMA, POSITION_ACTION_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -77,7 +85,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supported_features & SUPPORT_SET_POSITION:
diff --git a/homeassistant/components/cover/device_condition.py b/homeassistant/components/cover/device_condition.py
index 6144bdb6dbf6c1..2aa0a1dd2fb845 100644
--- a/homeassistant/components/cover/device_condition.py
+++ b/homeassistant/components/cover/device_condition.py
@@ -4,7 +4,6 @@
 import voluptuous as vol
 
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_ABOVE,
     CONF_BELOW,
     CONF_CONDITION,
@@ -43,7 +42,7 @@
 POSITION_CONDITION_SCHEMA = vol.All(
     DEVICE_CONDITION_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(POSITION_CONDITION_TYPES),
             vol.Optional(CONF_ABOVE): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=100)
@@ -58,7 +57,7 @@
 
 STATE_CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(STATE_CONDITION_TYPES),
     }
 )
@@ -86,7 +85,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supports_open_close:
@@ -127,6 +126,9 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     if config[CONF_TYPE] in STATE_CONDITION_TYPES:
         if config[CONF_TYPE] == "is_open":
             state = STATE_OPEN
@@ -139,7 +141,7 @@ def async_condition_from_config(
 
         def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
             """Test if an entity is a certain state."""
-            return condition.state(hass, config[ATTR_ENTITY_ID], state)
+            return condition.state(hass, entity_id, state)
 
         return test_is_state
 
@@ -156,7 +158,7 @@ def check_numeric_state(
     ) -> bool:
         """Return whether the criteria are met."""
         return condition.async_numeric_state(
-            hass, config[ATTR_ENTITY_ID], max_pos, min_pos, attribute=position_attr
+            hass, entity_id, max_pos, min_pos, attribute=position_attr
         )
 
     return check_numeric_state
diff --git a/homeassistant/components/cover/device_trigger.py b/homeassistant/components/cover/device_trigger.py
index aad225c803969c..2fb456d726d74c 100644
--- a/homeassistant/components/cover/device_trigger.py
+++ b/homeassistant/components/cover/device_trigger.py
@@ -43,7 +43,7 @@
 POSITION_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(POSITION_TRIGGER_TYPES),
             vol.Optional(CONF_ABOVE): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=100)
@@ -58,7 +58,7 @@
 
 STATE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(STATE_TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -87,7 +87,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if supports_open_close:
diff --git a/homeassistant/components/cpuspeed/sensor.py b/homeassistant/components/cpuspeed/sensor.py
index c71de53ebbe7aa..7eb3cfab753fc5 100644
--- a/homeassistant/components/cpuspeed/sensor.py
+++ b/homeassistant/components/cpuspeed/sensor.py
@@ -35,6 +35,7 @@ class CPUSpeedSensor(SensorEntity):
     _attr_device_class = SensorDeviceClass.FREQUENCY
     _attr_icon = "mdi:pulse"
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_native_unit_of_measurement = UnitOfFrequency.GIGAHERTZ
 
     def __init__(self, entry: ConfigEntry) -> None:
diff --git a/homeassistant/components/cups/sensor.py b/homeassistant/components/cups/sensor.py
index c642eb9112e03b..dd5366dee6a9d6 100644
--- a/homeassistant/components/cups/sensor.py
+++ b/homeassistant/components/cups/sensor.py
@@ -115,10 +115,15 @@ class CupsSensor(SensorEntity):
     def __init__(self, data: CupsData, printer_name: str) -> None:
         """Initialize the CUPS sensor."""
         self.data = data
-        self._attr_name = printer_name
+        self._name = printer_name
         self._printer: dict[str, Any] | None = None
         self._attr_available = False
 
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -149,7 +154,6 @@ def extra_state_attributes(self):
     def update(self) -> None:
         """Get the latest data and updates the states."""
         self.data.update()
-        assert self.name is not None
         assert self.data.printers is not None
         self._printer = self.data.printers.get(self.name)
         self._attr_available = self.data.available
diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py
index 481a072bdb3c73..b0097f607d5809 100644
--- a/homeassistant/components/daikin/__init__.py
+++ b/homeassistant/components/daikin/__init__.py
@@ -15,8 +15,9 @@
     CONF_UUID,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
@@ -52,6 +53,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if not daikin_api:
         return False
 
+    await async_migrate_unique_id(hass, entry, daikin_api)
+
     hass.data.setdefault(DOMAIN, {}).update({entry.entry_id: daikin_api})
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
@@ -67,7 +70,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-async def daikin_api_setup(hass, host, key, uuid, password):
+async def daikin_api_setup(hass: HomeAssistant, host, key, uuid, password):
     """Create a Daikin instance only once."""
 
     session = async_get_clientsession(hass)
@@ -127,3 +130,82 @@ def device_info(self) -> DeviceInfo:
             name=info.get("name"),
             sw_version=info.get("ver", "").replace("_", "."),
         )
+
+
+async def async_migrate_unique_id(
+    hass: HomeAssistant, config_entry: ConfigEntry, api: DaikinApi
+) -> None:
+    """Migrate old entry."""
+    dev_reg = dr.async_get(hass)
+    old_unique_id = config_entry.unique_id
+    new_unique_id = api.device.mac
+    new_name = api.device.values["name"]
+
+    @callback
+    def _update_unique_id(entity_entry: er.RegistryEntry) -> dict[str, str] | None:
+        """Update unique ID of entity entry."""
+        return update_unique_id(entity_entry, new_unique_id)
+
+    if new_unique_id == old_unique_id:
+        return
+
+    # Migrate devices
+    for device_entry in dr.async_entries_for_config_entry(
+        dev_reg, config_entry.entry_id
+    ):
+        for connection in device_entry.connections:
+            if connection[1] == old_unique_id:
+                new_connections = {
+                    (CONNECTION_NETWORK_MAC, dr.format_mac(new_unique_id))
+                }
+
+                _LOGGER.debug(
+                    "Migrating device %s connections to %s",
+                    device_entry.name,
+                    new_connections,
+                )
+                dev_reg.async_update_device(
+                    device_entry.id,
+                    merge_connections=new_connections,
+                )
+
+        if device_entry.name is None:
+            _LOGGER.debug(
+                "Migrating device name to %s",
+                new_name,
+            )
+            dev_reg.async_update_device(
+                device_entry.id,
+                name=new_name,
+            )
+
+        # Migrate entities
+        await er.async_migrate_entries(hass, config_entry.entry_id, _update_unique_id)
+
+        new_data = {**config_entry.data, KEY_MAC: dr.format_mac(new_unique_id)}
+
+        hass.config_entries.async_update_entry(
+            config_entry, unique_id=new_unique_id, data=new_data
+        )
+
+
+@callback
+def update_unique_id(
+    entity_entry: er.RegistryEntry, unique_id: str
+) -> dict[str, str] | None:
+    """Update unique ID of entity entry."""
+    if entity_entry.unique_id.startswith(unique_id):
+        # Already correct, nothing to do
+        return None
+
+    unique_id_parts = entity_entry.unique_id.split("-")
+    unique_id_parts[0] = unique_id
+    entity_new_unique_id = "-".join(unique_id_parts)
+
+    _LOGGER.debug(
+        "Migrating entity %s from %s to new id %s",
+        entity_entry.entity_id,
+        entity_entry.unique_id,
+        entity_new_unique_id,
+    )
+    return {"new_unique_id": entity_new_unique_id}
diff --git a/homeassistant/components/daikin/climate.py b/homeassistant/components/daikin/climate.py
index bd0e846ea4d9cb..5ede11c60b673d 100644
--- a/homeassistant/components/daikin/climate.py
+++ b/homeassistant/components/daikin/climate.py
@@ -276,17 +276,16 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
             await self._api.device.set_advanced_mode(
                 HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_ON
             )
-        else:
-            if self.preset_mode == PRESET_AWAY:
-                await self._api.device.set_holiday(ATTR_STATE_OFF)
-            elif self.preset_mode == PRESET_BOOST:
-                await self._api.device.set_advanced_mode(
-                    HA_PRESET_TO_DAIKIN[PRESET_BOOST], ATTR_STATE_OFF
-                )
-            elif self.preset_mode == PRESET_ECO:
-                await self._api.device.set_advanced_mode(
-                    HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_OFF
-                )
+        elif self.preset_mode == PRESET_AWAY:
+            await self._api.device.set_holiday(ATTR_STATE_OFF)
+        elif self.preset_mode == PRESET_BOOST:
+            await self._api.device.set_advanced_mode(
+                HA_PRESET_TO_DAIKIN[PRESET_BOOST], ATTR_STATE_OFF
+            )
+        elif self.preset_mode == PRESET_ECO:
+            await self._api.device.set_advanced_mode(
+                HA_PRESET_TO_DAIKIN[PRESET_ECO], ATTR_STATE_OFF
+            )
 
     @property
     def preset_modes(self):
diff --git a/homeassistant/components/daikin/manifest.json b/homeassistant/components/daikin/manifest.json
index 6f90b0cf5efa6b..c6334dfaeca417 100644
--- a/homeassistant/components/daikin/manifest.json
+++ b/homeassistant/components/daikin/manifest.json
@@ -7,6 +7,6 @@
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
   "quality_scale": "platinum",
-  "requirements": ["pydaikin==2.9.0"],
+  "requirements": ["pydaikin==2.10.5"],
   "zeroconf": ["_dkapi._tcp.local."]
 }
diff --git a/homeassistant/components/daikin/switch.py b/homeassistant/components/daikin/switch.py
index 68cd4fdc590d87..847f030fae5aba 100644
--- a/homeassistant/components/daikin/switch.py
+++ b/homeassistant/components/daikin/switch.py
@@ -42,7 +42,7 @@ async def async_setup_entry(
             [
                 DaikinZoneSwitch(daikin_api, zone_id)
                 for zone_id, zone in enumerate(zones)
-                if zone != ("-", "0")
+                if zone[0] != "-"
             ]
         )
     if daikin_api.device.support_advanced_modes:
@@ -90,11 +90,11 @@ async def async_update(self) -> None:
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the zone on."""
-        await self._api.device.set_zone(self._zone_id, "1")
+        await self._api.device.set_zone(self._zone_id, "zone_onoff", "1")
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the zone off."""
-        await self._api.device.set_zone(self._zone_id, "0")
+        await self._api.device.set_zone(self._zone_id, "zone_onoff", "0")
 
 
 class DaikinStreamerSwitch(SwitchEntity):
diff --git a/homeassistant/components/datetime/__init__.py b/homeassistant/components/datetime/__init__.py
new file mode 100644
index 00000000000000..fb67f4b1ffb688
--- /dev/null
+++ b/homeassistant/components/datetime/__init__.py
@@ -0,0 +1,126 @@
+"""Component to allow setting date/time as platforms."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime, timedelta, timezone
+import logging
+from typing import final
+
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.config_validation import (  # noqa: F401
+    ENTITY_SERVICE_FIELDS,
+    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA_BASE,
+)
+from homeassistant.helpers.entity import Entity, EntityDescription
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.util import dt as dt_util
+
+from .const import ATTR_DATETIME, DOMAIN, SERVICE_SET_VALUE
+
+SCAN_INTERVAL = timedelta(seconds=30)
+
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
+
+_LOGGER = logging.getLogger(__name__)
+
+__all__ = ["ATTR_DATETIME", "DOMAIN", "DateTimeEntity", "DateTimeEntityDescription"]
+
+
+async def _async_set_value(entity: DateTimeEntity, service_call: ServiceCall) -> None:
+    """Service call wrapper to set a new date/time."""
+    value: datetime = service_call.data[ATTR_DATETIME]
+    if value.tzinfo is None:
+        value = value.replace(
+            tzinfo=dt_util.get_time_zone(entity.hass.config.time_zone)
+        )
+    return await entity.async_set_value(value)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up Date/Time entities."""
+    component = hass.data[DOMAIN] = EntityComponent[DateTimeEntity](
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
+    )
+    await component.async_setup(config)
+
+    component.async_register_entity_service(
+        SERVICE_SET_VALUE,
+        {
+            vol.Required(ATTR_DATETIME): cv.datetime,
+            **ENTITY_SERVICE_FIELDS,
+        },
+        _async_set_value,
+    )
+
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up a config entry."""
+    component: EntityComponent[DateTimeEntity] = hass.data[DOMAIN]
+    return await component.async_setup_entry(entry)
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    component: EntityComponent[DateTimeEntity] = hass.data[DOMAIN]
+    return await component.async_unload_entry(entry)
+
+
+@dataclass
+class DateTimeEntityDescription(EntityDescription):
+    """A class that describes date/time entities."""
+
+
+class DateTimeEntity(Entity):
+    """Representation of a Date/time entity."""
+
+    entity_description: DateTimeEntityDescription
+    _attr_device_class: None = None
+    _attr_state: None = None
+    _attr_native_value: datetime | None
+
+    @property
+    @final
+    def device_class(self) -> None:
+        """Return entity device class."""
+        return None
+
+    @property
+    @final
+    def state_attributes(self) -> None:
+        """Return the state attributes."""
+        return None
+
+    @property
+    @final
+    def state(self) -> str | None:
+        """Return the entity state."""
+        if (value := self.native_value) is None:
+            return None
+        if value.tzinfo is None:
+            raise ValueError(
+                f"Invalid datetime: {self.entity_id} provides state '{value}', "
+                "which is missing timezone information"
+            )
+
+        return value.astimezone(timezone.utc).isoformat(timespec="seconds")
+
+    @property
+    def native_value(self) -> datetime | None:
+        """Return the value reported by the datetime."""
+        return self._attr_native_value
+
+    def set_value(self, value: datetime) -> None:
+        """Change the date/time."""
+        raise NotImplementedError()
+
+    async def async_set_value(self, value: datetime) -> None:
+        """Change the date/time."""
+        await self.hass.async_add_executor_job(self.set_value, value)
diff --git a/homeassistant/components/datetime/const.py b/homeassistant/components/datetime/const.py
new file mode 100644
index 00000000000000..f9a5c4e538cf41
--- /dev/null
+++ b/homeassistant/components/datetime/const.py
@@ -0,0 +1,7 @@
+"""Provides the constants needed for the component."""
+
+DOMAIN = "datetime"
+
+ATTR_DATETIME = "datetime"
+
+SERVICE_SET_VALUE = "set_value"
diff --git a/homeassistant/components/datetime/manifest.json b/homeassistant/components/datetime/manifest.json
new file mode 100644
index 00000000000000..469d9a8bd988ce
--- /dev/null
+++ b/homeassistant/components/datetime/manifest.json
@@ -0,0 +1,8 @@
+{
+  "domain": "datetime",
+  "name": "Date/Time",
+  "codeowners": ["@home-assistant/core"],
+  "documentation": "https://www.home-assistant.io/integrations/datetime",
+  "integration_type": "entity",
+  "quality_scale": "internal"
+}
diff --git a/homeassistant/components/datetime/services.yaml b/homeassistant/components/datetime/services.yaml
new file mode 100644
index 00000000000000..b5cce19e88b70e
--- /dev/null
+++ b/homeassistant/components/datetime/services.yaml
@@ -0,0 +1,14 @@
+set_value:
+  name: Set Date/Time
+  description: Set the date/time for a datetime entity.
+  target:
+    entity:
+      domain: datetime
+  fields:
+    datetime:
+      name: Date & Time
+      description: The date/time to set. The time zone of the Home Assistant instance is assumed.
+      required: true
+      example: "2022/11/01 22:15"
+      selector:
+        datetime:
diff --git a/homeassistant/components/datetime/strings.json b/homeassistant/components/datetime/strings.json
new file mode 100644
index 00000000000000..3b97559018c770
--- /dev/null
+++ b/homeassistant/components/datetime/strings.json
@@ -0,0 +1,8 @@
+{
+  "title": "Date/Time",
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::datetime::title%]"
+    }
+  }
+}
diff --git a/homeassistant/components/deconz/manifest.json b/homeassistant/components/deconz/manifest.json
index 61794e7c70a242..6245558a1c55a7 100644
--- a/homeassistant/components/deconz/manifest.json
+++ b/homeassistant/components/deconz/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["pydeconz"],
   "quality_scale": "platinum",
-  "requirements": ["pydeconz==111"],
+  "requirements": ["pydeconz==113"],
   "ssdp": [
     {
       "manufacturer": "Royal Philips Electronics",
diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py
index 136f582f5c7f51..4e00ac0a41525e 100644
--- a/homeassistant/components/deconz/sensor.py
+++ b/homeassistant/components/deconz/sensor.py
@@ -16,6 +16,7 @@
 from pydeconz.models.sensor.generic_status import GenericStatus
 from pydeconz.models.sensor.humidity import Humidity
 from pydeconz.models.sensor.light_level import LightLevel
+from pydeconz.models.sensor.moisture import Moisture
 from pydeconz.models.sensor.power import Power
 from pydeconz.models.sensor.pressure import Pressure
 from pydeconz.models.sensor.switch import Switch
@@ -81,6 +82,7 @@
     GenericStatus,
     Humidity,
     LightLevel,
+    Moisture,
     Power,
     Pressure,
     Temperature,
@@ -194,6 +196,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
+        suggested_display_precision=1,
     ),
     DeconzSensorDescription[LightLevel](
         key="light_level",
@@ -205,6 +208,17 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=LIGHT_LUX,
     ),
+    DeconzSensorDescription[Moisture](
+        key="moisture",
+        supported_fn=lambda device: device.moisture is not None,
+        update_key="moisture",
+        value_fn=lambda device: device.scaled_moisture,
+        instance_check=Moisture,
+        device_class=SensorDeviceClass.MOISTURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+        suggested_display_precision=1,
+    ),
     DeconzSensorDescription[Power](
         key="power",
         supported_fn=lambda device: device.power is not None,
@@ -234,6 +248,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        suggested_display_precision=1,
     ),
     DeconzSensorDescription[Time](
         key="last_set",
diff --git a/homeassistant/components/decora_wifi/manifest.json b/homeassistant/components/decora_wifi/manifest.json
index 592942ee99b7d8..0bead527e78e7e 100644
--- a/homeassistant/components/decora_wifi/manifest.json
+++ b/homeassistant/components/decora_wifi/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/decora_wifi",
   "iot_class": "cloud_polling",
   "loggers": ["decora_wifi"],
-  "requirements": ["decora_wifi==1.4"]
+  "requirements": ["decora-wifi==1.4"]
 }
diff --git a/homeassistant/components/default_config/__init__.py b/homeassistant/components/default_config/__init__.py
index d91d06949e691d..25a9ca311e8030 100644
--- a/homeassistant/components/default_config/__init__.py
+++ b/homeassistant/components/default_config/__init__.py
@@ -1,11 +1,14 @@
 """Component providing default configuration for new users."""
 from homeassistant.components.hassio import is_hassio
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import async_setup_component
 
 DOMAIN = "default_config"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize default configuration."""
diff --git a/homeassistant/components/delijn/manifest.json b/homeassistant/components/delijn/manifest.json
index 81307c47bbad7c..d25dab4234ec0c 100644
--- a/homeassistant/components/delijn/manifest.json
+++ b/homeassistant/components/delijn/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/delijn",
   "iot_class": "cloud_polling",
   "loggers": ["pydelijn"],
-  "requirements": ["pydelijn==1.0.0"]
+  "requirements": ["pydelijn==1.1.0"]
 }
diff --git a/homeassistant/components/deluge/sensor.py b/homeassistant/components/deluge/sensor.py
index eed194640dd7c5..9242e3e2d5ed2e 100644
--- a/homeassistant/components/deluge/sensor.py
+++ b/homeassistant/components/deluge/sensor.py
@@ -28,11 +28,11 @@ def get_state(data: dict[str, float], key: str) -> str | float:
     download = data[DATA_KEYS[1]] - data[DATA_KEYS[3]]
     if key == CURRENT_STATUS:
         if upload > 0 and download > 0:
-            return "Up/Down"
+            return "seeding_and_downloading"
         if upload > 0 and download == 0:
-            return "Seeding"
+            return "seeding"
         if upload == 0 and download > 0:
-            return "Downloading"
+            return "downloading"
         return STATE_IDLE
     kb_spd = float(upload if key == UPLOAD_SPEED else download) / 1024
     return round(kb_spd, 2 if kb_spd < 0.1 else 1)
@@ -48,12 +48,14 @@ class DelugeSensorEntityDescription(SensorEntityDescription):
 SENSOR_TYPES: tuple[DelugeSensorEntityDescription, ...] = (
     DelugeSensorEntityDescription(
         key=CURRENT_STATUS,
-        name="Status",
+        translation_key="status",
         value=lambda data: get_state(data, CURRENT_STATUS),
+        device_class=SensorDeviceClass.ENUM,
+        options=["seeding_and_downloading", "seeding", "downloading", "idle"],
     ),
     DelugeSensorEntityDescription(
         key=DOWNLOAD_SPEED,
-        name="Down speed",
+        translation_key="download_speed",
         device_class=SensorDeviceClass.DATA_RATE,
         native_unit_of_measurement=UnitOfDataRate.KILOBYTES_PER_SECOND,
         state_class=SensorStateClass.MEASUREMENT,
@@ -61,7 +63,7 @@ class DelugeSensorEntityDescription(SensorEntityDescription):
     ),
     DelugeSensorEntityDescription(
         key=UPLOAD_SPEED,
-        name="Up speed",
+        translation_key="upload_speed",
         device_class=SensorDeviceClass.DATA_RATE,
         native_unit_of_measurement=UnitOfDataRate.KILOBYTES_PER_SECOND,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/deluge/strings.json b/homeassistant/components/deluge/strings.json
index f11e1a2bd3e825..e0266d004e2b8b 100644
--- a/homeassistant/components/deluge/strings.json
+++ b/homeassistant/components/deluge/strings.json
@@ -19,5 +19,24 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "status": {
+        "name": "Status",
+        "state": {
+          "seeding_and_downloading": "Up/Down",
+          "seeding": "Seeding",
+          "downloading": "Downloading",
+          "idle": "[%key:common::state::idle%]"
+        }
+      },
+      "download_speed": {
+        "name": "Download speed"
+      },
+      "upload_speed": {
+        "name": "Upload speed"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/deluge/switch.py b/homeassistant/components/deluge/switch.py
index f9e89543d26b16..483b02844d6d47 100644
--- a/homeassistant/components/deluge/switch.py
+++ b/homeassistant/components/deluge/switch.py
@@ -24,6 +24,8 @@ async def async_setup_entry(
 class DelugeSwitch(DelugeEntity, SwitchEntity):
     """Representation of a Deluge switch."""
 
+    _attr_name = None
+
     def __init__(self, coordinator: DelugeDataUpdateCoordinator) -> None:
         """Initialize the Deluge switch."""
         super().__init__(coordinator)
diff --git a/homeassistant/components/demo/__init__.py b/homeassistant/components/demo/__init__.py
index 85f7b89483f3b3..246c952e219417 100644
--- a/homeassistant/components/demo/__init__.py
+++ b/homeassistant/components/demo/__init__.py
@@ -14,6 +14,7 @@
 )
 import homeassistant.core as ha
 from homeassistant.core import Event, HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 
@@ -28,6 +29,7 @@
     Platform.CLIMATE,
     Platform.COVER,
     Platform.DATE,
+    Platform.DATETIME,
     Platform.FAN,
     Platform.HUMIDIFIER,
     Platform.LIGHT,
@@ -48,7 +50,6 @@
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
     Platform.TTS,
-    Platform.STT,
     Platform.MAILBOX,
     Platform.NOTIFY,
     Platform.IMAGE_PROCESSING,
@@ -56,12 +57,11 @@
     Platform.DEVICE_TRACKER,
 ]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the demo environment."""
-    if DOMAIN not in config:
-        return True
-
     if not hass.config_entries.async_entries(DOMAIN):
         hass.async_create_task(
             hass.config_entries.flow.async_init(
@@ -69,6 +69,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             )
         )
 
+    if DOMAIN not in config:
+        return True
+
     # Set up demo platforms
     for platform in COMPONENTS_WITH_DEMO_PLATFORM:
         hass.async_create_task(async_load_platform(hass, platform, DOMAIN, {}, config))
@@ -188,6 +191,14 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    await hass.config_entries.async_unload_platforms(
+        config_entry, COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM
+    )
+    return True
+
+
 async def finish_setup(hass: HomeAssistant, config: ConfigType) -> None:
     """Finish set up once demo platforms are set up."""
     switches: list[str] | None = None
diff --git a/homeassistant/components/demo/binary_sensor.py b/homeassistant/components/demo/binary_sensor.py
index ee718e85cc0fb0..236d4bbb1b0b8c 100644
--- a/homeassistant/components/demo/binary_sensor.py
+++ b/homeassistant/components/demo/binary_sensor.py
@@ -9,18 +9,16 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo binary sensor platform."""
+    """Set up the demo binary sensor platform."""
     async_add_entities(
         [
             DemoBinarySensor(
@@ -36,42 +34,30 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoBinarySensor(BinarySensorEntity):
     """representation of a Demo binary sensor."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         device_class: BinarySensorDeviceClass,
     ) -> None:
         """Initialize the demo sensor."""
         self._unique_id = unique_id
-        self._attr_name = name
         self._state = state
         self._attr_device_class = device_class
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/button.py b/homeassistant/components/demo/button.py
index 626403009ce03d..f7a653e17797a2 100644
--- a/homeassistant/components/demo/button.py
+++ b/homeassistant/components/demo/button.py
@@ -4,59 +4,48 @@
 from homeassistant.components import persistent_notification
 from homeassistant.components.button import ButtonEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Button entity."""
+    """Set up the demo button platform."""
     async_add_entities(
         [
             DemoButton(
                 unique_id="push",
-                name="Push",
+                device_name="Push",
                 icon="mdi:gesture-tap-button",
             ),
         ]
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoButton(ButtonEntity):
     """Representation of a demo button entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str,
     ) -> None:
         """Initialize the Demo button entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_icon = icon
         self._attr_device_info = {
             "identifiers": {(DOMAIN, unique_id)},
-            "name": name,
+            "name": device_name,
         }
 
     async def async_press(self) -> None:
diff --git a/homeassistant/components/demo/calendar.py b/homeassistant/components/demo/calendar.py
index ae546361d8f1a6..73b45a556404f7 100644
--- a/homeassistant/components/demo/calendar.py
+++ b/homeassistant/components/demo/calendar.py
@@ -27,10 +27,10 @@ def setup_platform(
 
 def calendar_data_future() -> CalendarEvent:
     """Representation of a Demo Calendar for a future event."""
-    one_hour_from_now = dt_util.now() + datetime.timedelta(minutes=30)
+    half_hour_from_now = dt_util.now() + datetime.timedelta(minutes=30)
     return CalendarEvent(
-        start=one_hour_from_now,
-        end=one_hour_from_now + datetime.timedelta(minutes=60),
+        start=half_hour_from_now,
+        end=half_hour_from_now + datetime.timedelta(minutes=60),
         summary="Future Event",
         description="Future Description",
         location="Future Location",
@@ -67,4 +67,9 @@ async def async_get_events(
         end_date: datetime.datetime,
     ) -> list[CalendarEvent]:
         """Return calendar events within a datetime range."""
+        assert start_date < end_date
+        if self._event.start_datetime_local >= end_date:
+            return []
+        if self._event.end_datetime_local < start_date:
+            return []
         return [self._event]
diff --git a/homeassistant/components/demo/camera.py b/homeassistant/components/demo/camera.py
index b55fb4ba0e9bd0..722693280a0222 100644
--- a/homeassistant/components/demo/camera.py
+++ b/homeassistant/components/demo/camera.py
@@ -7,16 +7,14 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo camera platform."""
+    """Set up the Demo config entry."""
     async_add_entities(
         [
             DemoCamera("Demo camera", "image/jpg"),
@@ -25,15 +23,6 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoCamera(Camera):
     """The representation of a Demo camera."""
 
diff --git a/homeassistant/components/demo/climate.py b/homeassistant/components/demo/climate.py
index 7c0a4a5c9c8507..340a4b306cba49 100644
--- a/homeassistant/components/demo/climate.py
+++ b/homeassistant/components/demo/climate.py
@@ -14,27 +14,24 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 SUPPORT_FLAGS = ClimateEntityFeature(0)
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo climate devices."""
+    """Set up the demo climate platform."""
     async_add_entities(
         [
             DemoClimate(
                 unique_id="climate_1",
-                name="HeatPump",
+                device_name="HeatPump",
                 target_temperature=68,
                 unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
                 preset=None,
@@ -52,7 +49,7 @@ async def async_setup_platform(
             ),
             DemoClimate(
                 unique_id="climate_2",
-                name="Hvac",
+                device_name="Hvac",
                 target_temperature=21,
                 unit_of_measurement=UnitOfTemperature.CELSIUS,
                 preset=None,
@@ -70,7 +67,7 @@ async def async_setup_platform(
             ),
             DemoClimate(
                 unique_id="climate_3",
-                name="Ecobee",
+                device_name="Ecobee",
                 target_temperature=None,
                 unit_of_measurement=UnitOfTemperature.CELSIUS,
                 preset="home",
@@ -91,25 +88,18 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo climate devices config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoClimate(ClimateEntity):
     """Representation of a demo climate device."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_translation_key = "ubercool"
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         target_temperature: float | None,
         unit_of_measurement: str,
         preset: str | None,
@@ -128,7 +118,6 @@ def __init__(
     ) -> None:
         """Initialize the climate device."""
         self._unique_id = unique_id
-        self._attr_name = name
         self._attr_supported_features = SUPPORT_FLAGS
         if target_temperature is not None:
             self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
@@ -163,17 +152,10 @@ def __init__(
         self._swing_modes = ["auto", "1", "2", "3", "off"]
         self._target_temperature_high = target_temp_high
         self._target_temperature_low = target_temp_low
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
-            identifiers={
-                # Serial numbers are unique identifiers within a specific domain
-                (DOMAIN, self.unique_id)
-            },
-            name=self.name,
-        )
+        self._attr_device_info = {
+            "identifiers": {(DOMAIN, unique_id)},
+            "name": device_name,
+        }
 
     @property
     def unique_id(self) -> str:
diff --git a/homeassistant/components/demo/cover.py b/homeassistant/components/demo/cover.py
index 6f443329661870..42e30aa83360d6 100644
--- a/homeassistant/components/demo/cover.py
+++ b/homeassistant/components/demo/cover.py
@@ -16,18 +16,16 @@
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_utc_time_change
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo covers."""
+    """Set up the demo cover platform."""
     async_add_entities(
         [
             DemoCover(hass, "cover_1", "Kitchen Window"),
@@ -56,25 +54,18 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoCover(CoverEntity):
     """Representation of a demo cover."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         hass: HomeAssistant,
         unique_id: str,
-        name: str,
+        device_name: str,
         position: int | None = None,
         tilt_position: int | None = None,
         device_class: CoverDeviceClass | None = None,
@@ -83,7 +74,6 @@ def __init__(
         """Initialize the cover."""
         self.hass = hass
         self._unique_id = unique_id
-        self._attr_name = name
         self._position = position
         self._attr_device_class = device_class
         self._attr_supported_features = supported_features
@@ -101,15 +91,12 @@ def __init__(
         else:
             self._closed = position <= 0
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/date.py b/homeassistant/components/demo/date.py
index eb96bc49038279..4129d0d392a81c 100644
--- a/homeassistant/components/demo/date.py
+++ b/homeassistant/components/demo/date.py
@@ -5,22 +5,19 @@
 
 from homeassistant.components.date import DateEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo date entity."""
+    """Set up the demo date platform."""
     async_add_entities(
         [
             DemoDate(
@@ -34,24 +31,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoDate(DateEntity):
     """Representation of a Demo date entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: date,
         icon: str,
         assumed_state: bool,
@@ -59,12 +49,11 @@ def __init__(
         """Initialize the Demo date entity."""
         self._attr_assumed_state = assumed_state
         self._attr_icon = icon
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = state
         self._attr_unique_id = unique_id
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)}, name=self.name
+            identifiers={(DOMAIN, unique_id)}, name=device_name
         )
 
     async def async_set_value(self, value: date) -> None:
diff --git a/homeassistant/components/demo/datetime.py b/homeassistant/components/demo/datetime.py
new file mode 100644
index 00000000000000..b769f9baba3102
--- /dev/null
+++ b/homeassistant/components/demo/datetime.py
@@ -0,0 +1,66 @@
+"""Demo platform that offers a fake date/time entity."""
+from __future__ import annotations
+
+from datetime import datetime, timezone
+
+from homeassistant.components.datetime import DateTimeEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import DOMAIN
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the demo datetime platform."""
+    async_add_entities(
+        [
+            DemoDateTime(
+                "datetime",
+                "Date and Time",
+                datetime(2020, 1, 1, 12, 0, 0, tzinfo=timezone.utc),
+                "mdi:calendar-clock",
+                False,
+            ),
+        ]
+    )
+
+
+class DemoDateTime(DateTimeEntity):
+    """Representation of a Demo date/time entity."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_should_poll = False
+
+    def __init__(
+        self,
+        unique_id: str,
+        device_name: str,
+        state: datetime,
+        icon: str,
+        assumed_state: bool,
+    ) -> None:
+        """Initialize the Demo date/time entity."""
+        self._attr_assumed_state = assumed_state
+        self._attr_icon = icon
+        self._attr_native_value = state
+        self._attr_unique_id = unique_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                # Serial numbers are unique identifiers within a specific domain
+                (DOMAIN, unique_id)
+            },
+            name=device_name,
+        )
+
+    async def async_set_value(self, value: datetime) -> None:
+        """Update the date/time."""
+        self._attr_native_value = value
+        self.async_write_ha_state()
diff --git a/homeassistant/components/demo/humidifier.py b/homeassistant/components/demo/humidifier.py
index 772726ac1d5d9b..2e16a04e171e1c 100644
--- a/homeassistant/components/demo/humidifier.py
+++ b/homeassistant/components/demo/humidifier.py
@@ -4,6 +4,7 @@
 from typing import Any
 
 from homeassistant.components.humidifier import (
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -29,12 +30,16 @@ async def async_setup_platform(
                 name="Humidifier",
                 mode=None,
                 target_humidity=68,
+                current_humidity=45,
+                action=HumidifierAction.HUMIDIFYING,
                 device_class=HumidifierDeviceClass.HUMIDIFIER,
             ),
             DemoHumidifier(
                 name="Dehumidifier",
                 mode=None,
                 target_humidity=54,
+                current_humidity=59,
+                action=HumidifierAction.DRYING,
                 device_class=HumidifierDeviceClass.DEHUMIDIFIER,
             ),
             DemoHumidifier(
@@ -66,17 +71,21 @@ def __init__(
         name: str,
         mode: str | None,
         target_humidity: int,
+        current_humidity: int | None = None,
         available_modes: list[str] | None = None,
         is_on: bool = True,
+        action: HumidifierAction | None = None,
         device_class: HumidifierDeviceClass | None = None,
     ) -> None:
         """Initialize the humidifier device."""
         self._attr_name = name
         self._attr_is_on = is_on
+        self._attr_action = action
         self._attr_supported_features = SUPPORT_FLAGS
         if mode is not None:
             self._attr_supported_features |= HumidifierEntityFeature.MODES
         self._attr_target_humidity = target_humidity
+        self._attr_current_humidity = current_humidity
         self._attr_mode = mode
         self._attr_available_modes = available_modes
         self._attr_device_class = device_class
diff --git a/homeassistant/components/demo/light.py b/homeassistant/components/demo/light.py
index 2e5291b8a133b5..fbc35965dc409f 100644
--- a/homeassistant/components/demo/light.py
+++ b/homeassistant/components/demo/light.py
@@ -20,7 +20,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
@@ -34,11 +33,10 @@
 SUPPORT_DEMO_HS_WHITE = {ColorMode.HS, ColorMode.WHITE}
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the demo light platform."""
     async_add_entities(
@@ -47,28 +45,28 @@ async def async_setup_platform(
                 available=True,
                 effect_list=LIGHT_EFFECT_LIST,
                 effect=LIGHT_EFFECT_LIST[0],
-                name="Bed Light",
+                device_name="Bed Light",
                 state=False,
                 unique_id="light_1",
             ),
             DemoLight(
                 available=True,
                 ct=LIGHT_TEMPS[1],
-                name="Ceiling Lights",
+                device_name="Ceiling Lights",
                 state=True,
                 unique_id="light_2",
             ),
             DemoLight(
                 available=True,
                 hs_color=LIGHT_COLORS[1],
-                name="Kitchen Lights",
+                device_name="Kitchen Lights",
                 state=True,
                 unique_id="light_3",
             ),
             DemoLight(
                 available=True,
                 ct=LIGHT_TEMPS[1],
-                name="Office RGBW Lights",
+                device_name="Office RGBW Lights",
                 rgbw_color=(255, 0, 0, 255),
                 state=True,
                 supported_color_modes={ColorMode.RGBW},
@@ -76,7 +74,7 @@ async def async_setup_platform(
             ),
             DemoLight(
                 available=True,
-                name="Living Room RGBWW Lights",
+                device_name="Living Room RGBWW Lights",
                 rgbww_color=(255, 0, 0, 255, 0),
                 state=True,
                 supported_color_modes={ColorMode.RGBWW},
@@ -84,7 +82,7 @@ async def async_setup_platform(
             ),
             DemoLight(
                 available=True,
-                name="Entrance Color + White Lights",
+                device_name="Entrance Color + White Lights",
                 hs_color=LIGHT_COLORS[1],
                 state=True,
                 supported_color_modes=SUPPORT_DEMO_HS_WHITE,
@@ -94,24 +92,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoLight(LightEntity):
     """Representation of a demo light."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         available: bool = False,
         brightness: int = 180,
@@ -130,7 +121,6 @@ def __init__(
         self._effect = effect
         self._effect_list = effect_list
         self._hs_color = hs_color
-        self._attr_name = name
         self._rgbw_color = rgbw_color
         self._rgbww_color = rgbww_color
         self._state = state
@@ -148,16 +138,12 @@ def __init__(
         self._color_modes = supported_color_modes
         if self._effect_list is not None:
             self._attr_supported_features |= LightEntityFeature.EFFECT
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info."""
-        return DeviceInfo(
+        self._attr_device_info = DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, self.unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     @property
diff --git a/homeassistant/components/demo/mailbox.py b/homeassistant/components/demo/mailbox.py
index 6f0b23525e5969..8aa3e1ef384740 100644
--- a/homeassistant/components/demo/mailbox.py
+++ b/homeassistant/components/demo/mailbox.py
@@ -9,7 +9,7 @@
 from homeassistant.components.mailbox import CONTENT_TYPE_MPEG, Mailbox, StreamError
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,7 +34,9 @@ def __init__(self, hass: HomeAssistant, name: str) -> None:
         self._messages: dict[str, dict[str, Any]] = {}
         txt = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
         for idx in range(0, 10):
-            msgtime = int(dt.as_timestamp(dt.utcnow()) - 3600 * 24 * (10 - idx))
+            msgtime = int(
+                dt_util.as_timestamp(dt_util.utcnow()) - 3600 * 24 * (10 - idx)
+            )
             msgtxt = f"Message {idx + 1}. {txt * (1 + idx * (idx % 2))}"
             msgsha = sha1(msgtxt.encode("utf-8")).hexdigest()
             msg = {
@@ -76,7 +78,7 @@ async def async_get_messages(self) -> list[dict[str, Any]]:
         """Return a list of the current messages."""
         return sorted(
             self._messages.values(),
-            key=lambda item: item["info"]["origtime"],  # type: ignore[no-any-return]
+            key=lambda item: item["info"]["origtime"],
             reverse=True,
         )
 
diff --git a/homeassistant/components/demo/number.py b/homeassistant/components/demo/number.py
index 25ed7347bdac35..719b1078b8c79d 100644
--- a/homeassistant/components/demo/number.py
+++ b/homeassistant/components/demo/number.py
@@ -3,22 +3,20 @@
 
 from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME, UnitOfTemperature
+from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Number entity."""
+    """Set up the demo number platform."""
     async_add_entities(
         [
             DemoNumber(
@@ -77,24 +75,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoNumber(NumberEntity):
     """Representation of a demo Number entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: float,
         icon: str,
         assumed_state: bool,
@@ -111,7 +102,6 @@ def __init__(
         self._attr_device_class = device_class
         self._attr_icon = icon
         self._attr_mode = mode
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = state
         self._attr_unique_id = unique_id
@@ -128,7 +118,7 @@ def __init__(
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, unique_id)
             },
-            name=self.name,
+            name=device_name,
         )
 
     async def async_set_native_value(self, value: float) -> None:
diff --git a/homeassistant/components/demo/select.py b/homeassistant/components/demo/select.py
index e30d65c9f0e468..6349b10040cd05 100644
--- a/homeassistant/components/demo/select.py
+++ b/homeassistant/components/demo/select.py
@@ -3,27 +3,24 @@
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Select entity."""
+    """Set up the demo select platform."""
     async_add_entities(
         [
             DemoSelect(
                 unique_id="speed",
-                name="Speed",
+                device_name="Speed",
                 icon="mdi:speedometer",
                 current_option="ridiculous_speed",
                 options=[
@@ -37,24 +34,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSelect(SelectEntity):
     """Representation of a demo select entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str,
         current_option: str | None,
         options: list[str],
@@ -62,14 +52,13 @@ def __init__(
     ) -> None:
         """Initialize the Demo select entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_current_option = current_option
         self._attr_icon = icon
         self._attr_options = options
         self._attr_translation_key = translation_key
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
     async def async_select_option(self, option: str) -> None:
diff --git a/homeassistant/components/demo/sensor.py b/homeassistant/components/demo/sensor.py
index 84758f0c294d4b..26689582faef03 100644
--- a/homeassistant/components/demo/sensor.py
+++ b/homeassistant/components/demo/sensor.py
@@ -25,18 +25,17 @@
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
+from homeassistant.helpers.typing import StateType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo sensors."""
+    """Set up the demo sensor platform."""
     async_add_entities(
         [
             DemoSensor(
@@ -126,7 +125,7 @@ async def async_setup_platform(
             ),
             DemoSensor(
                 unique_id="sensor_10",
-                name=None,
+                device_name="Thermostat",
                 state="eco",
                 device_class=SensorDeviceClass.ENUM,
                 state_class=None,
@@ -139,24 +138,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSensor(SensorEntity):
     """Representation of a Demo sensor."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str | None,
+        device_name: str | None,
         state: StateType,
         device_class: SensorDeviceClass,
         state_class: SensorStateClass | None,
@@ -167,10 +159,6 @@ def __init__(
     ) -> None:
         """Initialize the sensor."""
         self._attr_device_class = device_class
-        if name is not None:
-            self._attr_name = name
-        else:
-            self._attr_has_entity_name = True
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = state
         self._attr_state_class = state_class
@@ -180,7 +168,7 @@ def __init__(
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
         if battery:
@@ -196,7 +184,7 @@ class DemoSumSensor(RestoreSensor):
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         five_minute_increase: float,
         device_class: SensorDeviceClass,
         state_class: SensorStateClass | None,
@@ -207,7 +195,6 @@ def __init__(
         """Initialize the sensor."""
         self.entity_id = f"{SENSOR_DOMAIN}.{suggested_entity_id}"
         self._attr_device_class = device_class
-        self._attr_name = name
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_native_value = 0
         self._attr_state_class = state_class
@@ -216,7 +203,7 @@ def __init__(
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
         if battery:
diff --git a/homeassistant/components/demo/strings.json b/homeassistant/components/demo/strings.json
index add04c236e76f6..3794b27cc0ea01 100644
--- a/homeassistant/components/demo/strings.json
+++ b/homeassistant/components/demo/strings.json
@@ -1,46 +1,5 @@
 {
   "title": "Demo",
-  "issues": {
-    "bad_psu": {
-      "title": "The power supply is not stable",
-      "fix_flow": {
-        "step": {
-          "confirm": {
-            "title": "The power supply needs to be replaced",
-            "description": "Press SUBMIT to confirm the power supply has been replaced"
-          }
-        }
-      }
-    },
-    "out_of_blinker_fluid": {
-      "title": "The blinker fluid is empty and needs to be refilled",
-      "fix_flow": {
-        "step": {
-          "confirm": {
-            "title": "Blinker fluid needs to be refilled",
-            "description": "Press SUBMIT when blinker fluid has been refilled"
-          }
-        }
-      }
-    },
-    "cold_tea": {
-      "title": "The tea is cold",
-      "fix_flow": {
-        "step": {},
-        "abort": {
-          "not_tea_time": "Can not re-heat the tea at this time"
-        }
-      }
-    },
-    "transmogrifier_deprecated": {
-      "title": "The transmogrifier component is deprecated",
-      "description": "The transmogrifier component is now deprecated due to the lack of local control available in the new API"
-    },
-    "unfixable_problem": {
-      "title": "This is not a fixable problem",
-      "description": "This issue is never going to give up."
-    }
-  },
   "options": {
     "step": {
       "init": {
@@ -81,7 +40,7 @@
               "2": "2",
               "3": "3",
               "auto": "Auto",
-              "off": "Off"
+              "off": "[%key:common::state::off%]"
             }
           }
         }
diff --git a/homeassistant/components/demo/stt.py b/homeassistant/components/demo/stt.py
index 07a844c048cc52..8cbc287b71dbb3 100644
--- a/homeassistant/components/demo/stt.py
+++ b/homeassistant/components/demo/stt.py
@@ -1,4 +1,4 @@
-"""Support for the demo for speech to text service."""
+"""Support for the demo for speech-to-text service."""
 from __future__ import annotations
 
 from collections.abc import AsyncIterable
@@ -9,7 +9,6 @@
     AudioCodecs,
     AudioFormats,
     AudioSampleRates,
-    Provider,
     SpeechMetadata,
     SpeechResult,
     SpeechResultState,
@@ -18,20 +17,10 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 SUPPORT_LANGUAGES = ["en", "de"]
 
 
-async def async_get_engine(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> Provider:
-    """Set up Demo speech component."""
-    return DemoProvider()
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -86,48 +75,3 @@ async def async_process_audio_stream(
             pass
 
         return SpeechResult("Turn the Kitchen Lights on", SpeechResultState.SUCCESS)
-
-
-class DemoProvider(Provider):
-    """Demo speech API provider."""
-
-    @property
-    def supported_languages(self) -> list[str]:
-        """Return a list of supported languages."""
-        return SUPPORT_LANGUAGES
-
-    @property
-    def supported_formats(self) -> list[AudioFormats]:
-        """Return a list of supported formats."""
-        return [AudioFormats.WAV]
-
-    @property
-    def supported_codecs(self) -> list[AudioCodecs]:
-        """Return a list of supported codecs."""
-        return [AudioCodecs.PCM]
-
-    @property
-    def supported_bit_rates(self) -> list[AudioBitRates]:
-        """Return a list of supported bit rates."""
-        return [AudioBitRates.BITRATE_16]
-
-    @property
-    def supported_sample_rates(self) -> list[AudioSampleRates]:
-        """Return a list of supported sample rates."""
-        return [AudioSampleRates.SAMPLERATE_16000, AudioSampleRates.SAMPLERATE_44100]
-
-    @property
-    def supported_channels(self) -> list[AudioChannels]:
-        """Return a list of supported channels."""
-        return [AudioChannels.CHANNEL_STEREO]
-
-    async def async_process_audio_stream(
-        self, metadata: SpeechMetadata, stream: AsyncIterable[bytes]
-    ) -> SpeechResult:
-        """Process an audio stream to STT service."""
-
-        # Read available data
-        async for _ in stream:
-            pass
-
-        return SpeechResult("Turn the Kitchen Lights on", SpeechResultState.SUCCESS)
diff --git a/homeassistant/components/demo/switch.py b/homeassistant/components/demo/switch.py
index 2ad400ff3f7ac5..49e06839be5d10 100644
--- a/homeassistant/components/demo/switch.py
+++ b/homeassistant/components/demo/switch.py
@@ -5,22 +5,19 @@
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo switches."""
+    """Set up the demo switch platform."""
     async_add_entities(
         [
             DemoSwitch("switch1", "Decorative Lights", True, None, True),
@@ -36,24 +33,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoSwitch(SwitchEntity):
     """Representation of a demo switch."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: bool,
         icon: str | None,
         assumed: bool,
@@ -64,11 +54,10 @@ def __init__(
         self._attr_device_class = device_class
         self._attr_icon = icon
         self._attr_is_on = state
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=self.name,
+            name=device_name,
         )
 
     def turn_on(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/demo/text.py b/homeassistant/components/demo/text.py
index efce1af5c37cdd..7c243b73ea527e 100644
--- a/homeassistant/components/demo/text.py
+++ b/homeassistant/components/demo/text.py
@@ -3,40 +3,37 @@
 
 from homeassistant.components.text import TextEntity, TextMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the demo Text entity."""
+    """Set up the Demo text platform."""
     async_add_entities(
         [
             DemoText(
                 unique_id="text",
-                name="Text",
+                device_name="Text",
                 icon=None,
                 native_value="Hello world",
             ),
             DemoText(
                 unique_id="password",
-                name="Password",
+                device_name="Password",
                 icon="mdi:text",
                 native_value="Hello world",
                 mode=TextMode.PASSWORD,
             ),
             DemoText(
                 unique_id="text_1_to_5_char",
-                name="Text with 1 to 5 characters",
+                device_name="Text with 1 to 5 characters",
                 icon="mdi:text",
                 native_value="Hello",
                 native_min=1,
@@ -44,7 +41,7 @@ async def async_setup_platform(
             ),
             DemoText(
                 unique_id="text_lowercase",
-                name="Text with only lower case characters",
+                device_name="Text with only lower case characters",
                 icon="mdi:text",
                 native_value="world",
                 pattern=r"[a-z]+",
@@ -53,24 +50,17 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 class DemoText(TextEntity):
     """Representation of a demo text entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         icon: str | None,
         native_value: str | None,
         mode: TextMode = TextMode.TEXT,
@@ -80,7 +70,6 @@ def __init__(
     ) -> None:
         """Initialize the Demo text entity."""
         self._attr_unique_id = unique_id
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = native_value
         self._attr_icon = icon
         self._attr_mode = mode
@@ -92,7 +81,7 @@ def __init__(
             self._attr_pattern = pattern
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
 
     async def async_set_value(self, value: str) -> None:
diff --git a/homeassistant/components/demo/time.py b/homeassistant/components/demo/time.py
index aafd425a024f2d..0384c0822f47f7 100644
--- a/homeassistant/components/demo/time.py
+++ b/homeassistant/components/demo/time.py
@@ -5,43 +5,33 @@
 
 from homeassistant.components.time import TimeEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Demo time entity."""
-    async_add_entities([DemoTime("time", "Time", time(12, 0, 0), "mdi:clock", False)])
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
+    """Set up the demo time platform."""
+    async_add_entities([DemoTime("time", "Time", time(12, 0, 0), "mdi:clock", False)])
 
 
 class DemoTime(TimeEntity):
     """Representation of a Demo time entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         unique_id: str,
-        name: str,
+        device_name: str,
         state: time,
         icon: str,
         assumed_state: bool,
@@ -49,12 +39,11 @@ def __init__(
         """Initialize the Demo time entity."""
         self._attr_assumed_state = assumed_state
         self._attr_icon = icon
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_native_value = state
         self._attr_unique_id = unique_id
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)}, name=self.name
+            identifiers={(DOMAIN, unique_id)}, name=device_name
         )
 
     async def async_set_value(self, value: time) -> None:
diff --git a/homeassistant/components/demo/tts.py b/homeassistant/components/demo/tts.py
index 2c9cd654d8429a..dfc8d7d7efb1be 100644
--- a/homeassistant/components/demo/tts.py
+++ b/homeassistant/components/demo/tts.py
@@ -1,4 +1,4 @@
-"""Support for the demo for text to speech service."""
+"""Support for the demo for text-to-speech service."""
 from __future__ import annotations
 
 import os
@@ -57,7 +57,7 @@ def supported_options(self) -> list[str]:
         return ["voice", "age"]
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load TTS from demo."""
         filename = os.path.join(os.path.dirname(__file__), "tts.mp3")
diff --git a/homeassistant/components/demo/update.py b/homeassistant/components/demo/update.py
index 15e67ffa0a87d8..6373c4850377aa 100644
--- a/homeassistant/components/demo/update.py
+++ b/homeassistant/components/demo/update.py
@@ -10,29 +10,26 @@
     UpdateEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import DOMAIN
 
 FAKE_INSTALL_SLEEP_TIME = 0.5
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up demo update entities."""
+    """Set up demo update platform."""
     async_add_entities(
         [
             DemoUpdate(
                 unique_id="update_no_install",
-                name="Demo Update No Install",
+                device_name="Demo Update No Install",
                 title="Awesomesoft Inc.",
                 installed_version="1.0.0",
                 latest_version="1.0.1",
@@ -42,14 +39,14 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_2_date",
-                name="Demo No Update",
+                device_name="Demo No Update",
                 title="AdGuard Home",
                 installed_version="1.0.0",
                 latest_version="1.0.0",
             ),
             DemoUpdate(
                 unique_id="update_addon",
-                name="Demo add-on",
+                device_name="Demo add-on",
                 title="AdGuard Home",
                 installed_version="1.0.0",
                 latest_version="1.0.1",
@@ -58,7 +55,7 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_light_bulb",
-                name="Demo Living Room Bulb Update",
+                device_name="Demo Living Room Bulb Update",
                 title="Philips Lamps Firmware",
                 installed_version="1.93.3",
                 latest_version="1.94.2",
@@ -68,7 +65,7 @@ async def async_setup_platform(
             ),
             DemoUpdate(
                 unique_id="update_support_progress",
-                name="Demo Update with Progress",
+                device_name="Demo Update with Progress",
                 title="Philips Lamps Firmware",
                 installed_version="1.93.3",
                 latest_version="1.94.2",
@@ -82,15 +79,6 @@ async def async_setup_platform(
     )
 
 
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Demo config entry."""
-    await async_setup_platform(hass, {}, async_add_entities)
-
-
 async def _fake_install() -> None:
     """Fake install an update."""
     await asyncio.sleep(FAKE_INSTALL_SLEEP_TIME)
@@ -99,13 +87,15 @@ async def _fake_install() -> None:
 class DemoUpdate(UpdateEntity):
     """Representation of a demo update entity."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(
         self,
         *,
         unique_id: str,
-        name: str,
+        device_name: str,
         title: str | None,
         installed_version: str | None,
         latest_version: str | None,
@@ -120,14 +110,13 @@ def __init__(
         self._attr_installed_version = installed_version
         self._attr_device_class = device_class
         self._attr_latest_version = latest_version
-        self._attr_name = name or DEVICE_DEFAULT_NAME
         self._attr_release_summary = release_summary
         self._attr_release_url = release_url
         self._attr_title = title
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=name,
+            name=device_name,
         )
         if support_install:
             self._attr_supported_features |= (
diff --git a/homeassistant/components/derivative/sensor.py b/homeassistant/components/derivative/sensor.py
index e1cc278137cfcd..af04da27406c28 100644
--- a/homeassistant/components/derivative/sensor.py
+++ b/homeassistant/components/derivative/sensor.py
@@ -19,7 +19,12 @@
     UnitOfTime,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -86,6 +91,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE]
     )
 
+    source_entity = registry.async_get(source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     unit_prefix = config_entry.options[CONF_UNIT_PREFIX]
     if unit_prefix == "none":
         unit_prefix = None
@@ -99,6 +126,7 @@ async def async_setup_entry(
         unit_of_measurement=None,
         unit_prefix=unit_prefix,
         unit_time=config_entry.options[CONF_UNIT_TIME],
+        device_info=device_info,
     )
 
     async_add_entities([derivative_sensor])
@@ -142,9 +170,11 @@ def __init__(
         unit_prefix: str | None,
         unit_time: UnitOfTime,
         unique_id: str | None,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the derivative sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._sensor_source_id = source_entity
         self._round_digits = round_digits
         self._state: float | int | Decimal = 0
diff --git a/homeassistant/components/device_automation/__init__.py b/homeassistant/components/device_automation/__init__.py
index d5017ac2329e81..af2fd61081cb80 100644
--- a/homeassistant/components/device_automation/__init__.py
+++ b/homeassistant/components/device_automation/__init__.py
@@ -19,6 +19,7 @@
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
     CONF_DOMAIN,
+    CONF_ENTITY_ID,
     CONF_PLATFORM,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -40,7 +41,7 @@
     CONF_TURNED_OFF,
     CONF_TURNED_ON,
 )
-from .exceptions import DeviceNotFound, InvalidDeviceAutomationConfig
+from .exceptions import DeviceNotFound, EntityNotFound, InvalidDeviceAutomationConfig
 
 if TYPE_CHECKING:
     from .action import DeviceAutomationActionProtocol
@@ -57,6 +58,8 @@
 
 DOMAIN = "device_automation"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 DEVICE_TRIGGER_BASE_SCHEMA: vol.Schema = cv.TRIGGER_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_PLATFORM): "device",
@@ -311,7 +314,7 @@ async def _async_get_device_automation_capabilities(
 
     try:
         capabilities = await getattr(platform, function_name)(hass, automation)
-    except InvalidDeviceAutomationConfig:
+    except (EntityNotFound, InvalidDeviceAutomationConfig):
         return {}
 
     capabilities = capabilities.copy()
@@ -326,6 +329,33 @@ async def _async_get_device_automation_capabilities(
     return capabilities  # type: ignore[no-any-return]
 
 
+@callback
+def async_get_entity_registry_entry_or_raise(
+    hass: HomeAssistant, entity_registry_id: str
+) -> er.RegistryEntry:
+    """Get an entity registry entry from entry ID or raise."""
+    entity_registry = er.async_get(hass)
+    entry = entity_registry.async_get(entity_registry_id)
+    if entry is None:
+        raise EntityNotFound
+    return entry
+
+
+@callback
+def async_validate_entity_schema(
+    hass: HomeAssistant, config: ConfigType, schema: vol.Schema
+) -> ConfigType:
+    """Validate schema and resolve entity registry entry id to entity_id."""
+    config = schema(config)
+
+    registry = er.async_get(hass)
+    config[CONF_ENTITY_ID] = er.async_resolve_entity_id(
+        registry, config[CONF_ENTITY_ID]
+    )
+
+    return config
+
+
 def handle_device_errors(
     func: Callable[[HomeAssistant, ActiveConnection, dict[str, Any]], Awaitable[None]]
 ) -> Callable[
diff --git a/homeassistant/components/device_automation/entity.py b/homeassistant/components/device_automation/entity.py
index f38daf2dae6eab..87ff5a2cb5203e 100644
--- a/homeassistant/components/device_automation/entity.py
+++ b/homeassistant/components/device_automation/entity.py
@@ -23,7 +23,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_CHANGED_STATES]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -73,7 +73,7 @@ async def _async_get_automations(
             {
                 **template,
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": domain,
             }
             for template in automation_templates
diff --git a/homeassistant/components/device_automation/exceptions.py b/homeassistant/components/device_automation/exceptions.py
index ad92696cb945df..0b2f2c01be7651 100644
--- a/homeassistant/components/device_automation/exceptions.py
+++ b/homeassistant/components/device_automation/exceptions.py
@@ -8,3 +8,7 @@ class InvalidDeviceAutomationConfig(HomeAssistantError):
 
 class DeviceNotFound(HomeAssistantError):
     """When referenced device not found."""
+
+
+class EntityNotFound(HomeAssistantError):
+    """When referenced entity not found."""
diff --git a/homeassistant/components/device_automation/helpers.py b/homeassistant/components/device_automation/helpers.py
index 5f844c36aa573d..038ded07e8aef0 100644
--- a/homeassistant/components/device_automation/helpers.py
+++ b/homeassistant/components/device_automation/helpers.py
@@ -5,7 +5,7 @@
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN
+from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.typing import ConfigType
@@ -25,6 +25,24 @@
     DeviceAutomationType.TRIGGER: "TRIGGER_SCHEMA",
 }
 
+ENTITY_PLATFORMS = {
+    Platform.ALARM_CONTROL_PANEL.value,
+    Platform.BUTTON.value,
+    Platform.CLIMATE.value,
+    Platform.COVER.value,
+    Platform.FAN.value,
+    Platform.HUMIDIFIER.value,
+    Platform.LIGHT.value,
+    Platform.LOCK.value,
+    Platform.NUMBER.value,
+    Platform.REMOTE.value,
+    Platform.SELECT.value,
+    Platform.SWITCH.value,
+    Platform.TEXT.value,
+    Platform.VACUUM.value,
+    Platform.WATER_HEATER.value,
+}
+
 
 async def async_validate_device_automation_config(
     hass: HomeAssistant,
@@ -43,6 +61,16 @@ async def async_validate_device_automation_config(
             ConfigType, getattr(platform, STATIC_VALIDATOR[automation_type])(config)
         )
 
+    # Bypass checks for entity platforms
+    if (
+        automation_type == DeviceAutomationType.ACTION
+        and validated_config[CONF_DOMAIN] in ENTITY_PLATFORMS
+    ):
+        return cast(
+            ConfigType,
+            await getattr(platform, DYNAMIC_VALIDATOR[automation_type])(hass, config),
+        )
+
     # Only call the dynamic validator if the referenced device exists and the relevant
     # config entry is loaded
     registry = dr.async_get(hass)
diff --git a/homeassistant/components/device_automation/toggle_entity.py b/homeassistant/components/device_automation/toggle_entity.py
index e5061cb691e8c7..189fc750e50a5b 100644
--- a/homeassistant/components/device_automation/toggle_entity.py
+++ b/homeassistant/components/device_automation/toggle_entity.py
@@ -78,14 +78,14 @@
 
 ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(DEVICE_ACTION_TYPES),
     }
 )
 
 CONDITION_SCHEMA = cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_IS_OFF, CONF_IS_ON]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -93,7 +93,7 @@
 
 _TOGGLE_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In([CONF_TURNED_OFF, CONF_TURNED_ON]),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -196,7 +196,7 @@ async def _async_get_automations(
             {
                 **template,
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": domain,
             }
             for template in automation_templates
diff --git a/homeassistant/components/device_tracker/config_entry.py b/homeassistant/components/device_tracker/config_entry.py
index 5d56548f0ecb41..286929c534588d 100644
--- a/homeassistant/components/device_tracker/config_entry.py
+++ b/homeassistant/components/device_tracker/config_entry.py
@@ -176,7 +176,9 @@ def handle_device_event(ev: Event) -> None:
         # Enable entity
         ent_reg.async_update_entity(entity_id, disabled_by=None)
 
-    hass.bus.async_listen(dr.EVENT_DEVICE_REGISTRY_UPDATED, handle_device_event)
+    hass.bus.async_listen(
+        dr.EVENT_DEVICE_REGISTRY_UPDATED, handle_device_event, run_immediately=True
+    )
 
 
 class BaseTrackerEntity(Entity):
@@ -371,7 +373,6 @@ async def async_internal_added_to_hass(self) -> None:
         # Entities without a unique ID don't have a device
         if (
             not self.registry_entry
-            or not self.platform
             or not self.platform.config_entry
             or not self.mac_address
             or (device_entry := self.find_device_entry()) is None
diff --git a/homeassistant/components/device_tracker/device_condition.py b/homeassistant/components/device_tracker/device_condition.py
index 96ee70baca8252..b5bf850b4fad7f 100644
--- a/homeassistant/components/device_tracker/device_condition.py
+++ b/homeassistant/components/device_tracker/device_condition.py
@@ -27,7 +27,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -50,7 +50,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -63,12 +63,14 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
     reverse = config[CONF_TYPE] == "is_not_home"
 
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        result = condition.state(hass, config[ATTR_ENTITY_ID], STATE_HOME)
+        result = condition.state(hass, entity_id, STATE_HOME)
         if reverse:
             result = not result
         return result
diff --git a/homeassistant/components/device_tracker/device_trigger.py b/homeassistant/components/device_tracker/device_trigger.py
index 150b58722754c9..a96f9affb1dd32 100644
--- a/homeassistant/components/device_tracker/device_trigger.py
+++ b/homeassistant/components/device_tracker/device_trigger.py
@@ -27,7 +27,7 @@
 
 TRIGGER_SCHEMA: Final = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Required(CONF_ZONE): cv.entity_domain(DOMAIN_ZONE),
     }
@@ -51,7 +51,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: "enters",
             }
         )
@@ -60,7 +60,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: "leaves",
             }
         )
diff --git a/homeassistant/components/device_tracker/legacy.py b/homeassistant/components/device_tracker/legacy.py
index e27ff57f03f284..b428018cd9ec36 100644
--- a/homeassistant/components/device_tracker/legacy.py
+++ b/homeassistant/components/device_tracker/legacy.py
@@ -726,6 +726,10 @@ async def async_init_single_device(dev: Device) -> None:
 class Device(RestoreEntity):
     """Base class for a tracked device."""
 
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
+
     host_name: str | None = None
     location_name: str | None = None
     gps: GPSType | None = None
diff --git a/homeassistant/components/device_tracker/services.yaml b/homeassistant/components/device_tracker/services.yaml
index c6c2d212e2d04e..22d89b42253c68 100644
--- a/homeassistant/components/device_tracker/services.yaml
+++ b/homeassistant/components/device_tracker/services.yaml
@@ -30,7 +30,7 @@ see:
         text:
     gps:
       name: GPS coordinates
-      description: GPS coordinates where device is located (latitude, longitude).
+      description: GPS coordinates where device is located, specified by latitude and longitude.
       example: "[51.509802, -0.086692]"
       selector:
         object:
diff --git a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
index eafd1e63b1fef4..d2608ed43c7a02 100644
--- a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
+++ b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
@@ -8,6 +8,8 @@
 class DevoloMultiLevelSwitchDeviceEntity(DevoloDeviceEntity):
     """Representation of a multi level switch device within devolo Home Control. Something like a dimmer or a thermostat."""
 
+    _attr_name = None
+
     def __init__(
         self, homecontrol: HomeControl, device_instance: Zwave, element_uid: str
     ) -> None:
diff --git a/homeassistant/components/devolo_home_control/light.py b/homeassistant/components/devolo_home_control/light.py
index 4ccd5a00ab2bcc..93a66e345ecb2b 100644
--- a/homeassistant/components/devolo_home_control/light.py
+++ b/homeassistant/components/devolo_home_control/light.py
@@ -71,13 +71,12 @@ def turn_on(self, **kwargs: Any) -> None:
             self._multi_level_switch_property.set(
                 round(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
             )
+        elif self._binary_switch_property is not None:
+            # Turn on the light device to the latest known value. The value is known by the device itself.
+            self._binary_switch_property.set(True)
         else:
-            if self._binary_switch_property is not None:
-                # Turn on the light device to the latest known value. The value is known by the device itself.
-                self._binary_switch_property.set(True)
-            else:
-                # If there is no binary switch attached to the device, turn it on to 100 %.
-                self._multi_level_switch_property.set(100)
+            # If there is no binary switch attached to the device, turn it on to 100 %.
+            self._multi_level_switch_property.set(100)
 
     def turn_off(self, **kwargs: Any) -> None:
         """Turn device off."""
diff --git a/homeassistant/components/devolo_home_control/manifest.json b/homeassistant/components/devolo_home_control/manifest.json
index 60f99daffdc531..71ca03f9638b90 100644
--- a/homeassistant/components/devolo_home_control/manifest.json
+++ b/homeassistant/components/devolo_home_control/manifest.json
@@ -8,7 +8,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["devolo_home_control_api"],
-  "quality_scale": "silver",
+  "quality_scale": "gold",
   "requirements": ["devolo-home-control-api==0.18.2"],
   "zeroconf": ["_dvl-deviceapi._tcp.local."]
 }
diff --git a/homeassistant/components/devolo_home_control/switch.py b/homeassistant/components/devolo_home_control/switch.py
index 24b1d3545deafd..9b96e58da60062 100644
--- a/homeassistant/components/devolo_home_control/switch.py
+++ b/homeassistant/components/devolo_home_control/switch.py
@@ -41,6 +41,8 @@ async def async_setup_entry(
 class DevoloSwitch(DevoloDeviceEntity, SwitchEntity):
     """Representation of a switch."""
 
+    _attr_name = None
+
     def __init__(
         self, homecontrol: HomeControl, device_instance: Zwave, element_uid: str
     ) -> None:
diff --git a/homeassistant/components/dexcom/sensor.py b/homeassistant/components/dexcom/sensor.py
index bf53022b43bf0e..b9958dc7309989 100644
--- a/homeassistant/components/dexcom/sensor.py
+++ b/homeassistant/components/dexcom/sensor.py
@@ -20,53 +20,35 @@ async def async_setup_entry(
     coordinator = hass.data[DOMAIN][config_entry.entry_id][COORDINATOR]
     username = config_entry.data[CONF_USERNAME]
     unit_of_measurement = config_entry.options[CONF_UNIT_OF_MEASUREMENT]
-    sensors: list[SensorEntity] = []
-    sensors.append(DexcomGlucoseTrendSensor(coordinator, username))
-    sensors.append(DexcomGlucoseValueSensor(coordinator, username, unit_of_measurement))
-    async_add_entities(sensors, False)
+    async_add_entities(
+        [
+            DexcomGlucoseTrendSensor(coordinator, username),
+            DexcomGlucoseValueSensor(coordinator, username, unit_of_measurement),
+        ],
+        False,
+    )
 
 
 class DexcomGlucoseValueSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose value sensor."""
 
+    _attr_icon = GLUCOSE_VALUE_ICON
+
     def __init__(self, coordinator, username, unit_of_measurement):
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self._state = None
-        self._unit_of_measurement = unit_of_measurement
-        self._attribute_unit_of_measurement = (
-            "mg_dl" if unit_of_measurement == MG_DL else "mmol_l"
-        )
-        self._name = f"{DOMAIN}_{username}_glucose_value"
-        self._unique_id = f"{username}-value"
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def icon(self):
-        """Return the icon for the frontend."""
-        return GLUCOSE_VALUE_ICON
-
-    @property
-    def native_unit_of_measurement(self):
-        """Return the unit of measurement of the device."""
-        return self._unit_of_measurement
+        self._attr_native_unit_of_measurement = unit_of_measurement
+        self._key = "mg_dl" if unit_of_measurement == MG_DL else "mmol_l"
+        self._attr_name = f"{DOMAIN}_{username}_glucose_value"
+        self._attr_unique_id = f"{username}-value"
 
     @property
     def native_value(self):
         """Return the state of the sensor."""
         if self.coordinator.data:
-            return getattr(self.coordinator.data, self._attribute_unit_of_measurement)
+            return getattr(self.coordinator.data, self._key)
         return None
 
-    @property
-    def unique_id(self):
-        """Device unique id."""
-        return self._unique_id
-
 
 class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
     """Representation of a Dexcom glucose trend sensor."""
@@ -74,14 +56,8 @@ class DexcomGlucoseTrendSensor(CoordinatorEntity, SensorEntity):
     def __init__(self, coordinator, username):
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self._state = None
-        self._name = f"{DOMAIN}_{username}_glucose_trend"
-        self._unique_id = f"{username}-trend"
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
+        self._attr_name = f"{DOMAIN}_{username}_glucose_trend"
+        self._attr_unique_id = f"{username}-trend"
 
     @property
     def icon(self):
@@ -96,8 +72,3 @@ def native_value(self):
         if self.coordinator.data:
             return self.coordinator.data.trend_description
         return None
-
-    @property
-    def unique_id(self):
-        """Device unique id."""
-        return self._unique_id
diff --git a/homeassistant/components/dhcp/__init__.py b/homeassistant/components/dhcp/__init__.py
index 7f41d2c1d3d36b..4a9f6c2b163dab 100644
--- a/homeassistant/components/dhcp/__init__.py
+++ b/homeassistant/components/dhcp/__init__.py
@@ -42,7 +42,7 @@
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
 from homeassistant.data_entry_flow import BaseServiceInfo
-from homeassistant.helpers import discovery_flow
+from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     DeviceRegistry,
@@ -59,10 +59,14 @@
 from homeassistant.util.async_ import run_callback_threadsafe
 from homeassistant.util.network import is_invalid, is_link_local, is_loopback
 
+from .const import DOMAIN
+
 if TYPE_CHECKING:
     from scapy.packet import Packet
     from scapy.sendrecv import AsyncSniffer
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 FILTER = "udp and (port 67 or 68)"
 REQUESTED_ADDR = "requested_addr"
 MESSAGE_TYPE = "message-type"
diff --git a/homeassistant/components/diagnostics/__init__.py b/homeassistant/components/diagnostics/__init__.py
index ea7b13f471913d..2ff220b90966a7 100644
--- a/homeassistant/components/diagnostics/__init__.py
+++ b/homeassistant/components/diagnostics/__init__.py
@@ -14,7 +14,7 @@
 from homeassistant.components import http, websocket_api
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import integration_platform
+from homeassistant.helpers import config_validation as cv, integration_platform
 from homeassistant.helpers.device_registry import DeviceEntry, async_get
 from homeassistant.helpers.json import (
     ExtendedJSONEncoder,
@@ -33,7 +33,10 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
+@dataclass(slots=True)
 class DiagnosticsPlatformData:
     """Diagnostic platform data."""
 
@@ -46,7 +49,7 @@ class DiagnosticsPlatformData:
     ] | None
 
 
-@dataclass
+@dataclass(slots=True)
 class DiagnosticsData:
     """Diagnostic data."""
 
diff --git a/homeassistant/components/dialogflow/config_flow.py b/homeassistant/components/dialogflow/config_flow.py
index fee99898ccc179..7e62869c3fa702 100644
--- a/homeassistant/components/dialogflow/config_flow.py
+++ b/homeassistant/components/dialogflow/config_flow.py
@@ -7,7 +7,7 @@
     DOMAIN,
     "Dialogflow Webhook",
     {
-        "dialogflow_url": "https://dialogflow.com/docs/fulfillment#webhook",
+        "dialogflow_url": "https://cloud.google.com/dialogflow/es/docs/fulfillment-webhook",
         "docs_url": "https://www.home-assistant.io/integrations/dialogflow/",
     },
 )
diff --git a/homeassistant/components/directv/entity.py b/homeassistant/components/directv/entity.py
index 08b24a50a755d1..9d1fd68b742c0a 100644
--- a/homeassistant/components/directv/entity.py
+++ b/homeassistant/components/directv/entity.py
@@ -1,6 +1,8 @@
 """Base DirecTV Entity."""
 from __future__ import annotations
 
+from typing import cast
+
 from directv import DIRECTV
 
 from homeassistant.helpers.entity import DeviceInfo, Entity
@@ -24,7 +26,10 @@ def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={(DOMAIN, self._device_id)},
             manufacturer=self.dtv.device.info.brand,
-            name=self.name,
+            # Instead of setting the device name to the entity name, directv
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             sw_version=self.dtv.device.info.version,
             via_device=(DOMAIN, self.dtv.device.info.receiver_id),
         )
diff --git a/homeassistant/components/directv/media_player.py b/homeassistant/components/directv/media_player.py
index 21b25962fce145..8c1570db159611 100644
--- a/homeassistant/components/directv/media_player.py
+++ b/homeassistant/components/directv/media_player.py
@@ -112,7 +112,8 @@ async def async_update(self) -> None:
             self._paused = self._last_position == self._program.position
             self._is_recorded = self._program.recorded
             self._last_position = self._program.position
-            self._last_update = state.at
+            if not self._paused:
+                self._last_update = dt_util.utcnow()
             self._attr_assumed_state = self._is_recorded
 
     @property
diff --git a/homeassistant/components/discogs/manifest.json b/homeassistant/components/discogs/manifest.json
index 2b405341841e55..fceb214aded2a2 100644
--- a/homeassistant/components/discogs/manifest.json
+++ b/homeassistant/components/discogs/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/discogs",
   "iot_class": "cloud_polling",
   "loggers": ["discogs_client"],
-  "requirements": ["discogs_client==2.3.0"]
+  "requirements": ["discogs-client==2.3.0"]
 }
diff --git a/homeassistant/components/discord/__init__.py b/homeassistant/components/discord/__init__.py
index a52c079ac8ea15..329709e88d28bc 100644
--- a/homeassistant/components/discord/__init__.py
+++ b/homeassistant/components/discord/__init__.py
@@ -6,13 +6,15 @@
 from homeassistant.const import CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Discord component."""
diff --git a/homeassistant/components/discovergy/__init__.py b/homeassistant/components/discovergy/__init__.py
new file mode 100644
index 00000000000000..54f6fca83d4698
--- /dev/null
+++ b/homeassistant/components/discovergy/__init__.py
@@ -0,0 +1,93 @@
+"""The Discovergy integration."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+import pydiscovergy
+from pydiscovergy.authentication import BasicAuth
+import pydiscovergy.error as discovergyError
+from pydiscovergy.models import Meter
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers.httpx_client import get_async_client
+
+from .const import APP_NAME, DOMAIN
+from .coordinator import DiscovergyUpdateCoordinator
+
+PLATFORMS = [Platform.SENSOR]
+
+
+@dataclass
+class DiscovergyData:
+    """Discovergy data class to share meters and api client."""
+
+    api_client: pydiscovergy.Discovergy
+    meters: list[Meter]
+    coordinators: dict[str, DiscovergyUpdateCoordinator]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Discovergy from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
+
+    # init discovergy data class
+    discovergy_data = DiscovergyData(
+        api_client=pydiscovergy.Discovergy(
+            email=entry.data[CONF_EMAIL],
+            password=entry.data[CONF_PASSWORD],
+            app_name=APP_NAME,
+            httpx_client=get_async_client(hass),
+            authentication=BasicAuth(),
+        ),
+        meters=[],
+        coordinators={},
+    )
+
+    try:
+        # try to get meters from api to check if credentials are still valid and for later use
+        # if no exception is raised everything is fine to go
+        discovergy_data.meters = await discovergy_data.api_client.get_meters()
+    except discovergyError.InvalidLogin as err:
+        raise ConfigEntryAuthFailed("Invalid email or password") from err
+    except Exception as err:  # pylint: disable=broad-except
+        raise ConfigEntryNotReady(
+            "Unexpected error while while getting meters"
+        ) from err
+
+    # Init coordinators for meters
+    for meter in discovergy_data.meters:
+        # Create coordinator for meter, set config entry and fetch initial data,
+        # so we have data when entities are added
+        coordinator = DiscovergyUpdateCoordinator(
+            hass=hass,
+            config_entry=entry,
+            meter=meter,
+            discovergy_client=discovergy_data.api_client,
+        )
+        await coordinator.async_config_entry_first_refresh()
+
+        discovergy_data.coordinators[meter.get_meter_id()] = coordinator
+
+    hass.data[DOMAIN][entry.entry_id] = discovergy_data
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    entry.async_on_unload(entry.add_update_listener(async_reload_entry))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle an options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/discovergy/config_flow.py b/homeassistant/components/discovergy/config_flow.py
new file mode 100644
index 00000000000000..d6b81ed88375e8
--- /dev/null
+++ b/homeassistant/components/discovergy/config_flow.py
@@ -0,0 +1,122 @@
+"""Config flow for Discovergy integration."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+import logging
+from typing import Any
+
+import pydiscovergy
+from pydiscovergy.authentication import BasicAuth
+import pydiscovergy.error as discovergyError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.httpx_client import get_async_client
+
+from .const import APP_NAME, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def make_schema(email: str = "", password: str = "") -> vol.Schema:
+    """Create schema for config flow."""
+    return vol.Schema(
+        {
+            vol.Required(
+                CONF_EMAIL,
+                default=email,
+            ): str,
+            vol.Required(
+                CONF_PASSWORD,
+                default=password,
+            ): str,
+        }
+    )
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Discovergy."""
+
+    VERSION = 1
+
+    existing_entry: ConfigEntry | None = None
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=make_schema(),
+            )
+
+        return await self._validate_and_save(user_input)
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Handle the initial step."""
+        self.existing_entry = await self.async_set_unique_id(self.context["unique_id"])
+
+        if entry_data is None:
+            return self.async_show_form(
+                step_id="reauth",
+                data_schema=make_schema(
+                    self.existing_entry.data[CONF_EMAIL] or "",
+                    self.existing_entry.data[CONF_PASSWORD] or "",
+                ),
+            )
+
+        return await self._validate_and_save(entry_data, step_id="reauth")
+
+    async def _validate_and_save(
+        self, user_input: Mapping[str, Any] | None = None, step_id: str = "user"
+    ) -> FlowResult:
+        """Validate user input and create config entry."""
+        errors = {}
+
+        if user_input:
+            try:
+                await pydiscovergy.Discovergy(
+                    email=user_input[CONF_EMAIL],
+                    password=user_input[CONF_PASSWORD],
+                    app_name=APP_NAME,
+                    httpx_client=get_async_client(self.hass),
+                    authentication=BasicAuth(),
+                ).get_meters()
+            except discovergyError.HTTPError:
+                errors["base"] = "cannot_connect"
+            except discovergyError.InvalidLogin:
+                errors["base"] = "invalid_auth"
+            except Exception:  # pylint: disable=broad-except
+                _LOGGER.exception("Unexpected error occurred while getting meters")
+                errors["base"] = "unknown"
+            else:
+                if self.existing_entry:
+                    self.hass.config_entries.async_update_entry(
+                        self.existing_entry,
+                        data={
+                            CONF_EMAIL: user_input[CONF_EMAIL],
+                            CONF_PASSWORD: user_input[CONF_PASSWORD],
+                        },
+                    )
+                    await self.hass.config_entries.async_reload(
+                        self.existing_entry.entry_id
+                    )
+                    return self.async_abort(reason="reauth_successful")
+
+                # set unique id to title which is the account email
+                await self.async_set_unique_id(user_input[CONF_EMAIL].lower())
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title=user_input[CONF_EMAIL], data=user_input
+                )
+
+        return self.async_show_form(
+            step_id=step_id,
+            data_schema=make_schema(),
+            errors=errors,
+        )
diff --git a/homeassistant/components/discovergy/const.py b/homeassistant/components/discovergy/const.py
new file mode 100644
index 00000000000000..866e9f11def260
--- /dev/null
+++ b/homeassistant/components/discovergy/const.py
@@ -0,0 +1,6 @@
+"""Constants for the Discovergy integration."""
+from __future__ import annotations
+
+DOMAIN = "discovergy"
+MANUFACTURER = "Discovergy"
+APP_NAME = "homeassistant"
diff --git a/homeassistant/components/discovergy/coordinator.py b/homeassistant/components/discovergy/coordinator.py
new file mode 100644
index 00000000000000..e3b6e91e03f50e
--- /dev/null
+++ b/homeassistant/components/discovergy/coordinator.py
@@ -0,0 +1,60 @@
+"""DataUpdateCoordinator for the Discovergy integration."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+
+from pydiscovergy import Discovergy
+from pydiscovergy.error import AccessTokenExpired, HTTPError
+from pydiscovergy.models import Meter, Reading
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DiscovergyUpdateCoordinator(DataUpdateCoordinator[Reading]):
+    """The Discovergy update coordinator."""
+
+    config_entry: ConfigEntry
+    discovergy_client: Discovergy
+    meter: Meter
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        meter: Meter,
+        discovergy_client: Discovergy,
+    ) -> None:
+        """Initialize the Discovergy coordinator."""
+        self.config_entry = config_entry
+        self.meter = meter
+        self.discovergy_client = discovergy_client
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=30),
+        )
+
+    async def _async_update_data(self) -> Reading:
+        """Get last reading for meter."""
+        try:
+            return await self.discovergy_client.get_last_reading(
+                self.meter.get_meter_id()
+            )
+        except AccessTokenExpired as err:
+            raise ConfigEntryAuthFailed(
+                f"Auth expired while fetching last reading for meter {self.meter.get_meter_id()}"
+            ) from err
+        except HTTPError as err:
+            raise UpdateFailed(
+                f"Error while fetching last reading for meter {self.meter.get_meter_id()}"
+            ) from err
diff --git a/homeassistant/components/discovergy/diagnostics.py b/homeassistant/components/discovergy/diagnostics.py
new file mode 100644
index 00000000000000..02d5585c1dcfe3
--- /dev/null
+++ b/homeassistant/components/discovergy/diagnostics.py
@@ -0,0 +1,49 @@
+"""Diagnostics support for discovergy."""
+from __future__ import annotations
+
+from typing import Any
+
+from pydiscovergy.models import Meter
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, CONF_UNIQUE_ID
+from homeassistant.core import HomeAssistant
+
+from . import DiscovergyData
+from .const import DOMAIN
+
+TO_REDACT_CONFIG_ENTRY = {CONF_EMAIL, CONF_PASSWORD, CONF_UNIQUE_ID, "title"}
+
+TO_REDACT_METER = {
+    "serial_number",
+    "full_serial_number",
+    "location",
+    "fullSerialNumber",
+    "printedFullSerialNumber",
+    "administrationNumber",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    flattened_meter: list[dict] = []
+    last_readings: dict[str, dict] = {}
+    data: DiscovergyData = hass.data[DOMAIN][entry.entry_id]
+    meters: list[Meter] = data.meters  # always returns a list
+
+    for meter in meters:
+        # make a dict of meter data and redact some data
+        flattened_meter.append(async_redact_data(meter.__dict__, TO_REDACT_METER))
+
+        # get last reading for meter and make a dict of it
+        coordinator = data.coordinators[meter.get_meter_id()]
+        last_readings[meter.get_meter_id()] = coordinator.data.__dict__
+
+    return {
+        "entry": async_redact_data(entry.as_dict(), TO_REDACT_CONFIG_ENTRY),
+        "meters": flattened_meter,
+        "readings": last_readings,
+    }
diff --git a/homeassistant/components/discovergy/manifest.json b/homeassistant/components/discovergy/manifest.json
new file mode 100644
index 00000000000000..c929386e8e85ca
--- /dev/null
+++ b/homeassistant/components/discovergy/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "discovergy",
+  "name": "Discovergy",
+  "codeowners": ["@jpbede"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/discovergy",
+  "integration_type": "hub",
+  "iot_class": "cloud_polling",
+  "requirements": ["pydiscovergy==1.2.1"]
+}
diff --git a/homeassistant/components/discovergy/sensor.py b/homeassistant/components/discovergy/sensor.py
new file mode 100644
index 00000000000000..3f4069752f2ed0
--- /dev/null
+++ b/homeassistant/components/discovergy/sensor.py
@@ -0,0 +1,210 @@
+"""Discovergy sensor entity."""
+from dataclasses import dataclass, field
+
+from pydiscovergy.models import Meter
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    UnitOfElectricPotential,
+    UnitOfEnergy,
+    UnitOfPower,
+    UnitOfVolume,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import DiscovergyData, DiscovergyUpdateCoordinator
+from .const import DOMAIN, MANUFACTURER
+
+PARALLEL_UPDATES = 1
+
+
+@dataclass
+class DiscovergyMixin:
+    """Mixin for alternative keys."""
+
+    alternative_keys: list[str] = field(default_factory=lambda: [])
+    scale: int = field(default_factory=lambda: 1000)
+
+
+@dataclass
+class DiscovergySensorEntityDescription(DiscovergyMixin, SensorEntityDescription):
+    """Define Sensor entity description class."""
+
+
+GAS_SENSORS: tuple[DiscovergySensorEntityDescription, ...] = (
+    DiscovergySensorEntityDescription(
+        key="volume",
+        translation_key="total_gas_consumption",
+        suggested_display_precision=4,
+        native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
+        device_class=SensorDeviceClass.GAS,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+    ),
+)
+
+ELECTRICITY_SENSORS: tuple[DiscovergySensorEntityDescription, ...] = (
+    # power sensors
+    DiscovergySensorEntityDescription(
+        key="power",
+        translation_key="total_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    DiscovergySensorEntityDescription(
+        key="power1",
+        translation_key="phase_1_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase1Power"],
+    ),
+    DiscovergySensorEntityDescription(
+        key="power2",
+        translation_key="phase_2_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase2Power"],
+    ),
+    DiscovergySensorEntityDescription(
+        key="power3",
+        translation_key="phase_3_power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        suggested_display_precision=3,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        alternative_keys=["phase3Power"],
+    ),
+    # voltage sensors
+    DiscovergySensorEntityDescription(
+        key="phase1Voltage",
+        translation_key="phase_1_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    DiscovergySensorEntityDescription(
+        key="phase2Voltage",
+        translation_key="phase_2_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    DiscovergySensorEntityDescription(
+        key="phase3Voltage",
+        translation_key="phase_3_voltage",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        suggested_display_precision=1,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
+    # energy sensors
+    DiscovergySensorEntityDescription(
+        key="energy",
+        translation_key="total_consumption",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=4,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        scale=10000000000,
+    ),
+    DiscovergySensorEntityDescription(
+        key="energyOut",
+        translation_key="total_production",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=4,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        scale=10000000000,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Discovergy sensors."""
+    data: DiscovergyData = hass.data[DOMAIN][entry.entry_id]
+    meters: list[Meter] = data.meters  # always returns a list
+
+    entities: list[DiscovergySensor] = []
+    for meter in meters:
+        meter_id = meter.get_meter_id()
+
+        sensors = None
+        if meter.measurement_type == "ELECTRICITY":
+            sensors = ELECTRICITY_SENSORS
+        elif meter.measurement_type == "GAS":
+            sensors = GAS_SENSORS
+
+        if sensors is not None:
+            for description in sensors:
+                # check if this meter has this data, then add this sensor
+                for key in {description.key, *description.alternative_keys}:
+                    coordinator: DiscovergyUpdateCoordinator = data.coordinators[
+                        meter_id
+                    ]
+                    if key in coordinator.data.values:
+                        entities.append(
+                            DiscovergySensor(key, description, meter, coordinator)
+                        )
+
+    async_add_entities(entities, False)
+
+
+class DiscovergySensor(CoordinatorEntity[DiscovergyUpdateCoordinator], SensorEntity):
+    """Represents a discovergy smart meter sensor."""
+
+    entity_description: DiscovergySensorEntityDescription
+    data_key: str
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        data_key: str,
+        description: DiscovergySensorEntityDescription,
+        meter: Meter,
+        coordinator: DiscovergyUpdateCoordinator,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+
+        self.data_key = data_key
+
+        self.entity_description = description
+        self._attr_unique_id = f"{meter.full_serial_number}-{data_key}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, meter.get_meter_id())},
+            name=f"{meter.measurement_type.capitalize()} {meter.location.street} {meter.location.street_number}",
+            model=f"{meter.type} {meter.full_serial_number}",
+            manufacturer=MANUFACTURER,
+        )
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the sensor state."""
+        return float(
+            self.coordinator.data.values[self.data_key] / self.entity_description.scale
+        )
diff --git a/homeassistant/components/discovergy/strings.json b/homeassistant/components/discovergy/strings.json
new file mode 100644
index 00000000000000..e8dbbab202162e
--- /dev/null
+++ b/homeassistant/components/discovergy/strings.json
@@ -0,0 +1,66 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "reauth": {
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    }
+  },
+  "system_health": {
+    "info": {
+      "api_endpoint_reachable": "Discovergy API endpoint reachable"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "total_gas_consumption": {
+        "name": "Total gas consumption"
+      },
+      "total_power": {
+        "name": "Total power"
+      },
+      "total_consumption": {
+        "name": "Total consumption"
+      },
+      "total_production": {
+        "name": "Total production"
+      },
+      "phase_1_voltage": {
+        "name": "Phase 1 voltage"
+      },
+      "phase_2_voltage": {
+        "name": "Phase 2 voltage"
+      },
+      "phase_3_voltage": {
+        "name": "Phase 3 voltage"
+      },
+      "phase_1_power": {
+        "name": "Phase 1 power"
+      },
+      "phase_2_power": {
+        "name": "Phase 2 power"
+      },
+      "phase_3_power": {
+        "name": "Phase 3 power"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/discovergy/system_health.py b/homeassistant/components/discovergy/system_health.py
new file mode 100644
index 00000000000000..2baeb0e5f6e3d7
--- /dev/null
+++ b/homeassistant/components/discovergy/system_health.py
@@ -0,0 +1,22 @@
+"""Provide info to system health."""
+from pydiscovergy.const import API_BASE
+
+from homeassistant.components import system_health
+from homeassistant.core import HomeAssistant, callback
+
+
+@callback
+def async_register(
+    hass: HomeAssistant, register: system_health.SystemHealthRegistration
+) -> None:
+    """Register system health callbacks."""
+    register.async_register_info(system_health_info)
+
+
+async def system_health_info(hass):
+    """Get info for the info page."""
+    return {
+        "api_endpoint_reachable": system_health.async_check_can_reach_url(
+            hass, API_BASE
+        )
+    }
diff --git a/homeassistant/components/discovery/__init__.py b/homeassistant/components/discovery/__init__.py
index 53b2478490da75..79653e1c9bc16c 100644
--- a/homeassistant/components/discovery/__init__.py
+++ b/homeassistant/components/discovery/__init__.py
@@ -60,7 +60,6 @@ class ServiceDetails(NamedTuple):
 SERVICE_HANDLERS = {
     SERVICE_ENIGMA2: ServiceDetails("media_player", "enigma2"),
     "yamaha": ServiceDetails("media_player", "yamaha"),
-    "openhome": ServiceDetails("media_player", "openhome"),
     "bluesound": ServiceDetails("media_player", "bluesound"),
 }
 
@@ -87,6 +86,7 @@ class ServiceDetails(NamedTuple):
     SERVICE_MOBILE_APP,
     SERVICE_NETGEAR,
     SERVICE_OCTOPRINT,
+    "openhome",
     "philips_hue",
     SERVICE_SAMSUNG_PRINTER,
     "sonos",
diff --git a/homeassistant/components/dlib_face_detect/manifest.json b/homeassistant/components/dlib_face_detect/manifest.json
index 33811d5821cc1d..e395a84f2061df 100644
--- a/homeassistant/components/dlib_face_detect/manifest.json
+++ b/homeassistant/components/dlib_face_detect/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dlib_face_detect",
   "iot_class": "local_push",
   "loggers": ["face_recognition"],
-  "requirements": ["face_recognition==1.2.3"]
+  "requirements": ["face-recognition==1.2.3"]
 }
diff --git a/homeassistant/components/dlib_face_identify/manifest.json b/homeassistant/components/dlib_face_identify/manifest.json
index 34cc7344cd9a93..60c0ef3c766927 100644
--- a/homeassistant/components/dlib_face_identify/manifest.json
+++ b/homeassistant/components/dlib_face_identify/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dlib_face_identify",
   "iot_class": "local_push",
   "loggers": ["face_recognition"],
-  "requirements": ["face_recognition==1.2.3"]
+  "requirements": ["face-recognition==1.2.3"]
 }
diff --git a/homeassistant/components/dlink/strings.json b/homeassistant/components/dlink/strings.json
index 9ac7453093cb95..ee7abb3e97907d 100644
--- a/homeassistant/components/dlink/strings.json
+++ b/homeassistant/components/dlink/strings.json
@@ -24,11 +24,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The D-Link Smart Plug YAML configuration is being removed",
-      "description": "Configuring D-Link Smart Plug using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the D-Link Power Plug YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/dlna_dms/dms.py b/homeassistant/components/dlna_dms/dms.py
index 2fd1a85ebae208..8fc55830c63425 100644
--- a/homeassistant/components/dlna_dms/dms.py
+++ b/homeassistant/components/dlna_dms/dms.py
@@ -16,6 +16,7 @@
 from didl_lite import didl_lite
 
 from homeassistant.backports.enum import StrEnum
+from homeassistant.backports.functools import cached_property
 from homeassistant.components import ssdp
 from homeassistant.components.media_player import BrowseError, MediaClass
 from homeassistant.components.media_source.error import Unresolvable
@@ -619,7 +620,7 @@ def _make_identifier(self, action: Action, object_id: str) -> str:
         """Make an identifier for BrowseMediaSource."""
         return f"{self.source_id}/{action}{object_id}"
 
-    @functools.cached_property
+    @cached_property
     def _sort_criteria(self) -> list[str]:
         """Return criteria to be used for sorting results.
 
diff --git a/homeassistant/components/doods/image_processing.py b/homeassistant/components/doods/image_processing.py
index 8240bb117ea3b4..c94fff1124e6e5 100644
--- a/homeassistant/components/doods/image_processing.py
+++ b/homeassistant/components/doods/image_processing.py
@@ -350,14 +350,13 @@ def process_image(self, image):
                     or boxes[3] > self._area[3]
                 ):
                     continue
-            else:
-                if (
-                    boxes[0] > self._area[2]
-                    or boxes[1] > self._area[3]
-                    or boxes[2] < self._area[0]
-                    or boxes[3] < self._area[1]
-                ):
-                    continue
+            elif (
+                boxes[0] > self._area[2]
+                or boxes[1] > self._area[3]
+                or boxes[2] < self._area[0]
+                or boxes[3] < self._area[1]
+            ):
+                continue
 
             # Exclude matches outside label specific area definition
             if self._label_areas.get(label):
@@ -369,14 +368,13 @@ def process_image(self, image):
                         or boxes[3] > self._label_areas[label][3]
                     ):
                         continue
-                else:
-                    if (
-                        boxes[0] > self._label_areas[label][2]
-                        or boxes[1] > self._label_areas[label][3]
-                        or boxes[2] < self._label_areas[label][0]
-                        or boxes[3] < self._label_areas[label][1]
-                    ):
-                        continue
+                elif (
+                    boxes[0] > self._label_areas[label][2]
+                    or boxes[1] > self._label_areas[label][3]
+                    or boxes[2] < self._label_areas[label][0]
+                    or boxes[3] < self._label_areas[label][1]
+                ):
+                    continue
 
             if label not in matches:
                 matches[label] = []
diff --git a/homeassistant/components/doods/manifest.json b/homeassistant/components/doods/manifest.json
index 79c114e2f38964..52c89f3f34b675 100644
--- a/homeassistant/components/doods/manifest.json
+++ b/homeassistant/components/doods/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/doods",
   "iot_class": "local_polling",
   "loggers": ["pydoods"],
-  "requirements": ["pydoods==1.0.2", "pillow==9.5.0"]
+  "requirements": ["pydoods==1.0.2", "Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/doorbird/manifest.json b/homeassistant/components/doorbird/manifest.json
index d6eba115bb88d5..2bb981ab06fefd 100644
--- a/homeassistant/components/doorbird/manifest.json
+++ b/homeassistant/components/doorbird/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/doorbird",
   "iot_class": "local_push",
   "loggers": ["doorbirdpy"],
-  "requirements": ["doorbirdpy==2.1.0"],
+  "requirements": ["DoorBirdPy==2.1.0"],
   "zeroconf": [
     {
       "type": "_axis-video._tcp.local.",
diff --git a/homeassistant/components/dormakaba_dkey/binary_sensor.py b/homeassistant/components/dormakaba_dkey/binary_sensor.py
index e21e35da1e53ea..6cfbdd50b34a16 100644
--- a/homeassistant/components/dormakaba_dkey/binary_sensor.py
+++ b/homeassistant/components/dormakaba_dkey/binary_sensor.py
@@ -39,13 +39,12 @@ class DormakabaDkeyBinarySensorDescription(
 BINARY_SENSOR_DESCRIPTIONS = (
     DormakabaDkeyBinarySensorDescription(
         key="door_position",
-        name="Door",
         device_class=BinarySensorDeviceClass.DOOR,
         is_on=lambda state: state.door_position == DoorPosition.OPEN,
     ),
     DormakabaDkeyBinarySensorDescription(
         key="security_locked",
-        name="Deadbolt",
+        translation_key="deadbolt",
         device_class=BinarySensorDeviceClass.LOCK,
         is_on=lambda state: state.unlock_status
         not in (UnlockStatus.SECURITY_LOCKED, UnlockStatus.UNLOCKED_SECURITY_LOCKED),
diff --git a/homeassistant/components/dormakaba_dkey/sensor.py b/homeassistant/components/dormakaba_dkey/sensor.py
index 8234b41c43a4cf..39915563b036ba 100644
--- a/homeassistant/components/dormakaba_dkey/sensor.py
+++ b/homeassistant/components/dormakaba_dkey/sensor.py
@@ -22,7 +22,6 @@
 BINARY_SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key="battery_level",
-        name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/dormakaba_dkey/strings.json b/homeassistant/components/dormakaba_dkey/strings.json
index efe9d3acb52c4b..15bcf3f9ddc633 100644
--- a/homeassistant/components/dormakaba_dkey/strings.json
+++ b/homeassistant/components/dormakaba_dkey/strings.json
@@ -33,5 +33,12 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "deadbolt": {
+        "name": "Deadbolt"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/dremel_3d_printer/__init__.py b/homeassistant/components/dremel_3d_printer/__init__.py
new file mode 100644
index 00000000000000..5f9f10dc9c1294
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/__init__.py
@@ -0,0 +1,48 @@
+"""The Dremel 3D Printer (3D20, 3D40, 3D45) integration."""
+from __future__ import annotations
+
+from dremel3dpy import Dremel3DPrinter
+from requests.exceptions import ConnectTimeout, HTTPError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import CAMERA_MODEL, DOMAIN
+from .coordinator import Dremel3DPrinterDataUpdateCoordinator
+
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.CAMERA, Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Set up Dremel 3D Printer from a config entry."""
+    try:
+        api = await hass.async_add_executor_job(
+            Dremel3DPrinter, config_entry.data[CONF_HOST]
+        )
+
+    except (ConnectTimeout, HTTPError) as ex:
+        raise ConfigEntryNotReady(
+            f"Unable to connect to Dremel 3D Printer: {ex}"
+        ) from ex
+
+    coordinator = Dremel3DPrinterDataUpdateCoordinator(hass, api)
+    await coordinator.async_config_entry_first_refresh()
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
+    platforms = list(PLATFORMS)
+    if api.get_model() != CAMERA_MODEL:
+        platforms.remove(Platform.CAMERA)
+    await hass.config_entries.async_forward_entry_setups(config_entry, platforms)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload Dremel config entry."""
+    platforms = list(PLATFORMS)
+    api: Dremel3DPrinter = hass.data[DOMAIN][entry.entry_id].api
+    if api.get_model() != CAMERA_MODEL:
+        platforms.remove(Platform.CAMERA)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, platforms):
+        hass.data[DOMAIN].pop(entry.entry_id)
+    return unload_ok
diff --git a/homeassistant/components/dremel_3d_printer/binary_sensor.py b/homeassistant/components/dremel_3d_printer/binary_sensor.py
new file mode 100644
index 00000000000000..3a92bfe5510be4
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/binary_sensor.py
@@ -0,0 +1,72 @@
+"""Support for monitoring Dremel 3D Printer binary sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterBinarySensorEntityMixin:
+    """Mixin for Dremel 3D Printer binary sensor."""
+
+    value_fn: Callable[[Dremel3DPrinter], bool]
+
+
+@dataclass
+class Dremel3DPrinterBinarySensorEntityDescription(
+    BinarySensorEntityDescription, Dremel3DPrinterBinarySensorEntityMixin
+):
+    """Describes a Dremel 3D Printer binary sensor."""
+
+
+BINARY_SENSOR_TYPES: tuple[Dremel3DPrinterBinarySensorEntityDescription, ...] = (
+    Dremel3DPrinterBinarySensorEntityDescription(
+        key="door",
+        device_class=BinarySensorDeviceClass.DOOR,
+        value_fn=lambda api: api.is_door_open(),
+    ),
+    Dremel3DPrinterBinarySensorEntityDescription(
+        key="running",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        value_fn=lambda api: api.is_running(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the available Dremel binary sensors."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities(
+        Dremel3DPrinterBinarySensor(coordinator, description)
+        for description in BINARY_SENSOR_TYPES
+    )
+
+
+class Dremel3DPrinterBinarySensor(Dremel3DPrinterEntity, BinarySensorEntity):
+    """Representation of a Dremel 3D Printer door binary sensor."""
+
+    entity_description: Dremel3DPrinterBinarySensorEntityDescription
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if door is open."""
+        return self.entity_description.value_fn(self._api)
diff --git a/homeassistant/components/dremel_3d_printer/button.py b/homeassistant/components/dremel_3d_printer/button.py
new file mode 100644
index 00000000000000..2d328b30ceaed9
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/button.py
@@ -0,0 +1,78 @@
+"""Support for Dremel 3D Printer buttons."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterButtonEntityMixin:
+    """Mixin for required keys."""
+
+    press_fn: Callable[[Dremel3DPrinter], None]
+
+
+@dataclass
+class Dremel3DPrinterButtonEntityDescription(
+    ButtonEntityDescription, Dremel3DPrinterButtonEntityMixin
+):
+    """Describes a Dremel 3D Printer button entity."""
+
+
+BUTTON_TYPES: tuple[Dremel3DPrinterButtonEntityDescription, ...] = (
+    Dremel3DPrinterButtonEntityDescription(
+        key="cancel_job",
+        translation_key="cancel_job",
+        press_fn=lambda api: api.stop_print(),
+    ),
+    Dremel3DPrinterButtonEntityDescription(
+        key="pause_job",
+        translation_key="pause_job",
+        press_fn=lambda api: api.pause_print(),
+    ),
+    Dremel3DPrinterButtonEntityDescription(
+        key="resume_job",
+        translation_key="resume_job",
+        press_fn=lambda api: api.resume_print(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Dremel 3D Printer control buttons."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities(
+        Dremel3DPrinterButtonEntity(coordinator, description)
+        for description in BUTTON_TYPES
+    )
+
+
+class Dremel3DPrinterButtonEntity(Dremel3DPrinterEntity, ButtonEntity):
+    """Represent a Dremel 3D Printer button."""
+
+    entity_description: Dremel3DPrinterButtonEntityDescription
+
+    def press(self) -> None:
+        """Handle the button press."""
+        # api does not care about the current state
+        try:
+            self.entity_description.press_fn(self._api)
+        except RuntimeError as ex:
+            raise HomeAssistantError(
+                "An error occurred while submitting command"
+            ) from ex
diff --git a/homeassistant/components/dremel_3d_printer/camera.py b/homeassistant/components/dremel_3d_printer/camera.py
new file mode 100644
index 00000000000000..7468400ec35bce
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/camera.py
@@ -0,0 +1,44 @@
+"""Support for Dremel 3D45 Camera."""
+from __future__ import annotations
+
+from homeassistant.components.camera import CameraEntityDescription
+from homeassistant.components.mjpeg import MjpegCamera
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import Dremel3DPrinterDataUpdateCoordinator
+from .const import DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+CAMERA_TYPE = CameraEntityDescription(
+    key="camera",
+    name="Camera",
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up a MJPEG IP Camera for the 3D45 Model. The 3D20 and 3D40 models don't have built in cameras."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([Dremel3D45Camera(coordinator, CAMERA_TYPE)])
+
+
+class Dremel3D45Camera(Dremel3DPrinterEntity, MjpegCamera):
+    """Dremel 3D45 Camera."""
+
+    def __init__(
+        self,
+        coordinator: Dremel3DPrinterDataUpdateCoordinator,
+        description: CameraEntityDescription,
+    ) -> None:
+        """Initialize a new Dremel 3D Printer integration camera for the 3D45 model."""
+        super().__init__(coordinator, description)
+        MjpegCamera.__init__(
+            self,
+            mjpeg_url=coordinator.api.get_stream_url(),
+            still_image_url=coordinator.api.get_snapshot_url(),
+        )
diff --git a/homeassistant/components/dremel_3d_printer/config_flow.py b/homeassistant/components/dremel_3d_printer/config_flow.py
new file mode 100644
index 00000000000000..6fa4d2e0a5be6e
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/config_flow.py
@@ -0,0 +1,58 @@
+"""Config flow for Dremel 3D Printer (3D20, 3D40, 3D45)."""
+from __future__ import annotations
+
+from json.decoder import JSONDecodeError
+from typing import Any
+
+from dremel3dpy import Dremel3DPrinter
+from requests.exceptions import ConnectTimeout, HTTPError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST
+from homeassistant.data_entry_flow import FlowResult
+import homeassistant.helpers.config_validation as cv
+
+from .const import DOMAIN, LOGGER
+
+
+def _schema_with_defaults(host: str = "") -> vol.Schema:
+    return vol.Schema({vol.Required(CONF_HOST, default=host): cv.string})
+
+
+class Dremel3DPrinterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Dremel 3D Printer."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors = {}
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=_schema_with_defaults(),
+            )
+        host = user_input[CONF_HOST]
+
+        try:
+            api = await self.hass.async_add_executor_job(Dremel3DPrinter, host)
+        except (ConnectTimeout, HTTPError, JSONDecodeError):
+            errors = {"base": "cannot_connect"}
+        except Exception:  # pylint: disable=broad-except
+            LOGGER.exception("An unknown error has occurred")
+            errors = {"base": "unknown"}
+
+        if errors:
+            return self.async_show_form(
+                step_id="user",
+                errors=errors,
+                data_schema=_schema_with_defaults(host=host),
+            )
+
+        await self.async_set_unique_id(api.get_serial_number())
+        self._abort_if_unique_id_configured()
+        return self.async_create_entry(title=api.get_title(), data={CONF_HOST: host})
diff --git a/homeassistant/components/dremel_3d_printer/const.py b/homeassistant/components/dremel_3d_printer/const.py
new file mode 100644
index 00000000000000..cccdeb937cb4c1
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/const.py
@@ -0,0 +1,13 @@
+"""Constants for the Dremel 3D Printer (3D20, 3D40, 3D45) integration."""
+from __future__ import annotations
+
+import logging
+
+LOGGER = logging.getLogger(__package__)
+
+CAMERA_MODEL = "3D45"
+
+DOMAIN = "dremel_3d_printer"
+
+ATTR_EXTRUDER = "extruder"
+ATTR_PLATFORM = "platform"
diff --git a/homeassistant/components/dremel_3d_printer/coordinator.py b/homeassistant/components/dremel_3d_printer/coordinator.py
new file mode 100644
index 00000000000000..81e0053fd77101
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/coordinator.py
@@ -0,0 +1,36 @@
+"""Data update coordinator for the Dremel 3D Printer integration."""
+
+from datetime import timedelta
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN, LOGGER
+
+
+class Dremel3DPrinterDataUpdateCoordinator(DataUpdateCoordinator[None]):
+    """Class to manage fetching Dremel 3D Printer data."""
+
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, api: Dremel3DPrinter) -> None:
+        """Initialize Dremel 3D Printer data update coordinator."""
+        super().__init__(
+            hass=hass,
+            logger=LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=10),
+        )
+        self.api = api
+
+    async def _async_update_data(self) -> None:
+        """Update data via APIs."""
+        try:
+            await self.hass.async_add_executor_job(self.api.refresh)
+        except RuntimeError as ex:
+            raise UpdateFailed(
+                f"Unable to refresh printer information: Printer offline: {ex}"
+            ) from ex
diff --git a/homeassistant/components/dremel_3d_printer/entity.py b/homeassistant/components/dremel_3d_printer/entity.py
new file mode 100644
index 00000000000000..392869a138bd35
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/entity.py
@@ -0,0 +1,41 @@
+"""Entity representing a Dremel 3D Printer."""
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import Dremel3DPrinterDataUpdateCoordinator
+
+
+class Dremel3DPrinterEntity(CoordinatorEntity[Dremel3DPrinterDataUpdateCoordinator]):
+    """Defines a Dremel 3D Printer device entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: Dremel3DPrinterDataUpdateCoordinator,
+        description: EntityDescription,
+    ) -> None:
+        """Initialize the base device entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{description.key}"
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device information about this Dremel printer."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._api.get_serial_number())},
+            manufacturer=self._api.get_manufacturer(),
+            model=self._api.get_model(),
+            name=self._api.get_title(),
+            sw_version=self._api.get_firmware_version(),
+        )
+
+    @property
+    def _api(self) -> Dremel3DPrinter:
+        """Return to api from coordinator."""
+        return self.coordinator.api
diff --git a/homeassistant/components/dremel_3d_printer/manifest.json b/homeassistant/components/dremel_3d_printer/manifest.json
new file mode 100644
index 00000000000000..12d4e4003c4df8
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "dremel_3d_printer",
+  "name": "Dremel 3D Printer",
+  "codeowners": ["@tkdrob"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/dremel_3d_printer",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "requirements": ["dremel3dpy==2.1.1"]
+}
diff --git a/homeassistant/components/dremel_3d_printer/sensor.py b/homeassistant/components/dremel_3d_printer/sensor.py
new file mode 100644
index 00000000000000..660e7a90487b8c
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/sensor.py
@@ -0,0 +1,279 @@
+"""Support for monitoring Dremel 3D Printer sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+
+from dremel3dpy import Dremel3DPrinter
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    EntityCategory,
+    UnitOfInformation,
+    UnitOfTemperature,
+    UnitOfTime,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.util.dt import utcnow
+from homeassistant.util.variance import ignore_variance
+
+from .const import ATTR_EXTRUDER, ATTR_PLATFORM, DOMAIN
+from .entity import Dremel3DPrinterEntity
+
+
+@dataclass
+class Dremel3DPrinterSensorEntityMixin:
+    """Mixin for Dremel 3D Printer sensor."""
+
+    value_fn: Callable[[Dremel3DPrinter, str], StateType | datetime]
+
+
+@dataclass
+class Dremel3DPrinterSensorEntityDescription(
+    SensorEntityDescription, Dremel3DPrinterSensorEntityMixin
+):
+    """Describes a Dremel 3D Printer sensor."""
+
+    available_fn: Callable[[Dremel3DPrinter, str], bool] = lambda api, _: True
+
+
+SENSOR_TYPES: tuple[Dremel3DPrinterSensorEntityDescription, ...] = (
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_phase",
+        translation_key="job_phase",
+        icon="mdi:printer-3d",
+        value_fn=lambda api, _: api.get_printing_status(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="remaining_time",
+        translation_key="completion_time",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        available_fn=lambda api, key: api.get_job_status()[key] > 0,
+        value_fn=ignore_variance(
+            lambda api, key: utcnow() + timedelta(seconds=api.get_job_status()[key]),
+            timedelta(minutes=2),
+        ),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="progress",
+        translation_key="progress",
+        icon="mdi:printer-3d-nozzle",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_printing_progress(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="chamber",
+        translation_key="chamber",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_temperature_type(key),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="platform_temperature",
+        translation_key="platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_type(ATTR_PLATFORM),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="target_platform_temperature",
+        translation_key="target_platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_PLATFORM)[
+            "target_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="max_platform_temperature",
+        translation_key="max_platform_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_PLATFORM)[
+            "max_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key=ATTR_EXTRUDER,
+        translation_key="extruder",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_temperature_type(key),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="target_extruder_temperature",
+        translation_key="target_extruder_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_EXTRUDER)[
+            "target_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="max_extruder_temperature",
+        translation_key="max_extruder_temperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_temperature_attributes(ATTR_EXTRUDER)[
+            "max_temp"
+        ],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="network_build",
+        translation_key="network_build",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="filament",
+        translation_key="filament",
+        icon="mdi:printer-3d-nozzle",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="elapsed_time",
+        translation_key="elapsed_time",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        available_fn=lambda api, _: api.get_printing_status() == "building",
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="estimated_total_time",
+        translation_key="estimated_total_time",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        available_fn=lambda api, key: api.get_job_status()[key] > 0,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_status",
+        translation_key="job_status",
+        icon="mdi:printer-3d",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_job_status()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="job_name",
+        translation_key="job_name",
+        icon="mdi:file",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, _: api.get_job_name(),
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="api_version",
+        translation_key="api_version",
+        icon="mdi:api",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="host",
+        translation_key="host",
+        icon="mdi:ip-network",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="connection_type",
+        translation_key="connection_type",
+        icon="mdi:network",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="available_storage",
+        translation_key="available_storage",
+        native_unit_of_measurement=UnitOfInformation.MEGABYTES,
+        device_class=SensorDeviceClass.DATA_SIZE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key] * 100,
+    ),
+    Dremel3DPrinterSensorEntityDescription(
+        key="hours_used",
+        translation_key="hours_used",
+        icon="mdi:clock",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda api, key: api.get_printer_info()[key],
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the available Dremel 3D Printer sensors."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities(
+        Dremel3DPrinterSensor(coordinator, description) for description in SENSOR_TYPES
+    )
+
+
+class Dremel3DPrinterSensor(Dremel3DPrinterEntity, SensorEntity):
+    """Representation of a Dremel 3D Printer sensor."""
+
+    entity_description: Dremel3DPrinterSensorEntityDescription
+
+    @property
+    def available(self) -> bool:
+        """Return True if the entity is available."""
+        return super().available and self.entity_description.available_fn(
+            self._api, self.entity_description.key
+        )
+
+    @property
+    def native_value(self) -> StateType | datetime:
+        """Return the sensor state."""
+        return self.entity_description.value_fn(self._api, self.entity_description.key)
diff --git a/homeassistant/components/dremel_3d_printer/strings.json b/homeassistant/components/dremel_3d_printer/strings.json
new file mode 100644
index 00000000000000..0016b8f2bca144
--- /dev/null
+++ b/homeassistant/components/dremel_3d_printer/strings.json
@@ -0,0 +1,96 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
+  "entity": {
+    "button": {
+      "cancel_job": {
+        "name": "Cancel job"
+      },
+      "pause_job": {
+        "name": "Pause job"
+      },
+      "resume_job": {
+        "name": "Resume job"
+      }
+    },
+    "sensor": {
+      "job_phase": {
+        "name": "Job phase"
+      },
+      "completion_time": {
+        "name": "Completion time"
+      },
+      "progress": {
+        "name": "Progress"
+      },
+      "chamber": {
+        "name": "Chamber"
+      },
+      "platform_temperature": {
+        "name": "Platform temperature"
+      },
+      "target_platform_temperature": {
+        "name": "Target platform temperature"
+      },
+      "max_platform_temperature": {
+        "name": "Max platform temperature"
+      },
+      "extruder": {
+        "name": "Extruder"
+      },
+      "target_extruder_temperature": {
+        "name": "Target extruder temperature"
+      },
+      "max_extruder_temperature": {
+        "name": "Max extruder temperature"
+      },
+      "network_build": {
+        "name": "Network build"
+      },
+      "filament": {
+        "name": "Filament"
+      },
+      "elapsed_time": {
+        "name": "Elapsed time"
+      },
+      "estimated_total_time": {
+        "name": "Estimated total time"
+      },
+      "job_status": {
+        "name": "Job status"
+      },
+      "job_name": {
+        "name": "Job name"
+      },
+      "api_version": {
+        "name": "API version"
+      },
+      "host": {
+        "name": "[%key:common::config_flow::data::host%]"
+      },
+      "connection_type": {
+        "name": "Connection type"
+      },
+      "available_storage": {
+        "name": "Available storage"
+      },
+      "hours_used": {
+        "name": "Hours used"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/dsmr/manifest.json b/homeassistant/components/dsmr/manifest.json
index 2ba7ce558355e7..3fc81d2f8e7474 100644
--- a/homeassistant/components/dsmr/manifest.json
+++ b/homeassistant/components/dsmr/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["dsmr_parser"],
-  "requirements": ["dsmr_parser==0.33"]
+  "requirements": ["dsmr-parser==0.33"]
 }
diff --git a/homeassistant/components/dsmr/sensor.py b/homeassistant/components/dsmr/sensor.py
index 524f5c4ffc2a3e..e6d1d035e3b6e8 100644
--- a/homeassistant/components/dsmr/sensor.py
+++ b/homeassistant/components/dsmr/sensor.py
@@ -459,9 +459,9 @@ async def connect_and_reconnect() -> None:
                     @callback
                     def close_transport(_event: EventType) -> None:
                         """Close the transport on HA shutdown."""
-                        if not transport:
+                        if not transport:  # noqa: B023
                             return
-                        transport.close()
+                        transport.close()  # noqa: B023
 
                     stop_listener = hass.bus.async_listen_once(
                         EVENT_HOMEASSISTANT_STOP, close_transport
diff --git a/homeassistant/components/dwd_weather_warnings/__init__.py b/homeassistant/components/dwd_weather_warnings/__init__.py
index 99c3a110caa8ec..275d47d15ca0af 100644
--- a/homeassistant/components/dwd_weather_warnings/__init__.py
+++ b/homeassistant/components/dwd_weather_warnings/__init__.py
@@ -8,18 +8,20 @@
 from homeassistant.core import HomeAssistant
 
 from .const import CONF_REGION_IDENTIFIER, DOMAIN, PLATFORMS
+from .coordinator import DwdWeatherWarningsCoordinator
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
     region_identifier: str = entry.data[CONF_REGION_IDENTIFIER]
 
-    # Initialize the API.
+    # Initialize the API and coordinator.
     api = await hass.async_add_executor_job(DwdWeatherWarningsAPI, region_identifier)
+    coordinator = DwdWeatherWarningsCoordinator(hass, api)
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = api
+    await coordinator.async_config_entry_first_refresh()
 
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
diff --git a/homeassistant/components/dwd_weather_warnings/config_flow.py b/homeassistant/components/dwd_weather_warnings/config_flow.py
index 653812632c0da0..e806db7ec91e19 100644
--- a/homeassistant/components/dwd_weather_warnings/config_flow.py
+++ b/homeassistant/components/dwd_weather_warnings/config_flow.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Final
+from typing import Any
 
 from dwdwfsapi import DwdWeatherWarningsAPI
 import voluptuous as vol
@@ -12,19 +12,7 @@
 from homeassistant.data_entry_flow import FlowResult
 import homeassistant.helpers.config_validation as cv
 
-from .const import (
-    CONF_REGION_IDENTIFIER,
-    CONF_REGION_NAME,
-    DEFAULT_NAME,
-    DOMAIN,
-    LOGGER,
-)
-
-CONFIG_SCHEMA: Final = vol.Schema(
-    {
-        vol.Required(CONF_REGION_IDENTIFIER): cv.string,
-    }
-)
+from .const import CONF_REGION_IDENTIFIER, CONF_REGION_NAME, DOMAIN, LOGGER
 
 
 class DwdWeatherWarningsConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -52,13 +40,16 @@ async def async_step_user(
                 await self.async_set_unique_id(region_identifier)
                 self._abort_if_unique_id_configured()
 
-                # Set the name for this config entry.
-                name = f"{DEFAULT_NAME} {region_identifier}"
-
-                return self.async_create_entry(title=name, data=user_input)
+                return self.async_create_entry(title=region_identifier, data=user_input)
 
         return self.async_show_form(
-            step_id="user", errors=errors, data_schema=CONFIG_SCHEMA
+            step_id="user",
+            errors=errors,
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_REGION_IDENTIFIER): cv.string,
+                }
+            ),
         )
 
     async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
@@ -67,12 +58,12 @@ async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
             "Starting import of sensor from configuration.yaml - %s", import_config
         )
 
-        # Adjust data to new format.
-        region_identifier = import_config.pop(CONF_REGION_NAME)
-        import_config[CONF_REGION_IDENTIFIER] = region_identifier
+        # Extract the necessary data for the setup.
+        region_identifier = import_config[CONF_REGION_NAME]
+        name = import_config.get(CONF_NAME, region_identifier)
 
         # Set the unique ID for this imported entry.
-        await self.async_set_unique_id(import_config[CONF_REGION_IDENTIFIER])
+        await self.async_set_unique_id(region_identifier)
         self._abort_if_unique_id_configured()
 
         # Validate region identifier using the API
@@ -81,8 +72,6 @@ async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
         ):
             return self.async_abort(reason="invalid_identifier")
 
-        name = import_config.get(
-            CONF_NAME, f"{DEFAULT_NAME} {import_config[CONF_REGION_IDENTIFIER]}"
+        return self.async_create_entry(
+            title=name, data={CONF_REGION_IDENTIFIER: region_identifier}
         )
-
-        return self.async_create_entry(title=name, data=import_config)
diff --git a/homeassistant/components/dwd_weather_warnings/coordinator.py b/homeassistant/components/dwd_weather_warnings/coordinator.py
new file mode 100644
index 00000000000000..a12326971306f7
--- /dev/null
+++ b/homeassistant/components/dwd_weather_warnings/coordinator.py
@@ -0,0 +1,26 @@
+"""Data coordinator for the dwd_weather_warnings integration."""
+
+from __future__ import annotations
+
+from dwdwfsapi import DwdWeatherWarningsAPI
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER
+
+
+class DwdWeatherWarningsCoordinator(DataUpdateCoordinator[None]):
+    """Custom coordinator for the dwd_weather_warnings integration."""
+
+    def __init__(self, hass: HomeAssistant, api: DwdWeatherWarningsAPI) -> None:
+        """Initialize the dwd_weather_warnings coordinator."""
+        super().__init__(
+            hass, LOGGER, name=DOMAIN, update_interval=DEFAULT_SCAN_INTERVAL
+        )
+
+        self.api = api
+
+    async def _async_update_data(self) -> None:
+        """Get the latest data from the DWD Weather Warnings API."""
+        await self.hass.async_add_executor_job(self.api.update)
diff --git a/homeassistant/components/dwd_weather_warnings/sensor.py b/homeassistant/components/dwd_weather_warnings/sensor.py
index de96b3e9e0866d..f44d736b426cf7 100644
--- a/homeassistant/components/dwd_weather_warnings/sensor.py
+++ b/homeassistant/components/dwd_weather_warnings/sensor.py
@@ -27,7 +27,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
     ADVANCE_WARNING_SENSOR,
@@ -47,10 +47,10 @@
     ATTR_WARNING_COUNT,
     CONF_REGION_NAME,
     CURRENT_WARNING_SENSOR,
-    DEFAULT_SCAN_INTERVAL,
+    DEFAULT_NAME,
     DOMAIN,
-    LOGGER,
 )
+from .coordinator import DwdWeatherWarningsCoordinator
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
@@ -91,7 +91,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.8.0",
+        breaks_in_ha_version="2023.12.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -108,56 +108,60 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up entities from config entry."""
-    api = WrappedDwDWWAPI(hass.data[DOMAIN][entry.entry_id])
+    coordinator = hass.data[DOMAIN][entry.entry_id]
 
     async_add_entities(
         [
-            DwdWeatherWarningsSensor(api, entry.title, entry.unique_id, description)
+            DwdWeatherWarningsSensor(coordinator, entry, description)
             for description in SENSOR_TYPES
         ],
         True,
     )
 
 
-class DwdWeatherWarningsSensor(SensorEntity):
+class DwdWeatherWarningsSensor(
+    CoordinatorEntity[DwdWeatherWarningsCoordinator], SensorEntity
+):
     """Representation of a DWD-Weather-Warnings sensor."""
 
     _attr_attribution = "Data provided by DWD"
 
     def __init__(
         self,
-        api,
-        name,
-        unique_id,
+        coordinator: DwdWeatherWarningsCoordinator,
+        entry: ConfigEntry,
         description: SensorEntityDescription,
     ) -> None:
         """Initialize a DWD-Weather-Warnings sensor."""
-        self._api = api
+        super().__init__(coordinator)
+
         self.entity_description = description
-        self._attr_name = f"{name} {description.name}"
-        self._attr_unique_id = f"{unique_id}-{description.key}"
+        self._attr_name = f"{DEFAULT_NAME} {entry.title} {description.name}"
+        self._attr_unique_id = f"{entry.unique_id}-{description.key}"
+
+        self.api = coordinator.api
 
     @property
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == CURRENT_WARNING_SENSOR:
-            return self._api.api.current_warning_level
+            return self.api.current_warning_level
 
-        return self._api.api.expected_warning_level
+        return self.api.expected_warning_level
 
     @property
     def extra_state_attributes(self):
         """Return the state attributes of the sensor."""
         data = {
-            ATTR_REGION_NAME: self._api.api.warncell_name,
-            ATTR_REGION_ID: self._api.api.warncell_id,
-            ATTR_LAST_UPDATE: self._api.api.last_update,
+            ATTR_REGION_NAME: self.api.warncell_name,
+            ATTR_REGION_ID: self.api.warncell_id,
+            ATTR_LAST_UPDATE: self.api.last_update,
         }
 
         if self.entity_description.key == CURRENT_WARNING_SENSOR:
-            searched_warnings = self._api.api.current_warnings
+            searched_warnings = self.api.current_warnings
         else:
-            searched_warnings = self._api.api.expected_warnings
+            searched_warnings = self.api.expected_warnings
 
         data[ATTR_WARNING_COUNT] = len(searched_warnings)
 
@@ -173,7 +177,7 @@ def extra_state_attributes(self):
             data[f"warning_{i}_parameters"] = warning[API_ATTR_WARNING_PARAMETERS]
             data[f"warning_{i}_color"] = warning[API_ATTR_WARNING_COLOR]
 
-            # Dictionary for the attribute containing the complete warning
+            # Dictionary for the attribute containing the complete warning.
             warning_copy = warning.copy()
             warning_copy[API_ATTR_WARNING_START] = data[f"warning_{i}_start"]
             warning_copy[API_ATTR_WARNING_END] = data[f"warning_{i}_end"]
@@ -184,28 +188,4 @@ def extra_state_attributes(self):
     @property
     def available(self) -> bool:
         """Could the device be accessed during the last update call."""
-        return self._api.api.data_valid
-
-    def update(self) -> None:
-        """Get the latest data from the DWD-Weather-Warnings API."""
-        LOGGER.debug(
-            "Update requested for %s (%s) by %s",
-            self._api.api.warncell_name,
-            self._api.api.warncell_id,
-            self.entity_description.key,
-        )
-        self._api.update()
-
-
-class WrappedDwDWWAPI:
-    """Wrapper for the DWD-Weather-Warnings api."""
-
-    def __init__(self, api):
-        """Initialize a DWD-Weather-Warnings wrapper."""
-        self.api = api
-
-    @Throttle(DEFAULT_SCAN_INTERVAL)
-    def update(self):
-        """Get the latest data from the DWD-Weather-Warnings API."""
-        self.api.update()
-        LOGGER.debug("Update performed")
+        return self.api.data_valid
diff --git a/homeassistant/components/dynalite/manifest.json b/homeassistant/components/dynalite/manifest.json
index a3dd890cc11f93..8fd138dc49be2f 100644
--- a/homeassistant/components/dynalite/manifest.json
+++ b/homeassistant/components/dynalite/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dynalite",
   "iot_class": "local_push",
   "loggers": ["dynalite_devices_lib"],
-  "requirements": ["dynalite_devices==0.1.47", "dynalite_panel==0.0.4"]
+  "requirements": ["dynalite-devices==0.1.47", "dynalite-panel==0.0.4"]
 }
diff --git a/homeassistant/components/eafm/sensor.py b/homeassistant/components/eafm/sensor.py
index 2650aa35489136..ce3ee2bfbecc7e 100644
--- a/homeassistant/components/eafm/sensor.py
+++ b/homeassistant/components/eafm/sensor.py
@@ -100,6 +100,7 @@ def __init__(self, coordinator, key):
         """Initialise the gauge with a data instance and station."""
         super().__init__(coordinator)
         self.key = key
+        self._attr_unique_id = key
 
     @property
     def station_name(self):
@@ -126,11 +127,6 @@ def name(self):
         """Return the name of the gauge."""
         return f"{self.station_name} {self.parameter_name} {self.qualifier}"
 
-    @property
-    def unique_id(self):
-        """Return the unique id of the gauge."""
-        return self.key
-
     @property
     def device_info(self):
         """Return the device info."""
diff --git a/homeassistant/components/easyenergy/coordinator.py b/homeassistant/components/easyenergy/coordinator.py
index 3d92f63b752eb5..3996fd4d16ab0a 100644
--- a/homeassistant/components/easyenergy/coordinator.py
+++ b/homeassistant/components/easyenergy/coordinator.py
@@ -16,7 +16,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL, THRESHOLD_HOUR
 
@@ -47,7 +47,7 @@ def __init__(self, hass: HomeAssistant) -> None:
 
     async def _async_update_data(self) -> EasyEnergyData:
         """Fetch data from easyEnergy."""
-        today = dt.now().date()
+        today = dt_util.now().date()
         gas_today = None
         energy_tomorrow = None
 
@@ -62,7 +62,7 @@ async def _async_update_data(self) -> EasyEnergyData:
             except EasyEnergyNoDataError:
                 LOGGER.debug("No data for gas prices for easyEnergy integration")
             # Energy for tomorrow only after 14:00 UTC
-            if dt.utcnow().hour >= THRESHOLD_HOUR:
+            if dt_util.utcnow().hour >= THRESHOLD_HOUR:
                 tomorrow = today + timedelta(days=1)
                 try:
                     energy_tomorrow = await self.easyenergy.energy_prices(
diff --git a/homeassistant/components/easyenergy/sensor.py b/homeassistant/components/easyenergy/sensor.py
index 9cf5944dfaa1b2..a64851f669614b 100644
--- a/homeassistant/components/easyenergy/sensor.py
+++ b/homeassistant/components/easyenergy/sensor.py
@@ -48,7 +48,7 @@ class EasyEnergySensorEntityDescription(
 SENSORS: tuple[EasyEnergySensorEntityDescription, ...] = (
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_gas",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
@@ -56,14 +56,14 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_gas",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
         value_fn=lambda data: get_gas_price(data, 1),
     ),
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy_usage",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -71,7 +71,7 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -80,42 +80,42 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_usage_price,
     ),
     EasyEnergySensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_usage_prices[1],
     ),
     EasyEnergySensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy_usage",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_usage_prices[0],
     ),
     EasyEnergySensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy_usage",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_usage_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy_usage",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_usage_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy_usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
@@ -123,7 +123,7 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy_return",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -131,7 +131,7 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -140,42 +140,42 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_return_price,
     ),
     EasyEnergySensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_return_prices[1],
     ),
     EasyEnergySensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy_return",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_return_prices[0],
     ),
     EasyEnergySensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy_return",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_return_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy_return",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_return_price_time,
     ),
     EasyEnergySensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy_return",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
@@ -183,7 +183,7 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="hours_priced_equal_or_lower",
-        name="Hours priced equal or lower than current - today",
+        translation_key="hours_priced_equal_or_lower",
         service_type="today_energy_usage",
         native_unit_of_measurement=UnitOfTime.HOURS,
         icon="mdi:clock",
@@ -191,7 +191,7 @@ class EasyEnergySensorEntityDescription(
     ),
     EasyEnergySensorEntityDescription(
         key="hours_priced_equal_or_higher",
-        name="Hours priced equal or higher than current - today",
+        translation_key="hours_priced_equal_or_higher",
         service_type="today_energy_return",
         native_unit_of_measurement=UnitOfTime.HOURS,
         icon="mdi:clock",
@@ -231,7 +231,7 @@ async def async_setup_entry(
 class EasyEnergySensorEntity(
     CoordinatorEntity[EasyEnergyDataUpdateCoordinator], SensorEntity
 ):
-    """Defines a easyEnergy sensor."""
+    """Defines an easyEnergy sensor."""
 
     _attr_has_entity_name = True
     _attr_attribution = "Data provided by easyEnergy"
diff --git a/homeassistant/components/easyenergy/strings.json b/homeassistant/components/easyenergy/strings.json
index ed89e0068d4d61..93fb264b01d4c3 100644
--- a/homeassistant/components/easyenergy/strings.json
+++ b/homeassistant/components/easyenergy/strings.json
@@ -8,5 +8,39 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_hour_price": {
+        "name": "Current hour"
+      },
+      "next_hour_price": {
+        "name": "Next hour"
+      },
+      "average_price": {
+        "name": "Average - today"
+      },
+      "max_price": {
+        "name": "Highest price - today"
+      },
+      "min_price": {
+        "name": "Lowest price - today"
+      },
+      "highest_price_time": {
+        "name": "Time of highest price - today"
+      },
+      "lowest_price_time": {
+        "name": "Time of lowest price - today"
+      },
+      "percentage_of_max": {
+        "name": "Current percentage of highest price - today"
+      },
+      "hours_priced_equal_or_lower": {
+        "name": "Hours priced equal or lower than current - today"
+      },
+      "hours_priced_equal_or_higher": {
+        "name": "Hours priced equal or higher than current - today"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ecobee/binary_sensor.py b/homeassistant/components/ecobee/binary_sensor.py
index 2266d70e0ad820..e65dc221a9fb1c 100644
--- a/homeassistant/components/ecobee/binary_sensor.py
+++ b/homeassistant/components/ecobee/binary_sensor.py
@@ -35,19 +35,16 @@ async def async_setup_entry(
 class EcobeeBinarySensor(BinarySensorEntity):
     """Representation of an Ecobee sensor."""
 
+    _attr_device_class = BinarySensorDeviceClass.OCCUPANCY
+    _attr_has_entity_name = True
+
     def __init__(self, data, sensor_name, sensor_index):
         """Initialize the Ecobee sensor."""
         self.data = data
-        self._name = f"{sensor_name} Occupancy"
-        self.sensor_name = sensor_name
+        self.sensor_name = sensor_name.rstrip()
         self.index = sensor_index
         self._state = None
 
-    @property
-    def name(self):
-        """Return the name of the Ecobee sensor."""
-        return self._name.rstrip()
-
     @property
     def unique_id(self):
         """Return a unique identifier for this sensor."""
@@ -101,11 +98,6 @@ def is_on(self):
         """Return the status of the sensor."""
         return self._state == "true"
 
-    @property
-    def device_class(self):
-        """Return the class of this sensor, from DEVICE_CLASSES."""
-        return BinarySensorDeviceClass.OCCUPANCY
-
     async def async_update(self) -> None:
         """Get the latest state of the sensor."""
         await self.data.update()
diff --git a/homeassistant/components/ecobee/climate.py b/homeassistant/components/ecobee/climate.py
index 7925832953baa7..8c0b77b913dd23 100644
--- a/homeassistant/components/ecobee/climate.py
+++ b/homeassistant/components/ecobee/climate.py
@@ -310,6 +310,8 @@ class Thermostat(ClimateEntity):
 
     _attr_precision = PRECISION_TENTHS
     _attr_temperature_unit = UnitOfTemperature.FAHRENHEIT
+    _attr_name = None
+    _attr_has_entity_name = True
 
     def __init__(
         self, data: EcobeeData, thermostat_index: int, thermostat: dict
@@ -318,7 +320,7 @@ def __init__(
         self.data = data
         self.thermostat_index = thermostat_index
         self.thermostat = thermostat
-        self._name = self.thermostat["name"]
+        self._attr_unique_id = self.thermostat["identifier"]
         self.vacation = None
         self._last_active_hvac_mode = HVACMode.HEAT_COOL
 
@@ -364,16 +366,6 @@ def supported_features(self) -> ClimateEntityFeature:
             supported = supported | ClimateEntityFeature.AUX_HEAT
         return supported
 
-    @property
-    def name(self):
-        """Return the name of the Ecobee Thermostat."""
-        return self.thermostat["name"]
-
-    @property
-    def unique_id(self):
-        """Return a unique identifier for this ecobee thermostat."""
-        return self.thermostat["identifier"]
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for this ecobee thermostat."""
@@ -388,7 +380,7 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, self.thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self.thermostat["name"],
         )
 
     @property
diff --git a/homeassistant/components/ecobee/humidifier.py b/homeassistant/components/ecobee/humidifier.py
index f4c4dad6527a3f..fb5533adf07a22 100644
--- a/homeassistant/components/ecobee/humidifier.py
+++ b/homeassistant/components/ecobee/humidifier.py
@@ -44,27 +44,19 @@ class EcobeeHumidifier(HumidifierEntity):
     """A humidifier class for an ecobee thermostat with humidifier attached."""
 
     _attr_supported_features = HumidifierEntityFeature.MODES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, data, thermostat_index):
         """Initialize ecobee humidifier platform."""
         self.data = data
         self.thermostat_index = thermostat_index
         self.thermostat = self.data.ecobee.get_thermostat(self.thermostat_index)
-        self._name = self.thermostat["name"]
+        self._attr_unique_id = self.thermostat["identifier"]
         self._last_humidifier_on_mode = MODE_MANUAL
 
         self.update_without_throttle = False
 
-    @property
-    def name(self):
-        """Return the name of the humidifier."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return unique_id for humidifier."""
-        return f"{self.thermostat['identifier']}"
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for the ecobee humidifier."""
@@ -79,7 +71,7 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, self.thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self.thermostat["name"],
         )
 
     @property
diff --git a/homeassistant/components/ecobee/number.py b/homeassistant/components/ecobee/number.py
index 15ad17b0e39909..67c975010ab9af 100644
--- a/homeassistant/components/ecobee/number.py
+++ b/homeassistant/components/ecobee/number.py
@@ -36,7 +36,7 @@ class EcobeeNumberEntityDescription(
 VENTILATOR_NUMBERS = (
     EcobeeNumberEntityDescription(
         key="home",
-        name="home",
+        translation_key="ventilator_min_type_home",
         ecobee_setting_key="ventilatorMinOnTimeHome",
         set_fn=lambda data, id, min_time: data.ecobee.set_ventilator_min_on_time_home(
             id, min_time
@@ -44,7 +44,7 @@ class EcobeeNumberEntityDescription(
     ),
     EcobeeNumberEntityDescription(
         key="away",
-        name="away",
+        translation_key="ventilator_min_type_away",
         ecobee_setting_key="ventilatorMinOnTimeAway",
         set_fn=lambda data, id, min_time: data.ecobee.set_ventilator_min_on_time_away(
             id, min_time
@@ -92,7 +92,6 @@ def __init__(
         """Initialize ecobee ventilator platform."""
         super().__init__(data, thermostat_index)
         self.entity_description = description
-        self._attr_name = f"Ventilator min time {description.name}"
         self._attr_unique_id = f"{self.base_unique_id}_ventilator_{description.key}"
 
     async def async_update(self) -> None:
diff --git a/homeassistant/components/ecobee/sensor.py b/homeassistant/components/ecobee/sensor.py
index 90d4ba4202e258..3996ec6fd3503c 100644
--- a/homeassistant/components/ecobee/sensor.py
+++ b/homeassistant/components/ecobee/sensor.py
@@ -42,7 +42,6 @@ class EcobeeSensorEntityDescription(
 SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     EcobeeSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -50,7 +49,6 @@ class EcobeeSensorEntityDescription(
     ),
     EcobeeSensorEntityDescription(
         key="humidity",
-        name="Humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
@@ -58,7 +56,6 @@ class EcobeeSensorEntityDescription(
     ),
     EcobeeSensorEntityDescription(
         key="co2PPM",
-        name="CO2",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
@@ -66,7 +63,6 @@ class EcobeeSensorEntityDescription(
     ),
     EcobeeSensorEntityDescription(
         key="vocPPM",
-        name="VOC",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -74,7 +70,6 @@ class EcobeeSensorEntityDescription(
     ),
     EcobeeSensorEntityDescription(
         key="airQuality",
-        name="Air Quality Index",
         device_class=SensorDeviceClass.AQI,
         state_class=SensorStateClass.MEASUREMENT,
         runtime_key="actualAQScore",
@@ -104,6 +99,8 @@ async def async_setup_entry(
 class EcobeeSensor(SensorEntity):
     """Representation of an Ecobee sensor."""
 
+    _attr_has_entity_name = True
+
     entity_description: EcobeeSensorEntityDescription
 
     def __init__(
@@ -119,7 +116,6 @@ def __init__(
         self.sensor_name = sensor_name
         self.index = sensor_index
         self._state = None
-        self._attr_name = f"{sensor_name} {description.name}"
 
     @property
     def unique_id(self):
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index 19f379de7d953a..647ea55e3115fd 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -2,14 +2,12 @@
   "config": {
     "step": {
       "user": {
-        "title": "ecobee API key",
         "description": "Please enter the API key obtained from ecobee.com.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
         }
       },
       "authorize": {
-        "title": "Authorize app on ecobee.com",
         "description": "Please authorize this app at https://www.ecobee.com/consumerportal/index.html with PIN code:\n\n{pin}\n\nThen, press Submit."
       }
     },
@@ -20,5 +18,15 @@
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
+  },
+  "entity": {
+    "number": {
+      "ventilator_min_type_home": {
+        "name": "Ventilator min time home"
+      },
+      "ventilator_min_type_away": {
+        "name": "Ventilator min time away"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py
index 5610cdb2a9c1dd..d38bc82c6f2d04 100644
--- a/homeassistant/components/ecobee/weather.py
+++ b/homeassistant/components/ecobee/weather.py
@@ -57,6 +57,8 @@ class EcobeeWeather(WeatherEntity):
     _attr_native_temperature_unit = UnitOfTemperature.FAHRENHEIT
     _attr_native_visibility_unit = UnitOfLength.METERS
     _attr_native_wind_speed_unit = UnitOfSpeed.METERS_PER_SECOND
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, data, name, index):
         """Initialize the Ecobee weather platform."""
@@ -64,6 +66,7 @@ def __init__(self, data, name, index):
         self._name = name
         self._index = index
         self.weather = None
+        self._attr_unique_id = data.ecobee.get_thermostat(self._index)["identifier"]
 
     def get_forecast(self, index, param):
         """Retrieve forecast parameter."""
@@ -73,16 +76,6 @@ def get_forecast(self, index, param):
         except (IndexError, KeyError) as err:
             raise ValueError from err
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return a unique identifier for the weather platform."""
-        return self.data.ecobee.get_thermostat(self._index)["identifier"]
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return device information for the ecobee weather platform."""
@@ -98,7 +91,7 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, thermostat["identifier"])},
             manufacturer=MANUFACTURER,
             model=model,
-            name=self.name,
+            name=self._name,
         )
 
     @property
diff --git a/homeassistant/components/econet/__init__.py b/homeassistant/components/econet/__init__.py
index 6fa54fc70fb92b..afba9ba68374fe 100644
--- a/homeassistant/components/econet/__init__.py
+++ b/homeassistant/components/econet/__init__.py
@@ -19,7 +19,6 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
 from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType
 
 from .const import API_CLIENT, DOMAIN, EQUIPMENT
 
@@ -36,14 +35,6 @@
 INTERVAL = timedelta(minutes=60)
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the EcoNet component."""
-    hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][API_CLIENT] = {}
-    hass.data[DOMAIN][EQUIPMENT] = {}
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up EcoNet as config entry."""
 
@@ -65,6 +56,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         )
     except (ClientError, GenericHTTPError, InvalidResponseFormat) as err:
         raise ConfigEntryNotReady from err
+    hass.data.setdefault(DOMAIN, {API_CLIENT: {}, EQUIPMENT: {}})
     hass.data[DOMAIN][API_CLIENT][config_entry.entry_id] = api
     hass.data[DOMAIN][EQUIPMENT][config_entry.entry_id] = equipment
 
diff --git a/homeassistant/components/econet/climate.py b/homeassistant/components/econet/climate.py
index cf950a3c38c48b..7233d135f2e1cd 100644
--- a/homeassistant/components/econet/climate.py
+++ b/homeassistant/components/econet/climate.py
@@ -151,7 +151,7 @@ def hvac_modes(self):
         return self.op_list
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool, mode.
 
         Needs to be one of HVAC_MODE_*.
diff --git a/homeassistant/components/ecovacs/vacuum.py b/homeassistant/components/ecovacs/vacuum.py
index f1bf7deb502686..ba922a30b84fa6 100644
--- a/homeassistant/components/ecovacs/vacuum.py
+++ b/homeassistant/components/ecovacs/vacuum.py
@@ -6,7 +6,15 @@
 
 import sucks
 
-from homeassistant.components.vacuum import VacuumEntity, VacuumEntityFeature
+from homeassistant.components.vacuum import (
+    STATE_CLEANING,
+    STATE_DOCKED,
+    STATE_ERROR,
+    STATE_IDLE,
+    STATE_RETURNING,
+    StateVacuumEntity,
+    VacuumEntityFeature,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.icon import icon_for_battery_level
@@ -34,7 +42,7 @@ def setup_platform(
     add_entities(vacuums, True)
 
 
-class EcovacsVacuum(VacuumEntity):
+class EcovacsVacuum(StateVacuumEntity):
     """Ecovacs Vacuums such as Deebot."""
 
     _attr_fan_speed_list = [sucks.FAN_SPEED_NORMAL, sucks.FAN_SPEED_HIGH]
@@ -44,10 +52,9 @@ class EcovacsVacuum(VacuumEntity):
         | VacuumEntityFeature.RETURN_HOME
         | VacuumEntityFeature.CLEAN_SPOT
         | VacuumEntityFeature.STOP
-        | VacuumEntityFeature.TURN_OFF
-        | VacuumEntityFeature.TURN_ON
+        | VacuumEntityFeature.START
         | VacuumEntityFeature.LOCATE
-        | VacuumEntityFeature.STATUS
+        | VacuumEntityFeature.STATE
         | VacuumEntityFeature.SEND_COMMAND
         | VacuumEntityFeature.FAN_SPEED
     )
@@ -56,14 +63,13 @@ def __init__(self, device: sucks.VacBot) -> None:
         """Initialize the Ecovacs Vacuum."""
         self.device = device
         self.device.connect_and_wait_until_ready()
-        if self.device.vacuum.get("nick") is not None:
-            self._attr_name = str(self.device.vacuum["nick"])
-        else:
-            # In case there is no nickname defined, use the device id
-            self._attr_name = str(format(self.device.vacuum["did"]))
+        vacuum = self.device.vacuum
+
+        self.error = None
+        self._attr_unique_id = vacuum["did"]
+        self._attr_name = vacuum.get("nick", vacuum["did"])
 
-        self._error = None
-        _LOGGER.debug("Vacuum initialized: %s", self.name)
+        _LOGGER.debug("StateVacuum initialized: %s", self.name)
 
     async def async_added_to_hass(self) -> None:
         """Set up the event listeners now that hass is ready."""
@@ -79,9 +85,9 @@ def on_error(self, error):
         to change, that will come through as a separate on_status event
         """
         if error == "no_error":
-            self._error = None
+            self.error = None
         else:
-            self._error = error
+            self.error = error
 
         self.hass.bus.fire(
             "ecovacs_error", {"entity_id": self.entity_id, "error": error}
@@ -89,36 +95,24 @@ def on_error(self, error):
         self.schedule_update_ha_state()
 
     @property
-    def unique_id(self) -> str:
-        """Return an unique ID."""
-        return self.device.vacuum.get("did")
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if vacuum is currently cleaning."""
-        return self.device.is_cleaning
+    def state(self) -> str | None:
+        """Return the state of the vacuum cleaner."""
+        if self.error is not None:
+            return STATE_ERROR
 
-    @property
-    def is_charging(self) -> bool:
-        """Return true if vacuum is currently charging."""
-        return self.device.is_charging
+        if self.device.is_cleaning:
+            return STATE_CLEANING
 
-    @property
-    def status(self) -> str | None:
-        """Return the status of the vacuum cleaner."""
-        return self.device.vacuum_status
+        if self.device.is_charging:
+            return STATE_DOCKED
 
-    def return_to_base(self, **kwargs: Any) -> None:
-        """Set the vacuum cleaner to return to the dock."""
+        if self.device.vacuum_status == sucks.CLEAN_MODE_STOP:
+            return STATE_IDLE
 
-        self.device.run(sucks.Charge())
+        if self.device.vacuum_status == sucks.CHARGE_MODE_RETURNING:
+            return STATE_RETURNING
 
-    @property
-    def battery_icon(self) -> str:
-        """Return the battery icon for the vacuum cleaner."""
-        return icon_for_battery_level(
-            battery_level=self.battery_level, charging=self.is_charging
-        )
+        return None
 
     @property
     def battery_level(self) -> int | None:
@@ -126,22 +120,42 @@ def battery_level(self) -> int | None:
         if self.device.battery_status is not None:
             return self.device.battery_status * 100
 
-        return super().battery_level
+        return None
+
+    @property
+    def battery_icon(self) -> str:
+        """Return the battery icon for the vacuum cleaner."""
+        return icon_for_battery_level(
+            battery_level=self.battery_level, charging=self.device.is_charging
+        )
 
     @property
     def fan_speed(self) -> str | None:
         """Return the fan speed of the vacuum cleaner."""
         return self.device.fan_speed
 
-    def turn_on(self, **kwargs: Any) -> None:
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        """Return the device-specific state attributes of this vacuum."""
+        data: dict[str, Any] = {}
+        data[ATTR_ERROR] = self.error
+
+        for key, val in self.device.components.items():
+            attr_name = ATTR_COMPONENT_PREFIX + key
+            data[attr_name] = int(val * 100)
+
+        return data
+
+    def return_to_base(self, **kwargs: Any) -> None:
+        """Set the vacuum cleaner to return to the dock."""
+
+        self.device.run(sucks.Charge())
+
+    def start(self, **kwargs: Any) -> None:
         """Turn the vacuum on and start cleaning."""
 
         self.device.run(sucks.Clean())
 
-    def turn_off(self, **kwargs: Any) -> None:
-        """Turn the vacuum off stopping the cleaning and returning home."""
-        self.return_to_base()
-
     def stop(self, **kwargs: Any) -> None:
         """Stop the vacuum cleaner."""
 
@@ -159,7 +173,7 @@ def locate(self, **kwargs: Any) -> None:
 
     def set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:
         """Set fan speed."""
-        if self.is_on:
+        if self.state == STATE_CLEANING:
             self.device.run(sucks.Clean(mode=self.device.clean_status, speed=fan_speed))
 
     def send_command(
@@ -170,15 +184,3 @@ def send_command(
     ) -> None:
         """Send a command to a vacuum cleaner."""
         self.device.run(sucks.VacBotCommand(command, params))
-
-    @property
-    def extra_state_attributes(self) -> dict[str, Any]:
-        """Return the device-specific state attributes of this vacuum."""
-        data: dict[str, Any] = {}
-        data[ATTR_ERROR] = self._error
-
-        for key, val in self.device.components.items():
-            attr_name = ATTR_COMPONENT_PREFIX + key
-            data[attr_name] = int(val * 100)
-
-        return data
diff --git a/homeassistant/components/ecowitt/sensor.py b/homeassistant/components/ecowitt/sensor.py
index 5bbe22b697232e..8d5411e9e2e6ce 100644
--- a/homeassistant/components/ecowitt/sensor.py
+++ b/homeassistant/components/ecowitt/sensor.py
@@ -125,7 +125,7 @@
     EcoWittSensorTypes.LIGHTNING_COUNT: SensorEntityDescription(
         key="LIGHTNING_COUNT",
         native_unit_of_measurement="strikes",
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.TEMPERATURE_C: SensorEntityDescription(
         key="TEMPERATURE_C",
@@ -143,13 +143,13 @@
         key="RAIN_COUNT_MM",
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.RAIN_COUNT_INCHES: SensorEntityDescription(
         key="RAIN_COUNT_INCHES",
         native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
         device_class=SensorDeviceClass.PRECIPITATION,
-        state_class=SensorStateClass.TOTAL,
+        state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     EcoWittSensorTypes.RAIN_RATE_MM: SensorEntityDescription(
         key="RAIN_RATE_MM",
@@ -230,6 +230,13 @@ def _new_sensor(sensor: EcoWittSensor) -> None:
             name=sensor.name,
         )
 
+        # Hourly rain doesn't reset to fixed hours, it must be measurement state classes
+        if sensor.key in ("hrain_piezomm", "hrain_piezo"):
+            description = dataclasses.replace(
+                description,
+                state_class=SensorStateClass.MEASUREMENT,
+            )
+
         async_add_entities([EcowittSensorEntity(sensor, description)])
 
     ecowitt.new_sensor_cb.append(_new_sensor)
diff --git a/homeassistant/components/eddystone_temperature/manifest.json b/homeassistant/components/eddystone_temperature/manifest.json
index dba5d35ab1a700..b15a88d099f1ed 100644
--- a/homeassistant/components/eddystone_temperature/manifest.json
+++ b/homeassistant/components/eddystone_temperature/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eddystone_temperature",
   "iot_class": "local_polling",
   "loggers": ["beacontools"],
-  "requirements": ["beacontools[scan]==2.1.0", "construct==2.10.56"]
+  "requirements": ["beacontools[scan]==2.1.0"]
 }
diff --git a/homeassistant/components/edl21/config_flow.py b/homeassistant/components/edl21/config_flow.py
index b66a988958b9ba..0bedcc515efd45 100644
--- a/homeassistant/components/edl21/config_flow.py
+++ b/homeassistant/components/edl21/config_flow.py
@@ -1,10 +1,8 @@
 """Config flow for EDL21 integration."""
-from typing import Any
 
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_NAME
 from homeassistant.data_entry_flow import FlowResult
 
 from .const import CONF_SERIAL_PORT, DEFAULT_TITLE, DOMAIN
@@ -21,17 +19,6 @@ class EDL21ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
-        """Import a config entry from configuration.yaml."""
-
-        self._async_abort_entries_match(
-            {CONF_SERIAL_PORT: import_config[CONF_SERIAL_PORT]}
-        )
-        return self.async_create_entry(
-            title=import_config[CONF_NAME] or DEFAULT_TITLE,
-            data=import_config,
-        )
-
     async def async_step_user(
         self, user_input: dict[str, str] | None = None
     ) -> FlowResult:
diff --git a/homeassistant/components/edl21/manifest.json b/homeassistant/components/edl21/manifest.json
index 5fdda4634591e6..faa471e44b193b 100644
--- a/homeassistant/components/edl21/manifest.json
+++ b/homeassistant/components/edl21/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["sml"],
-  "requirements": ["pysml==0.0.11"]
+  "requirements": ["pysml==0.0.12"]
 }
diff --git a/homeassistant/components/edl21/sensor.py b/homeassistant/components/edl21/sensor.py
index e526f951f1c6b5..3ce42198fbdcd0 100644
--- a/homeassistant/components/edl21/sensor.py
+++ b/homeassistant/components/edl21/sensor.py
@@ -7,18 +7,15 @@
 
 from sml import SmlGetListResponse
 from sml.asyncio import SmlProtocol
-import voluptuous as vol
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONF_NAME,
     DEGREE,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -27,15 +24,12 @@
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.dt import utcnow
 
 from .const import (
@@ -48,13 +42,6 @@
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_SERIAL_PORT): cv.string,
-        vol.Optional(CONF_NAME, default=""): cv.string,
-    },
-)
-
 # OBIS format: A-B:C.D.E*F
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     # A=1: Electricity
@@ -63,41 +50,47 @@
     # E=0 Ownership ID
     SensorEntityDescription(
         key="1-0:0.0.0*255",
-        name="Ownership ID",
+        translation_key="ownership_id",
         icon="mdi:flash",
         entity_registry_enabled_default=False,
     ),
     # E=9: Electrity ID
     SensorEntityDescription(
-        key="1-0:0.0.9*255", name="Electricity ID", icon="mdi:flash"
+        key="1-0:0.0.9*255",
+        translation_key="electricity_id",
+        icon="mdi:flash",
     ),
     # D=2: Program entries
     SensorEntityDescription(
-        key="1-0:0.2.0*0", name="Configuration program version number", icon="mdi:flash"
+        key="1-0:0.2.0*0",
+        translation_key="configuration_program_version_number",
+        icon="mdi:flash",
     ),
     SensorEntityDescription(
-        key="1-0:0.2.0*1", name="Firmware version number", icon="mdi:flash"
+        key="1-0:0.2.0*1",
+        translation_key="firmware_version_number",
+        icon="mdi:flash",
     ),
     # C=1: Active power +
     # D=8: Time integral 1
     # E=0: Total
     SensorEntityDescription(
         key="1-0:1.8.0*255",
-        name="Positive active energy total",
+        translation_key="positive_active_energy_total",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=1: Rate 1
     SensorEntityDescription(
         key="1-0:1.8.1*255",
-        name="Positive active energy in tariff T1",
+        translation_key="positive_active_energy_tariff_t1",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=2: Rate 2
     SensorEntityDescription(
         key="1-0:1.8.2*255",
-        name="Positive active energy in tariff T2",
+        translation_key="positive_active_energy_tariff_t2",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
@@ -105,28 +98,28 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:1.17.0*255",
-        name="Last signed positive active energy total",
+        translation_key="last_signed_positive_active_energy_total",
     ),
     # C=2: Active power -
     # D=8: Time integral 1
     # E=0: Total
     SensorEntityDescription(
         key="1-0:2.8.0*255",
-        name="Negative active energy total",
+        translation_key="negative_active_energy_total",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=1: Rate 1
     SensorEntityDescription(
         key="1-0:2.8.1*255",
-        name="Negative active energy in tariff T1",
+        translation_key="negative_active_energy_tariff_t1",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
     # E=2: Rate 2
     SensorEntityDescription(
         key="1-0:2.8.2*255",
-        name="Negative active energy in tariff T2",
+        translation_key="negative_active_energy_tariff_t2",
         state_class=SensorStateClass.TOTAL_INCREASING,
         device_class=SensorDeviceClass.ENERGY,
     ),
@@ -134,14 +127,16 @@
     # D=7: Instantaneous value
     # E=0: Total
     SensorEntityDescription(
-        key="1-0:14.7.0*255", name="Supply frequency", icon="mdi:sine-wave"
+        key="1-0:14.7.0*255",
+        translation_key="supply_frequency",
+        icon="mdi:sine-wave",
     ),
     # C=15: Active power absolute
     # D=7: Instantaneous value
     # E=0: Total
     SensorEntityDescription(
         key="1-0:15.7.0*255",
-        name="Absolute active instantaneous power",
+        translation_key="absolute_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -150,7 +145,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:16.7.0*255",
-        name="Sum active instantaneous power",
+        translation_key="sum_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -159,7 +154,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:31.7.0*255",
-        name="L1 active instantaneous amperage",
+        translation_key="l1_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -168,7 +163,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:32.7.0*255",
-        name="L1 active instantaneous voltage",
+        translation_key="l1_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -177,7 +172,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:36.7.0*255",
-        name="L1 active instantaneous power",
+        translation_key="l1_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -186,7 +181,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:51.7.0*255",
-        name="L2 active instantaneous amperage",
+        translation_key="l2_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -195,7 +190,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:52.7.0*255",
-        name="L2 active instantaneous voltage",
+        translation_key="l2_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -204,7 +199,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:56.7.0*255",
-        name="L2 active instantaneous power",
+        translation_key="l2_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -213,7 +208,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:71.7.0*255",
-        name="L3 active instantaneous amperage",
+        translation_key="l3_active_instantaneous_amperage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CURRENT,
     ),
@@ -222,7 +217,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:72.7.0*255",
-        name="L3 active instantaneous voltage",
+        translation_key="l3_active_instantaneous_voltage",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
@@ -231,7 +226,7 @@
     # E=0: Total
     SensorEntityDescription(
         key="1-0:76.7.0*255",
-        name="L3 active instantaneous power",
+        translation_key="l3_active_instantaneous_power",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.POWER,
     ),
@@ -243,26 +238,40 @@
     # E=15: U(L2) x I(L2)
     # E=26: U(L3) x I(L3)
     SensorEntityDescription(
-        key="1-0:81.7.1*255", name="U(L2)/U(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.1*255",
+        translation_key="u_l2_u_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.2*255", name="U(L3)/U(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.2*255",
+        translation_key="u_l3_u_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.4*255", name="U(L1)/I(L1) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.4*255",
+        translation_key="u_l1_i_l1_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.15*255", name="U(L2)/I(L2) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.15*255",
+        translation_key="u_l2_i_l2_phase_angle",
+        icon="mdi:sine-wave",
     ),
     SensorEntityDescription(
-        key="1-0:81.7.26*255", name="U(L3)/I(L3) phase angle", icon="mdi:sine-wave"
+        key="1-0:81.7.26*255",
+        translation_key="u_l3_i_l3_phase_angle",
+        icon="mdi:sine-wave",
     ),
     # C=96: Electricity-related service entries
     SensorEntityDescription(
-        key="1-0:96.1.0*255", name="Metering point ID 1", icon="mdi:flash"
+        key="1-0:96.1.0*255",
+        translation_key="metering_point_id_1",
+        icon="mdi:flash",
     ),
     SensorEntityDescription(
-        key="1-0:96.5.0*255", name="Internal operating status", icon="mdi:flash"
+        key="1-0:96.5.0*255",
+        translation_key="internal_operating_status",
+        icon="mdi:flash",
     ),
 )
 
@@ -279,31 +288,6 @@
 }
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up EDL21 sensors via configuration.yaml and show deprecation warning."""
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2023.6.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-    )
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=config,
-        )
-    )
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -341,12 +325,11 @@ def __init__(
         self._registered_obis: set[tuple[str, str]] = set()
         self._hass = hass
         self._async_add_entities = async_add_entities
-        self._name = config.get(CONF_NAME)
+        self._serial_port = config[CONF_SERIAL_PORT]
         self._proto = SmlProtocol(config[CONF_SERIAL_PORT])
         self._proto.add_listener(self.event, ["SmlGetListResponse"])
         LOGGER.debug(
-            "Initialized EDL21 for %s on %s",
-            config.get(CONF_NAME),
+            "Initialized EDL21 on %s",
             config[CONF_SERIAL_PORT],
         )
 
@@ -357,16 +340,14 @@ async def connect(self) -> None:
     def event(self, message_body) -> None:
         """Handle events from pysml."""
         assert isinstance(message_body, SmlGetListResponse)
-        LOGGER.debug("Received sml message for %s: %s", self._name, message_body)
+        LOGGER.debug("Received sml message on %s: %s", self._serial_port, message_body)
 
-        electricity_id = None
-        for telegram in message_body.get("valList", []):
-            if telegram.get("objName") in ("1-0:0.0.9*255", "1-0:96.1.0*255"):
-                electricity_id = telegram.get("value")
-                break
+        electricity_id = message_body["serverId"]
 
         if electricity_id is None:
-            LOGGER.debug("No electricity id found in sml message for %s", self._name)
+            LOGGER.debug(
+                "No electricity id found in sml message on %s", self._serial_port
+            )
             return
         electricity_id = electricity_id.replace(" ", "")
 
@@ -381,15 +362,11 @@ def event(self, message_body) -> None:
                 )
             else:
                 entity_description = SENSORS.get(obis)
-                if entity_description and entity_description.name:
-                    # self._name is only used for backwards YAML compatibility
-                    # This needs to be cleaned up when YAML support is removed
-                    device_name = self._name or DEFAULT_DEVICE_NAME
+                if entity_description:
                     new_entities.append(
                         EDL21Entity(
                             electricity_id,
                             obis,
-                            device_name,
                             entity_description,
                             telegram,
                         )
@@ -413,7 +390,7 @@ class EDL21Entity(SensorEntity):
     _attr_should_poll = False
     _attr_has_entity_name = True
 
-    def __init__(self, electricity_id, obis, device_name, entity_description, telegram):
+    def __init__(self, electricity_id, obis, entity_description, telegram):
         """Initialize an EDL21Entity."""
         self._electricity_id = electricity_id
         self._obis = obis
@@ -425,7 +402,7 @@ def __init__(self, electricity_id, obis, device_name, entity_description, telegr
         self._attr_unique_id = f"{electricity_id}_{obis}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._electricity_id)},
-            name=device_name,
+            name=DEFAULT_DEVICE_NAME,
         )
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/edl21/strings.json b/homeassistant/components/edl21/strings.json
index 284e8229c59b54..4397864294358b 100644
--- a/homeassistant/components/edl21/strings.json
+++ b/homeassistant/components/edl21/strings.json
@@ -12,10 +12,98 @@
       }
     }
   },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "EDL21 YAML configuration is being removed",
-      "description": "Configuring EDL21 using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the EDL21 YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+  "entity": {
+    "sensor": {
+      "ownership_id": {
+        "name": "Ownership ID"
+      },
+      "electricity_id": {
+        "name": "Electricity ID"
+      },
+      "configuration_program_version_number": {
+        "name": "Configuration program version number"
+      },
+      "firmware_version_number": {
+        "name": "Firmware version number"
+      },
+      "positive_active_energy_total": {
+        "name": "Positive active energy total"
+      },
+      "positive_active_energy_tariff_t1": {
+        "name": "Positive active energy in tariff T1"
+      },
+      "positive_active_energy_tariff_t2": {
+        "name": "Positive active energy in tariff T2"
+      },
+      "last_signed_positive_active_energy_total": {
+        "name": "Last signed positive active energy total"
+      },
+      "negative_active_energy_total": {
+        "name": "Negative active energy total"
+      },
+      "negative_active_energy_tariff_t1": {
+        "name": "Negative active energy in tariff T1"
+      },
+      "negative_active_energy_tariff_t2": {
+        "name": "Negative active energy in tariff T2"
+      },
+      "supply_frequency": {
+        "name": "Supply frequency"
+      },
+      "absolute_active_instantaneous_power": {
+        "name": "Absolute active instantaneous power"
+      },
+      "sum_active_instantaneous_power": {
+        "name": "Sum active instantaneous power"
+      },
+      "l1_active_instantaneous_amperage": {
+        "name": "L1 active instantaneous amperage"
+      },
+      "l1_active_instantaneous_voltage": {
+        "name": "L1 active instantaneous voltage"
+      },
+      "l1_active_instantaneous_power": {
+        "name": "L1 active instantaneous power"
+      },
+      "l2_active_instantaneous_amperage": {
+        "name": "L2 active instantaneous amperage"
+      },
+      "l2_active_instantaneous_voltage": {
+        "name": "L2 active instantaneous voltage"
+      },
+      "l2_active_instantaneous_power": {
+        "name": "L2 active instantaneous power"
+      },
+      "l3_active_instantaneous_amperage": {
+        "name": "L3 active instantaneous amperage"
+      },
+      "l3_active_instantaneous_voltage": {
+        "name": "L3 active instantaneous voltage"
+      },
+      "l3_active_instantaneous_power": {
+        "name": "L3 active instantaneous power"
+      },
+      "u_l2_u_l1_phase_angle": {
+        "name": "U(L2)/U(L1) phase angle"
+      },
+      "u_l3_u_l1_phase_angle": {
+        "name": "U(L3)/U(L1) phase angle"
+      },
+      "u_l1_i_l1_phase_angle": {
+        "name": "U(L1)/I(L1) phase angle"
+      },
+      "u_l2_i_l2_phase_angle": {
+        "name": "U(L2)/I(L2) phase angle"
+      },
+      "u_l3_i_l3_phase_angle": {
+        "name": "U(L3)/I(L3) phase angle"
+      },
+      "metering_point_id_1": {
+        "name": "Metering point ID 1"
+      },
+      "internal_operating_status": {
+        "name": "Internal operating status"
+      }
     }
   }
 }
diff --git a/homeassistant/components/efergy/sensor.py b/homeassistant/components/efergy/sensor.py
index 1f544a7a97b151..6fc6eed40f6906 100644
--- a/homeassistant/components/efergy/sensor.py
+++ b/homeassistant/components/efergy/sensor.py
@@ -25,14 +25,14 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="instant_readings",
-        name="Power Usage",
+        translation_key="instant_readings",
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="energy_day",
-        name="Daily Consumption",
+        translation_key="energy_day",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -40,7 +40,7 @@
     ),
     SensorEntityDescription(
         key="energy_week",
-        name="Weekly Consumption",
+        translation_key="energy_week",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -48,14 +48,14 @@
     ),
     SensorEntityDescription(
         key="energy_month",
-        name="Monthly Consumption",
+        translation_key="energy_month",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="energy_year",
-        name="Yearly Consumption",
+        translation_key="energy_year",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -63,32 +63,32 @@
     ),
     SensorEntityDescription(
         key="budget",
-        name="Energy Budget",
+        translation_key="budget",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_day",
-        name="Daily Energy Cost",
+        translation_key="cost_day",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_week",
-        name="Weekly Energy Cost",
+        translation_key="cost_week",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="cost_month",
-        name="Monthly Energy Cost",
+        translation_key="cost_month",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="cost_year",
-        name="Yearly Energy Cost",
+        translation_key="cost_year",
         device_class=SensorDeviceClass.MONETARY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
@@ -137,6 +137,8 @@ async def async_setup_entry(
 class EfergySensor(EfergyEntity, SensorEntity):
     """Implementation of an Efergy sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         api: Efergy,
diff --git a/homeassistant/components/efergy/strings.json b/homeassistant/components/efergy/strings.json
index 924d5a56bcf8a4..3b17bf07f1ae4d 100644
--- a/homeassistant/components/efergy/strings.json
+++ b/homeassistant/components/efergy/strings.json
@@ -16,5 +16,39 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "instant_readings": {
+        "name": "Power usage"
+      },
+      "energy_day": {
+        "name": "Daily consumption"
+      },
+      "energy_week": {
+        "name": "Weekly consumption"
+      },
+      "energy_month": {
+        "name": "Monthly consumption"
+      },
+      "energy_year": {
+        "name": "Yearly consumption"
+      },
+      "budget": {
+        "name": "Energy budget"
+      },
+      "cost_day": {
+        "name": "Daily energy cost"
+      },
+      "cost_week": {
+        "name": "Weekly energy cost"
+      },
+      "cost_month": {
+        "name": "Monthly energy cost"
+      },
+      "cost_year": {
+        "name": "Yearly energy cost"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/eight_sleep/manifest.json b/homeassistant/components/eight_sleep/manifest.json
index b95e24823d65b9..71e01f75d46754 100644
--- a/homeassistant/components/eight_sleep/manifest.json
+++ b/homeassistant/components/eight_sleep/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eight_sleep",
   "iot_class": "cloud_polling",
   "loggers": ["pyeight"],
-  "requirements": ["pyeight==0.3.2"]
+  "requirements": ["pyEight==0.3.2"]
 }
diff --git a/homeassistant/components/electrasmart/climate.py b/homeassistant/components/electrasmart/climate.py
index 361f906133d46d..59523d5a4cbd08 100644
--- a/homeassistant/components/electrasmart/climate.py
+++ b/homeassistant/components/electrasmart/climate.py
@@ -109,15 +109,18 @@ class ElectraClimateEntity(ClimateEntity):
     _attr_min_temp = MIN_TEMP
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_hvac_modes = ELECTRA_MODES
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device: ElectraAirConditioner, api: ElectraAPI) -> None:
         """Initialize Electra climate entity."""
         self._api = api
         self._electra_ac_device = device
-        self._attr_name = device.name
         self._attr_unique_id = device.mac
         self._attr_supported_features = (
-            ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.FAN_MODE
+            ClimateEntityFeature.TARGET_TEMPERATURE
+            | ClimateEntityFeature.FAN_MODE
+            | ClimateEntityFeature.PRESET_MODE
         )
 
         swing_modes: list = []
@@ -140,7 +143,7 @@ def __init__(self, device: ElectraAirConditioner, api: ElectraAPI) -> None:
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._electra_ac_device.mac)},
-            name=self.name,
+            name=device.name,
             model=self._electra_ac_device.model,
             manufacturer=self._electra_ac_device.manufactor,
         )
@@ -250,7 +253,7 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
             raise ValueError("No target temperature provided")
 
-        self._electra_ac_device.set_temperature(temperature)
+        self._electra_ac_device.set_temperature(int(temperature))
         await self._async_operate_electra_ac()
 
     def _update_device_attrs(self) -> None:
diff --git a/homeassistant/components/electrasmart/manifest.json b/homeassistant/components/electrasmart/manifest.json
index a2a3f928eeb48a..405d9ee688ad25 100644
--- a/homeassistant/components/electrasmart/manifest.json
+++ b/homeassistant/components/electrasmart/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/electrasmart",
   "iot_class": "cloud_polling",
-  "requirements": ["pyelectra==1.2.0"]
+  "requirements": ["pyElectra==1.2.0"]
 }
diff --git a/homeassistant/components/electrasmart/translations/en.json b/homeassistant/components/electrasmart/translations/en.json
deleted file mode 100644
index c6afd62454025e..00000000000000
--- a/homeassistant/components/electrasmart/translations/en.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "config": {
-        "abort": {
-            "already_configured": "Phone number already configured"
-        },
-        "error": {
-            "cannot_connect": "Failed to connect to Electra API",
-            "invalid_auth": "Wrong one time password key",
-            "invalid_phone_number": "Either wrong phone number or unregistered user",
-            "unknown": "Unexpected error"
-        },
-        "step": {
-            "user": {
-                "data": {
-                    "phone_number": "Phone Number (eg. 0501234567)"
-                }
-            },
-            "one_time_password": {
-                "data": {
-                     "one_time_password": "One Time Password (OTP)"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/elgato/button.py b/homeassistant/components/elgato/button.py
index 97673a79b9a5ce..b05cd532c16eea 100644
--- a/homeassistant/components/elgato/button.py
+++ b/homeassistant/components/elgato/button.py
@@ -40,14 +40,12 @@ class ElgatoButtonEntityDescription(
 BUTTONS = [
     ElgatoButtonEntityDescription(
         key="identify",
-        translation_key="identify",
-        icon="mdi:help",
+        device_class=ButtonDeviceClass.IDENTIFY,
         entity_category=EntityCategory.CONFIG,
         press_fn=lambda client: client.identify(),
     ),
     ElgatoButtonEntityDescription(
         key="restart",
-        translation_key="restart",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_fn=lambda client: client.restart(),
diff --git a/homeassistant/components/elgato/light.py b/homeassistant/components/elgato/light.py
index 47da87306a34b5..f74ec04476ff6f 100644
--- a/homeassistant/components/elgato/light.py
+++ b/homeassistant/components/elgato/light.py
@@ -47,6 +47,7 @@ async def async_setup_entry(
 class ElgatoLight(ElgatoEntity, LightEntity):
     """Defines an Elgato Light."""
 
+    _attr_name = None
     _attr_min_mireds = 143
     _attr_max_mireds = 344
 
diff --git a/homeassistant/components/elgato/sensor.py b/homeassistant/components/elgato/sensor.py
index 371840de013a34..8ed8265705c2b3 100644
--- a/homeassistant/components/elgato/sensor.py
+++ b/homeassistant/components/elgato/sensor.py
@@ -45,7 +45,6 @@ class ElgatoSensorEntityDescription(
 SENSORS = [
     ElgatoSensorEntityDescription(
         key="battery",
-        translation_key="battery",
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
diff --git a/homeassistant/components/elgato/strings.json b/homeassistant/components/elgato/strings.json
index c5fc016aeb9067..8a2f20f209f8bf 100644
--- a/homeassistant/components/elgato/strings.json
+++ b/homeassistant/components/elgato/strings.json
@@ -23,18 +23,7 @@
     }
   },
   "entity": {
-    "button": {
-      "identify": {
-        "name": "Identify"
-      },
-      "restart": {
-        "name": "[%key:component::button::entity_component::restart::name%]"
-      }
-    },
     "sensor": {
-      "battery": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      },
       "charge_power": {
         "name": "Charging power"
       },
diff --git a/homeassistant/components/elkm1/climate.py b/homeassistant/components/elkm1/climate.py
index 570c8567403106..d0094a5b37bc4c 100644
--- a/homeassistant/components/elkm1/climate.py
+++ b/homeassistant/components/elkm1/climate.py
@@ -85,7 +85,7 @@ class ElkThermostat(ElkEntity, ClimateEntity):
     def __init__(self, element: Element, elk: Elk, elk_data: dict[str, Any]) -> None:
         """Initialize climate entity."""
         super().__init__(element, elk, elk_data)
-        self._state: str | None = None
+        self._state: HVACMode | None = None
 
     @property
     def temperature_unit(self) -> str:
@@ -130,7 +130,7 @@ def current_humidity(self) -> int | None:
         return self._element.humidity
 
     @property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
         return self._state
 
diff --git a/homeassistant/components/elkm1/manifest.json b/homeassistant/components/elkm1/manifest.json
index d7094a2e60b106..ccac1593fa002c 100644
--- a/homeassistant/components/elkm1/manifest.json
+++ b/homeassistant/components/elkm1/manifest.json
@@ -15,5 +15,5 @@
   "documentation": "https://www.home-assistant.io/integrations/elkm1",
   "iot_class": "local_push",
   "loggers": ["elkm1_lib"],
-  "requirements": ["elkm1-lib==2.2.2"]
+  "requirements": ["elkm1-lib==2.2.5"]
 }
diff --git a/homeassistant/components/elmax/manifest.json b/homeassistant/components/elmax/manifest.json
index e6e8d76be91653..dfb90763c83c58 100644
--- a/homeassistant/components/elmax/manifest.json
+++ b/homeassistant/components/elmax/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/elmax",
   "iot_class": "cloud_polling",
   "loggers": ["elmax_api"],
-  "requirements": ["elmax_api==0.0.4"]
+  "requirements": ["elmax-api==0.0.4"]
 }
diff --git a/homeassistant/components/emby/manifest.json b/homeassistant/components/emby/manifest.json
index 872b3cca1e14b6..f90dda7935233f 100644
--- a/homeassistant/components/emby/manifest.json
+++ b/homeassistant/components/emby/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emby",
   "iot_class": "local_push",
   "loggers": ["pyemby"],
-  "requirements": ["pyemby==1.8"]
+  "requirements": ["pyEmby==1.9"]
 }
diff --git a/homeassistant/components/emonitor/sensor.py b/homeassistant/components/emonitor/sensor.py
index dc7159001d8039..0cf4f0f234687a 100644
--- a/homeassistant/components/emonitor/sensor.py
+++ b/homeassistant/components/emonitor/sensor.py
@@ -15,7 +15,7 @@
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.typing import UNDEFINED, StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -80,7 +80,7 @@ def __init__(
         mac_address = self.emonitor_status.network.mac_address
         device_name = name_short_mac(mac_address[-6:])
         label = self.channel_data.label or f"{device_name} {channel_number}"
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = f"{label} {description.name}"
             self._attr_unique_id = f"{mac_address}_{channel_number}_{description.key}"
         else:
diff --git a/homeassistant/components/emulated_hue/manifest.json b/homeassistant/components/emulated_hue/manifest.json
index ff3591e00667d5..01dae2dca77275 100644
--- a/homeassistant/components/emulated_hue/manifest.json
+++ b/homeassistant/components/emulated_hue/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emulated_hue",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["aiohttp_cors==0.7.0"]
+  "requirements": ["aiohttp-cors==0.7.0"]
 }
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index eea3f18adc0ae4..324279db7d9e66 100644
--- a/homeassistant/components/emulated_kasa/manifest.json
+++ b/homeassistant/components/emulated_kasa/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_push",
   "loggers": ["sense_energy"],
   "quality_scale": "internal",
-  "requirements": ["sense_energy==0.11.2"]
+  "requirements": ["sense_energy==0.12.0"]
 }
diff --git a/homeassistant/components/emulated_roku/manifest.json b/homeassistant/components/emulated_roku/manifest.json
index 960b3d41f6363a..739f3b04ec0c1f 100644
--- a/homeassistant/components/emulated_roku/manifest.json
+++ b/homeassistant/components/emulated_roku/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/emulated_roku",
   "iot_class": "local_push",
   "loggers": ["emulated_roku"],
-  "requirements": ["emulated_roku==0.2.1"]
+  "requirements": ["emulated-roku==0.2.1"]
 }
diff --git a/homeassistant/components/energy/__init__.py b/homeassistant/components/energy/__init__.py
index 41598b39b7294d..7f86b2458cbd0a 100644
--- a/homeassistant/components/energy/__init__.py
+++ b/homeassistant/components/energy/__init__.py
@@ -4,13 +4,15 @@
 from homeassistant.components import frontend
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from . import websocket_api
 from .const import DOMAIN
 from .data import async_get_manager
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def is_configured(hass: HomeAssistant) -> bool:
     """Return a boolean to indicate if energy is configured."""
diff --git a/homeassistant/components/energy/sensor.py b/homeassistant/components/energy/sensor.py
index b2b29760e5e2f5..ae92ee2de58997 100644
--- a/homeassistant/components/energy/sensor.py
+++ b/homeassistant/components/energy/sensor.py
@@ -226,6 +226,8 @@ class EnergyCostSensor(SensorEntity):
     """
 
     _attr_entity_registry_visible_default = False
+    _attr_should_poll = False
+
     _wrong_state_class_reported = False
     _wrong_unit_reported = False
 
@@ -432,6 +434,7 @@ def async_state_changed_listener(*_: Any) -> None:
     def add_to_platform_abort(self) -> None:
         """Abort adding an entity to a platform."""
         self.add_finished.set()
+        super().add_to_platform_abort()
 
     async def async_will_remove_from_hass(self) -> None:
         """Handle removing from hass."""
diff --git a/homeassistant/components/energyzero/coordinator.py b/homeassistant/components/energyzero/coordinator.py
index 232f14e8f8d363..a30509a3840a1c 100644
--- a/homeassistant/components/energyzero/coordinator.py
+++ b/homeassistant/components/energyzero/coordinator.py
@@ -16,7 +16,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, LOGGER, SCAN_INTERVAL, THRESHOLD_HOUR
 
@@ -47,7 +47,7 @@ def __init__(self, hass: HomeAssistant) -> None:
 
     async def _async_update_data(self) -> EnergyZeroData:
         """Fetch data from EnergyZero."""
-        today = dt.now().date()
+        today = dt_util.now().date()
         gas_today = None
         energy_tomorrow = None
 
@@ -62,7 +62,7 @@ async def _async_update_data(self) -> EnergyZeroData:
             except EnergyZeroNoDataError:
                 LOGGER.debug("No data for gas prices for EnergyZero integration")
             # Energy for tomorrow only after 14:00 UTC
-            if dt.utcnow().hour >= THRESHOLD_HOUR:
+            if dt_util.utcnow().hour >= THRESHOLD_HOUR:
                 tomorrow = today + timedelta(days=1)
                 try:
                     energy_tomorrow = await self.energyzero.energy_prices(
diff --git a/homeassistant/components/energyzero/sensor.py b/homeassistant/components/energyzero/sensor.py
index 75b5fa6fea6fd9..17052dfab57c94 100644
--- a/homeassistant/components/energyzero/sensor.py
+++ b/homeassistant/components/energyzero/sensor.py
@@ -42,7 +42,7 @@ class EnergyZeroSensorEntityDescription(
 SENSORS: tuple[EnergyZeroSensorEntityDescription, ...] = (
     EnergyZeroSensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_gas",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
@@ -50,14 +50,14 @@ class EnergyZeroSensorEntityDescription(
     ),
     EnergyZeroSensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_gas",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
         value_fn=lambda data: get_gas_price(data, 1),
     ),
     EnergyZeroSensorEntityDescription(
         key="current_hour_price",
-        name="Current hour",
+        translation_key="current_hour_price",
         service_type="today_energy",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
@@ -65,7 +65,7 @@ class EnergyZeroSensorEntityDescription(
     ),
     EnergyZeroSensorEntityDescription(
         key="next_hour_price",
-        name="Next hour",
+        translation_key="next_hour_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.price_at_time(
@@ -74,42 +74,42 @@ class EnergyZeroSensorEntityDescription(
     ),
     EnergyZeroSensorEntityDescription(
         key="average_price",
-        name="Average - today",
+        translation_key="average_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.average_price,
     ),
     EnergyZeroSensorEntityDescription(
         key="max_price",
-        name="Highest price - today",
+        translation_key="max_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_prices[1],
     ),
     EnergyZeroSensorEntityDescription(
         key="min_price",
-        name="Lowest price - today",
+        translation_key="min_price",
         service_type="today_energy",
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
         value_fn=lambda data: data.energy_today.extreme_prices[0],
     ),
     EnergyZeroSensorEntityDescription(
         key="highest_price_time",
-        name="Time of highest price - today",
+        translation_key="highest_price_time",
         service_type="today_energy",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.highest_price_time,
     ),
     EnergyZeroSensorEntityDescription(
         key="lowest_price_time",
-        name="Time of lowest price - today",
+        translation_key="lowest_price_time",
         service_type="today_energy",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.energy_today.lowest_price_time,
     ),
     EnergyZeroSensorEntityDescription(
         key="percentage_of_max",
-        name="Current percentage of highest price - today",
+        translation_key="percentage_of_max",
         service_type="today_energy",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:percent",
diff --git a/homeassistant/components/energyzero/strings.json b/homeassistant/components/energyzero/strings.json
index ed89e0068d4d61..93fb264b01d4c3 100644
--- a/homeassistant/components/energyzero/strings.json
+++ b/homeassistant/components/energyzero/strings.json
@@ -8,5 +8,39 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_hour_price": {
+        "name": "Current hour"
+      },
+      "next_hour_price": {
+        "name": "Next hour"
+      },
+      "average_price": {
+        "name": "Average - today"
+      },
+      "max_price": {
+        "name": "Highest price - today"
+      },
+      "min_price": {
+        "name": "Lowest price - today"
+      },
+      "highest_price_time": {
+        "name": "Time of highest price - today"
+      },
+      "lowest_price_time": {
+        "name": "Time of lowest price - today"
+      },
+      "percentage_of_max": {
+        "name": "Current percentage of highest price - today"
+      },
+      "hours_priced_equal_or_lower": {
+        "name": "Hours priced equal or lower than current - today"
+      },
+      "hours_priced_equal_or_higher": {
+        "name": "Hours priced equal or higher than current - today"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/enocean/sensor.py b/homeassistant/components/enocean/sensor.py
index 4fa3b25ed06a00..5d1c0027791528 100644
--- a/homeassistant/components/enocean/sensor.py
+++ b/homeassistant/components/enocean/sensor.py
@@ -151,6 +151,7 @@ def setup_platform(
     add_entities(entities)
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EnOceanSensor(EnOceanEntity, RestoreEntity, SensorEntity):
     """Representation of an  EnOcean sensor device such as a power meter."""
 
@@ -180,6 +181,7 @@ def value_changed(self, packet):
         """Update the internal state of the sensor."""
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EnOceanPowerSensor(EnOceanSensor):
     """Representation of an EnOcean power sensor.
 
@@ -200,6 +202,7 @@ def value_changed(self, packet):
             self.schedule_update_ha_state()
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EnOceanTemperatureSensor(EnOceanSensor):
     """Representation of an EnOcean temperature sensor device.
 
@@ -249,6 +252,7 @@ def value_changed(self, packet):
         self.schedule_update_ha_state()
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EnOceanHumiditySensor(EnOceanSensor):
     """Representation of an EnOcean humidity sensor device.
 
@@ -267,6 +271,7 @@ def value_changed(self, packet):
         self.schedule_update_ha_state()
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EnOceanWindowHandle(EnOceanSensor):
     """Representation of an EnOcean window handle device.
 
diff --git a/homeassistant/components/enphase_envoy/manifest.json b/homeassistant/components/enphase_envoy/manifest.json
index 447c903430944b..28a8d0ba28a90b 100644
--- a/homeassistant/components/enphase_envoy/manifest.json
+++ b/homeassistant/components/enphase_envoy/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/enphase_envoy",
   "iot_class": "local_polling",
   "loggers": ["envoy_reader"],
-  "requirements": ["envoy_reader==0.20.1"],
+  "requirements": ["envoy-reader==0.20.1"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."
diff --git a/homeassistant/components/enphase_envoy/sensor.py b/homeassistant/components/enphase_envoy/sensor.py
index 2870a61d9a0a50..44ffbcdb497829 100644
--- a/homeassistant/components/enphase_envoy/sensor.py
+++ b/homeassistant/components/enphase_envoy/sensor.py
@@ -18,6 +18,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -168,7 +169,7 @@ def __init__(
         """Initialize Envoy inverter entity."""
         self.entity_description = description
         self._serial_number = serial_number
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = (
                 f"{envoy_name} Inverter {serial_number} {description.name}"
             )
diff --git a/homeassistant/components/environment_canada/camera.py b/homeassistant/components/environment_canada/camera.py
index 7b93f0b28f4d55..385f973a25a8ae 100644
--- a/homeassistant/components/environment_canada/camera.py
+++ b/homeassistant/components/environment_canada/camera.py
@@ -42,7 +42,7 @@ class ECCamera(CoordinatorEntity, Camera):
     """Implementation of an Environment Canada radar camera."""
 
     _attr_has_entity_name = True
-    _attr_name = "Radar"
+    _attr_translation_key = "radar"
 
     def __init__(self, coordinator):
         """Initialize the camera."""
diff --git a/homeassistant/components/environment_canada/manifest.json b/homeassistant/components/environment_canada/manifest.json
index 6262a28302fad5..4a8a9dec5874c2 100644
--- a/homeassistant/components/environment_canada/manifest.json
+++ b/homeassistant/components/environment_canada/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/environment_canada",
   "iot_class": "cloud_polling",
   "loggers": ["env_canada"],
-  "requirements": ["env_canada==0.5.34"]
+  "requirements": ["env-canada==0.5.35"]
 }
diff --git a/homeassistant/components/environment_canada/sensor.py b/homeassistant/components/environment_canada/sensor.py
index e7eceb8dadc75b..987a779d2e84d6 100644
--- a/homeassistant/components/environment_canada/sensor.py
+++ b/homeassistant/components/environment_canada/sensor.py
@@ -52,12 +52,12 @@ class ECSensorEntityDescription(
 SENSOR_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ECSensorEntityDescription(
         key="condition",
-        name="Current condition",
+        translation_key="condition",
         value_fn=lambda data: data.conditions.get("condition", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="dewpoint",
-        name="Dew point",
+        translation_key="dewpoint",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -65,7 +65,7 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="high_temp",
-        name="High temperature",
+        translation_key="high_temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -73,7 +73,7 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="humidex",
-        name="Humidex",
+        translation_key="humidex",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -81,7 +81,6 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -89,11 +88,13 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="icon_code",
+        translation_key="icon_code",
         name="Icon code",
         value_fn=lambda data: data.conditions.get("icon_code", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="low_temp",
+        translation_key="low_temp",
         name="Low temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
@@ -102,27 +103,27 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="normal_high",
-        name="Normal high temperature",
+        translation_key="normal_high",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         value_fn=lambda data: data.conditions.get("normal_high", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="normal_low",
-        name="Normal low temperature",
+        translation_key="normal_low",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         value_fn=lambda data: data.conditions.get("normal_low", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="pop",
-        name="Chance of precipitation",
+        translation_key="pop",
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda data: data.conditions.get("pop", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="precip_yesterday",
-        name="Precipitation yesterday",
+        translation_key="precip_yesterday",
         device_class=SensorDeviceClass.PRECIPITATION,
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -130,7 +131,7 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="pressure",
-        name="Barometric pressure",
+        translation_key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.KPA,
         state_class=SensorStateClass.MEASUREMENT,
@@ -138,7 +139,6 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -146,32 +146,32 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="tendency",
-        name="Tendency",
+        translation_key="tendency",
         value_fn=lambda data: data.conditions.get("tendency", {}).get("value"),
         transform=lambda val: str(val).capitalize(),
     ),
     ECSensorEntityDescription(
         key="text_summary",
-        name="Summary",
+        translation_key="text_summary",
         value_fn=lambda data: data.conditions.get("text_summary", {}).get("value"),
         transform=lambda val: val[:255],
     ),
     ECSensorEntityDescription(
         key="timestamp",
-        name="Observation time",
+        translation_key="timestamp",
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.metadata.get("timestamp"),
     ),
     ECSensorEntityDescription(
         key="uv_index",
-        name="UV index",
+        translation_key="uv_index",
         native_unit_of_measurement=UV_INDEX,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.conditions.get("uv_index", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="visibility",
-        name="Visibility",
+        translation_key="visibility",
         native_unit_of_measurement=UnitOfLength.KILOMETERS,
         device_class=SensorDeviceClass.DISTANCE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -179,13 +179,13 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="wind_bearing",
-        name="Wind bearing",
+        translation_key="wind_bearing",
         native_unit_of_measurement=DEGREE,
         value_fn=lambda data: data.conditions.get("wind_bearing", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="wind_chill",
-        name="Wind chill",
+        translation_key="wind_chill",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -193,12 +193,12 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="wind_dir",
-        name="Wind direction",
+        translation_key="wind_dir",
         value_fn=lambda data: data.conditions.get("wind_dir", {}).get("value"),
     ),
     ECSensorEntityDescription(
         key="wind_gust",
-        name="Wind gust",
+        translation_key="wind_gust",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
@@ -206,7 +206,6 @@ class ECSensorEntityDescription(
     ),
     ECSensorEntityDescription(
         key="wind_speed",
-        name="Wind speed",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
@@ -226,7 +225,7 @@ def _get_aqhi_value(data):
 
 AQHI_SENSOR = ECSensorEntityDescription(
     key="aqhi",
-    name="AQHI",
+    translation_key="aqhi",
     device_class=SensorDeviceClass.AQI,
     state_class=SensorStateClass.MEASUREMENT,
     value_fn=_get_aqhi_value,
@@ -235,35 +234,35 @@ def _get_aqhi_value(data):
 ALERT_TYPES: tuple[ECSensorEntityDescription, ...] = (
     ECSensorEntityDescription(
         key="advisories",
-        name="Advisory",
+        translation_key="advisories",
         icon="mdi:bell-alert",
         value_fn=lambda data: data.alerts.get("advisories", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="endings",
-        name="Endings",
+        translation_key="endings",
         icon="mdi:alert-circle-check",
         value_fn=lambda data: data.alerts.get("endings", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="statements",
-        name="Statements",
+        translation_key="statements",
         icon="mdi:bell-alert",
         value_fn=lambda data: data.alerts.get("statements", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="warnings",
-        name="Warnings",
+        translation_key="warnings",
         icon="mdi:alert-octagon",
         value_fn=lambda data: data.alerts.get("warnings", {}).get("value"),
         transform=len,
     ),
     ECSensorEntityDescription(
         key="watches",
-        name="Watches",
+        translation_key="watches",
         icon="mdi:alert",
         value_fn=lambda data: data.alerts.get("watches", {}).get("value"),
         transform=len,
diff --git a/homeassistant/components/environment_canada/strings.json b/homeassistant/components/environment_canada/strings.json
index 4c6d75cfeb62f7..d30124ddf5af69 100644
--- a/homeassistant/components/environment_canada/strings.json
+++ b/homeassistant/components/environment_canada/strings.json
@@ -22,5 +22,100 @@
       "too_many_attempts": "Connections to Environment Canada are rate limited; Try again in 60 seconds",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "condition": {
+        "name": "Current condition"
+      },
+      "dewpoint": {
+        "name": "Dew point"
+      },
+      "high_temp": {
+        "name": "High temperature"
+      },
+      "humidex": {
+        "name": "Humidex"
+      },
+      "icon_code": {
+        "name": "Icon code"
+      },
+      "low_temp": {
+        "name": "Low temperature"
+      },
+      "normal_high": {
+        "name": "Normal high temperature"
+      },
+      "normal_low": {
+        "name": "Normal low temperature"
+      },
+      "pop": {
+        "name": "Chance of precipitation"
+      },
+      "precip_yesterday": {
+        "name": "Precipitation yesterday"
+      },
+      "pressure": {
+        "name": "Barometric pressure"
+      },
+      "tendency": {
+        "name": "Tendency"
+      },
+      "text_summary": {
+        "name": "Summary"
+      },
+      "timestamp": {
+        "name": "Observation time"
+      },
+      "uv_index": {
+        "name": "UV index"
+      },
+      "visibility": {
+        "name": "Visibility"
+      },
+      "wind_bearing": {
+        "name": "Wind bearing"
+      },
+      "wind_chill": {
+        "name": "Wind chill"
+      },
+      "wind_dir": {
+        "name": "Wind direction"
+      },
+      "wind_gust": {
+        "name": "Wind gust"
+      },
+      "aqhi": {
+        "name": "AQHI"
+      },
+      "advisories": {
+        "name": "Advisory"
+      },
+      "endings": {
+        "name": "Endings"
+      },
+      "statements": {
+        "name": "Statements"
+      },
+      "warnings": {
+        "name": "Warnings"
+      },
+      "watches": {
+        "name": "Watches"
+      }
+    },
+    "camera": {
+      "radar": {
+        "name": "Radar"
+      }
+    },
+    "weather": {
+      "hourly_forecast": {
+        "name": "Hourly forecast"
+      },
+      "forecast": {
+        "name": "Forecast"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/environment_canada/weather.py b/homeassistant/components/environment_canada/weather.py
index 74bf9c8ca54b9a..a9f79907b54a34 100644
--- a/homeassistant/components/environment_canada/weather.py
+++ b/homeassistant/components/environment_canada/weather.py
@@ -33,7 +33,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import device_info
 from .const import DOMAIN
@@ -80,7 +80,7 @@ def __init__(self, coordinator, hourly):
         super().__init__(coordinator)
         self.ec_data = coordinator.ec_data
         self._attr_attribution = self.ec_data.metadata["attribution"]
-        self._attr_name = "Hourly forecast" if hourly else "Forecast"
+        self._attr_translation_key = "hourly_forecast" if hourly else "forecast"
         self._attr_unique_id = (
             f"{coordinator.config_entry.unique_id}{'-hourly' if hourly else '-daily'}"
         )
@@ -169,7 +169,7 @@ def get_forecast(ec_data, hourly):
             return None
 
         today = {
-            ATTR_FORECAST_TIME: dt.now().isoformat(),
+            ATTR_FORECAST_TIME: dt_util.now().isoformat(),
             ATTR_FORECAST_CONDITION: icon_code_to_condition(
                 int(half_days[0]["icon_code"])
             ),
@@ -201,7 +201,7 @@ def get_forecast(ec_data, hourly):
             forecast_array.append(
                 {
                     ATTR_FORECAST_TIME: (
-                        dt.now() + datetime.timedelta(days=day)
+                        dt_util.now() + datetime.timedelta(days=day)
                     ).isoformat(),
                     ATTR_FORECAST_NATIVE_TEMP: int(half_days[high]["temperature"]),
                     ATTR_FORECAST_NATIVE_TEMP_LOW: int(half_days[low]["temperature"]),
diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index a68dd562af1435..fb13e86dd1d64b 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -1,149 +1,48 @@
 """Support for esphome devices."""
 from __future__ import annotations
 
-from collections.abc import Callable
-import functools
-import logging
-import math
-from typing import Any, Generic, NamedTuple, TypeVar, cast
-
 from aioesphomeapi import (
     APIClient,
-    APIConnectionError,
-    APIVersion,
-    DeviceInfo as EsphomeDeviceInfo,
-    EntityCategory as EsphomeEntityCategory,
-    EntityInfo,
-    EntityState,
-    HomeassistantServiceCall,
-    InvalidAuthAPIError,
-    InvalidEncryptionKeyAPIError,
-    ReconnectLogic,
-    RequiresEncryptionAPIError,
-    UserService,
-    UserServiceArgType,
-    VoiceAssistantEventType,
 )
-from awesomeversion import AwesomeVersion
-import voluptuous as vol
 
-from homeassistant.components import tag, zeroconf
+from homeassistant.components import zeroconf
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_DEVICE_ID,
     CONF_HOST,
-    CONF_MODE,
     CONF_PASSWORD,
     CONF_PORT,
-    EVENT_HOMEASSISTANT_STOP,
-    EntityCategory,
     __version__ as ha_version,
 )
-from homeassistant.core import Event, HomeAssistant, ServiceCall, State, callback
-from homeassistant.exceptions import TemplateError
-from homeassistant.helpers import template
+from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
-import homeassistant.helpers.device_registry as dr
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import DeviceInfo, Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import async_track_state_change_event
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
-from homeassistant.helpers.service import async_set_service_schema
-from homeassistant.helpers.template import Template
+from homeassistant.helpers.typing import ConfigType
 
-from .bluetooth import async_connect_scanner
-from .const import DOMAIN
-from .dashboard import async_get_dashboard
+from .const import (
+    CONF_NOISE_PSK,
+    DOMAIN,
+)
+from .dashboard import async_setup as async_setup_dashboard
 from .domain_data import DomainData
 
 # Import config flow so that it's added to the registry
 from .entry_data import RuntimeEntryData
-from .enum_mapper import EsphomeEnumMapper
-from .voice_assistant import VoiceAssistantUDPServer
+from .manager import ESPHomeManager, cleanup_instance
 
-CONF_DEVICE_NAME = "device_name"
-CONF_NOISE_PSK = "noise_psk"
-_LOGGER = logging.getLogger(__name__)
-_R = TypeVar("_R")
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-STABLE_BLE_VERSION_STR = "2023.4.0"
-STABLE_BLE_VERSION = AwesomeVersion(STABLE_BLE_VERSION_STR)
-PROJECT_URLS = {
-    "esphome.bluetooth-proxy": "https://esphome.github.io/bluetooth-proxies/",
-}
-DEFAULT_URL = f"https://esphome.io/changelog/{STABLE_BLE_VERSION_STR}.html"
 
-
-@callback
-def _async_check_firmware_version(
-    hass: HomeAssistant, device_info: EsphomeDeviceInfo
-) -> None:
-    """Create or delete an the ble_firmware_outdated issue."""
-    # ESPHome device_info.mac_address is the unique_id
-    issue = f"ble_firmware_outdated-{device_info.mac_address}"
-    if (
-        not device_info.bluetooth_proxy_version
-        # If the device has a project name its up to that project
-        # to tell them about the firmware version update so we don't notify here
-        or (device_info.project_name and device_info.project_name not in PROJECT_URLS)
-        or AwesomeVersion(device_info.esphome_version) >= STABLE_BLE_VERSION
-    ):
-        async_delete_issue(hass, DOMAIN, issue)
-        return
-    async_create_issue(
-        hass,
-        DOMAIN,
-        issue,
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        learn_more_url=PROJECT_URLS.get(device_info.project_name, DEFAULT_URL),
-        translation_key="ble_firmware_outdated",
-        translation_placeholders={
-            "name": device_info.name,
-            "version": STABLE_BLE_VERSION_STR,
-        },
-    )
-
-
-@callback
-def _async_check_using_api_password(
-    hass: HomeAssistant, device_info: EsphomeDeviceInfo, has_password: bool
-) -> None:
-    """Create or delete an the api_password_deprecated issue."""
-    # ESPHome device_info.mac_address is the unique_id
-    issue = f"api_password_deprecated-{device_info.mac_address}"
-    if not has_password:
-        async_delete_issue(hass, DOMAIN, issue)
-        return
-    async_create_issue(
-        hass,
-        DOMAIN,
-        issue,
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        learn_more_url="https://esphome.io/components/api.html",
-        translation_key="api_password_deprecated",
-        translation_placeholders={
-            "name": device_info.name,
-        },
-    )
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the esphome component."""
+    await async_setup_dashboard(hass)
+    return True
 
 
-async def async_setup_entry(  # noqa: C901
-    hass: HomeAssistant, entry: ConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up the esphome component."""
     host = entry.data[CONF_HOST]
     port = entry.data[CONF_PORT]
     password = entry.data[CONF_PASSWORD]
     noise_psk = entry.data.get(CONF_NOISE_PSK)
-    device_id: str | None = None
 
     zeroconf_instance = await zeroconf.async_get_instance(hass)
 
@@ -161,490 +60,21 @@ async def async_setup_entry(  # noqa: C901
         client=cli,
         entry_id=entry.entry_id,
         store=domain_data.get_or_create_store(hass, entry),
+        original_options=dict(entry.options),
     )
     domain_data.set_entry_data(entry, entry_data)
 
-    async def on_stop(event: Event) -> None:
-        """Cleanup the socket client on HA stop."""
-        await _cleanup_instance(hass, entry)
-
-    # Use async_listen instead of async_listen_once so that we don't deregister
-    # the callback twice when shutting down Home Assistant.
-    # "Unable to remove unknown listener
-    # <function EventBus.async_listen_once.<locals>.onetime_listener>"
-    entry_data.cleanup_callbacks.append(
-        hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, on_stop)
-    )
-
-    @callback
-    def async_on_service_call(service: HomeassistantServiceCall) -> None:
-        """Call service when user automation in ESPHome config is triggered."""
-        domain, service_name = service.service.split(".", 1)
-        service_data = service.data
-
-        if service.data_template:
-            try:
-                data_template = {
-                    key: Template(value) for key, value in service.data_template.items()
-                }
-                template.attach(hass, data_template)
-                service_data.update(
-                    template.render_complex(data_template, service.variables)
-                )
-            except TemplateError as ex:
-                _LOGGER.error("Error rendering data template for %s: %s", host, ex)
-                return
-
-        if service.is_event:
-            # ESPHome uses servicecall packet for both events and service calls
-            # Ensure the user can only send events of form 'esphome.xyz'
-            if domain != "esphome":
-                _LOGGER.error(
-                    "Can only generate events under esphome domain! (%s)", host
-                )
-                return
-
-            # Call native tag scan
-            if service_name == "tag_scanned" and device_id is not None:
-                tag_id = service_data["tag_id"]
-                hass.async_create_task(tag.async_scan_tag(hass, tag_id, device_id))
-                return
-
-            hass.bus.async_fire(
-                service.service,
-                {
-                    ATTR_DEVICE_ID: device_id,
-                    **service_data,
-                },
-            )
-        else:
-            hass.async_create_task(
-                hass.services.async_call(
-                    domain, service_name, service_data, blocking=True
-                )
-            )
-
-    async def _send_home_assistant_state(
-        entity_id: str, attribute: str | None, state: State | None
-    ) -> None:
-        """Forward Home Assistant states to ESPHome."""
-        if state is None or (attribute and attribute not in state.attributes):
-            return
-
-        send_state = state.state
-        if attribute:
-            attr_val = state.attributes[attribute]
-            # ESPHome only handles "on"/"off" for boolean values
-            if isinstance(attr_val, bool):
-                send_state = "on" if attr_val else "off"
-            else:
-                send_state = attr_val
-
-        await cli.send_home_assistant_state(entity_id, attribute, str(send_state))
-
-    @callback
-    def async_on_state_subscription(
-        entity_id: str, attribute: str | None = None
-    ) -> None:
-        """Subscribe and forward states for requested entities."""
-
-        async def send_home_assistant_state_event(event: Event) -> None:
-            """Forward Home Assistant states updates to ESPHome."""
-
-            # Only communicate changes to the state or attribute tracked
-            if event.data.get("new_state") is None or (
-                event.data.get("old_state") is not None
-                and "new_state" in event.data
-                and (
-                    (
-                        not attribute
-                        and event.data["old_state"].state
-                        == event.data["new_state"].state
-                    )
-                    or (
-                        attribute
-                        and attribute in event.data["old_state"].attributes
-                        and attribute in event.data["new_state"].attributes
-                        and event.data["old_state"].attributes[attribute]
-                        == event.data["new_state"].attributes[attribute]
-                    )
-                )
-            ):
-                return
-
-            await _send_home_assistant_state(
-                event.data["entity_id"], attribute, event.data.get("new_state")
-            )
-
-        unsub = async_track_state_change_event(
-            hass, [entity_id], send_home_assistant_state_event
-        )
-        entry_data.disconnect_callbacks.append(unsub)
-
-        # Send initial state
-        hass.async_create_task(
-            _send_home_assistant_state(entity_id, attribute, hass.states.get(entity_id))
-        )
-
-    voice_assistant_udp_server: VoiceAssistantUDPServer | None = None
-
-    def _handle_pipeline_event(
-        event_type: VoiceAssistantEventType, data: dict[str, str] | None
-    ) -> None:
-        cli.send_voice_assistant_event(event_type, data)
-
-    def _handle_pipeline_finished() -> None:
-        nonlocal voice_assistant_udp_server
-
-        entry_data.async_set_assist_pipeline_state(False)
-
-        if voice_assistant_udp_server is not None:
-            voice_assistant_udp_server.close()
-            voice_assistant_udp_server = None
-
-    async def _handle_pipeline_start() -> int | None:
-        """Start a voice assistant pipeline."""
-        nonlocal voice_assistant_udp_server
-
-        if voice_assistant_udp_server is not None:
-            return None
-
-        voice_assistant_udp_server = VoiceAssistantUDPServer(
-            hass, entry_data, _handle_pipeline_event, _handle_pipeline_finished
-        )
-        port = await voice_assistant_udp_server.start_server()
-
-        hass.async_create_background_task(
-            voice_assistant_udp_server.run_pipeline(),
-            "esphome.voice_assistant_udp_server.run_pipeline",
-        )
-        entry_data.async_set_assist_pipeline_state(True)
-
-        return port
-
-    async def _handle_pipeline_stop() -> None:
-        """Stop a voice assistant pipeline."""
-        nonlocal voice_assistant_udp_server
-
-        if voice_assistant_udp_server is not None:
-            voice_assistant_udp_server.stop()
-
-    async def on_connect() -> None:
-        """Subscribe to states and list entities on successful API login."""
-        nonlocal device_id
-        try:
-            device_info = await cli.device_info()
-
-            # Migrate config entry to new unique ID if necessary
-            # This was changed in 2023.1
-            if entry.unique_id != format_mac(device_info.mac_address):
-                hass.config_entries.async_update_entry(
-                    entry, unique_id=format_mac(device_info.mac_address)
-                )
-
-            # Make sure we have the correct device name stored
-            # so we can map the device to ESPHome Dashboard config
-            if entry.data.get(CONF_DEVICE_NAME) != device_info.name:
-                hass.config_entries.async_update_entry(
-                    entry, data={**entry.data, CONF_DEVICE_NAME: device_info.name}
-                )
-
-            entry_data.device_info = device_info
-            assert cli.api_version is not None
-            entry_data.api_version = cli.api_version
-            entry_data.available = True
-            if entry_data.device_info.name:
-                reconnect_logic.name = entry_data.device_info.name
-
-            if device_info.bluetooth_proxy_version:
-                entry_data.disconnect_callbacks.append(
-                    await async_connect_scanner(hass, entry, cli, entry_data)
-                )
-
-            device_id = _async_setup_device_registry(
-                hass, entry, entry_data.device_info
-            )
-            entry_data.async_update_device_state(hass)
-
-            entity_infos, services = await cli.list_entities_services()
-            await entry_data.async_update_static_infos(hass, entry, entity_infos)
-            await _setup_services(hass, entry_data, services)
-            await cli.subscribe_states(entry_data.async_update_state)
-            await cli.subscribe_service_calls(async_on_service_call)
-            await cli.subscribe_home_assistant_states(async_on_state_subscription)
-
-            if device_info.voice_assistant_version:
-                entry_data.disconnect_callbacks.append(
-                    await cli.subscribe_voice_assistant(
-                        _handle_pipeline_start,
-                        _handle_pipeline_stop,
-                    )
-                )
-
-            hass.async_create_task(entry_data.async_save_to_store())
-        except APIConnectionError as err:
-            _LOGGER.warning("Error getting initial data for %s: %s", host, err)
-            # Re-connection logic will trigger after this
-            await cli.disconnect()
-        else:
-            _async_check_firmware_version(hass, device_info)
-            _async_check_using_api_password(hass, device_info, bool(password))
-
-    async def on_disconnect() -> None:
-        """Run disconnect callbacks on API disconnect."""
-        name = entry_data.device_info.name if entry_data.device_info else host
-        _LOGGER.debug("%s: %s disconnected, running disconnected callbacks", name, host)
-        for disconnect_cb in entry_data.disconnect_callbacks:
-            disconnect_cb()
-        entry_data.disconnect_callbacks = []
-        entry_data.available = False
-        # Mark state as stale so that we will always dispatch
-        # the next state update of that type when the device reconnects
-        entry_data.stale_state = {
-            (type(entity_state), key)
-            for state_dict in entry_data.state.values()
-            for key, entity_state in state_dict.items()
-        }
-        if not hass.is_stopping:
-            # Avoid marking every esphome entity as unavailable on shutdown
-            # since it generates a lot of state changed events and database
-            # writes when we already know we're shutting down and the state
-            # will be cleared anyway.
-            entry_data.async_update_device_state(hass)
-
-    async def on_connect_error(err: Exception) -> None:
-        """Start reauth flow if appropriate connect error type."""
-        if isinstance(
-            err,
-            (
-                RequiresEncryptionAPIError,
-                InvalidEncryptionKeyAPIError,
-                InvalidAuthAPIError,
-            ),
-        ):
-            entry.async_start_reauth(hass)
-
-    reconnect_logic = ReconnectLogic(
-        client=cli,
-        on_connect=on_connect,
-        on_disconnect=on_disconnect,
-        zeroconf_instance=zeroconf_instance,
-        name=host,
-        on_connect_error=on_connect_error,
+    manager = ESPHomeManager(
+        hass, entry, host, password, cli, zeroconf_instance, domain_data, entry_data
     )
-
-    infos, services = await entry_data.async_load_from_store()
-    await entry_data.async_update_static_infos(hass, entry, infos)
-    await _setup_services(hass, entry_data, services)
-
-    if entry_data.device_info is not None and entry_data.device_info.name:
-        reconnect_logic.name = entry_data.device_info.name
-        if entry.unique_id is None:
-            hass.config_entries.async_update_entry(
-                entry, unique_id=format_mac(entry_data.device_info.mac_address)
-            )
-
-    await reconnect_logic.start()
-    entry_data.cleanup_callbacks.append(reconnect_logic.stop_callback)
+    await manager.async_start()
 
     return True
 
 
-@callback
-def _async_setup_device_registry(
-    hass: HomeAssistant, entry: ConfigEntry, device_info: EsphomeDeviceInfo
-) -> str:
-    """Set up device registry feature for a particular config entry."""
-    sw_version = device_info.esphome_version
-    if device_info.compilation_time:
-        sw_version += f" ({device_info.compilation_time})"
-
-    configuration_url = None
-    if device_info.webserver_port > 0:
-        configuration_url = f"http://{entry.data['host']}:{device_info.webserver_port}"
-    elif dashboard := async_get_dashboard(hass):
-        configuration_url = f"homeassistant://hassio/ingress/{dashboard.addon_slug}"
-
-    manufacturer = "espressif"
-    if device_info.manufacturer:
-        manufacturer = device_info.manufacturer
-    model = device_info.model
-    hw_version = None
-    if device_info.project_name:
-        project_name = device_info.project_name.split(".")
-        manufacturer = project_name[0]
-        model = project_name[1]
-        hw_version = device_info.project_version
-
-    device_registry = dr.async_get(hass)
-    device_entry = device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        configuration_url=configuration_url,
-        connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)},
-        name=device_info.friendly_name or device_info.name,
-        manufacturer=manufacturer,
-        model=model,
-        sw_version=sw_version,
-        hw_version=hw_version,
-    )
-    return device_entry.id
-
-
-class ServiceMetadata(NamedTuple):
-    """Metadata for services."""
-
-    validator: Any
-    example: str
-    selector: dict[str, Any]
-    description: str | None = None
-
-
-ARG_TYPE_METADATA = {
-    UserServiceArgType.BOOL: ServiceMetadata(
-        validator=cv.boolean,
-        example="False",
-        selector={"boolean": None},
-    ),
-    UserServiceArgType.INT: ServiceMetadata(
-        validator=vol.Coerce(int),
-        example="42",
-        selector={"number": {CONF_MODE: "box"}},
-    ),
-    UserServiceArgType.FLOAT: ServiceMetadata(
-        validator=vol.Coerce(float),
-        example="12.3",
-        selector={"number": {CONF_MODE: "box", "step": 1e-3}},
-    ),
-    UserServiceArgType.STRING: ServiceMetadata(
-        validator=cv.string,
-        example="Example text",
-        selector={"text": None},
-    ),
-    UserServiceArgType.BOOL_ARRAY: ServiceMetadata(
-        validator=[cv.boolean],
-        description="A list of boolean values.",
-        example="[True, False]",
-        selector={"object": {}},
-    ),
-    UserServiceArgType.INT_ARRAY: ServiceMetadata(
-        validator=[vol.Coerce(int)],
-        description="A list of integer values.",
-        example="[42, 34]",
-        selector={"object": {}},
-    ),
-    UserServiceArgType.FLOAT_ARRAY: ServiceMetadata(
-        validator=[vol.Coerce(float)],
-        description="A list of floating point numbers.",
-        example="[ 12.3, 34.5 ]",
-        selector={"object": {}},
-    ),
-    UserServiceArgType.STRING_ARRAY: ServiceMetadata(
-        validator=[cv.string],
-        description="A list of strings.",
-        example="['Example text', 'Another example']",
-        selector={"object": {}},
-    ),
-}
-
-
-async def _register_service(
-    hass: HomeAssistant, entry_data: RuntimeEntryData, service: UserService
-) -> None:
-    if entry_data.device_info is None:
-        raise ValueError("Device Info needs to be fetched first")
-    service_name = f"{entry_data.device_info.name.replace('-', '_')}_{service.name}"
-    schema = {}
-    fields = {}
-
-    for arg in service.args:
-        if arg.type not in ARG_TYPE_METADATA:
-            _LOGGER.error(
-                "Can't register service %s because %s is of unknown type %s",
-                service_name,
-                arg.name,
-                arg.type,
-            )
-            return
-        metadata = ARG_TYPE_METADATA[arg.type]
-        schema[vol.Required(arg.name)] = metadata.validator
-        fields[arg.name] = {
-            "name": arg.name,
-            "required": True,
-            "description": metadata.description,
-            "example": metadata.example,
-            "selector": metadata.selector,
-        }
-
-    async def execute_service(call: ServiceCall) -> None:
-        await entry_data.client.execute_service(service, call.data)
-
-    hass.services.async_register(
-        DOMAIN, service_name, execute_service, vol.Schema(schema)
-    )
-
-    service_desc = {
-        "description": (
-            f"Calls the service {service.name} of the node"
-            f" {entry_data.device_info.name}"
-        ),
-        "fields": fields,
-    }
-
-    async_set_service_schema(hass, DOMAIN, service_name, service_desc)
-
-
-async def _setup_services(
-    hass: HomeAssistant, entry_data: RuntimeEntryData, services: list[UserService]
-) -> None:
-    if entry_data.device_info is None:
-        # Can happen if device has never connected or .storage cleared
-        return
-    old_services = entry_data.services.copy()
-    to_unregister = []
-    to_register = []
-    for service in services:
-        if service.key in old_services:
-            # Already exists
-            if (matching := old_services.pop(service.key)) != service:
-                # Need to re-register
-                to_unregister.append(matching)
-                to_register.append(service)
-        else:
-            # New service
-            to_register.append(service)
-
-    for service in old_services.values():
-        to_unregister.append(service)
-
-    entry_data.services = {serv.key: serv for serv in services}
-
-    for service in to_unregister:
-        service_name = f"{entry_data.device_info.name}_{service.name}"
-        hass.services.async_remove(DOMAIN, service_name)
-
-    for service in to_register:
-        await _register_service(hass, entry_data, service)
-
-
-async def _cleanup_instance(
-    hass: HomeAssistant, entry: ConfigEntry
-) -> RuntimeEntryData:
-    """Cleanup the esphome client if it exists."""
-    domain_data = DomainData.get(hass)
-    data = domain_data.pop_entry_data(entry)
-    data.available = False
-    for disconnect_cb in data.disconnect_callbacks:
-        disconnect_cb()
-    data.disconnect_callbacks = []
-    for cleanup_callback in data.cleanup_callbacks:
-        cleanup_callback()
-    await data.client.disconnect()
-    return data
-
-
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload an esphome config entry."""
-    entry_data = await _cleanup_instance(hass, entry)
+    entry_data = await cleanup_instance(hass, entry)
     return await hass.config_entries.async_unload_platforms(
         entry, entry_data.loaded_platforms
     )
@@ -653,291 +83,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Remove an esphome config entry."""
     await DomainData.get(hass).get_or_create_store(hass, entry).async_remove()
-
-
-_InfoT = TypeVar("_InfoT", bound=EntityInfo)
-_EntityT = TypeVar("_EntityT", bound="EsphomeEntity[Any,Any]")
-_StateT = TypeVar("_StateT", bound=EntityState)
-
-
-async def platform_async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-    *,
-    component_key: str,
-    info_type: type[_InfoT],
-    entity_type: type[_EntityT],
-    state_type: type[_StateT],
-) -> None:
-    """Set up an esphome platform.
-
-    This method is in charge of receiving, distributing and storing
-    info and state updates.
-    """
-    entry_data: RuntimeEntryData = DomainData.get(hass).get_entry_data(entry)
-    entry_data.info[component_key] = {}
-    entry_data.old_info[component_key] = {}
-    entry_data.state.setdefault(state_type, {})
-
-    @callback
-    def async_list_entities(infos: list[EntityInfo]) -> None:
-        """Update entities of this platform when entities are listed."""
-        old_infos = entry_data.info[component_key]
-        new_infos: dict[int, EntityInfo] = {}
-        add_entities: list[_EntityT] = []
-        for info in infos:
-            if not isinstance(info, info_type):
-                # Filter out infos that don't belong to this platform.
-                continue
-
-            if info.key in old_infos:
-                # Update existing entity
-                old_infos.pop(info.key)
-            else:
-                # Create new entity
-                entity = entity_type(entry_data, component_key, info.key, state_type)
-                add_entities.append(entity)
-            new_infos[info.key] = info
-
-        # Remove old entities
-        for info in old_infos.values():
-            entry_data.async_remove_entity(hass, component_key, info.key)
-
-        # First copy the now-old info into the backup object
-        entry_data.old_info[component_key] = entry_data.info[component_key]
-        # Then update the actual info
-        entry_data.info[component_key] = new_infos
-
-        # Add entities to Home Assistant
-        async_add_entities(add_entities)
-
-    entry_data.cleanup_callbacks.append(
-        async_dispatcher_connect(
-            hass, entry_data.signal_static_info_updated, async_list_entities
-        )
-    )
-
-
-def esphome_state_property(
-    func: Callable[[_EntityT], _R]
-) -> Callable[[_EntityT], _R | None]:
-    """Wrap a state property of an esphome entity.
-
-    This checks if the state object in the entity is set, and
-    prevents writing NAN values to the Home Assistant state machine.
-    """
-
-    @functools.wraps(func)
-    def _wrapper(self: _EntityT) -> _R | None:
-        # pylint: disable-next=protected-access
-        if not self._has_state:
-            return None
-        val = func(self)
-        if isinstance(val, float) and math.isnan(val):
-            # Home Assistant doesn't use NAN values in state machine
-            # (not JSON serializable)
-            return None
-        return val
-
-    return _wrapper
-
-
-ICON_SCHEMA = vol.Schema(cv.icon)
-
-
-ENTITY_CATEGORIES: EsphomeEnumMapper[
-    EsphomeEntityCategory, EntityCategory | None
-] = EsphomeEnumMapper(
-    {
-        EsphomeEntityCategory.NONE: None,
-        EsphomeEntityCategory.CONFIG: EntityCategory.CONFIG,
-        EsphomeEntityCategory.DIAGNOSTIC: EntityCategory.DIAGNOSTIC,
-    }
-)
-
-
-class EsphomeEntity(Entity, Generic[_InfoT, _StateT]):
-    """Define a base esphome entity."""
-
-    _attr_should_poll = False
-
-    def __init__(
-        self,
-        entry_data: RuntimeEntryData,
-        component_key: str,
-        key: int,
-        state_type: type[_StateT],
-    ) -> None:
-        """Initialize."""
-        self._entry_data = entry_data
-        self._component_key = component_key
-        self._key = key
-        self._state_type = state_type
-        if entry_data.device_info is not None and entry_data.device_info.friendly_name:
-            self._attr_has_entity_name = True
-
-    async def async_added_to_hass(self) -> None:
-        """Register callbacks."""
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"esphome_{self._entry_id}_remove_{self._component_key}_{self._key}",
-                functools.partial(self.async_remove, force_remove=True),
-            )
-        )
-
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                self._entry_data.signal_device_updated,
-                self._on_device_update,
-            )
-        )
-
-        self.async_on_remove(
-            self._entry_data.async_subscribe_state_update(
-                self._state_type, self._key, self._on_state_update
-            )
-        )
-
-    @callback
-    def _on_state_update(self) -> None:
-        # Behavior can be changed in child classes
-        self.async_write_ha_state()
-
-    @callback
-    def _on_device_update(self) -> None:
-        """Update the entity state when device info has changed."""
-        if self._entry_data.available:
-            # Don't update the HA state yet when the device comes online.
-            # Only update the HA state when the full state arrives
-            # through the next entity state packet.
-            return
-        self._on_state_update()
-
-    @property
-    def _entry_id(self) -> str:
-        return self._entry_data.entry_id
-
-    @property
-    def _api_version(self) -> APIVersion:
-        return self._entry_data.api_version
-
-    @property
-    def _static_info(self) -> _InfoT:
-        # Check if value is in info database. Use a single lookup.
-        info = self._entry_data.info[self._component_key].get(self._key)
-        if info is not None:
-            return cast(_InfoT, info)
-        # This entity is in the removal project and has been removed from .info
-        # already, look in old_info
-        return cast(_InfoT, self._entry_data.old_info[self._component_key][self._key])
-
-    @property
-    def _device_info(self) -> EsphomeDeviceInfo:
-        assert self._entry_data.device_info is not None
-        return self._entry_data.device_info
-
-    @property
-    def _client(self) -> APIClient:
-        return self._entry_data.client
-
-    @property
-    def _state(self) -> _StateT:
-        return cast(_StateT, self._entry_data.state[self._state_type][self._key])
-
-    @property
-    def _has_state(self) -> bool:
-        return self._key in self._entry_data.state[self._state_type]
-
-    @property
-    def available(self) -> bool:
-        """Return if the entity is available."""
-        device = self._device_info
-
-        if device.has_deep_sleep:
-            # During deep sleep the ESP will not be connectable (by design)
-            # For these cases, show it as available
-            return True
-
-        return self._entry_data.available
-
-    @property
-    def unique_id(self) -> str | None:
-        """Return a unique id identifying the entity."""
-        if not self._static_info.unique_id:
-            return None
-        return self._static_info.unique_id
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device_info.mac_address)}
-        )
-
-    @property
-    def name(self) -> str:
-        """Return the name of the entity."""
-        return self._static_info.name
-
-    @property
-    def icon(self) -> str | None:
-        """Return the icon."""
-        if not self._static_info.icon:
-            return None
-
-        return cast(str, ICON_SCHEMA(self._static_info.icon))
-
-    @property
-    def entity_registry_enabled_default(self) -> bool:
-        """Return if the entity should be enabled when first added.
-
-        This only applies when fist added to the entity registry.
-        """
-        return not self._static_info.disabled_by_default
-
-    @property
-    def entity_category(self) -> EntityCategory | None:
-        """Return the category of the entity, if any."""
-        if not self._static_info.entity_category:
-            return None
-        return ENTITY_CATEGORIES.from_esphome(self._static_info.entity_category)
-
-
-class EsphomeAssistEntity(Entity):
-    """Define a base entity for Assist Pipeline entities."""
-
-    _attr_has_entity_name = True
-    _attr_should_poll = False
-
-    def __init__(self, entry_data: RuntimeEntryData) -> None:
-        """Initialize the binary sensor."""
-        self._entry_data: RuntimeEntryData = entry_data
-        self._attr_unique_id = (
-            f"{self._device_info.mac_address}-{self.entity_description.key}"
-        )
-
-    @property
-    def _device_info(self) -> EsphomeDeviceInfo:
-        assert self._entry_data.device_info is not None
-        return self._entry_data.device_info
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device_info.mac_address)}
-        )
-
-    @callback
-    def _update(self) -> None:
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Register update callback."""
-        await super().async_added_to_hass()
-        self.async_on_remove(
-            self._entry_data.async_subscribe_assist_pipeline_update(self._update)
-        )
diff --git a/homeassistant/components/esphome/alarm_control_panel.py b/homeassistant/components/esphome/alarm_control_panel.py
new file mode 100644
index 00000000000000..639f47272d91e8
--- /dev/null
+++ b/homeassistant/components/esphome/alarm_control_panel.py
@@ -0,0 +1,160 @@
+"""Support for ESPHome Alarm Control Panel."""
+from __future__ import annotations
+
+from aioesphomeapi import (
+    AlarmControlPanelCommand,
+    AlarmControlPanelEntityState,
+    AlarmControlPanelInfo,
+    AlarmControlPanelState,
+    APIIntEnum,
+    EntityInfo,
+)
+
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanelEntity,
+    AlarmControlPanelEntityFeature,
+    CodeFormat,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_VACATION,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMED,
+    STATE_ALARM_DISARMING,
+    STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
+from .enum_mapper import EsphomeEnumMapper
+
+_ESPHOME_ACP_STATE_TO_HASS_STATE: EsphomeEnumMapper[
+    AlarmControlPanelState, str
+] = EsphomeEnumMapper(
+    {
+        AlarmControlPanelState.DISARMED: STATE_ALARM_DISARMED,
+        AlarmControlPanelState.ARMED_HOME: STATE_ALARM_ARMED_HOME,
+        AlarmControlPanelState.ARMED_AWAY: STATE_ALARM_ARMED_AWAY,
+        AlarmControlPanelState.ARMED_NIGHT: STATE_ALARM_ARMED_NIGHT,
+        AlarmControlPanelState.ARMED_VACATION: STATE_ALARM_ARMED_VACATION,
+        AlarmControlPanelState.ARMED_CUSTOM_BYPASS: STATE_ALARM_ARMED_CUSTOM_BYPASS,
+        AlarmControlPanelState.PENDING: STATE_ALARM_PENDING,
+        AlarmControlPanelState.ARMING: STATE_ALARM_ARMING,
+        AlarmControlPanelState.DISARMING: STATE_ALARM_DISARMING,
+        AlarmControlPanelState.TRIGGERED: STATE_ALARM_TRIGGERED,
+    }
+)
+
+
+class EspHomeACPFeatures(APIIntEnum):
+    """ESPHome AlarmCintolPanel feature numbers."""
+
+    ARM_HOME = 1
+    ARM_AWAY = 2
+    ARM_NIGHT = 4
+    TRIGGER = 8
+    ARM_CUSTOM_BYPASS = 16
+    ARM_VACATION = 32
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up ESPHome switches based on a config entry."""
+    await platform_async_setup_entry(
+        hass,
+        entry,
+        async_add_entities,
+        info_type=AlarmControlPanelInfo,
+        entity_type=EsphomeAlarmControlPanel,
+        state_type=AlarmControlPanelEntityState,
+    )
+
+
+class EsphomeAlarmControlPanel(
+    EsphomeEntity[AlarmControlPanelInfo, AlarmControlPanelEntityState],
+    AlarmControlPanelEntity,
+):
+    """An Alarm Control Panel implementation for ESPHome."""
+
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        feature = 0
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_HOME:
+            feature |= AlarmControlPanelEntityFeature.ARM_HOME
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_AWAY:
+            feature |= AlarmControlPanelEntityFeature.ARM_AWAY
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_NIGHT:
+            feature |= AlarmControlPanelEntityFeature.ARM_NIGHT
+        if self._static_info.supported_features & EspHomeACPFeatures.TRIGGER:
+            feature |= AlarmControlPanelEntityFeature.TRIGGER
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_CUSTOM_BYPASS:
+            feature |= AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS
+        if self._static_info.supported_features & EspHomeACPFeatures.ARM_VACATION:
+            feature |= AlarmControlPanelEntityFeature.ARM_VACATION
+        self._attr_supported_features = AlarmControlPanelEntityFeature(feature)
+        self._attr_code_format = (
+            CodeFormat.NUMBER if static_info.requires_code else None
+        )
+        self._attr_code_arm_required = bool(static_info.requires_code_to_arm)
+
+    @property
+    @esphome_state_property
+    def state(self) -> str | None:
+        """Return the state of the device."""
+        return _ESPHOME_ACP_STATE_TO_HASS_STATE.from_esphome(self._state.state)
+
+    async def async_alarm_disarm(self, code: str | None = None) -> None:
+        """Send disarm command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.DISARM, code
+        )
+
+    async def async_alarm_arm_home(self, code: str | None = None) -> None:
+        """Send arm home command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_HOME, code
+        )
+
+    async def async_alarm_arm_away(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_AWAY, code
+        )
+
+    async def async_alarm_arm_night(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_NIGHT, code
+        )
+
+    async def async_alarm_arm_custom_bypass(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_CUSTOM_BYPASS, code
+        )
+
+    async def async_alarm_arm_vacation(self, code: str | None = None) -> None:
+        """Send arm away command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.ARM_VACATION, code
+        )
+
+    async def async_alarm_trigger(self, code: str | None = None) -> None:
+        """Send alarm trigger command."""
+        await self._client.alarm_control_panel_command(
+            self._key, AlarmControlPanelCommand.TRIGGER, code
+        )
diff --git a/homeassistant/components/esphome/binary_sensor.py b/homeassistant/components/esphome/binary_sensor.py
index 77ec780acb3571..65a237de4f7b90 100644
--- a/homeassistant/components/esphome/binary_sensor.py
+++ b/homeassistant/components/esphome/binary_sensor.py
@@ -1,7 +1,7 @@
 """Support for ESPHome binary sensors."""
 from __future__ import annotations
 
-from aioesphomeapi import BinarySensorInfo, BinarySensorState
+from aioesphomeapi import BinarySensorInfo, BinarySensorState, EntityInfo
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -9,12 +9,16 @@
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeAssistEntity, EsphomeEntity, platform_async_setup_entry
 from .domain_data import DomainData
+from .entity import (
+    EsphomeAssistEntity,
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -25,7 +29,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="binary_sensor",
         info_type=BinarySensorInfo,
         entity_type=EsphomeBinarySensor,
         state_type=BinarySensorState,
@@ -49,23 +52,22 @@ def is_on(self) -> bool | None:
             # Status binary sensors indicated connected state.
             # So in their case what's usually _availability_ is now state
             return self._entry_data.available
-        if not self._has_state:
-            return None
-        if self._state.missing_state:
+        if not self._has_state or self._state.missing_state:
             return None
         return self._state.state
 
-    @property
-    def device_class(self) -> BinarySensorDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(BinarySensorDeviceClass, self._static_info.device_class)
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_device_class = try_parse_enum(
+            BinarySensorDeviceClass, self._static_info.device_class
+        )
 
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        if self._static_info.is_status_binary_sensor:
-            return True
-        return super().available
+        return self._static_info.is_status_binary_sensor or super().available
 
 
 class EsphomeAssistInProgressBinarySensor(EsphomeAssistEntity, BinarySensorEntity):
diff --git a/homeassistant/components/esphome/bluetooth/__init__.py b/homeassistant/components/esphome/bluetooth/__init__.py
index e62b54655c8845..aea65f9358e65a 100644
--- a/homeassistant/components/esphome/bluetooth/__init__.py
+++ b/homeassistant/components/esphome/bluetooth/__init__.py
@@ -5,7 +5,7 @@
 from functools import partial
 import logging
 
-from aioesphomeapi import APIClient
+from aioesphomeapi import APIClient, BluetoothProxyFeature
 
 from homeassistant.components.bluetooth import (
     HaBluetoothConnector,
@@ -59,13 +59,15 @@ async def async_connect_scanner(
     source = str(entry.unique_id)
     new_info_callback = async_get_advertisement_callback(hass)
     assert entry_data.device_info is not None
-    version = entry_data.device_info.bluetooth_proxy_version
-    connectable = version >= 2
+    feature_flags = entry_data.device_info.bluetooth_proxy_feature_flags_compat(
+        entry_data.api_version
+    )
+    connectable = bool(feature_flags & BluetoothProxyFeature.ACTIVE_CONNECTIONS)
     _LOGGER.debug(
-        "%s [%s]: Connecting scanner version=%s, connectable=%s",
+        "%s [%s]: Connecting scanner feature_flags=%s, connectable=%s",
         entry.title,
         source,
-        version,
+        feature_flags,
         connectable,
     )
     connector = HaBluetoothConnector(
@@ -89,7 +91,12 @@ async def async_connect_scanner(
         async_register_scanner(hass, scanner, connectable),
         scanner.async_setup(),
     ]
-    await cli.subscribe_bluetooth_le_advertisements(scanner.async_on_advertisement)
+    if feature_flags & BluetoothProxyFeature.RAW_ADVERTISEMENTS:
+        await cli.subscribe_bluetooth_le_raw_advertisements(
+            scanner.async_on_raw_advertisements
+        )
+    else:
+        await cli.subscribe_bluetooth_le_advertisements(scanner.async_on_advertisement)
 
     @hass_callback
     def _async_unload() -> None:
diff --git a/homeassistant/components/esphome/bluetooth/client.py b/homeassistant/components/esphome/bluetooth/client.py
index 914021b467ef6f..d452ab8764aef3 100644
--- a/homeassistant/components/esphome/bluetooth/client.py
+++ b/homeassistant/components/esphome/bluetooth/client.py
@@ -12,6 +12,7 @@
     ESP_CONNECTION_ERROR_DESCRIPTION,
     ESPHOME_GATT_ERRORS,
     BLEConnectionError,
+    BluetoothProxyFeature,
 )
 from aioesphomeapi.connection import APIConnectionError, TimeoutAPIError
 from aioesphomeapi.core import BluetoothGATTAPIError
@@ -42,10 +43,6 @@
 CCCD_NOTIFY_BYTES = b"\x01\x00"
 CCCD_INDICATE_BYTES = b"\x02\x00"
 
-MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE = 3
-MIN_BLUETOOTH_PROXY_HAS_PAIRING = 4
-MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE = 5
-
 DEFAULT_MAX_WRITE_WITHOUT_RESPONSE = DEFAULT_MTU - GATT_HEADER_SIZE
 _LOGGER = logging.getLogger(__name__)
 
@@ -158,7 +155,10 @@ def __init__(
         self._disconnected_event: asyncio.Event | None = None
         device_info = self.entry_data.device_info
         assert device_info is not None
-        self._connection_version = device_info.bluetooth_proxy_version
+        self._device_info = device_info
+        self._feature_flags = device_info.bluetooth_proxy_feature_flags_compat(
+            self.entry_data.api_version
+        )
         self._address_type = address_or_ble_device.details["address_type"]
         self._source_name = f"{config_entry.title} [{self._source}]"
 
@@ -233,7 +233,7 @@ async def connect(
     ) -> bool:
         """Connect to a specified Peripheral.
 
-        Keyword Args:
+        **kwargs:
             timeout (float): Timeout for required
                 ``BleakScanner.find_device_by_address`` call. Defaults to 10.0.
 
@@ -247,7 +247,7 @@ async def connect(
         self._mtu = domain_data.get_gatt_mtu_cache(self._address_as_int)
         has_cache = bool(
             dangerous_use_bleak_cache
-            and self._connection_version >= MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE
+            and self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING
             and domain_data.get_gatt_services_cache(self._address_as_int)
             and self._mtu
         )
@@ -319,7 +319,7 @@ def _on_bluetooth_connection_state(
                         _on_bluetooth_connection_state,
                         timeout=timeout,
                         has_cache=has_cache,
-                        version=self._connection_version,
+                        feature_flags=self._feature_flags,
                         address_type=self._address_type,
                     )
                 )
@@ -397,9 +397,10 @@ def mtu_size(self) -> int:
     @api_error_as_bleak_error
     async def pair(self, *args: Any, **kwargs: Any) -> bool:
         """Attempt to pair."""
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_PAIRING:
+        if not self._feature_flags & BluetoothProxyFeature.PAIRING:
             raise NotImplementedError(
-                "Pairing is not available in ESPHome with version {self._connection_version}."
+                "Pairing is not available in this version ESPHome; "
+                f"Upgrade the ESPHome version on the {self._device_info.name} device."
             )
         response = await self._client.bluetooth_device_pair(self._address_as_int)
         if response.paired:
@@ -413,9 +414,10 @@ async def pair(self, *args: Any, **kwargs: Any) -> bool:
     @api_error_as_bleak_error
     async def unpair(self) -> bool:
         """Attempt to unpair."""
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_PAIRING:
+        if not self._feature_flags & BluetoothProxyFeature.PAIRING:
             raise NotImplementedError(
-                "Unpairing is not available in ESPHome with version {self._connection_version}."
+                "Unpairing is not available in this version ESPHome; "
+                f"Upgrade the ESPHome version on the {self._device_info.name} device."
             )
         response = await self._client.bluetooth_device_unpair(self._address_as_int)
         if response.success:
@@ -441,7 +443,7 @@ async def get_services(
         # because the esp has already wiped the services list to
         # save memory.
         if (
-            self._connection_version >= MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE
+            self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING
             or dangerous_use_bleak_cache
         ) and (cached_services := domain_data.get_gatt_services_cache(address_as_int)):
             _LOGGER.debug(
@@ -524,12 +526,11 @@ async def clear_cache(self) -> bool:
         """Clear the GATT cache."""
         self.domain_data.clear_gatt_services_cache(self._address_as_int)
         self.domain_data.clear_gatt_mtu_cache(self._address_as_int)
-        if self._connection_version < MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE:
+        if not self._feature_flags & BluetoothProxyFeature.CACHE_CLEARING:
             _LOGGER.warning(
-                "On device cache clear is not available with ESPHome Bluetooth version %s, "
-                "version %s is needed; Only memory cache will be cleared",
-                self._connection_version,
-                MIN_BLUETOOTH_PROXY_HAS_CLEAR_CACHE,
+                "On device cache clear is not available with this ESPHome version; "
+                "Upgrade the ESPHome version on the device %s; Only memory cache will be cleared",
+                self._device_info.name,
             )
             return True
         response = await self._client.bluetooth_device_clear_cache(self._address_as_int)
@@ -673,7 +674,7 @@ def callback(sender: int, data: bytearray):
             lambda handle, data: callback(data),
         )
 
-        if self._connection_version < MIN_BLUETOOTH_PROXY_VERSION_HAS_CACHE:
+        if not self._feature_flags & BluetoothProxyFeature.REMOTE_CACHING:
             return
 
         # For connection v3 we are responsible for enabling notifications
diff --git a/homeassistant/components/esphome/bluetooth/scanner.py b/homeassistant/components/esphome/bluetooth/scanner.py
index 6151ed30429f74..5013a288dcfaaa 100644
--- a/homeassistant/components/esphome/bluetooth/scanner.py
+++ b/homeassistant/components/esphome/bluetooth/scanner.py
@@ -1,10 +1,10 @@
 """Bluetooth scanner for esphome."""
 from __future__ import annotations
 
-from aioesphomeapi import BluetoothLEAdvertisement
-from bluetooth_data_tools import int_to_bluetooth_address
+from aioesphomeapi import BluetoothLEAdvertisement, BluetoothLERawAdvertisement
+from bluetooth_data_tools import int_to_bluetooth_address, parse_advertisement_data
 
-from homeassistant.components.bluetooth import BaseHaRemoteScanner
+from homeassistant.components.bluetooth import MONOTONIC_TIME, BaseHaRemoteScanner
 from homeassistant.core import callback
 
 
@@ -24,4 +24,25 @@ def async_on_advertisement(self, adv: BluetoothLEAdvertisement) -> None:
             adv.manufacturer_data,
             None,
             {"address_type": adv.address_type},
+            MONOTONIC_TIME(),
         )
+
+    @callback
+    def async_on_raw_advertisements(
+        self, advertisements: list[BluetoothLERawAdvertisement]
+    ) -> None:
+        """Call the registered callback."""
+        now = MONOTONIC_TIME()
+        for adv in advertisements:
+            parsed = parse_advertisement_data((adv.data,))
+            self._async_on_advertisement(
+                int_to_bluetooth_address(adv.address),
+                adv.rssi,
+                parsed.local_name,
+                parsed.service_uuids,
+                parsed.service_data,
+                parsed.manufacturer_data,
+                None,
+                {"address_type": adv.address_type},
+                now,
+            )
diff --git a/homeassistant/components/esphome/button.py b/homeassistant/components/esphome/button.py
index 0cb577f30c917f..eca8d226c69d77 100644
--- a/homeassistant/components/esphome/button.py
+++ b/homeassistant/components/esphome/button.py
@@ -1,7 +1,7 @@
 """Support for ESPHome buttons."""
 from __future__ import annotations
 
-from aioesphomeapi import ButtonInfo, EntityState
+from aioesphomeapi import ButtonInfo, EntityInfo, EntityState
 
 from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
@@ -9,7 +9,10 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -20,7 +23,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="button",
         info_type=ButtonInfo,
         entity_type=EsphomeButton,
         state_type=EntityState,
@@ -30,18 +32,29 @@ async def async_setup_entry(
 class EsphomeButton(EsphomeEntity[ButtonInfo, EntityState], ButtonEntity):
     """A button implementation for ESPHome."""
 
-    @property
-    def device_class(self) -> ButtonDeviceClass | None:
-        """Return the class of this entity."""
-        return try_parse_enum(ButtonDeviceClass, self._static_info.device_class)
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_device_class = try_parse_enum(
+            ButtonDeviceClass, self._static_info.device_class
+        )
 
     @callback
     def _on_device_update(self) -> None:
-        """Update the entity state when device info has changed."""
-        # This override the EsphomeEntity method as the button entity
-        # never gets a state update.
-        self._on_state_update()
+        """Call when device updates or entry data changes.
+
+        The default behavior is only to write entity state when the
+        device is unavailable when the device state changes.
+        This method overrides the default behavior since buttons do
+        not have a state, so we will never get a state update for a
+        button. As such, we need to write the state on every device
+        update to ensure the button goes available and unavailable
+        as the device becomes available or unavailable.
+        """
+        self._on_entry_data_changed()
+        self.async_write_ha_state()
 
     async def async_press(self) -> None:
         """Press the button."""
-        await self._client.button_command(self._static_info.key)
+        await self._client.button_command(self._key)
diff --git a/homeassistant/components/esphome/camera.py b/homeassistant/components/esphome/camera.py
index 390208f689d531..94a9b03b90ce2b 100644
--- a/homeassistant/components/esphome/camera.py
+++ b/homeassistant/components/esphome/camera.py
@@ -13,7 +13,10 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -24,7 +27,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="camera",
         info_type=CameraInfo,
         entity_type=EsphomeCamera,
         state_type=CameraState,
diff --git a/homeassistant/components/esphome/climate.py b/homeassistant/components/esphome/climate.py
index e40df234d58427..34043da012e2bc 100644
--- a/homeassistant/components/esphome/climate.py
+++ b/homeassistant/components/esphome/climate.py
@@ -11,6 +11,7 @@
     ClimatePreset,
     ClimateState,
     ClimateSwingMode,
+    EntityInfo,
 )
 
 from homeassistant.components.climate import (
@@ -51,10 +52,14 @@
     PRECISION_WHOLE,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 FAN_QUIET = "quiet"
@@ -68,7 +73,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="climate",
         info_type=ClimateInfo,
         entity_type=EsphomeClimateEntity,
         state_type=ClimateState,
@@ -137,71 +141,32 @@ class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEnti
 
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    @property
-    def precision(self) -> float:
-        """Return the precision of the climate device."""
-        precicions = [PRECISION_WHOLE, PRECISION_HALVES, PRECISION_TENTHS]
-        if self._static_info.visual_current_temperature_step != 0:
-            step = self._static_info.visual_current_temperature_step
-        else:
-            step = self._static_info.visual_target_temperature_step
-        for prec in precicions:
-            if step >= prec:
-                return prec
-        # Fall back to highest precision, tenths
-        return PRECISION_TENTHS
-
-    @property
-    def hvac_modes(self) -> list[str]:
-        """Return the list of available operation modes."""
-        return [
-            _CLIMATE_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_modes
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_precision = self._get_precision()
+        self._attr_hvac_modes = [
+            _CLIMATE_MODES.from_esphome(mode) for mode in static_info.supported_modes
         ]
-
-    @property
-    def fan_modes(self) -> list[str]:
-        """Return the list of available fan modes."""
-        return [
-            _FAN_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_fan_modes
-        ] + self._static_info.supported_custom_fan_modes
-
-    @property
-    def preset_modes(self) -> list[str]:
-        """Return preset modes."""
-        return [
+        self._attr_fan_modes = [
+            _FAN_MODES.from_esphome(mode) for mode in static_info.supported_fan_modes
+        ] + static_info.supported_custom_fan_modes
+        self._attr_preset_modes = [
             _PRESETS.from_esphome(preset)
-            for preset in self._static_info.supported_presets_compat(self._api_version)
-        ] + self._static_info.supported_custom_presets
-
-    @property
-    def swing_modes(self) -> list[str]:
-        """Return the list of available swing modes."""
-        return [
+            for preset in static_info.supported_presets_compat(self._api_version)
+        ] + static_info.supported_custom_presets
+        self._attr_swing_modes = [
             _SWING_MODES.from_esphome(mode)
-            for mode in self._static_info.supported_swing_modes
+            for mode in static_info.supported_swing_modes
         ]
-
-    @property
-    def target_temperature_step(self) -> float:
-        """Return the supported step of target temperature."""
         # Round to one digit because of floating point math
-        return round(self._static_info.visual_target_temperature_step, 1)
-
-    @property
-    def min_temp(self) -> float:
-        """Return the minimum temperature."""
-        return self._static_info.visual_min_temperature
-
-    @property
-    def max_temp(self) -> float:
-        """Return the maximum temperature."""
-        return self._static_info.visual_max_temperature
-
-    @property
-    def supported_features(self) -> ClimateEntityFeature:
-        """Return the list of supported features."""
+        self._attr_target_temperature_step = round(
+            static_info.visual_target_temperature_step, 1
+        )
+        self._attr_min_temp = static_info.visual_min_temperature
+        self._attr_max_temp = static_info.visual_max_temperature
         features = ClimateEntityFeature(0)
         if self._static_info.supports_two_point_target_temperature:
             features |= ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
@@ -213,17 +178,31 @@ def supported_features(self) -> ClimateEntityFeature:
             features |= ClimateEntityFeature.FAN_MODE
         if self.swing_modes:
             features |= ClimateEntityFeature.SWING_MODE
-        return features
+        self._attr_supported_features = features
+
+    def _get_precision(self) -> float:
+        """Return the precision of the climate device."""
+        precicions = [PRECISION_WHOLE, PRECISION_HALVES, PRECISION_TENTHS]
+        static_info = self._static_info
+        if static_info.visual_current_temperature_step != 0:
+            step = static_info.visual_current_temperature_step
+        else:
+            step = static_info.visual_target_temperature_step
+        for prec in precicions:
+            if step >= prec:
+                return prec
+        # Fall back to highest precision, tenths
+        return PRECISION_TENTHS
 
     @property
     @esphome_state_property
-    def hvac_mode(self) -> str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
         return _CLIMATE_MODES.from_esphome(self._state.mode)
 
     @property
     @esphome_state_property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return current action."""
         # HA has no support feature field for hvac_action
         if not self._static_info.supports_action:
@@ -234,16 +213,16 @@ def hvac_action(self) -> str | None:
     @esphome_state_property
     def fan_mode(self) -> str | None:
         """Return current fan setting."""
-        return self._state.custom_fan_mode or _FAN_MODES.from_esphome(
-            self._state.fan_mode
-        )
+        state = self._state
+        return state.custom_fan_mode or _FAN_MODES.from_esphome(state.fan_mode)
 
     @property
     @esphome_state_property
     def preset_mode(self) -> str | None:
         """Return current preset mode."""
-        return self._state.custom_preset or _PRESETS.from_esphome(
-            self._state.preset_compat(self._api_version)
+        state = self._state
+        return state.custom_preset or _PRESETS.from_esphome(
+            state.preset_compat(self._api_version)
         )
 
     @property
@@ -278,7 +257,7 @@ def target_temperature_high(self) -> float | None:
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature (and operation mode if set)."""
-        data: dict[str, Any] = {"key": self._static_info.key}
+        data: dict[str, Any] = {"key": self._key}
         if ATTR_HVAC_MODE in kwargs:
             data["mode"] = _CLIMATE_MODES.from_hass(
                 cast(HVACMode, kwargs[ATTR_HVAC_MODE])
@@ -294,12 +273,12 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target operation mode."""
         await self._client.climate_command(
-            key=self._static_info.key, mode=_CLIMATE_MODES.from_hass(hvac_mode)
+            key=self._key, mode=_CLIMATE_MODES.from_hass(hvac_mode)
         )
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set preset mode."""
-        kwargs: dict[str, Any] = {"key": self._static_info.key}
+        kwargs: dict[str, Any] = {"key": self._key}
         if preset_mode in self._static_info.supported_custom_presets:
             kwargs["custom_preset"] = preset_mode
         else:
@@ -308,7 +287,7 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new fan mode."""
-        kwargs: dict[str, Any] = {"key": self._static_info.key}
+        kwargs: dict[str, Any] = {"key": self._key}
         if fan_mode in self._static_info.supported_custom_fan_modes:
             kwargs["custom_fan_mode"] = fan_mode
         else:
@@ -318,5 +297,5 @@ async def async_set_fan_mode(self, fan_mode: str) -> None:
     async def async_set_swing_mode(self, swing_mode: str) -> None:
         """Set new swing mode."""
         await self._client.climate_command(
-            key=self._static_info.key, swing_mode=_SWING_MODES.from_hass(swing_mode)
+            key=self._key, swing_mode=_SWING_MODES.from_hass(swing_mode)
         )
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index acc94bc7ea035e..ecd49718559b2b 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -3,6 +3,7 @@
 
 from collections import OrderedDict
 from collections.abc import Mapping
+import json
 import logging
 from typing import Any
 
@@ -20,14 +21,20 @@
 
 from homeassistant.components import dhcp, zeroconf
 from homeassistant.components.hassio import HassioServiceInfo
-from homeassistant.config_entries import ConfigEntry, ConfigFlow
+from homeassistant.config_entries import ConfigEntry, ConfigFlow, OptionsFlow
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.device_registry import format_mac
 
-from . import CONF_DEVICE_NAME, CONF_NOISE_PSK
-from .const import DOMAIN
+from .const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    CONF_DEVICE_NAME,
+    CONF_NOISE_PSK,
+    DEFAULT_ALLOW_SERVICE_CALLS,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+    DOMAIN,
+)
 from .dashboard import async_get_dashboard, async_set_dashboard_info
 
 ERROR_REQUIRES_ENCRYPTION_KEY = "requires_encryption_key"
@@ -35,6 +42,8 @@
 ESPHOME_URL = "https://esphome.io/"
 _LOGGER = logging.getLogger(__name__)
 
+ZERO_NOISE_PSK = "MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA="
+
 
 class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a esphome config flow."""
@@ -144,11 +153,22 @@ def _name(self, value: str) -> None:
     async def _async_try_fetch_device_info(self) -> FlowResult:
         error = await self.fetch_device_info()
 
-        if (
-            error == ERROR_REQUIRES_ENCRYPTION_KEY
-            and await self._retrieve_encryption_key_from_dashboard()
-        ):
-            error = await self.fetch_device_info()
+        if error == ERROR_REQUIRES_ENCRYPTION_KEY:
+            if not self._device_name and not self._noise_psk:
+                # If device name is not set we can send a zero noise psk
+                # to get the device name which will allow us to populate
+                # the device name and hopefully get the encryption key
+                # from the dashboard.
+                self._noise_psk = ZERO_NOISE_PSK
+                error = await self.fetch_device_info()
+                self._noise_psk = None
+
+            if (
+                self._device_name
+                and await self._retrieve_encryption_key_from_dashboard()
+            ):
+                error = await self.fetch_device_info()
+
             # If the fetched key is invalid, unset it again.
             if error == ERROR_INVALID_ENCRYPTION_KEY:
                 self._noise_psk = None
@@ -237,6 +257,9 @@ def _async_get_entry(self) -> FlowResult:
             CONF_NOISE_PSK: self._noise_psk or "",
             CONF_DEVICE_NAME: self._device_name,
         }
+        config_options = {
+            CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
+        }
         if self._reauth_entry:
             entry = self._reauth_entry
             self.hass.config_entries.async_update_entry(
@@ -253,6 +276,7 @@ def _async_get_entry(self) -> FlowResult:
         return self.async_create_entry(
             title=self._name,
             data=config_data,
+            options=config_options,
         )
 
     async def async_step_encryption_key(
@@ -314,7 +338,10 @@ async def fetch_device_info(self) -> str | None:
             self._device_info = await cli.device_info()
         except RequiresEncryptionAPIError:
             return ERROR_REQUIRES_ENCRYPTION_KEY
-        except InvalidEncryptionKeyAPIError:
+        except InvalidEncryptionKeyAPIError as ex:
+            if ex.received_name:
+                self._device_name = ex.received_name
+                self._name = ex.received_name
             return ERROR_INVALID_ENCRYPTION_KEY
         except ResolveAPIError:
             return "resolve_error"
@@ -325,9 +352,8 @@ async def fetch_device_info(self) -> str | None:
 
         self._name = self._device_info.friendly_name or self._device_info.name
         self._device_name = self._device_info.name
-        await self.async_set_unique_id(
-            self._device_info.mac_address, raise_on_progress=False
-        )
+        mac_address = format_mac(self._device_info.mac_address)
+        await self.async_set_unique_id(mac_address, raise_on_progress=False)
         if not self._reauth_entry:
             self._abort_if_unique_id_configured(
                 updates={CONF_HOST: self._host, CONF_PORT: self._port}
@@ -364,14 +390,13 @@ async def _retrieve_encryption_key_from_dashboard(self) -> bool:
 
         Return boolean if a key was retrieved.
         """
-        if self._device_name is None:
-            return False
-
-        if (dashboard := async_get_dashboard(self.hass)) is None:
+        if (
+            self._device_name is None
+            or (dashboard := async_get_dashboard(self.hass)) is None
+        ):
             return False
 
         await dashboard.async_request_refresh()
-
         if not dashboard.last_update_success:
             return False
 
@@ -385,6 +410,46 @@ async def _retrieve_encryption_key_from_dashboard(self) -> bool:
         except aiohttp.ClientError as err:
             _LOGGER.error("Error talking to the dashboard: %s", err)
             return False
+        except json.JSONDecodeError as err:
+            _LOGGER.error(
+                "Error parsing response from dashboard: %s", err, exc_info=True
+            )
+            return False
 
         self._noise_psk = noise_psk
         return True
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: ConfigEntry,
+    ) -> OptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return OptionsFlowHandler(config_entry)
+
+
+class OptionsFlowHandler(OptionsFlow):
+    """Handle a option flow for esphome."""
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle options flow."""
+        if user_input is not None:
+            return self.async_create_entry(title="", data=user_input)
+
+        data_schema = vol.Schema(
+            {
+                vol.Required(
+                    CONF_ALLOW_SERVICE_CALLS,
+                    default=self.config_entry.options.get(
+                        CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS
+                    ),
+                ): bool,
+            }
+        )
+        return self.async_show_form(step_id="init", data_schema=data_schema)
diff --git a/homeassistant/components/esphome/const.py b/homeassistant/components/esphome/const.py
index 617c817924b22b..f0e3972f197745 100644
--- a/homeassistant/components/esphome/const.py
+++ b/homeassistant/components/esphome/const.py
@@ -1,3 +1,19 @@
 """ESPHome constants."""
+from awesomeversion import AwesomeVersion
 
 DOMAIN = "esphome"
+
+CONF_ALLOW_SERVICE_CALLS = "allow_service_calls"
+CONF_DEVICE_NAME = "device_name"
+CONF_NOISE_PSK = "noise_psk"
+
+DEFAULT_ALLOW_SERVICE_CALLS = True
+DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS = False
+
+
+STABLE_BLE_VERSION_STR = "2023.6.0"
+STABLE_BLE_VERSION = AwesomeVersion(STABLE_BLE_VERSION_STR)
+PROJECT_URLS = {
+    "esphome.bluetooth-proxy": "https://esphome.github.io/bluetooth-proxies/",
+}
+DEFAULT_URL = f"https://esphome.io/changelog/{STABLE_BLE_VERSION_STR}.html"
diff --git a/homeassistant/components/esphome/cover.py b/homeassistant/components/esphome/cover.py
index 9d82b2852916fc..45ef8a132f9f14 100644
--- a/homeassistant/components/esphome/cover.py
+++ b/homeassistant/components/esphome/cover.py
@@ -3,7 +3,7 @@
 
 from typing import Any
 
-from aioesphomeapi import APIVersion, CoverInfo, CoverOperation, CoverState
+from aioesphomeapi import APIVersion, CoverInfo, CoverOperation, CoverState, EntityInfo
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
@@ -13,11 +13,15 @@
     CoverEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -28,7 +32,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="cover",
         info_type=CoverInfo,
         entity_type=EsphomeCover,
         state_type=CoverState,
@@ -38,32 +41,27 @@ async def async_setup_entry(
 class EsphomeCover(EsphomeEntity[CoverInfo, CoverState], CoverEntity):
     """A cover implementation for ESPHome."""
 
-    @property
-    def supported_features(self) -> CoverEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
         flags = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
-
-        if self._api_version < APIVersion(1, 8) or self._static_info.supports_stop:
+        if self._api_version < APIVersion(1, 8) or static_info.supports_stop:
             flags |= CoverEntityFeature.STOP
-        if self._static_info.supports_position:
+        if static_info.supports_position:
             flags |= CoverEntityFeature.SET_POSITION
-        if self._static_info.supports_tilt:
+        if static_info.supports_tilt:
             flags |= (
                 CoverEntityFeature.OPEN_TILT
                 | CoverEntityFeature.CLOSE_TILT
                 | CoverEntityFeature.SET_TILT_POSITION
             )
-        return flags
-
-    @property
-    def device_class(self) -> CoverDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(CoverDeviceClass, self._static_info.device_class)
-
-    @property
-    def assumed_state(self) -> bool:
-        """Return true if we do optimistic updates."""
-        return self._static_info.assumed_state
+        self._attr_supported_features = flags
+        self._attr_device_class = try_parse_enum(
+            CoverDeviceClass, static_info.device_class
+        )
+        self._attr_assumed_state = static_info.assumed_state
 
     @property
     @esphome_state_property
@@ -102,33 +100,31 @@ def current_cover_tilt_position(self) -> int | None:
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        await self._client.cover_command(key=self._static_info.key, position=1.0)
+        await self._client.cover_command(key=self._key, position=1.0)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
-        await self._client.cover_command(key=self._static_info.key, position=0.0)
+        await self._client.cover_command(key=self._key, position=0.0)
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
-        await self._client.cover_command(key=self._static_info.key, stop=True)
+        await self._client.cover_command(key=self._key, stop=True)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
         await self._client.cover_command(
-            key=self._static_info.key, position=kwargs[ATTR_POSITION] / 100
+            key=self._key, position=kwargs[ATTR_POSITION] / 100
         )
 
     async def async_open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
-        await self._client.cover_command(key=self._static_info.key, tilt=1.0)
+        await self._client.cover_command(key=self._key, tilt=1.0)
 
     async def async_close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
-        await self._client.cover_command(key=self._static_info.key, tilt=0.0)
+        await self._client.cover_command(key=self._key, tilt=0.0)
 
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
         tilt_position: int = kwargs[ATTR_TILT_POSITION]
-        await self._client.cover_command(
-            key=self._static_info.key, tilt=tilt_position / 100
-        )
+        await self._client.cover_command(key=self._key, tilt=tilt_position / 100)
diff --git a/homeassistant/components/esphome/dashboard.py b/homeassistant/components/esphome/dashboard.py
index a8332f8d04000b..35e9cf74555968 100644
--- a/homeassistant/components/esphome/dashboard.py
+++ b/homeassistant/components/esphome/dashboard.py
@@ -4,6 +4,7 @@
 import asyncio
 from datetime import timedelta
 import logging
+from typing import Any
 
 import aiohttp
 from awesomeversion import AwesomeVersion
@@ -11,62 +12,148 @@
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.singleton import singleton
+from homeassistant.helpers.storage import Store
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN
 
-KEY_DASHBOARD = "esphome_dashboard"
+_LOGGER = logging.getLogger(__name__)
 
 
-@callback
-def async_get_dashboard(hass: HomeAssistant) -> ESPHomeDashboard | None:
-    """Get an instance of the dashboard if set."""
-    return hass.data.get(KEY_DASHBOARD)
+KEY_DASHBOARD_MANAGER = "esphome_dashboard_manager"
 
+STORAGE_KEY = "esphome.dashboard"
+STORAGE_VERSION = 1
 
-async def async_set_dashboard_info(
-    hass: HomeAssistant, addon_slug: str, host: str, port: int
-) -> None:
-    """Set the dashboard info."""
-    url = f"http://{host}:{port}"
 
-    if cur_dashboard := async_get_dashboard(hass):
-        if cur_dashboard.addon_slug == addon_slug and cur_dashboard.url == url:
-            # Do nothing if we already have this data.
-            return
-        # Clear and make way for new dashboard
-        await cur_dashboard.async_shutdown()
-        del hass.data[KEY_DASHBOARD]
+async def async_setup(hass: HomeAssistant) -> None:
+    """Set up the ESPHome dashboard."""
+    # Try to restore the dashboard manager from storage
+    # to avoid reloading every ESPHome config entry after
+    # Home Assistant starts and the dashboard is discovered.
+    await async_get_or_create_dashboard_manager(hass)
 
-    dashboard = ESPHomeDashboard(hass, addon_slug, url, async_get_clientsession(hass))
-    try:
+
+@singleton(KEY_DASHBOARD_MANAGER)
+async def async_get_or_create_dashboard_manager(
+    hass: HomeAssistant,
+) -> ESPHomeDashboardManager:
+    """Get the dashboard manager or create it."""
+    manager = ESPHomeDashboardManager(hass)
+    await manager.async_setup()
+    return manager
+
+
+class ESPHomeDashboardManager:
+    """Class to manage the dashboard and restore it from storage."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the dashboard manager."""
+        self._hass = hass
+        self._store: Store[dict[str, Any]] = Store(hass, STORAGE_VERSION, STORAGE_KEY)
+        self._data: dict[str, Any] | None = None
+        self._current_dashboard: ESPHomeDashboard | None = None
+        self._cancel_shutdown: CALLBACK_TYPE | None = None
+
+    async def async_setup(self) -> None:
+        """Restore the dashboard from storage."""
+        self._data = await self._store.async_load()
+        if (data := self._data) and (info := data.get("info")):
+            await self.async_set_dashboard_info(
+                info["addon_slug"], info["host"], info["port"]
+            )
+
+    @callback
+    def async_get(self) -> ESPHomeDashboard | None:
+        """Get the current dashboard."""
+        return self._current_dashboard
+
+    async def async_set_dashboard_info(
+        self, addon_slug: str, host: str, port: int
+    ) -> None:
+        """Set the dashboard info."""
+        url = f"http://{host}:{port}"
+        hass = self._hass
+
+        if cur_dashboard := self._current_dashboard:
+            if cur_dashboard.addon_slug == addon_slug and cur_dashboard.url == url:
+                # Do nothing if we already have this data.
+                return
+            # Clear and make way for new dashboard
+            await cur_dashboard.async_shutdown()
+            if self._cancel_shutdown is not None:
+                self._cancel_shutdown()
+                self._cancel_shutdown = None
+            self._current_dashboard = None
+
+        dashboard = ESPHomeDashboard(
+            hass, addon_slug, url, async_get_clientsession(hass)
+        )
         await dashboard.async_request_refresh()
-    except UpdateFailed as err:
-        logging.getLogger(__name__).error("Ignoring dashboard info: %s", err)
-        return
+        if not cur_dashboard and not dashboard.last_update_success:
+            # If there was no previous dashboard and the new one is not available,
+            # we skip setup and wait for discovery.
+            _LOGGER.error(
+                "Dashboard unavailable; skipping setup: %s", dashboard.last_exception
+            )
+            return
+
+        self._current_dashboard = dashboard
+
+        async def on_hass_stop(_: Event) -> None:
+            await dashboard.async_shutdown()
 
-    hass.data[KEY_DASHBOARD] = dashboard
+        self._cancel_shutdown = hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, on_hass_stop
+        )
 
-    async def on_hass_stop(_: Event) -> None:
-        await dashboard.async_shutdown()
+        new_data = {"info": {"addon_slug": addon_slug, "host": host, "port": port}}
+        if self._data != new_data:
+            await self._store.async_save(new_data)
+
+        reloads = [
+            hass.config_entries.async_reload(entry.entry_id)
+            for entry in hass.config_entries.async_entries(DOMAIN)
+            if entry.state == ConfigEntryState.LOADED
+        ]
+        # Re-auth flows will check the dashboard for encryption key when the form is requested
+        # but we only trigger reauth if the dashboard is available.
+        if dashboard.last_update_success:
+            reauths = [
+                hass.config_entries.flow.async_configure(flow["flow_id"])
+                for flow in hass.config_entries.flow.async_progress()
+                if flow["handler"] == DOMAIN
+                and flow["context"]["source"] == SOURCE_REAUTH
+            ]
+        else:
+            reauths = []
+            _LOGGER.error(
+                "Dashboard unavailable; skipping reauth: %s", dashboard.last_exception
+            )
+
+        _LOGGER.debug(
+            "Reloading %d and re-authenticating %d", len(reloads), len(reauths)
+        )
+        if reloads or reauths:
+            await asyncio.gather(*reloads, *reauths)
 
-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
 
-    reloads = [
-        hass.config_entries.async_reload(entry.entry_id)
-        for entry in hass.config_entries.async_entries(DOMAIN)
-        if entry.state == ConfigEntryState.LOADED
-    ]
-    # Re-auth flows will check the dashboard for encryption key when the form is requested
-    reauths = [
-        hass.config_entries.flow.async_configure(flow["flow_id"])
-        for flow in hass.config_entries.flow.async_progress()
-        if flow["handler"] == DOMAIN and flow["context"]["source"] == SOURCE_REAUTH
-    ]
-    if reloads or reauths:
-        await asyncio.gather(*reloads, *reauths)
+@callback
+def async_get_dashboard(hass: HomeAssistant) -> ESPHomeDashboard | None:
+    """Get an instance of the dashboard if set."""
+    manager: ESPHomeDashboardManager | None = hass.data.get(KEY_DASHBOARD_MANAGER)
+    return manager.async_get() if manager else None
+
+
+async def async_set_dashboard_info(
+    hass: HomeAssistant, addon_slug: str, host: str, port: int
+) -> None:
+    """Set the dashboard info."""
+    manager = await async_get_or_create_dashboard_manager(hass)
+    await manager.async_set_dashboard_info(addon_slug, host, port)
 
 
 class ESPHomeDashboard(DataUpdateCoordinator[dict[str, ConfiguredDevice]]):
@@ -82,7 +169,7 @@ def __init__(
         """Initialize."""
         super().__init__(
             hass,
-            logging.getLogger(__name__),
+            _LOGGER,
             name="ESPHome Dashboard",
             update_interval=timedelta(minutes=5),
         )
diff --git a/homeassistant/components/esphome/diagnostics.py b/homeassistant/components/esphome/diagnostics.py
index 8de1501bc434a6..292d1921abfce0 100644
--- a/homeassistant/components/esphome/diagnostics.py
+++ b/homeassistant/components/esphome/diagnostics.py
@@ -1,7 +1,7 @@
 """Diagnostics support for ESPHome."""
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Any
 
 from homeassistant.components.bluetooth import async_scanner_by_source
 from homeassistant.components.diagnostics import async_redact_data
@@ -28,7 +28,6 @@ async def async_get_config_entry_diagnostics(
     entry_data = DomainData.get(hass).get_entry_data(config_entry)
 
     if (storage_data := await entry_data.store.async_load()) is not None:
-        storage_data = cast("dict[str, Any]", storage_data)
         diag["storage_data"] = storage_data
 
     if config_entry.unique_id and (
diff --git a/homeassistant/components/esphome/domain_data.py b/homeassistant/components/esphome/domain_data.py
index 32d2d1efffff1a..2fc32129d1f998 100644
--- a/homeassistant/components/esphome/domain_data.py
+++ b/homeassistant/components/esphome/domain_data.py
@@ -12,10 +12,9 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.json import JSONEncoder
-from homeassistant.helpers.storage import Store
 
 from .const import DOMAIN
-from .entry_data import RuntimeEntryData
+from .entry_data import ESPHomeStorage, RuntimeEntryData
 
 STORAGE_VERSION = 1
 MAX_CACHED_SERVICES = 128
@@ -26,12 +25,12 @@ class DomainData:
     """Define a class that stores global esphome data in hass.data[DOMAIN]."""
 
     _entry_datas: dict[str, RuntimeEntryData] = field(default_factory=dict)
-    _stores: dict[str, Store] = field(default_factory=dict)
+    _stores: dict[str, ESPHomeStorage] = field(default_factory=dict)
     _gatt_services_cache: MutableMapping[int, BleakGATTServiceCollection] = field(
-        default_factory=lambda: LRU(MAX_CACHED_SERVICES)  # type: ignore[no-any-return]
+        default_factory=lambda: LRU(MAX_CACHED_SERVICES)
     )
     _gatt_mtu_cache: MutableMapping[int, int] = field(
-        default_factory=lambda: LRU(MAX_CACHED_SERVICES)  # type: ignore[no-any-return]
+        default_factory=lambda: LRU(MAX_CACHED_SERVICES)
     )
 
     def get_gatt_services_cache(
@@ -83,11 +82,13 @@ def is_entry_loaded(self, entry: ConfigEntry) -> bool:
         """Check whether the given entry is loaded."""
         return entry.entry_id in self._entry_datas
 
-    def get_or_create_store(self, hass: HomeAssistant, entry: ConfigEntry) -> Store:
+    def get_or_create_store(
+        self, hass: HomeAssistant, entry: ConfigEntry
+    ) -> ESPHomeStorage:
         """Get or create a Store instance for the given config entry."""
         return self._stores.setdefault(
             entry.entry_id,
-            Store(
+            ESPHomeStorage(
                 hass, STORAGE_VERSION, f"esphome.{entry.entry_id}", encoder=JSONEncoder
             ),
         )
diff --git a/homeassistant/components/esphome/entity.py b/homeassistant/components/esphome/entity.py
new file mode 100644
index 00000000000000..15c136f17c3df3
--- /dev/null
+++ b/homeassistant/components/esphome/entity.py
@@ -0,0 +1,295 @@
+"""Support for esphome entities."""
+from __future__ import annotations
+
+from collections.abc import Callable
+import functools
+import math
+from typing import (  # pylint: disable=unused-import
+    Any,
+    Generic,
+    TypeVar,
+    cast,
+)
+
+from aioesphomeapi import (
+    EntityCategory as EsphomeEntityCategory,
+    EntityInfo,
+    EntityState,
+)
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    EntityCategory,
+)
+from homeassistant.core import HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+)
+from homeassistant.helpers.entity import DeviceInfo, Entity
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .domain_data import DomainData
+
+# Import config flow so that it's added to the registry
+from .entry_data import RuntimeEntryData
+from .enum_mapper import EsphomeEnumMapper
+
+_R = TypeVar("_R")
+_InfoT = TypeVar("_InfoT", bound=EntityInfo)
+_EntityT = TypeVar("_EntityT", bound="EsphomeEntity[Any,Any]")
+_StateT = TypeVar("_StateT", bound=EntityState)
+
+
+async def platform_async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+    *,
+    info_type: type[_InfoT],
+    entity_type: type[_EntityT],
+    state_type: type[_StateT],
+) -> None:
+    """Set up an esphome platform.
+
+    This method is in charge of receiving, distributing and storing
+    info and state updates.
+    """
+    entry_data: RuntimeEntryData = DomainData.get(hass).get_entry_data(entry)
+    entry_data.info[info_type] = {}
+    entry_data.state.setdefault(state_type, {})
+
+    @callback
+    def async_list_entities(infos: list[EntityInfo]) -> None:
+        """Update entities of this platform when entities are listed."""
+        current_infos = entry_data.info[info_type]
+        new_infos: dict[int, EntityInfo] = {}
+        add_entities: list[_EntityT] = []
+
+        for info in infos:
+            if not current_infos.pop(info.key, None):
+                # Create new entity
+                entity = entity_type(entry_data, info, state_type)
+                add_entities.append(entity)
+            new_infos[info.key] = info
+
+        # Anything still in current_infos is now gone
+        if current_infos:
+            hass.async_create_task(
+                entry_data.async_remove_entities(current_infos.values())
+            )
+
+        # Then update the actual info
+        entry_data.info[info_type] = new_infos
+
+        if new_infos:
+            entry_data.async_update_entity_infos(new_infos.values())
+
+        if add_entities:
+            # Add entities to Home Assistant
+            async_add_entities(add_entities)
+
+    entry_data.cleanup_callbacks.append(
+        entry_data.async_register_static_info_callback(info_type, async_list_entities)
+    )
+
+
+def esphome_state_property(
+    func: Callable[[_EntityT], _R]
+) -> Callable[[_EntityT], _R | None]:
+    """Wrap a state property of an esphome entity.
+
+    This checks if the state object in the entity is set, and
+    prevents writing NAN values to the Home Assistant state machine.
+    """
+
+    @functools.wraps(func)
+    def _wrapper(self: _EntityT) -> _R | None:
+        # pylint: disable-next=protected-access
+        if not self._has_state:
+            return None
+        val = func(self)
+        if isinstance(val, float) and math.isnan(val):
+            # Home Assistant doesn't use NAN values in state machine
+            # (not JSON serializable)
+            return None
+        return val
+
+    return _wrapper
+
+
+ICON_SCHEMA = vol.Schema(cv.icon)
+
+
+ENTITY_CATEGORIES: EsphomeEnumMapper[
+    EsphomeEntityCategory, EntityCategory | None
+] = EsphomeEnumMapper(
+    {
+        EsphomeEntityCategory.NONE: None,
+        EsphomeEntityCategory.CONFIG: EntityCategory.CONFIG,
+        EsphomeEntityCategory.DIAGNOSTIC: EntityCategory.DIAGNOSTIC,
+    }
+)
+
+
+class EsphomeEntity(Entity, Generic[_InfoT, _StateT]):
+    """Define a base esphome entity."""
+
+    _attr_should_poll = False
+    _static_info: _InfoT
+    _state: _StateT
+    _has_state: bool
+
+    def __init__(
+        self,
+        entry_data: RuntimeEntryData,
+        entity_info: EntityInfo,
+        state_type: type[_StateT],
+    ) -> None:
+        """Initialize."""
+        self._entry_data = entry_data
+        self._on_entry_data_changed()
+        self._key = entity_info.key
+        self._state_type = state_type
+        self._on_static_info_update(entity_info)
+        assert entry_data.device_info is not None
+        device_info = entry_data.device_info
+        self._device_info = device_info
+        self._attr_has_entity_name = bool(device_info.friendly_name)
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)}
+        )
+        self._entry_id = entry_data.entry_id
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        entry_data = self._entry_data
+        hass = self.hass
+        key = self._key
+
+        self.async_on_remove(
+            entry_data.async_register_key_static_info_remove_callback(
+                self._static_info,
+                functools.partial(self.async_remove, force_remove=True),
+            )
+        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                hass,
+                entry_data.signal_device_updated,
+                self._on_device_update,
+            )
+        )
+        self.async_on_remove(
+            entry_data.async_subscribe_state_update(
+                self._state_type, key, self._on_state_update
+            )
+        )
+        self.async_on_remove(
+            entry_data.async_register_key_static_info_updated_callback(
+                self._static_info, self._on_static_info_update
+            )
+        )
+        self._update_state_from_entry_data()
+
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Save the static info for this entity when it changes.
+
+        This method can be overridden in child classes to know
+        when the static info changes.
+        """
+        static_info = cast(_InfoT, static_info)
+        self._static_info = static_info
+        self._attr_unique_id = static_info.unique_id
+        self._attr_entity_registry_enabled_default = not static_info.disabled_by_default
+        self._attr_name = static_info.name
+        if entity_category := static_info.entity_category:
+            self._attr_entity_category = ENTITY_CATEGORIES.from_esphome(entity_category)
+        else:
+            self._attr_entity_category = None
+        if icon := static_info.icon:
+            self._attr_icon = cast(str, ICON_SCHEMA(icon))
+        else:
+            self._attr_icon = None
+
+    @callback
+    def _update_state_from_entry_data(self) -> None:
+        """Update state from entry data."""
+
+        state = self._entry_data.state
+        key = self._key
+        state_type = self._state_type
+        has_state = key in state[state_type]
+        if has_state:
+            self._state = cast(_StateT, state[state_type][key])
+        self._has_state = has_state
+
+    @callback
+    def _on_state_update(self) -> None:
+        """Call when state changed.
+
+        Behavior can be changed in child classes
+        """
+        self._update_state_from_entry_data()
+        self.async_write_ha_state()
+
+    @callback
+    def _on_entry_data_changed(self) -> None:
+        entry_data = self._entry_data
+        self._api_version = entry_data.api_version
+        self._client = entry_data.client
+
+    @callback
+    def _on_device_update(self) -> None:
+        """Call when device updates or entry data changes."""
+        self._on_entry_data_changed()
+        if not self._entry_data.available:
+            # Only write state if the device has gone unavailable
+            # since _on_state_update will be called if the device
+            # is available when the full state arrives
+            # through the next entity state packet.
+            self.async_write_ha_state()
+
+    @property
+    def available(self) -> bool:
+        """Return if the entity is available."""
+        if self._device_info.has_deep_sleep:
+            # During deep sleep the ESP will not be connectable (by design)
+            # For these cases, show it as available
+            return self._entry_data.expected_disconnect
+
+        return self._entry_data.available
+
+
+class EsphomeAssistEntity(Entity):
+    """Define a base entity for Assist Pipeline entities."""
+
+    _attr_has_entity_name = True
+    _attr_should_poll = False
+
+    def __init__(self, entry_data: RuntimeEntryData) -> None:
+        """Initialize the binary sensor."""
+        self._entry_data: RuntimeEntryData = entry_data
+        assert entry_data.device_info is not None
+        device_info = entry_data.device_info
+        self._device_info = device_info
+        self._attr_unique_id = (
+            f"{device_info.mac_address}-{self.entity_description.key}"
+        )
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)}
+        )
+
+    @callback
+    def _update(self) -> None:
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register update callback."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self._entry_data.async_subscribe_assist_pipeline_update(self._update)
+        )
diff --git a/homeassistant/components/esphome/entry_data.py b/homeassistant/components/esphome/entry_data.py
index 7ce195d68fce08..3391d02a829aeb 100644
--- a/homeassistant/components/esphome/entry_data.py
+++ b/homeassistant/components/esphome/entry_data.py
@@ -2,17 +2,19 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable
+from collections.abc import Callable, Coroutine, Iterable
 from dataclasses import dataclass, field
 import logging
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, Final, TypedDict, cast
 
 from aioesphomeapi import (
     COMPONENT_TYPE_TO_INFO,
+    AlarmControlPanelInfo,
     APIClient,
     APIVersion,
     BinarySensorInfo,
     CameraInfo,
+    CameraState,
     ClimateInfo,
     CoverInfo,
     DeviceInfo,
@@ -34,18 +36,21 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.storage import Store
 
 from .dashboard import async_get_dashboard
 
+INFO_TO_COMPONENT_TYPE: Final = {v: k for k, v in COMPONENT_TYPE_TO_INFO.items()}
+
 _SENTINEL = object()
 SAVE_DELAY = 120
 _LOGGER = logging.getLogger(__name__)
 
 # Mapping from ESPHome info type to HA platform
 INFO_TYPE_TO_PLATFORM: dict[type[EntityInfo], Platform] = {
+    AlarmControlPanelInfo: Platform.ALARM_CONTROL_PANEL,
     BinarySensorInfo: Platform.BINARY_SENSOR,
     ButtonInfo: Platform.BUTTON,
     CameraInfo: Platform.CAMERA,
@@ -63,28 +68,34 @@
 }
 
 
+class StoreData(TypedDict, total=False):
+    """ESPHome storage data."""
+
+    device_info: dict[str, Any]
+    services: list[dict[str, Any]]
+    api_version: dict[str, Any]
+
+
+class ESPHomeStorage(Store[StoreData]):
+    """ESPHome Storage."""
+
+
 @dataclass
 class RuntimeEntryData:
     """Store runtime data for esphome config entries."""
 
     entry_id: str
     client: APIClient
-    store: Store
+    store: ESPHomeStorage
     state: dict[type[EntityState], dict[int, EntityState]] = field(default_factory=dict)
     # When the disconnect callback is called, we mark all states
     # as stale so we will always dispatch a state update when the
     # device reconnects. This is the same format as state_subscriptions.
     stale_state: set[tuple[type[EntityState], int]] = field(default_factory=set)
-    info: dict[str, dict[int, EntityInfo]] = field(default_factory=dict)
-
-    # A second list of EntityInfo objects
-    # This is necessary for when an entity is being removed. HA requires
-    # some static info to be accessible during removal (unique_id, maybe others)
-    # If an entity can't find anything in the info array, it will look for info here.
-    old_info: dict[str, dict[int, EntityInfo]] = field(default_factory=dict)
-
+    info: dict[type[EntityInfo], dict[int, EntityInfo]] = field(default_factory=dict)
     services: dict[int, UserService] = field(default_factory=dict)
     available: bool = False
+    expected_disconnect: bool = False  # Last disconnect was expected (e.g. deep sleep)
     device_info: DeviceInfo | None = None
     api_version: APIVersion = field(default_factory=APIVersion)
     cleanup_callbacks: list[Callable[[], None]] = field(default_factory=list)
@@ -94,7 +105,8 @@ class RuntimeEntryData:
     ] = field(default_factory=dict)
     loaded_platforms: set[Platform] = field(default_factory=set)
     platform_load_lock: asyncio.Lock = field(default_factory=asyncio.Lock)
-    _storage_contents: dict[str, Any] | None = None
+    _storage_contents: StoreData | None = None
+    _pending_storage: Callable[[], StoreData] | None = None
     ble_connections_free: int = 0
     ble_connections_limit: int = 0
     _ble_connection_free_futures: list[asyncio.Future[int]] = field(
@@ -104,6 +116,16 @@ class RuntimeEntryData:
         default_factory=list
     )
     assist_pipeline_state: bool = False
+    entity_info_callbacks: dict[
+        type[EntityInfo], list[Callable[[list[EntityInfo]], None]]
+    ] = field(default_factory=dict)
+    entity_info_key_remove_callbacks: dict[
+        tuple[type[EntityInfo], int], list[Callable[[], Coroutine[Any, Any, None]]]
+    ] = field(default_factory=dict)
+    entity_info_key_updated_callbacks: dict[
+        tuple[type[EntityInfo], int], list[Callable[[EntityInfo], None]]
+    ] = field(default_factory=dict)
+    original_options: dict[str, Any] = field(default_factory=dict)
 
     @property
     def name(self) -> str:
@@ -127,6 +149,53 @@ def signal_static_info_updated(self) -> str:
         """Return the signal to listen to for updates on static info."""
         return f"esphome_{self.entry_id}_on_list"
 
+    @callback
+    def async_register_static_info_callback(
+        self,
+        entity_info_type: type[EntityInfo],
+        callback_: Callable[[list[EntityInfo]], None],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info changes for an EntityInfo type."""
+        callbacks = self.entity_info_callbacks.setdefault(entity_info_type, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
+    @callback
+    def async_register_key_static_info_remove_callback(
+        self,
+        static_info: EntityInfo,
+        callback_: Callable[[], Coroutine[Any, Any, None]],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info is removed for a specific key."""
+        callback_key = (type(static_info), static_info.key)
+        callbacks = self.entity_info_key_remove_callbacks.setdefault(callback_key, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
+    @callback
+    def async_register_key_static_info_updated_callback(
+        self,
+        static_info: EntityInfo,
+        callback_: Callable[[EntityInfo], None],
+    ) -> CALLBACK_TYPE:
+        """Register to receive callbacks when static info is updated for a specific key."""
+        callback_key = (type(static_info), static_info.key)
+        callbacks = self.entity_info_key_updated_callbacks.setdefault(callback_key, [])
+        callbacks.append(callback_)
+
+        def _unsub() -> None:
+            callbacks.remove(callback_)
+
+        return _unsub
+
     @callback
     def async_update_ble_connection_limits(self, free: int, limit: int) -> None:
         """Update the BLE connection limits."""
@@ -176,13 +245,25 @@ def _unsubscribe() -> None:
         self.assist_pipeline_update_callbacks.append(update_callback)
         return _unsubscribe
 
-    @callback
-    def async_remove_entity(
-        self, hass: HomeAssistant, component_key: str, key: int
-    ) -> None:
+    async def async_remove_entities(self, static_infos: Iterable[EntityInfo]) -> None:
         """Schedule the removal of an entity."""
-        signal = f"esphome_{self.entry_id}_remove_{component_key}_{key}"
-        async_dispatcher_send(hass, signal)
+        callbacks: list[Coroutine[Any, Any, None]] = []
+        for static_info in static_infos:
+            callback_key = (type(static_info), static_info.key)
+            if key_callbacks := self.entity_info_key_remove_callbacks.get(callback_key):
+                callbacks.extend([callback_() for callback_ in key_callbacks])
+        if callbacks:
+            await asyncio.gather(*callbacks)
+
+    @callback
+    def async_update_entity_infos(self, static_infos: Iterable[EntityInfo]) -> None:
+        """Call static info updated callbacks."""
+        for static_info in static_infos:
+            callback_key = (type(static_info), static_info.key)
+            for callback_ in self.entity_info_key_updated_callbacks.get(
+                callback_key, []
+            ):
+                callback_(static_info)
 
     async def _ensure_platforms_loaded(
         self, hass: HomeAssistant, entry: ConfigEntry, platforms: set[Platform]
@@ -214,6 +295,21 @@ async def async_update_static_infos(
                     break
         await self._ensure_platforms_loaded(hass, entry, needed_platforms)
 
+        # Make a dict of the EntityInfo by type and send
+        # them to the listeners for each specific EntityInfo type
+        infos_by_type: dict[type[EntityInfo], list[EntityInfo]] = {}
+        for info in infos:
+            info_type = type(info)
+            if info_type not in infos_by_type:
+                infos_by_type[info_type] = []
+            infos_by_type[info_type].append(info)
+
+        callbacks_by_type = self.entity_info_callbacks
+        for type_, entity_infos in infos_by_type.items():
+            if callbacks_ := callbacks_by_type.get(type_):
+                for callback_ in callbacks_:
+                    callback_(entity_infos)
+
         # Then send dispatcher event
         async_dispatcher_send(hass, self.signal_static_info_updated, infos)
 
@@ -244,9 +340,10 @@ def async_update_state(self, state: EntityState) -> None:
         if (
             current_state == state
             and subscription_key not in stale_state
+            and state_type is not CameraState
             and not (
-                type(state) is SensorState  # pylint: disable=unidiomatic-typecheck
-                and (platform_info := self.info.get(Platform.SENSOR))
+                state_type is SensorState  # pylint: disable=unidiomatic-typecheck
+                and (platform_info := self.info.get(SensorInfo))
                 and (entity_info := platform_info.get(state.key))
                 and (cast(SensorInfo, entity_info)).force_update
             )
@@ -266,8 +363,14 @@ def async_update_state(self, state: EntityState) -> None:
         )
         stale_state.discard(subscription_key)
         current_state_by_type[key] = state
-        if subscription_key in self.state_subscriptions:
-            self.state_subscriptions[subscription_key]()
+        if subscription := self.state_subscriptions.get(subscription_key):
+            try:
+                subscription()
+            except Exception as ex:  # pylint: disable=broad-except
+                # If we allow this exception to raise it will
+                # make it all the way to data_received in aioesphomeapi
+                # which will cause the connection to be closed.
+                _LOGGER.exception("Error while calling subscription: %s", ex)
 
     @callback
     def async_update_device_state(self, hass: HomeAssistant) -> None:
@@ -278,43 +381,61 @@ async def async_load_from_store(self) -> tuple[list[EntityInfo], list[UserServic
         """Load the retained data from store and return de-serialized data."""
         if (restored := await self.store.async_load()) is None:
             return [], []
-        restored = cast("dict[str, Any]", restored)
         self._storage_contents = restored.copy()
 
         self.device_info = DeviceInfo.from_dict(restored.pop("device_info"))
         self.api_version = APIVersion.from_dict(restored.pop("api_version", {}))
-        infos = []
+        infos: list[EntityInfo] = []
         for comp_type, restored_infos in restored.items():
+            if TYPE_CHECKING:
+                restored_infos = cast(list[dict[str, Any]], restored_infos)
             if comp_type not in COMPONENT_TYPE_TO_INFO:
                 continue
             for info in restored_infos:
                 cls = COMPONENT_TYPE_TO_INFO[comp_type]
                 infos.append(cls.from_dict(info))
-        services = []
-        for service in restored.get("services", []):
-            services.append(UserService.from_dict(service))
+        services = [
+            UserService.from_dict(service) for service in restored.pop("services", [])
+        ]
         return infos, services
 
     async def async_save_to_store(self) -> None:
         """Generate dynamic data to store and save it to the filesystem."""
         if self.device_info is None:
             raise ValueError("device_info is not set yet")
-        store_data: dict[str, Any] = {
+        store_data: StoreData = {
             "device_info": self.device_info.to_dict(),
             "services": [],
             "api_version": self.api_version.to_dict(),
         }
-
-        for comp_type, infos in self.info.items():
-            store_data[comp_type] = [info.to_dict() for info in infos.values()]
+        for info_type, infos in self.info.items():
+            comp_type = INFO_TO_COMPONENT_TYPE[info_type]
+            store_data[comp_type] = [info.to_dict() for info in infos.values()]  # type: ignore[literal-required]
         for service in self.services.values():
             store_data["services"].append(service.to_dict())
 
         if store_data == self._storage_contents:
             return
 
-        def _memorized_storage() -> dict[str, Any]:
+        def _memorized_storage() -> StoreData:
+            self._pending_storage = None
             self._storage_contents = store_data
             return store_data
 
+        self._pending_storage = _memorized_storage
         self.store.async_delay_save(_memorized_storage, SAVE_DELAY)
+
+    async def async_cleanup(self) -> None:
+        """Cleanup the entry data when disconnected or unloading."""
+        if self._pending_storage:
+            # Ensure we save the data if we are unloading before the
+            # save delay has passed.
+            await self.store.async_save(self._pending_storage())
+
+    async def async_update_listener(
+        self, hass: HomeAssistant, entry: ConfigEntry
+    ) -> None:
+        """Handle options update."""
+        if self.original_options == entry.options:
+            return
+        hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
diff --git a/homeassistant/components/esphome/fan.py b/homeassistant/components/esphome/fan.py
index 01060630964ae1..c6be200e2b21ad 100644
--- a/homeassistant/components/esphome/fan.py
+++ b/homeassistant/components/esphome/fan.py
@@ -4,7 +4,7 @@
 import math
 from typing import Any
 
-from aioesphomeapi import FanDirection, FanInfo, FanSpeed, FanState
+from aioesphomeapi import EntityInfo, FanDirection, FanInfo, FanSpeed, FanState
 
 from homeassistant.components.fan import (
     DIRECTION_FORWARD,
@@ -13,7 +13,7 @@
     FanEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
@@ -22,7 +22,11 @@
     ranged_value_to_percentage,
 )
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 ORDERED_NAMED_FAN_SPEEDS = [FanSpeed.LOW, FanSpeed.MEDIUM, FanSpeed.HIGH]
@@ -36,7 +40,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="fan",
         info_type=FanInfo,
         entity_type=EsphomeFan,
         state_type=FanState,
@@ -68,7 +71,7 @@ async def _async_set_percentage(self, percentage: int | None) -> None:
             await self.async_turn_off()
             return
 
-        data: dict[str, Any] = {"key": self._static_info.key, "state": True}
+        data: dict[str, Any] = {"key": self._key, "state": True}
         if percentage is not None:
             if self._supports_speed_levels:
                 data["speed_level"] = math.ceil(
@@ -94,18 +97,16 @@ async def async_turn_on(
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the fan."""
-        await self._client.fan_command(key=self._static_info.key, state=False)
+        await self._client.fan_command(key=self._key, state=False)
 
     async def async_oscillate(self, oscillating: bool) -> None:
         """Oscillate the fan."""
-        await self._client.fan_command(
-            key=self._static_info.key, oscillating=oscillating
-        )
+        await self._client.fan_command(key=self._key, oscillating=oscillating)
 
     async def async_set_direction(self, direction: str) -> None:
         """Set direction of the fan."""
         await self._client.fan_command(
-            key=self._static_info.key, direction=_FAN_DIRECTIONS.from_hass(direction)
+            key=self._key, direction=_FAN_DIRECTIONS.from_hass(direction)
         )
 
     @property
@@ -141,26 +142,24 @@ def speed_count(self) -> int:
     @esphome_state_property
     def oscillating(self) -> bool | None:
         """Return the oscillation state."""
-        if not self._static_info.supports_oscillation:
-            return None
         return self._state.oscillating
 
     @property
     @esphome_state_property
     def current_direction(self) -> str | None:
         """Return the current fan direction."""
-        if not self._static_info.supports_direction:
-            return None
         return _FAN_DIRECTIONS.from_esphome(self._state.direction)
 
-    @property
-    def supported_features(self) -> FanEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
         flags = FanEntityFeature(0)
-        if self._static_info.supports_oscillation:
+        if static_info.supports_oscillation:
             flags |= FanEntityFeature.OSCILLATE
-        if self._static_info.supports_speed:
+        if static_info.supports_speed:
             flags |= FanEntityFeature.SET_SPEED
-        if self._static_info.supports_direction:
+        if static_info.supports_direction:
             flags |= FanEntityFeature.DIRECTION
-        return flags
+        self._attr_supported_features = flags
diff --git a/homeassistant/components/esphome/light.py b/homeassistant/components/esphome/light.py
index 880d94a5f55124..1ecc99730bfebd 100644
--- a/homeassistant/components/esphome/light.py
+++ b/homeassistant/components/esphome/light.py
@@ -3,11 +3,17 @@
 
 from typing import Any, cast
 
-from aioesphomeapi import APIVersion, LightColorCapability, LightInfo, LightState
+from aioesphomeapi import (
+    APIVersion,
+    EntityInfo,
+    LightColorCapability,
+    LightInfo,
+    LightState,
+)
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
-    ATTR_COLOR_TEMP,
+    ATTR_COLOR_TEMP_KELVIN,
     ATTR_EFFECT,
     ATTR_FLASH,
     ATTR_RGB_COLOR,
@@ -22,10 +28,14 @@
     LightEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 FLASH_LENGTHS = {FLASH_SHORT: 2, FLASH_LONG: 10}
 
@@ -38,7 +48,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="light",
         info_type=LightInfo,
         entity_type=EsphomeLight,
         state_type=LightState,
@@ -92,6 +101,20 @@ async def async_setup_entry(
 }
 
 
+def _mired_to_kelvin(mired_temperature: float) -> int:
+    """Convert absolute mired shift to degrees kelvin.
+
+    This function rounds the converted value instead of flooring the value as
+    is done in homeassistant.util.color.color_temperature_mired_to_kelvin().
+
+    If the value of mired_temperature is less than or equal to zero, return
+    the original value to avoid a divide by zero.
+    """
+    if mired_temperature <= 0:
+        return round(mired_temperature)
+    return round(1000000 / mired_temperature)
+
+
 def _color_mode_to_ha(mode: int) -> str:
     """Convert an esphome color mode to a HA color mode constant.
 
@@ -122,16 +145,14 @@ def _filter_color_modes(
 
     Excluding all values that don't have the requested features.
     """
-    return [mode for mode in supported if mode & features]
+    return [mode for mode in supported if (mode & features) == features]
 
 
 class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
     """A light implementation for ESPHome."""
 
-    @property
-    def _supports_color_mode(self) -> bool:
-        """Return whether the client supports the new color mode system natively."""
-        return self._api_version >= APIVersion(1, 6)
+    _native_supported_color_modes: list[int]
+    _supports_color_mode = False
 
     @property
     @esphome_state_property
@@ -141,7 +162,7 @@ def is_on(self) -> bool | None:
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
-        data: dict[str, Any] = {"key": self._static_info.key, "state": True}
+        data: dict[str, Any] = {"key": self._key, "state": True}
         # The list of color modes that would fit this service call
         color_modes = self._native_supported_color_modes
         try_keep_current_mode = True
@@ -194,8 +215,9 @@ async def async_turn_on(self, **kwargs: Any) -> None:
                 # need to convert cw+ww part to white+color_temp
                 white = data["white"] = max(cw, ww)
                 if white != 0:
-                    min_ct = self.min_mireds
-                    max_ct = self.max_mireds
+                    static_info = self._static_info
+                    min_ct = static_info.min_mireds
+                    max_ct = static_info.max_mireds
                     ct_ratio = ww / (cw + ww)
                     data["color_temperature"] = min_ct + ct_ratio * (max_ct - min_ct)
                 color_modes = _filter_color_modes(
@@ -212,8 +234,9 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         if (transition := kwargs.get(ATTR_TRANSITION)) is not None:
             data["transition_length"] = transition
 
-        if (color_temp := kwargs.get(ATTR_COLOR_TEMP)) is not None:
-            data["color_temperature"] = color_temp
+        if (color_temp_k := kwargs.get(ATTR_COLOR_TEMP_KELVIN)) is not None:
+            # Do not use kelvin_to_mired here to prevent precision loss
+            data["color_temperature"] = 1000000.0 / color_temp_k
             if _filter_color_modes(color_modes, LightColorCapability.COLOR_TEMPERATURE):
                 color_modes = _filter_color_modes(
                     color_modes, LightColorCapability.COLOR_TEMPERATURE
@@ -259,7 +282,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
-        data: dict[str, Any] = {"key": self._static_info.key, "state": False}
+        data: dict[str, Any] = {"key": self._key, "state": False}
         if ATTR_FLASH in kwargs:
             data["flash_length"] = FLASH_LENGTHS[kwargs[ATTR_FLASH]]
         if ATTR_TRANSITION in kwargs:
@@ -287,17 +310,18 @@ def color_mode(self) -> str | None:
     @esphome_state_property
     def rgb_color(self) -> tuple[int, int, int] | None:
         """Return the rgb color value [int, int, int]."""
+        state = self._state
         if not self._supports_color_mode:
             return (
-                round(self._state.red * 255),
-                round(self._state.green * 255),
-                round(self._state.blue * 255),
+                round(state.red * 255),
+                round(state.green * 255),
+                round(state.blue * 255),
             )
 
         return (
-            round(self._state.red * self._state.color_brightness * 255),
-            round(self._state.green * self._state.color_brightness * 255),
-            round(self._state.blue * self._state.color_brightness * 255),
+            round(state.red * state.color_brightness * 255),
+            round(state.green * state.color_brightness * 255),
+            round(state.blue * state.color_brightness * 255),
         )
 
     @property
@@ -312,15 +336,17 @@ def rgbw_color(self) -> tuple[int, int, int, int] | None:
     @esphome_state_property
     def rgbww_color(self) -> tuple[int, int, int, int, int] | None:
         """Return the rgbww color value [int, int, int, int, int]."""
+        state = self._state
         rgb = cast("tuple[int, int, int]", self.rgb_color)
         if not _filter_color_modes(
             self._native_supported_color_modes, LightColorCapability.COLD_WARM_WHITE
         ):
             # Try to reverse white + color temp to cwww
-            min_ct = self._static_info.min_mireds
-            max_ct = self._static_info.max_mireds
-            color_temp = min(max(self._state.color_temperature, min_ct), max_ct)
-            white = self._state.white
+            static_info = self._static_info
+            min_ct = static_info.min_mireds
+            max_ct = static_info.max_mireds
+            color_temp = min(max(state.color_temperature, min_ct), max_ct)
+            white = state.white
 
             ww_frac = (color_temp - min_ct) / (max_ct - min_ct)
             cw_frac = 1 - ww_frac
@@ -332,15 +358,15 @@ def rgbww_color(self) -> tuple[int, int, int, int, int] | None:
             )
         return (
             *rgb,
-            round(self._state.cold_white * 255),
-            round(self._state.warm_white * 255),
+            round(state.cold_white * 255),
+            round(state.warm_white * 255),
         )
 
     @property
     @esphome_state_property
-    def color_temp(self) -> int:
-        """Return the CT color value in mireds."""
-        return round(self._state.color_temperature)
+    def color_temp_kelvin(self) -> int:
+        """Return the CT color value in Kelvin."""
+        return _mired_to_kelvin(self._state.color_temperature)
 
     @property
     @esphome_state_property
@@ -348,26 +374,25 @@ def effect(self) -> str | None:
         """Return the current effect."""
         return self._state.effect
 
-    @property
-    def _native_supported_color_modes(self) -> list[int]:
-        return self._static_info.supported_color_modes_compat(self._api_version)
-
-    @property
-    def supported_features(self) -> LightEntityFeature:
-        """Flag supported features."""
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._supports_color_mode = self._api_version >= APIVersion(1, 6)
+        self._native_supported_color_modes = static_info.supported_color_modes_compat(
+            self._api_version
+        )
         flags = LightEntityFeature.FLASH
 
         # All color modes except UNKNOWN,ON_OFF support transition
         modes = self._native_supported_color_modes
         if any(m not in (0, LightColorCapability.ON_OFF) for m in modes):
             flags |= LightEntityFeature.TRANSITION
-        if self._static_info.effects:
+        if static_info.effects:
             flags |= LightEntityFeature.EFFECT
-        return flags
+        self._attr_supported_features = flags
 
-    @property
-    def supported_color_modes(self) -> set[str] | None:
-        """Flag supported color modes."""
         supported = set(map(_color_mode_to_ha, self._native_supported_color_modes))
         if ColorMode.ONOFF in supported and len(supported) > 1:
             supported.remove(ColorMode.ONOFF)
@@ -375,19 +400,10 @@ def supported_color_modes(self) -> set[str] | None:
             supported.remove(ColorMode.BRIGHTNESS)
         if ColorMode.WHITE in supported and len(supported) == 1:
             supported.remove(ColorMode.WHITE)
-        return supported
-
-    @property
-    def effect_list(self) -> list[str]:
-        """Return the list of supported effects."""
-        return self._static_info.effects
-
-    @property
-    def min_mireds(self) -> int:
-        """Return the coldest color_temp that this light supports."""
-        return round(self._static_info.min_mireds)
-
-    @property
-    def max_mireds(self) -> int:
-        """Return the warmest color_temp that this light supports."""
-        return round(self._static_info.max_mireds)
+        self._attr_supported_color_modes = supported
+        self._attr_effect_list = static_info.effects
+        self._attr_min_mireds = round(static_info.min_mireds)
+        self._attr_max_mireds = round(static_info.max_mireds)
+        if ColorMode.COLOR_TEMP in supported:
+            self._attr_min_color_temp_kelvin = _mired_to_kelvin(static_info.max_mireds)
+            self._attr_max_color_temp_kelvin = _mired_to_kelvin(static_info.min_mireds)
diff --git a/homeassistant/components/esphome/lock.py b/homeassistant/components/esphome/lock.py
index 947ea4729bb24d..00b94cd15ff581 100644
--- a/homeassistant/components/esphome/lock.py
+++ b/homeassistant/components/esphome/lock.py
@@ -3,15 +3,19 @@
 
 from typing import Any
 
-from aioesphomeapi import LockCommand, LockEntityState, LockInfo, LockState
+from aioesphomeapi import EntityInfo, LockCommand, LockEntityState, LockInfo, LockState
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_CODE
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -22,7 +26,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="lock",
         info_type=LockInfo,
         entity_type=EsphomeLock,
         state_type=LockEntityState,
@@ -32,24 +35,19 @@ async def async_setup_entry(
 class EsphomeLock(EsphomeEntity[LockInfo, LockEntityState], LockEntity):
     """A lock implementation for ESPHome."""
 
-    @property
-    def assumed_state(self) -> bool:
-        """Return True if unable to access real state of the entity."""
-        return self._static_info.assumed_state
-
-    @property
-    def supported_features(self) -> LockEntityFeature:
-        """Flag supported features."""
-        if self._static_info.supports_open:
-            return LockEntityFeature.OPEN
-        return LockEntityFeature(0)
-
-    @property
-    def code_format(self) -> str | None:
-        """Regex for code format or None if no code is required."""
-        if self._static_info.requires_code:
-            return self._static_info.code_format
-        return None
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_assumed_state = static_info.assumed_state
+        self._attr_supported_features = LockEntityFeature(0)
+        if static_info.supports_open:
+            self._attr_supported_features |= LockEntityFeature.OPEN
+        if static_info.requires_code:
+            self._attr_code_format = static_info.code_format
+        else:
+            self._attr_code_format = None
 
     @property
     @esphome_state_property
@@ -77,13 +75,13 @@ def is_jammed(self) -> bool | None:
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock."""
-        await self._client.lock_command(self._static_info.key, LockCommand.LOCK)
+        await self._client.lock_command(self._key, LockCommand.LOCK)
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock."""
         code = kwargs.get(ATTR_CODE, None)
-        await self._client.lock_command(self._static_info.key, LockCommand.UNLOCK, code)
+        await self._client.lock_command(self._key, LockCommand.UNLOCK, code)
 
     async def async_open(self, **kwargs: Any) -> None:
         """Open the door latch."""
-        await self._client.lock_command(self._static_info.key, LockCommand.OPEN)
+        await self._client.lock_command(self._key, LockCommand.OPEN)
diff --git a/homeassistant/components/esphome/manager.py b/homeassistant/components/esphome/manager.py
new file mode 100644
index 00000000000000..b87d3ac38992a5
--- /dev/null
+++ b/homeassistant/components/esphome/manager.py
@@ -0,0 +1,696 @@
+"""Manager for esphome devices."""
+from __future__ import annotations
+
+import logging
+from typing import Any, NamedTuple
+
+from aioesphomeapi import (
+    APIClient,
+    APIConnectionError,
+    APIVersion,
+    DeviceInfo as EsphomeDeviceInfo,
+    HomeassistantServiceCall,
+    InvalidAuthAPIError,
+    InvalidEncryptionKeyAPIError,
+    ReconnectLogic,
+    RequiresEncryptionAPIError,
+    UserService,
+    UserServiceArgType,
+    VoiceAssistantEventType,
+)
+from awesomeversion import AwesomeVersion
+import voluptuous as vol
+
+from homeassistant.components import tag, zeroconf
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    ATTR_DEVICE_ID,
+    CONF_MODE,
+    EVENT_HOMEASSISTANT_STOP,
+)
+from homeassistant.core import Event, HomeAssistant, ServiceCall, State, callback
+from homeassistant.exceptions import TemplateError
+from homeassistant.helpers import template
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.device_registry as dr
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.helpers.issue_registry import (
+    IssueSeverity,
+    async_create_issue,
+    async_delete_issue,
+)
+from homeassistant.helpers.service import async_set_service_schema
+from homeassistant.helpers.template import Template
+
+from .bluetooth import async_connect_scanner
+from .const import (
+    CONF_ALLOW_SERVICE_CALLS,
+    CONF_DEVICE_NAME,
+    DEFAULT_ALLOW_SERVICE_CALLS,
+    DEFAULT_URL,
+    DOMAIN,
+    PROJECT_URLS,
+    STABLE_BLE_VERSION,
+    STABLE_BLE_VERSION_STR,
+)
+from .dashboard import async_get_dashboard
+from .domain_data import DomainData
+
+# Import config flow so that it's added to the registry
+from .entry_data import RuntimeEntryData
+from .voice_assistant import VoiceAssistantUDPServer
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@callback
+def _async_check_firmware_version(
+    hass: HomeAssistant, device_info: EsphomeDeviceInfo, api_version: APIVersion
+) -> None:
+    """Create or delete an the ble_firmware_outdated issue."""
+    # ESPHome device_info.mac_address is the unique_id
+    issue = f"ble_firmware_outdated-{device_info.mac_address}"
+    if (
+        not device_info.bluetooth_proxy_feature_flags_compat(api_version)
+        # If the device has a project name its up to that project
+        # to tell them about the firmware version update so we don't notify here
+        or (device_info.project_name and device_info.project_name not in PROJECT_URLS)
+        or AwesomeVersion(device_info.esphome_version) >= STABLE_BLE_VERSION
+    ):
+        async_delete_issue(hass, DOMAIN, issue)
+        return
+    async_create_issue(
+        hass,
+        DOMAIN,
+        issue,
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        learn_more_url=PROJECT_URLS.get(device_info.project_name, DEFAULT_URL),
+        translation_key="ble_firmware_outdated",
+        translation_placeholders={
+            "name": device_info.name,
+            "version": STABLE_BLE_VERSION_STR,
+        },
+    )
+
+
+@callback
+def _async_check_using_api_password(
+    hass: HomeAssistant, device_info: EsphomeDeviceInfo, has_password: bool
+) -> None:
+    """Create or delete an the api_password_deprecated issue."""
+    # ESPHome device_info.mac_address is the unique_id
+    issue = f"api_password_deprecated-{device_info.mac_address}"
+    if not has_password:
+        async_delete_issue(hass, DOMAIN, issue)
+        return
+    async_create_issue(
+        hass,
+        DOMAIN,
+        issue,
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        learn_more_url="https://esphome.io/components/api.html",
+        translation_key="api_password_deprecated",
+        translation_placeholders={
+            "name": device_info.name,
+        },
+    )
+
+
+class ESPHomeManager:
+    """Class to manage an ESPHome connection."""
+
+    __slots__ = (
+        "hass",
+        "host",
+        "password",
+        "entry",
+        "cli",
+        "device_id",
+        "domain_data",
+        "voice_assistant_udp_server",
+        "reconnect_logic",
+        "zeroconf_instance",
+        "entry_data",
+    )
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: ConfigEntry,
+        host: str,
+        password: str | None,
+        cli: APIClient,
+        zeroconf_instance: zeroconf.HaZeroconf,
+        domain_data: DomainData,
+        entry_data: RuntimeEntryData,
+    ) -> None:
+        """Initialize the esphome manager."""
+        self.hass = hass
+        self.host = host
+        self.password = password
+        self.entry = entry
+        self.cli = cli
+        self.device_id: str | None = None
+        self.domain_data = domain_data
+        self.voice_assistant_udp_server: VoiceAssistantUDPServer | None = None
+        self.reconnect_logic: ReconnectLogic | None = None
+        self.zeroconf_instance = zeroconf_instance
+        self.entry_data = entry_data
+
+    async def on_stop(self, event: Event) -> None:
+        """Cleanup the socket client on HA stop."""
+        await cleanup_instance(self.hass, self.entry)
+
+    @property
+    def services_issue(self) -> str:
+        """Return the services issue name for this entry."""
+        return f"service_calls_not_enabled-{self.entry.unique_id}"
+
+    @callback
+    def async_on_service_call(self, service: HomeassistantServiceCall) -> None:
+        """Call service when user automation in ESPHome config is triggered."""
+        hass = self.hass
+        domain, service_name = service.service.split(".", 1)
+        service_data = service.data
+
+        if service.data_template:
+            try:
+                data_template = {
+                    key: Template(value) for key, value in service.data_template.items()
+                }
+                template.attach(hass, data_template)
+                service_data.update(
+                    template.render_complex(data_template, service.variables)
+                )
+            except TemplateError as ex:
+                _LOGGER.error("Error rendering data template for %s: %s", self.host, ex)
+                return
+
+        if service.is_event:
+            device_id = self.device_id
+            # ESPHome uses service call packet for both events and service calls
+            # Ensure the user can only send events of form 'esphome.xyz'
+            if domain != "esphome":
+                _LOGGER.error(
+                    "Can only generate events under esphome domain! (%s)", self.host
+                )
+                return
+
+            # Call native tag scan
+            if service_name == "tag_scanned" and device_id is not None:
+                tag_id = service_data["tag_id"]
+                hass.async_create_task(tag.async_scan_tag(hass, tag_id, device_id))
+                return
+
+            hass.bus.async_fire(
+                service.service,
+                {
+                    ATTR_DEVICE_ID: device_id,
+                    **service_data,
+                },
+            )
+        elif self.entry.options.get(
+            CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS
+        ):
+            hass.async_create_task(
+                hass.services.async_call(
+                    domain, service_name, service_data, blocking=True
+                )
+            )
+        else:
+            device_info = self.entry_data.device_info
+            assert device_info is not None
+            async_create_issue(
+                hass,
+                DOMAIN,
+                self.services_issue,
+                is_fixable=False,
+                severity=IssueSeverity.WARNING,
+                translation_key="service_calls_not_allowed",
+                translation_placeholders={
+                    "name": device_info.friendly_name or device_info.name,
+                },
+            )
+            _LOGGER.error(
+                "%s: Service call %s.%s: with data %s rejected; "
+                "If you trust this device and want to allow access for it to make "
+                "Home Assistant service calls, you can enable this "
+                "functionality in the options flow",
+                device_info.friendly_name or device_info.name,
+                domain,
+                service_name,
+                service_data,
+            )
+
+    async def _send_home_assistant_state(
+        self, entity_id: str, attribute: str | None, state: State | None
+    ) -> None:
+        """Forward Home Assistant states to ESPHome."""
+        if state is None or (attribute and attribute not in state.attributes):
+            return
+
+        send_state = state.state
+        if attribute:
+            attr_val = state.attributes[attribute]
+            # ESPHome only handles "on"/"off" for boolean values
+            if isinstance(attr_val, bool):
+                send_state = "on" if attr_val else "off"
+            else:
+                send_state = attr_val
+
+        await self.cli.send_home_assistant_state(entity_id, attribute, str(send_state))
+
+    @callback
+    def async_on_state_subscription(
+        self, entity_id: str, attribute: str | None = None
+    ) -> None:
+        """Subscribe and forward states for requested entities."""
+        hass = self.hass
+
+        async def send_home_assistant_state_event(event: Event) -> None:
+            """Forward Home Assistant states updates to ESPHome."""
+            event_data = event.data
+            new_state: State | None = event_data.get("new_state")
+            old_state: State | None = event_data.get("old_state")
+
+            if new_state is None or old_state is None:
+                return
+
+            # Only communicate changes to the state or attribute tracked
+            if (not attribute and old_state.state == new_state.state) or (
+                attribute
+                and old_state.attributes.get(attribute)
+                == new_state.attributes.get(attribute)
+            ):
+                return
+
+            await self._send_home_assistant_state(
+                event.data["entity_id"], attribute, new_state
+            )
+
+        self.entry_data.disconnect_callbacks.append(
+            async_track_state_change_event(
+                hass, [entity_id], send_home_assistant_state_event
+            )
+        )
+
+        # Send initial state
+        hass.async_create_task(
+            self._send_home_assistant_state(
+                entity_id, attribute, hass.states.get(entity_id)
+            )
+        )
+
+    def _handle_pipeline_event(
+        self, event_type: VoiceAssistantEventType, data: dict[str, str] | None
+    ) -> None:
+        self.cli.send_voice_assistant_event(event_type, data)
+
+    def _handle_pipeline_finished(self) -> None:
+        self.entry_data.async_set_assist_pipeline_state(False)
+
+        if self.voice_assistant_udp_server is not None:
+            self.voice_assistant_udp_server.close()
+            self.voice_assistant_udp_server = None
+
+    async def _handle_pipeline_start(
+        self, conversation_id: str, use_vad: bool
+    ) -> int | None:
+        """Start a voice assistant pipeline."""
+        if self.voice_assistant_udp_server is not None:
+            return None
+
+        hass = self.hass
+        voice_assistant_udp_server = VoiceAssistantUDPServer(
+            hass,
+            self.entry_data,
+            self._handle_pipeline_event,
+            self._handle_pipeline_finished,
+        )
+        port = await voice_assistant_udp_server.start_server()
+
+        assert self.device_id is not None, "Device ID must be set"
+        hass.async_create_background_task(
+            voice_assistant_udp_server.run_pipeline(
+                device_id=self.device_id,
+                conversation_id=conversation_id or None,
+                use_vad=use_vad,
+            ),
+            "esphome.voice_assistant_udp_server.run_pipeline",
+        )
+        self.entry_data.async_set_assist_pipeline_state(True)
+
+        return port
+
+    async def _handle_pipeline_stop(self) -> None:
+        """Stop a voice assistant pipeline."""
+        if self.voice_assistant_udp_server is not None:
+            self.voice_assistant_udp_server.stop()
+
+    async def on_connect(self) -> None:
+        """Subscribe to states and list entities on successful API login."""
+        entry = self.entry
+        entry_data = self.entry_data
+        reconnect_logic = self.reconnect_logic
+        hass = self.hass
+        cli = self.cli
+        try:
+            device_info = await cli.device_info()
+
+            # Migrate config entry to new unique ID if necessary
+            # This was changed in 2023.1
+            if entry.unique_id != format_mac(device_info.mac_address):
+                hass.config_entries.async_update_entry(
+                    entry, unique_id=format_mac(device_info.mac_address)
+                )
+
+            # Make sure we have the correct device name stored
+            # so we can map the device to ESPHome Dashboard config
+            if entry.data.get(CONF_DEVICE_NAME) != device_info.name:
+                hass.config_entries.async_update_entry(
+                    entry, data={**entry.data, CONF_DEVICE_NAME: device_info.name}
+                )
+
+            entry_data.device_info = device_info
+            assert cli.api_version is not None
+            entry_data.api_version = cli.api_version
+            entry_data.available = True
+            if entry_data.device_info.name:
+                assert reconnect_logic is not None, "Reconnect logic must be set"
+                reconnect_logic.name = entry_data.device_info.name
+
+            if device_info.bluetooth_proxy_feature_flags_compat(cli.api_version):
+                entry_data.disconnect_callbacks.append(
+                    await async_connect_scanner(hass, entry, cli, entry_data)
+                )
+
+            self.device_id = _async_setup_device_registry(
+                hass, entry, entry_data.device_info
+            )
+            entry_data.async_update_device_state(hass)
+
+            entity_infos, services = await cli.list_entities_services()
+            await entry_data.async_update_static_infos(hass, entry, entity_infos)
+            await _setup_services(hass, entry_data, services)
+            await cli.subscribe_states(entry_data.async_update_state)
+            await cli.subscribe_service_calls(self.async_on_service_call)
+            await cli.subscribe_home_assistant_states(self.async_on_state_subscription)
+
+            if device_info.voice_assistant_version:
+                entry_data.disconnect_callbacks.append(
+                    await cli.subscribe_voice_assistant(
+                        self._handle_pipeline_start,
+                        self._handle_pipeline_stop,
+                    )
+                )
+
+            hass.async_create_task(entry_data.async_save_to_store())
+        except APIConnectionError as err:
+            _LOGGER.warning("Error getting initial data for %s: %s", self.host, err)
+            # Re-connection logic will trigger after this
+            await cli.disconnect()
+        else:
+            _async_check_firmware_version(hass, device_info, entry_data.api_version)
+            _async_check_using_api_password(hass, device_info, bool(self.password))
+
+    async def on_disconnect(self, expected_disconnect: bool) -> None:
+        """Run disconnect callbacks on API disconnect."""
+        entry_data = self.entry_data
+        hass = self.hass
+        host = self.host
+        name = entry_data.device_info.name if entry_data.device_info else host
+        _LOGGER.debug(
+            "%s: %s disconnected (expected=%s), running disconnected callbacks",
+            name,
+            host,
+            expected_disconnect,
+        )
+        for disconnect_cb in entry_data.disconnect_callbacks:
+            disconnect_cb()
+        entry_data.disconnect_callbacks = []
+        entry_data.available = False
+        entry_data.expected_disconnect = expected_disconnect
+        # Mark state as stale so that we will always dispatch
+        # the next state update of that type when the device reconnects
+        entry_data.stale_state = {
+            (type(entity_state), key)
+            for state_dict in entry_data.state.values()
+            for key, entity_state in state_dict.items()
+        }
+        if not hass.is_stopping:
+            # Avoid marking every esphome entity as unavailable on shutdown
+            # since it generates a lot of state changed events and database
+            # writes when we already know we're shutting down and the state
+            # will be cleared anyway.
+            entry_data.async_update_device_state(hass)
+
+    async def on_connect_error(self, err: Exception) -> None:
+        """Start reauth flow if appropriate connect error type."""
+        if isinstance(
+            err,
+            (
+                RequiresEncryptionAPIError,
+                InvalidEncryptionKeyAPIError,
+                InvalidAuthAPIError,
+            ),
+        ):
+            self.entry.async_start_reauth(self.hass)
+
+    async def async_start(self) -> None:
+        """Start the esphome connection manager."""
+        hass = self.hass
+        entry = self.entry
+        entry_data = self.entry_data
+
+        if entry.options.get(CONF_ALLOW_SERVICE_CALLS, DEFAULT_ALLOW_SERVICE_CALLS):
+            async_delete_issue(hass, DOMAIN, self.services_issue)
+
+        # Use async_listen instead of async_listen_once so that we don't deregister
+        # the callback twice when shutting down Home Assistant.
+        # "Unable to remove unknown listener
+        # <function EventBus.async_listen_once.<locals>.onetime_listener>"
+        entry_data.cleanup_callbacks.append(
+            hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, self.on_stop)
+        )
+
+        reconnect_logic = ReconnectLogic(
+            client=self.cli,
+            on_connect=self.on_connect,
+            on_disconnect=self.on_disconnect,
+            zeroconf_instance=self.zeroconf_instance,
+            name=self.host,
+            on_connect_error=self.on_connect_error,
+        )
+        self.reconnect_logic = reconnect_logic
+
+        infos, services = await entry_data.async_load_from_store()
+        await entry_data.async_update_static_infos(hass, entry, infos)
+        await _setup_services(hass, entry_data, services)
+
+        if entry_data.device_info is not None and entry_data.device_info.name:
+            reconnect_logic.name = entry_data.device_info.name
+            if entry.unique_id is None:
+                hass.config_entries.async_update_entry(
+                    entry, unique_id=format_mac(entry_data.device_info.mac_address)
+                )
+
+        await reconnect_logic.start()
+        entry_data.cleanup_callbacks.append(reconnect_logic.stop_callback)
+
+        entry.async_on_unload(
+            entry.add_update_listener(entry_data.async_update_listener)
+        )
+
+
+@callback
+def _async_setup_device_registry(
+    hass: HomeAssistant, entry: ConfigEntry, device_info: EsphomeDeviceInfo
+) -> str:
+    """Set up device registry feature for a particular config entry."""
+    sw_version = device_info.esphome_version
+    if device_info.compilation_time:
+        sw_version += f" ({device_info.compilation_time})"
+
+    configuration_url = None
+    if device_info.webserver_port > 0:
+        configuration_url = f"http://{entry.data['host']}:{device_info.webserver_port}"
+    elif dashboard := async_get_dashboard(hass):
+        configuration_url = f"homeassistant://hassio/ingress/{dashboard.addon_slug}"
+
+    manufacturer = "espressif"
+    if device_info.manufacturer:
+        manufacturer = device_info.manufacturer
+    model = device_info.model
+    hw_version = None
+    if device_info.project_name:
+        project_name = device_info.project_name.split(".")
+        manufacturer = project_name[0]
+        model = project_name[1]
+        hw_version = device_info.project_version
+
+    device_registry = dr.async_get(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        configuration_url=configuration_url,
+        connections={(dr.CONNECTION_NETWORK_MAC, device_info.mac_address)},
+        name=device_info.friendly_name or device_info.name,
+        manufacturer=manufacturer,
+        model=model,
+        sw_version=sw_version,
+        hw_version=hw_version,
+    )
+    return device_entry.id
+
+
+class ServiceMetadata(NamedTuple):
+    """Metadata for services."""
+
+    validator: Any
+    example: str
+    selector: dict[str, Any]
+    description: str | None = None
+
+
+ARG_TYPE_METADATA = {
+    UserServiceArgType.BOOL: ServiceMetadata(
+        validator=cv.boolean,
+        example="False",
+        selector={"boolean": None},
+    ),
+    UserServiceArgType.INT: ServiceMetadata(
+        validator=vol.Coerce(int),
+        example="42",
+        selector={"number": {CONF_MODE: "box"}},
+    ),
+    UserServiceArgType.FLOAT: ServiceMetadata(
+        validator=vol.Coerce(float),
+        example="12.3",
+        selector={"number": {CONF_MODE: "box", "step": 1e-3}},
+    ),
+    UserServiceArgType.STRING: ServiceMetadata(
+        validator=cv.string,
+        example="Example text",
+        selector={"text": None},
+    ),
+    UserServiceArgType.BOOL_ARRAY: ServiceMetadata(
+        validator=[cv.boolean],
+        description="A list of boolean values.",
+        example="[True, False]",
+        selector={"object": {}},
+    ),
+    UserServiceArgType.INT_ARRAY: ServiceMetadata(
+        validator=[vol.Coerce(int)],
+        description="A list of integer values.",
+        example="[42, 34]",
+        selector={"object": {}},
+    ),
+    UserServiceArgType.FLOAT_ARRAY: ServiceMetadata(
+        validator=[vol.Coerce(float)],
+        description="A list of floating point numbers.",
+        example="[ 12.3, 34.5 ]",
+        selector={"object": {}},
+    ),
+    UserServiceArgType.STRING_ARRAY: ServiceMetadata(
+        validator=[cv.string],
+        description="A list of strings.",
+        example="['Example text', 'Another example']",
+        selector={"object": {}},
+    ),
+}
+
+
+async def _register_service(
+    hass: HomeAssistant, entry_data: RuntimeEntryData, service: UserService
+) -> None:
+    if entry_data.device_info is None:
+        raise ValueError("Device Info needs to be fetched first")
+    service_name = f"{entry_data.device_info.name.replace('-', '_')}_{service.name}"
+    schema = {}
+    fields = {}
+
+    for arg in service.args:
+        if arg.type not in ARG_TYPE_METADATA:
+            _LOGGER.error(
+                "Can't register service %s because %s is of unknown type %s",
+                service_name,
+                arg.name,
+                arg.type,
+            )
+            return
+        metadata = ARG_TYPE_METADATA[arg.type]
+        schema[vol.Required(arg.name)] = metadata.validator
+        fields[arg.name] = {
+            "name": arg.name,
+            "required": True,
+            "description": metadata.description,
+            "example": metadata.example,
+            "selector": metadata.selector,
+        }
+
+    async def execute_service(call: ServiceCall) -> None:
+        await entry_data.client.execute_service(service, call.data)
+
+    hass.services.async_register(
+        DOMAIN, service_name, execute_service, vol.Schema(schema)
+    )
+
+    service_desc = {
+        "description": (
+            f"Calls the service {service.name} of the node"
+            f" {entry_data.device_info.name}"
+        ),
+        "fields": fields,
+    }
+
+    async_set_service_schema(hass, DOMAIN, service_name, service_desc)
+
+
+async def _setup_services(
+    hass: HomeAssistant, entry_data: RuntimeEntryData, services: list[UserService]
+) -> None:
+    if entry_data.device_info is None:
+        # Can happen if device has never connected or .storage cleared
+        return
+    old_services = entry_data.services.copy()
+    to_unregister = []
+    to_register = []
+    for service in services:
+        if service.key in old_services:
+            # Already exists
+            if (matching := old_services.pop(service.key)) != service:
+                # Need to re-register
+                to_unregister.append(matching)
+                to_register.append(service)
+        else:
+            # New service
+            to_register.append(service)
+
+    for service in old_services.values():
+        to_unregister.append(service)
+
+    entry_data.services = {serv.key: serv for serv in services}
+
+    for service in to_unregister:
+        service_name = f"{entry_data.device_info.name}_{service.name}"
+        hass.services.async_remove(DOMAIN, service_name)
+
+    for service in to_register:
+        await _register_service(hass, entry_data, service)
+
+
+async def cleanup_instance(hass: HomeAssistant, entry: ConfigEntry) -> RuntimeEntryData:
+    """Cleanup the esphome client if it exists."""
+    domain_data = DomainData.get(hass)
+    data = domain_data.pop_entry_data(entry)
+    data.available = False
+    for disconnect_cb in data.disconnect_callbacks:
+        disconnect_cb()
+    data.disconnect_callbacks = []
+    for cleanup_callback in data.cleanup_callbacks:
+        cleanup_callback()
+    await data.async_cleanup()
+    await data.client.disconnect()
+    return data
diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index 49057080469cfa..1acf0f1154e472 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -2,7 +2,7 @@
   "domain": "esphome",
   "name": "ESPHome",
   "after_dependencies": ["zeroconf", "tag"],
-  "codeowners": ["@OttoWinter", "@jesserockz"],
+  "codeowners": ["@OttoWinter", "@jesserockz", "@bdraco"],
   "config_flow": true,
   "dependencies": ["assist_pipeline", "bluetooth"],
   "dhcp": [
@@ -15,8 +15,8 @@
   "iot_class": "local_push",
   "loggers": ["aioesphomeapi", "noiseprotocol"],
   "requirements": [
-    "aioesphomeapi==13.7.5",
-    "bluetooth-data-tools==0.4.0",
+    "aioesphomeapi==15.1.3",
+    "bluetooth-data-tools==1.3.0",
     "esphome-dashboard-api==1.2.3"
   ],
   "zeroconf": ["_esphomelib._tcp.local."]
diff --git a/homeassistant/components/esphome/media_player.py b/homeassistant/components/esphome/media_player.py
index d818e0409656f0..9d00830096676e 100644
--- a/homeassistant/components/esphome/media_player.py
+++ b/homeassistant/components/esphome/media_player.py
@@ -4,6 +4,7 @@
 from typing import Any
 
 from aioesphomeapi import (
+    EntityInfo,
     MediaPlayerCommand,
     MediaPlayerEntityState,
     MediaPlayerInfo,
@@ -21,10 +22,14 @@
     async_process_play_media_url,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -38,7 +43,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="media_player",
         info_type=MediaPlayerInfo,
         entity_type=EsphomeMediaPlayer,
         state_type=MediaPlayerEntityState,
@@ -61,6 +65,21 @@ class EsphomeMediaPlayer(
 
     _attr_device_class = MediaPlayerDeviceClass.SPEAKER
 
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        flags = (
+            MediaPlayerEntityFeature.PLAY_MEDIA
+            | MediaPlayerEntityFeature.BROWSE_MEDIA
+            | MediaPlayerEntityFeature.STOP
+            | MediaPlayerEntityFeature.VOLUME_SET
+            | MediaPlayerEntityFeature.VOLUME_MUTE
+        )
+        if self._static_info.supports_pause:
+            flags |= MediaPlayerEntityFeature.PAUSE | MediaPlayerEntityFeature.PLAY
+        self._attr_supported_features = flags
+
     @property
     @esphome_state_property
     def state(self) -> MediaPlayerState | None:
@@ -79,20 +98,6 @@ def volume_level(self) -> float | None:
         """Volume level of the media player (0..1)."""
         return self._state.volume
 
-    @property
-    def supported_features(self) -> MediaPlayerEntityFeature:
-        """Flag supported features."""
-        flags = (
-            MediaPlayerEntityFeature.PLAY_MEDIA
-            | MediaPlayerEntityFeature.BROWSE_MEDIA
-            | MediaPlayerEntityFeature.STOP
-            | MediaPlayerEntityFeature.VOLUME_SET
-            | MediaPlayerEntityFeature.VOLUME_MUTE
-        )
-        if self._static_info.supports_pause:
-            flags |= MediaPlayerEntityFeature.PAUSE | MediaPlayerEntityFeature.PLAY
-        return flags
-
     async def async_play_media(
         self, media_type: MediaType | str, media_id: str, **kwargs: Any
     ) -> None:
@@ -106,7 +111,7 @@ async def async_play_media(
         media_id = async_process_play_media_url(self.hass, media_id)
 
         await self._client.media_player_command(
-            self._static_info.key,
+            self._key,
             media_url=media_id,
         )
 
@@ -124,35 +129,29 @@ async def async_browse_media(
 
     async def async_set_volume_level(self, volume: float) -> None:
         """Set volume level, range 0..1."""
-        await self._client.media_player_command(
-            self._static_info.key,
-            volume=volume,
-        )
+        await self._client.media_player_command(self._key, volume=volume)
 
     async def async_media_pause(self) -> None:
         """Send pause command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.PAUSE,
+            self._key, command=MediaPlayerCommand.PAUSE
         )
 
     async def async_media_play(self) -> None:
         """Send play command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.PLAY,
+            self._key, command=MediaPlayerCommand.PLAY
         )
 
     async def async_media_stop(self) -> None:
         """Send stop command."""
         await self._client.media_player_command(
-            self._static_info.key,
-            command=MediaPlayerCommand.STOP,
+            self._key, command=MediaPlayerCommand.STOP
         )
 
     async def async_mute_volume(self, mute: bool) -> None:
         """Mute the volume."""
         await self._client.media_player_command(
-            self._static_info.key,
+            self._key,
             command=MediaPlayerCommand.MUTE if mute else MediaPlayerCommand.UNMUTE,
         )
diff --git a/homeassistant/components/esphome/number.py b/homeassistant/components/esphome/number.py
index 3ca8e0b97281b6..4e3d052e6ef06a 100644
--- a/homeassistant/components/esphome/number.py
+++ b/homeassistant/components/esphome/number.py
@@ -3,15 +3,24 @@
 
 import math
 
-from aioesphomeapi import NumberInfo, NumberMode as EsphomeNumberMode, NumberState
+from aioesphomeapi import (
+    EntityInfo,
+    NumberInfo,
+    NumberMode as EsphomeNumberMode,
+    NumberState,
+)
 
 from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -25,7 +34,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="number",
         info_type=NumberInfo,
         entity_type=EsphomeNumber,
         state_type=NumberState,
@@ -44,48 +52,32 @@ async def async_setup_entry(
 class EsphomeNumber(EsphomeEntity[NumberInfo, NumberState], NumberEntity):
     """A number implementation for esphome."""
 
-    @property
-    def device_class(self) -> NumberDeviceClass | None:
-        """Return the class of this entity."""
-        return try_parse_enum(NumberDeviceClass, self._static_info.device_class)
-
-    @property
-    def native_min_value(self) -> float:
-        """Return the minimum value."""
-        return super()._static_info.min_value
-
-    @property
-    def native_max_value(self) -> float:
-        """Return the maximum value."""
-        return super()._static_info.max_value
-
-    @property
-    def native_step(self) -> float:
-        """Return the increment/decrement step."""
-        return super()._static_info.step
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit of measurement."""
-        return super()._static_info.unit_of_measurement
-
-    @property
-    def mode(self) -> NumberMode:
-        """Return the mode of the entity."""
-        if self._static_info.mode:
-            return NUMBER_MODES.from_esphome(self._static_info.mode)
-        return NumberMode.AUTO
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_device_class = try_parse_enum(
+            NumberDeviceClass, self._static_info.device_class
+        )
+        self._attr_native_min_value = static_info.min_value
+        self._attr_native_max_value = static_info.max_value
+        self._attr_native_step = static_info.step
+        self._attr_native_unit_of_measurement = static_info.unit_of_measurement
+        if mode := static_info.mode:
+            self._attr_mode = NUMBER_MODES.from_esphome(mode)
+        else:
+            self._attr_mode = NumberMode.AUTO
 
     @property
     @esphome_state_property
     def native_value(self) -> float | None:
         """Return the state of the entity."""
-        if math.isnan(self._state.state):
-            return None
-        if self._state.missing_state:
+        state = self._state
+        if state.missing_state or math.isnan(state.state):
             return None
-        return self._state.state
+        return state.state
 
     async def async_set_native_value(self, value: float) -> None:
         """Update the current value."""
-        await self._client.number_command(self._static_info.key, value)
+        await self._client.number_command(self._key, value)
diff --git a/homeassistant/components/esphome/select.py b/homeassistant/components/esphome/select.py
index e4cac21dbc84f9..a3464b137dcb58 100644
--- a/homeassistant/components/esphome/select.py
+++ b/homeassistant/components/esphome/select.py
@@ -1,21 +1,24 @@
 """Support for esphome selects."""
 from __future__ import annotations
 
-from aioesphomeapi import SelectInfo, SelectState
+from aioesphomeapi import EntityInfo, SelectInfo, SelectState
 
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import (
+from .domain_data import DomainData
+from .entity import (
     EsphomeAssistEntity,
     EsphomeEntity,
     esphome_state_property,
     platform_async_setup_entry,
 )
-from .domain_data import DomainData
 from .entry_data import RuntimeEntryData
 
 
@@ -29,7 +32,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="select",
         info_type=SelectInfo,
         entity_type=EsphomeSelect,
         state_type=SelectState,
@@ -38,28 +40,33 @@ async def async_setup_entry(
     entry_data = DomainData.get(hass).get_entry_data(entry)
     assert entry_data.device_info is not None
     if entry_data.device_info.voice_assistant_version:
-        async_add_entities([EsphomeAssistPipelineSelect(hass, entry_data)])
+        async_add_entities(
+            [
+                EsphomeAssistPipelineSelect(hass, entry_data),
+                EsphomeVadSensitivitySelect(hass, entry_data),
+            ]
+        )
 
 
 class EsphomeSelect(EsphomeEntity[SelectInfo, SelectState], SelectEntity):
     """A select implementation for esphome."""
 
-    @property
-    def options(self) -> list[str]:
-        """Return a set of selectable options."""
-        return self._static_info.options
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        self._attr_options = self._static_info.options
 
     @property
     @esphome_state_property
     def current_option(self) -> str | None:
         """Return the state of the entity."""
-        if self._state.missing_state:
-            return None
-        return self._state.state
+        state = self._state
+        return None if state.missing_state else state.state
 
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
-        await self._client.select_command(self._static_info.key, option)
+        await self._client.select_command(self._key, option)
 
 
 class EsphomeAssistPipelineSelect(EsphomeAssistEntity, AssistPipelineSelect):
@@ -69,3 +76,12 @@ def __init__(self, hass: HomeAssistant, entry_data: RuntimeEntryData) -> None:
         """Initialize a pipeline selector."""
         EsphomeAssistEntity.__init__(self, entry_data)
         AssistPipelineSelect.__init__(self, hass, self._device_info.mac_address)
+
+
+class EsphomeVadSensitivitySelect(EsphomeAssistEntity, VadSensitivitySelect):
+    """VAD sensitivity selector for VoIP devices."""
+
+    def __init__(self, hass: HomeAssistant, entry_data: RuntimeEntryData) -> None:
+        """Initialize a VAD sensitivity selector."""
+        EsphomeAssistEntity.__init__(self, entry_data)
+        VadSensitivitySelect.__init__(self, hass, self._device_info.mac_address)
diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py
index 25a0bfaff7f50e..3185a5eb53618c 100644
--- a/homeassistant/components/esphome/sensor.py
+++ b/homeassistant/components/esphome/sensor.py
@@ -5,6 +5,7 @@
 import math
 
 from aioesphomeapi import (
+    EntityInfo,
     SensorInfo,
     SensorState,
     SensorStateClass as EsphomeSensorStateClass,
@@ -19,12 +20,16 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 from .enum_mapper import EsphomeEnumMapper
 
 
@@ -36,7 +41,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="sensor",
         info_type=SensorInfo,
         entity_type=EsphomeSensor,
         state_type=SensorState,
@@ -45,7 +49,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="text_sensor",
         info_type=TextSensorInfo,
         entity_type=EsphomeTextSensor,
         state_type=TextSensorState,
@@ -67,50 +70,38 @@ async def async_setup_entry(
 class EsphomeSensor(EsphomeEntity[SensorInfo, SensorState], SensorEntity):
     """A sensor implementation for esphome."""
 
-    @property
-    def force_update(self) -> bool:
-        """Return if this sensor should force a state update."""
-        return self._static_info.force_update
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_force_update = static_info.force_update
+        self._attr_native_unit_of_measurement = static_info.unit_of_measurement
+        self._attr_device_class = try_parse_enum(
+            SensorDeviceClass, static_info.device_class
+        )
+        if not (state_class := static_info.state_class):
+            return
+        if (
+            state_class == EsphomeSensorStateClass.MEASUREMENT
+            and static_info.last_reset_type == LastResetType.AUTO
+        ):
+            # Legacy, last_reset_type auto was the equivalent to the
+            # TOTAL_INCREASING state class
+            self._attr_state_class = SensorStateClass.TOTAL_INCREASING
+        else:
+            self._attr_state_class = _STATE_CLASSES.from_esphome(state_class)
 
     @property
     @esphome_state_property
     def native_value(self) -> datetime | str | None:
         """Return the state of the entity."""
-        if math.isnan(self._state.state):
-            return None
-        if self._state.missing_state:
-            return None
-        if self.device_class == SensorDeviceClass.TIMESTAMP:
-            return dt.utc_from_timestamp(self._state.state)
-        return f"{self._state.state:.{self._static_info.accuracy_decimals}f}"
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit the value is expressed in."""
-        if not self._static_info.unit_of_measurement:
+        state = self._state
+        if math.isnan(state.state) or state.missing_state:
             return None
-        return self._static_info.unit_of_measurement
-
-    @property
-    def device_class(self) -> SensorDeviceClass | None:
-        """Return the class of this device, from component DEVICE_CLASSES."""
-        return try_parse_enum(SensorDeviceClass, self._static_info.device_class)
-
-    @property
-    def state_class(self) -> SensorStateClass | None:
-        """Return the state class of this entity."""
-        if not self._static_info.state_class:
-            return None
-        state_class = self._static_info.state_class
-        reset_type = self._static_info.last_reset_type
-        if (
-            state_class == EsphomeSensorStateClass.MEASUREMENT
-            and reset_type == LastResetType.AUTO
-        ):
-            # Legacy, last_reset_type auto was the equivalent to the
-            # TOTAL_INCREASING state class
-            return SensorStateClass.TOTAL_INCREASING
-        return _STATE_CLASSES.from_esphome(self._static_info.state_class)
+        if self._attr_device_class == SensorDeviceClass.TIMESTAMP:
+            return dt_util.utc_from_timestamp(state.state)
+        return f"{state.state:.{self._static_info.accuracy_decimals}f}"
 
 
 class EsphomeTextSensor(EsphomeEntity[TextSensorInfo, TextSensorState], SensorEntity):
@@ -120,6 +111,5 @@ class EsphomeTextSensor(EsphomeEntity[TextSensorInfo, TextSensorState], SensorEn
     @esphome_state_property
     def native_value(self) -> str | None:
         """Return the state of the entity."""
-        if self._state.missing_state:
-            return None
-        return self._state.state
+        state = self._state
+        return None if state.missing_state else state.state
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 81350c2c6537c3..2ec1fe1bc41c07 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -46,6 +46,15 @@
     },
     "flow_title": "{name}"
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "allow_service_calls": "Allow the device to make Home Assistant service calls."
+        }
+      }
+    }
+  },
   "entity": {
     "binary_sensor": {
       "assist_in_progress": {
@@ -58,6 +67,14 @@
         "state": {
           "preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
         }
+      },
+      "vad_sensitivity": {
+        "name": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::name%]",
+        "state": {
+          "default": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::default%]",
+          "aggressive": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::aggressive%]",
+          "relaxed": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::relaxed%]"
+        }
       }
     }
   },
@@ -69,6 +86,10 @@
     "api_password_deprecated": {
       "title": "API Password deprecated on {name}",
       "description": "The API password for ESPHome is deprecated and the use of an API encryption key is recommended instead.\n\nRemove the API password and add an encryption key to your ESPHome device to resolve this issue."
+    },
+    "service_calls_not_allowed": {
+      "title": "{name} is not permitted to call Home Assistant services",
+      "description": "The ESPHome device attempted to make a Home Assistant service call, but this functionality is not enabled.\n\nIf you trust this device and want to allow it to make Home Assistant service calls, you can enable this functionality in the options flow."
     }
   }
 }
diff --git a/homeassistant/components/esphome/switch.py b/homeassistant/components/esphome/switch.py
index 83148542435740..99894b8501ea53 100644
--- a/homeassistant/components/esphome/switch.py
+++ b/homeassistant/components/esphome/switch.py
@@ -3,15 +3,19 @@
 
 from typing import Any
 
-from aioesphomeapi import SwitchInfo, SwitchState
+from aioesphomeapi import EntityInfo, SwitchInfo, SwitchState
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
+from .entity import (
+    EsphomeEntity,
+    esphome_state_property,
+    platform_async_setup_entry,
+)
 
 
 async def async_setup_entry(
@@ -22,7 +26,6 @@ async def async_setup_entry(
         hass,
         entry,
         async_add_entities,
-        component_key="switch",
         info_type=SwitchInfo,
         entity_type=EsphomeSwitch,
         state_type=SwitchState,
@@ -32,10 +35,15 @@ async def async_setup_entry(
 class EsphomeSwitch(EsphomeEntity[SwitchInfo, SwitchState], SwitchEntity):
     """A switch implementation for ESPHome."""
 
-    @property
-    def assumed_state(self) -> bool:
-        """Return true if we do optimistic updates."""
-        return self._static_info.assumed_state
+    @callback
+    def _on_static_info_update(self, static_info: EntityInfo) -> None:
+        """Set attrs from static info."""
+        super()._on_static_info_update(static_info)
+        static_info = self._static_info
+        self._attr_assumed_state = static_info.assumed_state
+        self._attr_device_class = try_parse_enum(
+            SwitchDeviceClass, static_info.device_class
+        )
 
     @property
     @esphome_state_property
@@ -43,15 +51,10 @@ def is_on(self) -> bool | None:
         """Return true if the switch is on."""
         return self._state.state
 
-    @property
-    def device_class(self) -> SwitchDeviceClass | None:
-        """Return the class of this device."""
-        return try_parse_enum(SwitchDeviceClass, self._static_info.device_class)
-
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the entity on."""
-        await self._client.switch_command(self._static_info.key, True)
+        await self._client.switch_command(self._key, True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
-        await self._client.switch_command(self._static_info.key, False)
+        await self._client.switch_command(self._key, False)
diff --git a/homeassistant/components/esphome/update.py b/homeassistant/components/esphome/update.py
index 618e31024b1abe..6f51b9df74415a 100644
--- a/homeassistant/components/esphome/update.py
+++ b/homeassistant/components/esphome/update.py
@@ -111,7 +111,11 @@ def available(self) -> bool:
         """
         return (
             super().available
-            and (self._entry_data.available or self._device_info.has_deep_sleep)
+            and (
+                self._entry_data.available
+                or self._entry_data.expected_disconnect
+                or self._device_info.has_deep_sleep
+            )
             and self._device_info.name in self.coordinator.data
         )
 
diff --git a/homeassistant/components/esphome/voice_assistant.py b/homeassistant/components/esphome/voice_assistant.py
index aaa2dc80a78cfa..6b49549d81257f 100644
--- a/homeassistant/components/esphome/voice_assistant.py
+++ b/homeassistant/components/esphome/voice_assistant.py
@@ -2,7 +2,8 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import AsyncIterable, Callable
+from collections import deque
+from collections.abc import AsyncIterable, Callable, MutableSequence, Sequence
 import logging
 import socket
 from typing import cast
@@ -14,9 +15,14 @@
 from homeassistant.components.assist_pipeline import (
     PipelineEvent,
     PipelineEventType,
+    PipelineNotFound,
     async_pipeline_from_audio_stream,
     select as pipeline_select,
 )
+from homeassistant.components.assist_pipeline.vad import (
+    VadSensitivity,
+    VoiceCommandSegmenter,
+)
 from homeassistant.components.media_player import async_process_play_media_url
 from homeassistant.core import Context, HomeAssistant, callback
 
@@ -50,7 +56,7 @@ class VoiceAssistantUDPServer(asyncio.DatagramProtocol):
     """Receive UDP packets and forward them to the voice assistant."""
 
     started = False
-    queue: asyncio.Queue[bytes] | None = None
+    stopped = False
     transport: asyncio.DatagramTransport | None = None
     remote_addr: tuple[str, int] | None = None
 
@@ -60,6 +66,7 @@ def __init__(
         entry_data: RuntimeEntryData,
         handle_event: Callable[[VoiceAssistantEventType, dict[str, str] | None], None],
         handle_finished: Callable[[], None],
+        audio_timeout: float = 2.0,
     ) -> None:
         """Initialize UDP receiver."""
         self.context = Context()
@@ -68,10 +75,11 @@ def __init__(
         assert entry_data.device_info is not None
         self.device_info = entry_data.device_info
 
-        self.queue = asyncio.Queue()
+        self.queue: asyncio.Queue[bytes] = asyncio.Queue()
         self.handle_event = handle_event
         self.handle_finished = handle_finished
         self._tts_done = asyncio.Event()
+        self.audio_timeout = audio_timeout
 
     async def start_server(self) -> int:
         """Start accepting connections."""
@@ -80,7 +88,7 @@ def accept_connection() -> VoiceAssistantUDPServer:
             """Accept connection."""
             if self.started:
                 raise RuntimeError("Can only start once")
-            if self.queue is None:
+            if self.stopped:
                 raise RuntimeError("No longer accepting connections")
 
             self.started = True
@@ -105,12 +113,11 @@ def connection_made(self, transport: asyncio.BaseTransport) -> None:
     @callback
     def datagram_received(self, data: bytes, addr: tuple[str, int]) -> None:
         """Handle incoming UDP packet."""
-        if not self.started:
+        if not self.started or self.stopped:
             return
         if self.remote_addr is None:
             self.remote_addr = addr
-        if self.queue is not None:
-            self.queue.put_nowait(data)
+        self.queue.put_nowait(data)
 
     def error_received(self, exc: Exception) -> None:
         """Handle when a send or receive operation raises an OSError.
@@ -123,21 +130,21 @@ def error_received(self, exc: Exception) -> None:
     @callback
     def stop(self) -> None:
         """Stop the receiver."""
-        if self.queue is not None:
-            self.queue.put_nowait(b"")
+        self.queue.put_nowait(b"")
         self.started = False
+        self.stopped = True
 
     def close(self) -> None:
         """Close the receiver."""
-        if self.queue is not None:
-            self.queue = None
+        self.started = False
+        self.stopped = True
         if self.transport is not None:
             self.transport.close()
 
     async def _iterate_packets(self) -> AsyncIterable[bytes]:
         """Iterate over incoming packets."""
-        if self.queue is None:
-            raise RuntimeError("Already stopped")
+        if not self.started or self.stopped:
+            raise RuntimeError("Not running")
 
         while data := await self.queue.get():
             yield data
@@ -152,9 +159,15 @@ def _event_callback(self, event: PipelineEvent) -> None:
             return
 
         data_to_send = None
+        error = False
         if event_type == VoiceAssistantEventType.VOICE_ASSISTANT_STT_END:
             assert event.data is not None
             data_to_send = {"text": event.data["stt_output"]["text"]}
+        elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_INTENT_END:
+            assert event.data is not None
+            data_to_send = {
+                "conversation_id": event.data["intent_output"]["conversation_id"] or "",
+            }
         elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_TTS_START:
             assert event.data is not None
             data_to_send = {"text": event.data["tts_input"]}
@@ -177,19 +190,142 @@ def _event_callback(self, event: PipelineEvent) -> None:
                 "code": event.data["code"],
                 "message": event.data["message"],
             }
-            self.handle_finished()
+            self._tts_done.set()
+            error = True
 
         self.handle_event(event_type, data_to_send)
+        if error:
+            self.handle_finished()
+
+    async def _wait_for_speech(
+        self,
+        segmenter: VoiceCommandSegmenter,
+        chunk_buffer: MutableSequence[bytes],
+    ) -> bool:
+        """Buffer audio chunks until speech is detected.
+
+        Raises asyncio.TimeoutError if no audio data is retrievable from the queue (device stops sending packets / networking issue).
+
+        Returns True if speech was detected
+        Returns False if the connection was stopped gracefully (b"" put onto the queue).
+        """
+        # Timeout if no audio comes in for a while.
+        async with async_timeout.timeout(self.audio_timeout):
+            chunk = await self.queue.get()
+
+        while chunk:
+            segmenter.process(chunk)
+            # Buffer the data we have taken from the queue
+            chunk_buffer.append(chunk)
+            if segmenter.in_command:
+                return True
+
+            async with async_timeout.timeout(self.audio_timeout):
+                chunk = await self.queue.get()
+
+        # If chunk is falsey, `stop()` was called
+        return False
+
+    async def _segment_audio(
+        self,
+        segmenter: VoiceCommandSegmenter,
+        chunk_buffer: Sequence[bytes],
+    ) -> AsyncIterable[bytes]:
+        """Yield audio chunks until voice command has finished.
+
+        Raises asyncio.TimeoutError if no audio data is retrievable from the queue.
+        """
+        # Buffered chunks first
+        for buffered_chunk in chunk_buffer:
+            yield buffered_chunk
+
+        # Timeout if no audio comes in for a while.
+        async with async_timeout.timeout(self.audio_timeout):
+            chunk = await self.queue.get()
+
+        while chunk:
+            if not segmenter.process(chunk):
+                # Voice command is finished
+                break
+
+            yield chunk
+
+            async with async_timeout.timeout(self.audio_timeout):
+                chunk = await self.queue.get()
+
+    async def _iterate_packets_with_vad(
+        self, pipeline_timeout: float, silence_seconds: float
+    ) -> Callable[[], AsyncIterable[bytes]] | None:
+        segmenter = VoiceCommandSegmenter(silence_seconds=silence_seconds)
+        chunk_buffer: deque[bytes] = deque(maxlen=100)
+        try:
+            async with async_timeout.timeout(pipeline_timeout):
+                speech_detected = await self._wait_for_speech(segmenter, chunk_buffer)
+                if not speech_detected:
+                    _LOGGER.debug(
+                        "Device stopped sending audio before speech was detected"
+                    )
+                    self.handle_finished()
+                    return None
+        except asyncio.TimeoutError:
+            self.handle_event(
+                VoiceAssistantEventType.VOICE_ASSISTANT_ERROR,
+                {
+                    "code": "speech-timeout",
+                    "message": "Timed out waiting for speech",
+                },
+            )
+            self.handle_finished()
+            return None
+
+        async def _stream_packets() -> AsyncIterable[bytes]:
+            try:
+                async for chunk in self._segment_audio(segmenter, chunk_buffer):
+                    yield chunk
+            except asyncio.TimeoutError:
+                self.handle_event(
+                    VoiceAssistantEventType.VOICE_ASSISTANT_ERROR,
+                    {
+                        "code": "speech-timeout",
+                        "message": "No speech detected",
+                    },
+                )
+                self.handle_finished()
+
+        return _stream_packets
 
     async def run_pipeline(
         self,
+        device_id: str,
+        conversation_id: str | None,
+        use_vad: bool = False,
         pipeline_timeout: float = 30.0,
     ) -> None:
         """Run the Voice Assistant pipeline."""
-        try:
-            tts_audio_output = (
-                "raw" if self.device_info.voice_assistant_version >= 2 else "mp3"
+
+        tts_audio_output = (
+            "raw" if self.device_info.voice_assistant_version >= 2 else "mp3"
+        )
+
+        if use_vad:
+            stt_stream = await self._iterate_packets_with_vad(
+                pipeline_timeout,
+                silence_seconds=VadSensitivity.to_seconds(
+                    pipeline_select.get_vad_sensitivity(
+                        self.hass,
+                        DOMAIN,
+                        self.device_info.mac_address,
+                    )
+                ),
             )
+            # Error or timeout occurred and was handled already
+            if stt_stream is None:
+                return
+        else:
+            stt_stream = self._iterate_packets
+
+        _LOGGER.debug("Starting pipeline")
+        try:
             async with async_timeout.timeout(pipeline_timeout):
                 await async_pipeline_from_audio_stream(
                     self.hass,
@@ -203,10 +339,12 @@ async def run_pipeline(
                         sample_rate=stt.AudioSampleRates.SAMPLERATE_16000,
                         channel=stt.AudioChannels.CHANNEL_MONO,
                     ),
-                    stt_stream=self._iterate_packets(),
+                    stt_stream=stt_stream(),
                     pipeline_id=pipeline_select.get_chosen_pipeline(
                         self.hass, DOMAIN, self.device_info.mac_address
                     ),
+                    conversation_id=conversation_id,
+                    device_id=device_id,
                     tts_audio_output=tts_audio_output,
                 )
 
@@ -214,7 +352,23 @@ async def run_pipeline(
                 await self._tts_done.wait()
 
             _LOGGER.debug("Pipeline finished")
+        except PipelineNotFound:
+            self.handle_event(
+                VoiceAssistantEventType.VOICE_ASSISTANT_ERROR,
+                {
+                    "code": "pipeline not found",
+                    "message": "Selected pipeline timeout",
+                },
+            )
+            _LOGGER.warning("Pipeline not found")
         except asyncio.TimeoutError:
+            self.handle_event(
+                VoiceAssistantEventType.VOICE_ASSISTANT_ERROR,
+                {
+                    "code": "pipeline-timeout",
+                    "message": "Pipeline timeout",
+                },
+            )
             _LOGGER.warning("Pipeline timeout")
         finally:
             self.handle_finished()
diff --git a/homeassistant/components/eufylife_ble/manifest.json b/homeassistant/components/eufylife_ble/manifest.json
index ad70dd97d584b4..c3a2357ebca849 100644
--- a/homeassistant/components/eufylife_ble/manifest.json
+++ b/homeassistant/components/eufylife_ble/manifest.json
@@ -24,5 +24,5 @@
   "documentation": "https://www.home-assistant.io/integrations/eufylife_ble",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["eufylife_ble_client==0.1.7"]
+  "requirements": ["eufylife-ble-client==0.1.7"]
 }
diff --git a/homeassistant/components/eufylife_ble/sensor.py b/homeassistant/components/eufylife_ble/sensor.py
index e57b83687a627e..741f71b34d201e 100644
--- a/homeassistant/components/eufylife_ble/sensor.py
+++ b/homeassistant/components/eufylife_ble/sensor.py
@@ -86,7 +86,7 @@ async def async_added_to_hass(self) -> None:
 class EufyLifeRealTimeWeightSensorEntity(EufyLifeSensorEntity):
     """Representation of an EufyLife real-time weight sensor."""
 
-    _attr_name = "Real-time weight"
+    _attr_translation_key = "real_time_weight"
     _attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS
     _attr_device_class = SensorDeviceClass.WEIGHT
 
@@ -111,10 +111,11 @@ def suggested_unit_of_measurement(self) -> str | None:
         return UnitOfMass.KILOGRAMS
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EufyLifeWeightSensorEntity(RestoreEntity, EufyLifeSensorEntity):
     """Representation of an EufyLife weight sensor."""
 
-    _attr_name = "Weight"
+    _attr_translation_key = "weight"
     _attr_native_unit_of_measurement = UnitOfMass.KILOGRAMS
     _attr_device_class = SensorDeviceClass.WEIGHT
 
@@ -171,10 +172,11 @@ async def async_added_to_hass(self) -> None:
         )
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class EufyLifeHeartRateSensorEntity(RestoreEntity, EufyLifeSensorEntity):
     """Representation of an EufyLife heart rate sensor."""
 
-    _attr_name = "Heart rate"
+    _attr_translation_key = "heart_rate"
     _attr_icon = "mdi:heart-pulse"
     _attr_native_unit_of_measurement = "bpm"
 
diff --git a/homeassistant/components/eufylife_ble/strings.json b/homeassistant/components/eufylife_ble/strings.json
index a045d84771e33b..5f7924f4cbd521 100644
--- a/homeassistant/components/eufylife_ble/strings.json
+++ b/homeassistant/components/eufylife_ble/strings.json
@@ -18,5 +18,18 @@
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "real_time_weight": {
+        "name": "Real-time weight"
+      },
+      "weight": {
+        "name": "Weight"
+      },
+      "heart_rate": {
+        "name": "Heart rate"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/evohome/climate.py b/homeassistant/components/evohome/climate.py
index d4ee8f3d5dfa91..3bee1d6062ea2f 100644
--- a/homeassistant/components/evohome/climate.py
+++ b/homeassistant/components/evohome/climate.py
@@ -131,7 +131,7 @@ class EvoClimateEntity(EvoDevice, ClimateEntity):
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     @property
-    def hvac_modes(self) -> list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return a list of available hvac operation modes."""
         return list(HA_HVAC_TO_TCS)
 
@@ -191,7 +191,7 @@ async def async_zone_svc_request(self, service: str, data: dict[str, Any]) -> No
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Zone."""
         if self._evo_tcs.systemModeStatus["mode"] in (EVO_AWAY, EVO_HEATOFF):
             return HVACMode.AUTO
@@ -356,7 +356,7 @@ async def _set_tcs_mode(self, mode: str, until: dt | None = None) -> None:
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operating mode of a Controller."""
         tcs_mode = self._evo_tcs.systemModeStatus["mode"]
         return HVACMode.OFF if tcs_mode == EVO_HEATOFF else HVACMode.HEAT
diff --git a/homeassistant/components/ezviz/__init__.py b/homeassistant/components/ezviz/__init__.py
index 05857abbac7bec..9386a407acb491 100644
--- a/homeassistant/components/ezviz/__init__.py
+++ b/homeassistant/components/ezviz/__init__.py
@@ -35,6 +35,8 @@
     ATTR_TYPE_CLOUD: [
         Platform.BINARY_SENSOR,
         Platform.CAMERA,
+        Platform.LIGHT,
+        Platform.NUMBER,
         Platform.SENSOR,
         Platform.SWITCH,
         Platform.UPDATE,
diff --git a/homeassistant/components/ezviz/camera.py b/homeassistant/components/ezviz/camera.py
index 0456e7ade9e6d7..60a332446cef36 100644
--- a/homeassistant/components/ezviz/camera.py
+++ b/homeassistant/components/ezviz/camera.py
@@ -17,7 +17,11 @@
 )
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, discovery_flow
+from homeassistant.helpers import (
+    config_validation as cv,
+    discovery_flow,
+    issue_registry as ir,
+)
 from homeassistant.helpers.entity_platform import (
     AddEntitiesCallback,
     async_get_current_platform,
@@ -303,3 +307,13 @@ def perform_set_alarm_detection_sensibility(
             )
         except (HTTPError, PyEzvizError) as err:
             raise PyEzvizError("Cannot set detection sensitivity level") from err
+
+        ir.async_create_issue(
+            self.hass,
+            DOMAIN,
+            "service_depreciation_detection_sensibility",
+            breaks_in_ha_version="2023.12.0",
+            is_fixable=False,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="service_depreciation_detection_sensibility",
+        )
diff --git a/homeassistant/components/ezviz/entity.py b/homeassistant/components/ezviz/entity.py
index 1c966c7f82e8ad..ccf273a970bb2b 100644
--- a/homeassistant/components/ezviz/entity.py
+++ b/homeassistant/components/ezviz/entity.py
@@ -38,3 +38,32 @@ def __init__(
     def data(self) -> dict[str, Any]:
         """Return coordinator data for this entity."""
         return self.coordinator.data[self._serial]
+
+
+class EzvizBaseEntity(Entity):
+    """Generic entity for EZVIZ individual poll entities."""
+
+    def __init__(
+        self,
+        coordinator: EzvizDataUpdateCoordinator,
+        serial: str,
+    ) -> None:
+        """Initialize the entity."""
+        self._serial = serial
+        self.coordinator = coordinator
+        self._camera_name = self.data["name"]
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, serial)},
+            connections={
+                (CONNECTION_NETWORK_MAC, self.data["mac_address"]),
+            },
+            manufacturer=MANUFACTURER,
+            model=self.data["device_sub_category"],
+            name=self.data["name"],
+            sw_version=self.data["version"],
+        )
+
+    @property
+    def data(self) -> dict[str, Any]:
+        """Return coordinator data for this entity."""
+        return self.coordinator.data[self._serial]
diff --git a/homeassistant/components/ezviz/light.py b/homeassistant/components/ezviz/light.py
new file mode 100644
index 00000000000000..38007962e4e6f3
--- /dev/null
+++ b/homeassistant/components/ezviz/light.py
@@ -0,0 +1,125 @@
+"""Support for EZVIZ light entity."""
+from __future__ import annotations
+
+from typing import Any
+
+from pyezviz.constants import DeviceCatagories, DeviceSwitchType, SupportExt
+from pyezviz.exceptions import HTTPError, PyEzvizError
+
+from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util.percentage import (
+    percentage_to_ranged_value,
+    ranged_value_to_percentage,
+)
+
+from .const import DATA_COORDINATOR, DOMAIN
+from .coordinator import EzvizDataUpdateCoordinator
+from .entity import EzvizEntity
+
+PARALLEL_UPDATES = 1
+BRIGHTNESS_RANGE = (1, 255)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up EZVIZ lights based on a config entry."""
+    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
+
+    async_add_entities(
+        EzvizLight(coordinator, camera)
+        for camera in coordinator.data
+        for capibility, value in coordinator.data[camera]["supportExt"].items()
+        if capibility == str(SupportExt.SupportAlarmLight.value)
+        if value == "1"
+    )
+
+
+class EzvizLight(EzvizEntity, LightEntity):
+    """Representation of a EZVIZ light."""
+
+    _attr_has_entity_name = True
+    _attr_color_mode = ColorMode.BRIGHTNESS
+    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
+
+    def __init__(
+        self,
+        coordinator: EzvizDataUpdateCoordinator,
+        serial: str,
+    ) -> None:
+        """Initialize the light."""
+        super().__init__(coordinator, serial)
+        self.battery_cam_type = bool(
+            self.data["device_category"]
+            == DeviceCatagories.BATTERY_CAMERA_DEVICE_CATEGORY.value
+        )
+        self._attr_unique_id = f"{serial}_Light"
+        self._attr_name = "Light"
+
+    @property
+    def brightness(self) -> int | None:
+        """Return the brightness of this light between 0..255."""
+        return round(
+            percentage_to_ranged_value(
+                BRIGHTNESS_RANGE,
+                self.coordinator.data[self._serial]["alarm_light_luminance"],
+            )
+        )
+
+    @property
+    def is_on(self) -> bool:
+        """Return the state of the light."""
+        return self.data["switches"][DeviceSwitchType.ALARM_LIGHT.value]
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on light."""
+        try:
+            if ATTR_BRIGHTNESS in kwargs:
+                data = ranged_value_to_percentage(
+                    BRIGHTNESS_RANGE, kwargs[ATTR_BRIGHTNESS]
+                )
+
+                update_ok = await self.hass.async_add_executor_job(
+                    self.coordinator.ezviz_client.set_floodlight_brightness,
+                    self._serial,
+                    data,
+                )
+            else:
+                update_ok = await self.hass.async_add_executor_job(
+                    self.coordinator.ezviz_client.switch_status,
+                    self._serial,
+                    DeviceSwitchType.ALARM_LIGHT.value,
+                    1,
+                )
+
+        except (HTTPError, PyEzvizError) as err:
+            raise HomeAssistantError(
+                f"Failed to turn on light {self._attr_name}"
+            ) from err
+
+        if update_ok:
+            await self.coordinator.async_request_refresh()
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off light."""
+        try:
+            update_ok = await self.hass.async_add_executor_job(
+                self.coordinator.ezviz_client.switch_status,
+                self._serial,
+                DeviceSwitchType.ALARM_LIGHT.value,
+                0,
+            )
+
+        except (HTTPError, PyEzvizError) as err:
+            raise HomeAssistantError(
+                f"Failed to turn off light {self._attr_name}"
+            ) from err
+
+        if update_ok:
+            await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/ezviz/manifest.json b/homeassistant/components/ezviz/manifest.json
index 219f4c87d13bf5..53976bf3002a64 100644
--- a/homeassistant/components/ezviz/manifest.json
+++ b/homeassistant/components/ezviz/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ezviz",
   "iot_class": "cloud_polling",
   "loggers": ["paho_mqtt", "pyezviz"],
-  "requirements": ["pyezviz==0.2.0.12"]
+  "requirements": ["pyezviz==0.2.1.2"]
 }
diff --git a/homeassistant/components/ezviz/number.py b/homeassistant/components/ezviz/number.py
new file mode 100644
index 00000000000000..074685c69f978e
--- /dev/null
+++ b/homeassistant/components/ezviz/number.py
@@ -0,0 +1,142 @@
+"""Support for EZVIZ number controls."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+
+from pyezviz.constants import SupportExt
+from pyezviz.exceptions import (
+    EzvizAuthTokenExpired,
+    EzvizAuthVerificationCode,
+    HTTPError,
+    InvalidURL,
+    PyEzvizError,
+)
+
+from homeassistant.components.number import NumberEntity, NumberEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DATA_COORDINATOR, DOMAIN
+from .coordinator import EzvizDataUpdateCoordinator
+from .entity import EzvizBaseEntity
+
+SCAN_INTERVAL = timedelta(seconds=3600)
+PARALLEL_UPDATES = 0
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class EzvizNumberEntityDescriptionMixin:
+    """Mixin values for EZVIZ Number entities."""
+
+    supported_ext: str
+    supported_ext_value: list
+
+
+@dataclass
+class EzvizNumberEntityDescription(
+    NumberEntityDescription, EzvizNumberEntityDescriptionMixin
+):
+    """Describe a EZVIZ Number."""
+
+
+NUMBER_TYPE = EzvizNumberEntityDescription(
+    key="detection_sensibility",
+    name="Detection sensitivity",
+    icon="mdi:eye",
+    entity_category=EntityCategory.CONFIG,
+    native_min_value=0,
+    native_step=1,
+    supported_ext=str(SupportExt.SupportSensibilityAdjust.value),
+    supported_ext_value=["1", "3"],
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up EZVIZ sensors based on a config entry."""
+    coordinator: EzvizDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
+
+    async_add_entities(
+        [
+            EzvizSensor(coordinator, camera, value, entry.entry_id)
+            for camera in coordinator.data
+            for capibility, value in coordinator.data[camera]["supportExt"].items()
+            if capibility == NUMBER_TYPE.supported_ext
+            if value in NUMBER_TYPE.supported_ext_value
+        ],
+        update_before_add=True,
+    )
+
+
+class EzvizSensor(EzvizBaseEntity, NumberEntity):
+    """Representation of a EZVIZ number entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: EzvizDataUpdateCoordinator,
+        serial: str,
+        value: str,
+        config_entry_id: str,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator, serial)
+        self.sensitivity_type = 3 if value == "3" else 0
+        self._attr_native_max_value = 100 if value == "3" else 6
+        self._attr_unique_id = f"{serial}_{NUMBER_TYPE.key}"
+        self.entity_description = NUMBER_TYPE
+        self.config_entry_id = config_entry_id
+        self.sensor_value: int | None = None
+
+    @property
+    def native_value(self) -> float | None:
+        """Return the state of the entity."""
+        if self.sensor_value is not None:
+            return float(self.sensor_value)
+        return None
+
+    def set_native_value(self, value: float) -> None:
+        """Set camera detection sensitivity."""
+        level = int(value)
+        try:
+            self.coordinator.ezviz_client.detection_sensibility(
+                self._serial,
+                level,
+                self.sensitivity_type,
+            )
+
+        except (HTTPError, PyEzvizError) as err:
+            raise HomeAssistantError(
+                f"Cannot set detection sensitivity level on {self.name}"
+            ) from err
+
+        self.sensor_value = level
+
+    def update(self) -> None:
+        """Fetch data from EZVIZ."""
+        _LOGGER.debug("Updating %s", self.name)
+        try:
+            self.sensor_value = self.coordinator.ezviz_client.get_detection_sensibility(
+                self._serial,
+                str(self.sensitivity_type),
+            )
+
+        except (EzvizAuthTokenExpired, EzvizAuthVerificationCode):
+            _LOGGER.debug("Failed to login to EZVIZ API")
+            self.hass.async_create_task(
+                self.hass.config_entries.async_reload(self.config_entry_id)
+            )
+            return
+
+        except (InvalidURL, HTTPError, PyEzvizError) as error:
+            raise HomeAssistantError(f"Invalid response from API: {error}") from error
diff --git a/homeassistant/components/ezviz/sensor.py b/homeassistant/components/ezviz/sensor.py
index 8e617aa3b3eb11..11412c1fc70d07 100644
--- a/homeassistant/components/ezviz/sensor.py
+++ b/homeassistant/components/ezviz/sensor.py
@@ -25,7 +25,6 @@
         device_class=SensorDeviceClass.BATTERY,
     ),
     "alarm_sound_mod": SensorEntityDescription(key="alarm_sound_mod"),
-    "detection_sensibility": SensorEntityDescription(key="detection_sensibility"),
     "last_alarm_time": SensorEntityDescription(key="last_alarm_time"),
     "Seconds_Last_Trigger": SensorEntityDescription(
         key="Seconds_Last_Trigger",
diff --git a/homeassistant/components/ezviz/strings.json b/homeassistant/components/ezviz/strings.json
index 5e258e42705748..5711aff2a4a036 100644
--- a/homeassistant/components/ezviz/strings.json
+++ b/homeassistant/components/ezviz/strings.json
@@ -58,5 +58,11 @@
         }
       }
     }
+  },
+  "issues": {
+    "service_depreciation_detection_sensibility": {
+      "title": "Ezviz Detection sensitivity service is being removed",
+      "description": "Ezviz Detection sensitivity service is deprecated and will be removed in Home Assistant 2023.12; Please adjust the automation or script that uses the service and select submit below to mark this issue as resolved."
+    }
   }
 }
diff --git a/homeassistant/components/fan/device_condition.py b/homeassistant/components/fan/device_condition.py
index d4bd5f2e419d3d..920f970185b408 100644
--- a/homeassistant/components/fan/device_condition.py
+++ b/homeassistant/components/fan/device_condition.py
@@ -28,7 +28,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -50,7 +50,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -63,6 +63,9 @@ def async_condition_from_config(
     hass: HomeAssistant, config: ConfigType
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     if config[CONF_TYPE] == "is_on":
         state = STATE_ON
     else:
@@ -71,6 +74,6 @@ def async_condition_from_config(
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/fan/services.yaml b/homeassistant/components/fan/services.yaml
index cfc44029e2340d..52d5aca070aa20 100644
--- a/homeassistant/components/fan/services.yaml
+++ b/homeassistant/components/fan/services.yaml
@@ -1,19 +1,4 @@
 # Describes the format for available fan services
-set_speed:
-  name: Set speed
-  description: Set fan speed.
-  target:
-    entity:
-      domain: fan
-  fields:
-    speed:
-      name: Speed
-      description: Speed setting.
-      required: true
-      example: "low"
-      selector:
-        text:
-
 set_preset_mode:
   name: Set preset mode
   description: Set preset mode for a fan device.
@@ -53,12 +38,6 @@ turn_on:
     entity:
       domain: fan
   fields:
-    speed:
-      name: Speed
-      description: Speed setting.
-      example: "high"
-      selector:
-        text:
     percentage:
       name: Percentage
       description: Percentage speed setting.
diff --git a/homeassistant/components/fastdotcom/sensor.py b/homeassistant/components/fastdotcom/sensor.py
index 4f00dd5a543906..b3d5f66ae8c887 100644
--- a/homeassistant/components/fastdotcom/sensor.py
+++ b/homeassistant/components/fastdotcom/sensor.py
@@ -24,6 +24,7 @@ async def async_setup_platform(
     async_add_entities([SpeedtestSensor(hass.data[FASTDOTCOM_DOMAIN])])
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SpeedtestSensor(RestoreEntity, SensorEntity):
     """Implementation of a FAst.com sensor."""
 
diff --git a/homeassistant/components/fibaro/__init__.py b/homeassistant/components/fibaro/__init__.py
index 3313e51ce7596a..dc7be9f1e69d37 100644
--- a/homeassistant/components/fibaro/__init__.py
+++ b/homeassistant/components/fibaro/__init__.py
@@ -8,7 +8,6 @@
 
 from pyfibaro.fibaro_client import FibaroClient
 from pyfibaro.fibaro_device import DeviceModel
-from pyfibaro.fibaro_scene import SceneModel
 from requests.exceptions import HTTPError
 
 from homeassistant.config_entries import ConfigEntry
@@ -278,24 +277,18 @@ def get_device_info(self, device: Any) -> DeviceInfo:
             return self._device_infos[device.parent_fibaro_id]
         return DeviceInfo(identifiers={(DOMAIN, self.hub_serial)})
 
+    def get_room_name(self, room_id: int) -> str | None:
+        """Get the room name by room id."""
+        assert self._room_map
+        room = self._room_map.get(room_id)
+        return room.name if room else None
+
     def _read_scenes(self):
         scenes = self._client.read_scenes()
         for device in scenes:
             device.fibaro_controller = self
-            if device.room_id == 0:
-                room_name = "Unknown"
-            else:
-                room_name = self._room_map[device.room_id].name
-            device.room_name = room_name
-            device.friendly_name = f"{room_name} {device.name}"
-            device.ha_id = (
-                f"scene_{slugify(room_name)}_{slugify(device.name)}_{device.fibaro_id}"
-            )
-            device.unique_id_str = (
-                f"{slugify(self.hub_serial)}.scene.{device.fibaro_id}"
-            )
             self.fibaro_devices[Platform.SCENE].append(device)
-            _LOGGER.debug("%s scene -> %s", device.ha_id, device)
+            _LOGGER.debug("Scene -> %s", device)
 
     def _read_devices(self):
         """Read and process the device list."""
@@ -425,7 +418,7 @@ class FibaroDevice(Entity):
 
     _attr_should_poll = False
 
-    def __init__(self, fibaro_device: DeviceModel | SceneModel) -> None:
+    def __init__(self, fibaro_device: DeviceModel) -> None:
         """Initialize the device."""
         self.fibaro_device = fibaro_device
         self.controller = fibaro_device.fibaro_controller
@@ -433,8 +426,7 @@ def __init__(self, fibaro_device: DeviceModel | SceneModel) -> None:
         self._attr_name = fibaro_device.friendly_name
         self._attr_unique_id = fibaro_device.unique_id_str
 
-        if isinstance(fibaro_device, DeviceModel):
-            self._attr_device_info = self.controller.get_device_info(fibaro_device)
+        self._attr_device_info = self.controller.get_device_info(fibaro_device)
         # propagate hidden attribute set in fibaro home center to HA
         if not fibaro_device.visible:
             self._attr_entity_registry_visible_default = False
@@ -519,14 +511,18 @@ def extra_state_attributes(self):
         """Return the state attributes of the device."""
         attr = {"fibaro_id": self.fibaro_device.fibaro_id}
 
-        if isinstance(self.fibaro_device, DeviceModel):
-            if self.fibaro_device.has_battery_level:
-                attr[ATTR_BATTERY_LEVEL] = self.fibaro_device.battery_level
-            if self.fibaro_device.has_armed:
-                attr[ATTR_ARMED] = self.fibaro_device.armed
+        if self.fibaro_device.has_battery_level:
+            attr[ATTR_BATTERY_LEVEL] = self.fibaro_device.battery_level
+        if self.fibaro_device.has_armed:
+            attr[ATTR_ARMED] = self.fibaro_device.armed
 
         return attr
 
+    def update(self) -> None:
+        """Update the available state of the entity."""
+        if isinstance(self.fibaro_device, DeviceModel) and self.fibaro_device.has_dead:
+            self._attr_available = not self.fibaro_device.dead
+
 
 class FibaroConnectFailed(HomeAssistantError):
     """Error to indicate we cannot connect to fibaro home center."""
diff --git a/homeassistant/components/fibaro/binary_sensor.py b/homeassistant/components/fibaro/binary_sensor.py
index 14f0a6a162c31e..57b3bc99b4f402 100644
--- a/homeassistant/components/fibaro/binary_sensor.py
+++ b/homeassistant/components/fibaro/binary_sensor.py
@@ -82,6 +82,7 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
 
     def update(self) -> None:
         """Get the latest data and update the state."""
+        super().update()
         if self._fibaro_sensor_type == "com.fibaro.accelerometer":
             # Accelerator sensors have values for the three axis x, y and z
             moving_values = self._get_moving_values()
diff --git a/homeassistant/components/fibaro/climate.py b/homeassistant/components/fibaro/climate.py
index f4b1cd0c1f589e..a56056ade03727 100644
--- a/homeassistant/components/fibaro/climate.py
+++ b/homeassistant/components/fibaro/climate.py
@@ -263,7 +263,7 @@ def fibaro_op_mode(self) -> str | int:
         return device.mode
 
     @property
-    def hvac_mode(self) -> HVACMode | str | None:
+    def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool, idle."""
         fibaro_operation_mode = self.fibaro_op_mode
         if isinstance(fibaro_operation_mode, str):
diff --git a/homeassistant/components/fibaro/light.py b/homeassistant/components/fibaro/light.py
index 577c661255295c..6a918f64f86b21 100644
--- a/homeassistant/components/fibaro/light.py
+++ b/homeassistant/components/fibaro/light.py
@@ -176,6 +176,7 @@ async def async_update(self) -> None:
 
     def _update(self):
         """Really update the state."""
+        super().update()
         # Brightness handling
         if brightness_supported(self.supported_color_modes):
             self._attr_brightness = scaleto255(self.fibaro_device.value.int_value())
diff --git a/homeassistant/components/fibaro/lock.py b/homeassistant/components/fibaro/lock.py
index 0fa1337e3e35ad..503407bc28f2bd 100644
--- a/homeassistant/components/fibaro/lock.py
+++ b/homeassistant/components/fibaro/lock.py
@@ -52,4 +52,5 @@ def unlock(self, **kwargs: Any) -> None:
 
     def update(self) -> None:
         """Update device state."""
+        super().update()
         self._attr_is_locked = self.current_binary_state
diff --git a/homeassistant/components/fibaro/scene.py b/homeassistant/components/fibaro/scene.py
index 0023b8e3fba73e..43baa0e4efd4ed 100644
--- a/homeassistant/components/fibaro/scene.py
+++ b/homeassistant/components/fibaro/scene.py
@@ -11,8 +11,9 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import slugify
 
-from . import FIBARO_DEVICES, FibaroDevice
+from . import FIBARO_DEVICES, FibaroController
 from .const import DOMAIN
 
 
@@ -33,18 +34,30 @@ async def async_setup_entry(
     )
 
 
-class FibaroScene(FibaroDevice, Scene):
+class FibaroScene(Scene):
     """Representation of a Fibaro scene entity."""
 
-    def __init__(self, fibaro_device: SceneModel) -> None:
+    def __init__(self, fibaro_scene: SceneModel) -> None:
         """Initialize the Fibaro scene."""
-        super().__init__(fibaro_device)
+        self._fibaro_scene = fibaro_scene
 
+        controller: FibaroController = fibaro_scene.fibaro_controller
+        room_name = controller.get_room_name(fibaro_scene.room_id)
+        if not room_name:
+            room_name = "Unknown"
+
+        self._attr_name = f"{room_name} {fibaro_scene.name}"
+        self._attr_unique_id = (
+            f"{slugify(controller.hub_serial)}.scene.{fibaro_scene.fibaro_id}"
+        )
+        self._attr_extra_state_attributes = {"fibaro_id": fibaro_scene.fibaro_id}
+        # propagate hidden attribute set in fibaro home center to HA
+        self._attr_entity_registry_visible_default = fibaro_scene.visible
         # All scenes are shown on hub device
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.controller.hub_serial)}
+            identifiers={(DOMAIN, controller.hub_serial)}
         )
 
     def activate(self, **kwargs: Any) -> None:
         """Activate the scene."""
-        self.fibaro_device.start()
+        self._fibaro_scene.start()
diff --git a/homeassistant/components/fibaro/sensor.py b/homeassistant/components/fibaro/sensor.py
index 6bb8291bbbb06f..c41c4afe312ce9 100644
--- a/homeassistant/components/fibaro/sensor.py
+++ b/homeassistant/components/fibaro/sensor.py
@@ -146,6 +146,7 @@ def __init__(
 
     def update(self) -> None:
         """Update the state."""
+        super().update()
         with suppress(TypeError):
             self._attr_native_value = self.fibaro_device.value.float_value()
 
@@ -170,6 +171,7 @@ def __init__(
 
     def update(self) -> None:
         """Update the state."""
+        super().update()
         with suppress(KeyError, ValueError):
             self._attr_native_value = convert(
                 self.fibaro_device.properties[self.entity_description.key],
diff --git a/homeassistant/components/fibaro/switch.py b/homeassistant/components/fibaro/switch.py
index d5c6eebeee50c2..6ca770ab2d1c5b 100644
--- a/homeassistant/components/fibaro/switch.py
+++ b/homeassistant/components/fibaro/switch.py
@@ -52,4 +52,5 @@ def turn_off(self, **kwargs: Any) -> None:
 
     def update(self) -> None:
         """Update device state."""
+        super().update()
         self._attr_is_on = self.current_binary_state
diff --git a/homeassistant/components/fido/sensor.py b/homeassistant/components/fido/sensor.py
index 9112351ce06fa2..b7942056a2ced0 100644
--- a/homeassistant/components/fido/sensor.py
+++ b/homeassistant/components/fido/sensor.py
@@ -235,11 +235,10 @@ async def async_update(self) -> None:
         if (sensor_type := self.entity_description.key) == "balance":
             if self.fido_data.data.get(sensor_type) is not None:
                 self._attr_native_value = round(self.fido_data.data[sensor_type], 2)
-        else:
-            if self.fido_data.data.get(self._number, {}).get(sensor_type) is not None:
-                self._attr_native_value = round(
-                    self.fido_data.data[self._number][sensor_type], 2
-                )
+        elif self.fido_data.data.get(self._number, {}).get(sensor_type) is not None:
+            self._attr_native_value = round(
+                self.fido_data.data[self._number][sensor_type], 2
+            )
 
 
 class FidoData:
diff --git a/homeassistant/components/file_upload/__init__.py b/homeassistant/components/file_upload/__init__.py
index 73f8465b1df7bf..8c594f7f85caa0 100644
--- a/homeassistant/components/file_upload/__init__.py
+++ b/homeassistant/components/file_upload/__init__.py
@@ -17,6 +17,7 @@
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import raise_if_invalid_filename
 from homeassistant.util.ulid import ulid_hex
@@ -27,6 +28,8 @@
 MAX_SIZE = 100 * ONE_MEGABYTE
 TEMP_DIR_NAME = f"home-assistant-{DOMAIN}"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @contextmanager
 def process_uploaded_file(hass: HomeAssistant, file_id: str) -> Iterator[Path]:
diff --git a/homeassistant/components/filesize/sensor.py b/homeassistant/components/filesize/sensor.py
index 6f7e31a1e67964..0b5c39f3629403 100644
--- a/homeassistant/components/filesize/sensor.py
+++ b/homeassistant/components/filesize/sensor.py
@@ -34,17 +34,17 @@
 SENSOR_TYPES = (
     SensorEntityDescription(
         key="file",
+        translation_key="size",
         icon=ICON,
-        name="Size",
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="bytes",
+        translation_key="size_bytes",
         entity_registry_enabled_default=False,
         icon=ICON,
-        name="Size bytes",
         native_unit_of_measurement=UnitOfInformation.BYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -52,9 +52,9 @@
     ),
     SensorEntityDescription(
         key="last_updated",
+        translation_key="last_updated",
         entity_registry_enabled_default=False,
         icon=ICON,
-        name="Last Updated",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
diff --git a/homeassistant/components/filesize/strings.json b/homeassistant/components/filesize/strings.json
index 90c286e7088800..3323c3411b26b2 100644
--- a/homeassistant/components/filesize/strings.json
+++ b/homeassistant/components/filesize/strings.json
@@ -15,5 +15,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
-  "title": "Filesize"
+  "title": "Filesize",
+  "entity": {
+    "sensor": {
+      "size": {
+        "name": "Size"
+      },
+      "size_bytes": {
+        "name": "Size in bytes"
+      },
+      "last_updated": {
+        "name": "Last updated"
+      }
+    }
+  }
 }
diff --git a/homeassistant/components/filter/sensor.py b/homeassistant/components/filter/sensor.py
index 9b1e2250a28c46..a1470baa4d2fcb 100644
--- a/homeassistant/components/filter/sensor.py
+++ b/homeassistant/components/filter/sensor.py
@@ -18,10 +18,8 @@
 from homeassistant.components.recorder import get_instance, history
 from homeassistant.components.sensor import (
     ATTR_STATE_CLASS,
-    DEVICE_CLASSES as SENSOR_DEVICE_CLASSES,
     DOMAIN as SENSOR_DOMAIN,
     PLATFORM_SCHEMA,
-    STATE_CLASSES as SENSOR_STATE_CLASSES,
     SensorDeviceClass,
     SensorEntity,
 )
@@ -41,6 +39,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.reload import async_setup_reload_service
+from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
 from homeassistant.util.decorator import Registry
 import homeassistant.util.dt as dt_util
@@ -273,22 +272,15 @@ def _update_filter_sensor_state(
 
         self._state = temp_state.state
 
-        if self._attr_icon is None:
-            self._attr_icon = new_state.attributes.get(ATTR_ICON, ICON)
+        self._attr_icon = new_state.attributes.get(ATTR_ICON, ICON)
+        self._attr_device_class = new_state.attributes.get(ATTR_DEVICE_CLASS)
+        self._attr_state_class = new_state.attributes.get(ATTR_STATE_CLASS)
 
-        if (
-            self._attr_device_class is None
-            and new_state.attributes.get(ATTR_DEVICE_CLASS) in SENSOR_DEVICE_CLASSES
+        if self._attr_native_unit_of_measurement != new_state.attributes.get(
+            ATTR_UNIT_OF_MEASUREMENT
         ):
-            self._attr_device_class = new_state.attributes.get(ATTR_DEVICE_CLASS)
-
-        if (
-            self._attr_state_class is None
-            and new_state.attributes.get(ATTR_STATE_CLASS) in SENSOR_STATE_CLASSES
-        ):
-            self._attr_state_class = new_state.attributes.get(ATTR_STATE_CLASS)
-
-        if self._attr_native_unit_of_measurement is None:
+            for filt in self._filters:
+                filt.reset()
             self._attr_native_unit_of_measurement = new_state.attributes.get(
                 ATTR_UNIT_OF_MEASUREMENT
             )
@@ -360,11 +352,16 @@ async def async_added_to_hass(self) -> None:
                 if state.state not in [STATE_UNKNOWN, STATE_UNAVAILABLE, None]:
                     self._update_filter_sensor_state(state, False)
 
-        self.async_on_remove(
-            async_track_state_change_event(
-                self.hass, [self._entity], self._update_filter_sensor_state_event
+        @callback
+        def _async_hass_started(hass: HomeAssistant) -> None:
+            """Delay source entity tracking."""
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [self._entity], self._update_filter_sensor_state_event
+                )
             )
-        )
+
+        self.async_on_remove(async_at_started(self.hass, _async_hass_started))
 
     @property
     def native_value(self) -> datetime | StateType:
@@ -460,6 +457,10 @@ def skip_processing(self) -> bool:
         """Return whether the current filter_state should be skipped."""
         return self._skip_processing
 
+    def reset(self) -> None:
+        """Reset filter."""
+        self.states.clear()
+
     def _filter_state(self, new_state: FilterState) -> FilterState:
         """Implement filter."""
         raise NotImplementedError()
diff --git a/homeassistant/components/fints/sensor.py b/homeassistant/components/fints/sensor.py
index 479e59d9cdf2ac..3b9610545448fe 100644
--- a/homeassistant/components/fints/sensor.py
+++ b/homeassistant/components/fints/sensor.py
@@ -3,7 +3,6 @@
 
 from collections import namedtuple
 from datetime import timedelta
-from functools import cached_property
 import logging
 from typing import Any
 
@@ -11,6 +10,7 @@
 from fints.models import SEPAAccount
 import voluptuous as vol
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
 from homeassistant.const import CONF_NAME, CONF_PIN, CONF_URL, CONF_USERNAME
 from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/fireservicerota/binary_sensor.py b/homeassistant/components/fireservicerota/binary_sensor.py
index 9e4d5b123f5a61..27f2c4a4526a69 100644
--- a/homeassistant/components/fireservicerota/binary_sensor.py
+++ b/homeassistant/components/fireservicerota/binary_sensor.py
@@ -35,6 +35,9 @@ async def async_setup_entry(
 class ResponseBinarySensor(CoordinatorEntity, BinarySensorEntity):
     """Representation of an FireServiceRota sensor."""
 
+    _attr_has_entity_name = True
+    _attr_translation_key = "duty"
+
     def __init__(
         self,
         coordinator: DataUpdateCoordinator,
@@ -44,15 +47,10 @@ def __init__(
         """Initialize."""
         super().__init__(coordinator)
         self._client = client
-        self._unique_id = f"{entry.unique_id}_Duty"
+        self._attr_unique_id = f"{entry.unique_id}_Duty"
 
         self._state: bool | None = None
 
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return "Duty"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -61,11 +59,6 @@ def icon(self) -> str:
 
         return "mdi:calendar-remove"
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this binary sensor."""
-        return self._unique_id
-
     @property
     def is_on(self) -> bool | None:
         """Return the state of the binary sensor."""
diff --git a/homeassistant/components/fireservicerota/sensor.py b/homeassistant/components/fireservicerota/sensor.py
index 1484ff7f1543a1..797e39e99cdc08 100644
--- a/homeassistant/components/fireservicerota/sensor.py
+++ b/homeassistant/components/fireservicerota/sensor.py
@@ -23,24 +23,22 @@ async def async_setup_entry(
     async_add_entities([IncidentsSensor(client)])
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class IncidentsSensor(RestoreEntity, SensorEntity):
     """Representation of FireServiceRota incidents sensor."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
+    _attr_translation_key = "incidents"
 
     def __init__(self, client):
         """Initialize."""
         self._client = client
         self._entry_id = self._client.entry_id
-        self._unique_id = f"{self._client.unique_id}_Incidents"
+        self._attr_unique_id = f"{self._client.unique_id}_Incidents"
         self._state = None
         self._state_attributes = {}
 
-    @property
-    def name(self) -> str:
-        """Return the name of the sensor."""
-        return "Incidents"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -57,11 +55,6 @@ def native_value(self) -> str:
         """Return the state of the sensor."""
         return self._state
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID of the sensor."""
-        return self._unique_id
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return available attributes for sensor."""
diff --git a/homeassistant/components/fireservicerota/strings.json b/homeassistant/components/fireservicerota/strings.json
index 7c60b4382641e2..7b4bd583b63435 100644
--- a/homeassistant/components/fireservicerota/strings.json
+++ b/homeassistant/components/fireservicerota/strings.json
@@ -25,5 +25,22 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "duty": {
+        "name": "Duty"
+      }
+    },
+    "sensor": {
+      "incidents": {
+        "name": "Incidents"
+      }
+    },
+    "switch": {
+      "incident_response": {
+        "name": "Incident response"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fireservicerota/switch.py b/homeassistant/components/fireservicerota/switch.py
index 49c6d577b30ea2..7409b2e53b4669 100644
--- a/homeassistant/components/fireservicerota/switch.py
+++ b/homeassistant/components/fireservicerota/switch.py
@@ -28,23 +28,20 @@ class ResponseSwitch(SwitchEntity):
     """Representation of an FireServiceRota switch."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
+    _attr_translation_key = "incident_response"
 
     def __init__(self, coordinator, client, entry):
         """Initialize."""
         self._coordinator = coordinator
         self._client = client
-        self._unique_id = f"{entry.unique_id}_Response"
+        self._attr_unique_id = f"{entry.unique_id}_Response"
         self._entry_id = entry.entry_id
 
         self._state = None
         self._state_attributes = {}
         self._state_icon = None
 
-    @property
-    def name(self) -> str:
-        """Return the name of the switch."""
-        return "Incident Response"
-
     @property
     def icon(self) -> str:
         """Return the icon to use in the frontend."""
@@ -60,11 +57,6 @@ def is_on(self) -> bool:
         """Get the assumed state of the switch."""
         return self._state
 
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this switch."""
-        return self._unique_id
-
     @property
     def available(self) -> bool:
         """Return if switch is available."""
diff --git a/homeassistant/components/fitbit/sensor.py b/homeassistant/components/fitbit/sensor.py
index c53c01c84a75c4..11946c421730a0 100644
--- a/homeassistant/components/fitbit/sensor.py
+++ b/homeassistant/components/fitbit/sensor.py
@@ -442,14 +442,13 @@ def update(self) -> None:
                     self._attr_native_value = f"{hours}:{minutes:02d} {setting}"
                 else:
                     self._attr_native_value = raw_state
+            elif self.is_metric:
+                self._attr_native_value = raw_state
             else:
-                if self.is_metric:
+                try:
+                    self._attr_native_value = int(raw_state)
+                except TypeError:
                     self._attr_native_value = raw_state
-                else:
-                    try:
-                        self._attr_native_value = int(raw_state)
-                    except TypeError:
-                        self._attr_native_value = raw_state
 
         if resource_type == "activities/heart":
             self._attr_native_value = (
diff --git a/homeassistant/components/fivem/__init__.py b/homeassistant/components/fivem/__init__.py
index 7b0ae2e2758586..93adda2b4fd428 100644
--- a/homeassistant/components/fivem/__init__.py
+++ b/homeassistant/components/fivem/__init__.py
@@ -1,36 +1,19 @@
 """The FiveM integration."""
 from __future__ import annotations
 
-from collections.abc import Mapping
-from dataclasses import dataclass
-from datetime import timedelta
 import logging
-from typing import Any
 
-from fivem import FiveM, FiveMServerOfflineError
+from fivem import FiveMServerOfflineError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.entity import DeviceInfo, EntityDescription
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
 
 from .const import (
-    ATTR_PLAYERS_LIST,
-    ATTR_RESOURCES_LIST,
     DOMAIN,
-    MANUFACTURER,
-    NAME_PLAYERS_MAX,
-    NAME_PLAYERS_ONLINE,
-    NAME_RESOURCES,
-    NAME_STATUS,
-    SCAN_INTERVAL,
 )
+from .coordinator import FiveMDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
@@ -67,98 +50,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class FiveMDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """Class to manage fetching FiveM data."""
-
-    def __init__(
-        self, hass: HomeAssistant, config_data: Mapping[str, Any], unique_id: str
-    ) -> None:
-        """Initialize server instance."""
-        self.unique_id = unique_id
-        self.server = None
-        self.version = None
-        self.game_name: str | None = None
-
-        self.host = config_data[CONF_HOST]
-
-        self._fivem = FiveM(self.host, config_data[CONF_PORT])
-
-        update_interval = timedelta(seconds=SCAN_INTERVAL)
-
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def initialize(self) -> None:
-        """Initialize the FiveM server."""
-        info = await self._fivem.get_info_raw()
-        self.server = info["server"]
-        self.version = info["version"]
-        self.game_name = info["vars"]["gamename"]
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Get server data from 3rd party library and update properties."""
-        try:
-            server = await self._fivem.get_server()
-        except FiveMServerOfflineError as err:
-            raise UpdateFailed from err
-
-        players_list: list[str] = []
-        for player in server.players:
-            players_list.append(player.name)
-        players_list.sort()
-
-        resources_list = server.resources
-        resources_list.sort()
-
-        return {
-            NAME_PLAYERS_ONLINE: len(players_list),
-            NAME_PLAYERS_MAX: server.max_players,
-            NAME_RESOURCES: len(resources_list),
-            NAME_STATUS: self.last_update_success,
-            ATTR_PLAYERS_LIST: players_list,
-            ATTR_RESOURCES_LIST: resources_list,
-        }
-
-
-@dataclass
-class FiveMEntityDescription(EntityDescription):
-    """Describes FiveM entity."""
-
-    extra_attrs: list[str] | None = None
-
-
-class FiveMEntity(CoordinatorEntity[FiveMDataUpdateCoordinator]):
-    """Representation of a FiveM base entity."""
-
-    entity_description: FiveMEntityDescription
-
-    def __init__(
-        self,
-        coordinator: FiveMDataUpdateCoordinator,
-        description: FiveMEntityDescription,
-    ) -> None:
-        """Initialize base entity."""
-        super().__init__(coordinator)
-        self.entity_description = description
-
-        self._attr_name = f"{self.coordinator.host} {description.name}"
-        self._attr_unique_id = f"{self.coordinator.unique_id}-{description.key}".lower()
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.unique_id)},
-            manufacturer=MANUFACTURER,
-            model=self.coordinator.server,
-            name=self.coordinator.host,
-            sw_version=self.coordinator.version,
-        )
-
-    @property
-    def extra_state_attributes(self) -> Mapping[str, Any] | None:
-        """Return the extra attributes of the sensor."""
-        if self.entity_description.extra_attrs is None:
-            return None
-
-        return {
-            attr: self.coordinator.data[attr]
-            for attr in self.entity_description.extra_attrs
-        }
diff --git a/homeassistant/components/fivem/binary_sensor.py b/homeassistant/components/fivem/binary_sensor.py
index f3f253fe530e41..153732d2ce500e 100644
--- a/homeassistant/components/fivem/binary_sensor.py
+++ b/homeassistant/components/fivem/binary_sensor.py
@@ -10,8 +10,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import FiveMEntity, FiveMEntityDescription
 from .const import DOMAIN, NAME_STATUS
+from .entity import FiveMEntity, FiveMEntityDescription
 
 
 @dataclass
@@ -24,7 +24,7 @@ class FiveMBinarySensorEntityDescription(
 BINARY_SENSORS: tuple[FiveMBinarySensorEntityDescription, ...] = (
     FiveMBinarySensorEntityDescription(
         key=NAME_STATUS,
-        name=NAME_STATUS,
+        translation_key="status",
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
     ),
 )
diff --git a/homeassistant/components/fivem/coordinator.py b/homeassistant/components/fivem/coordinator.py
new file mode 100644
index 00000000000000..e7fa4c426dbb29
--- /dev/null
+++ b/homeassistant/components/fivem/coordinator.py
@@ -0,0 +1,81 @@
+"""The FiveM update coordinator."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from datetime import timedelta
+import logging
+from typing import Any
+
+from fivem import FiveM, FiveMServerOfflineError
+
+from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import (
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
+
+from .const import (
+    ATTR_PLAYERS_LIST,
+    ATTR_RESOURCES_LIST,
+    DOMAIN,
+    NAME_PLAYERS_MAX,
+    NAME_PLAYERS_ONLINE,
+    NAME_RESOURCES,
+    NAME_STATUS,
+    SCAN_INTERVAL,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class FiveMDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Class to manage fetching FiveM data."""
+
+    def __init__(
+        self, hass: HomeAssistant, config_data: Mapping[str, Any], unique_id: str
+    ) -> None:
+        """Initialize server instance."""
+        self.unique_id = unique_id
+        self.server = None
+        self.version = None
+        self.game_name: str | None = None
+
+        self.host = config_data[CONF_HOST]
+
+        self._fivem = FiveM(self.host, config_data[CONF_PORT])
+
+        update_interval = timedelta(seconds=SCAN_INTERVAL)
+
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+
+    async def initialize(self) -> None:
+        """Initialize the FiveM server."""
+        info = await self._fivem.get_info_raw()
+        self.server = info["server"]
+        self.version = info["version"]
+        self.game_name = info["vars"]["gamename"]
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Get server data from 3rd party library and update properties."""
+        try:
+            server = await self._fivem.get_server()
+        except FiveMServerOfflineError as err:
+            raise UpdateFailed from err
+
+        players_list: list[str] = []
+        for player in server.players:
+            players_list.append(player.name)
+        players_list.sort()
+
+        resources_list = server.resources
+        resources_list.sort()
+
+        return {
+            NAME_PLAYERS_ONLINE: len(players_list),
+            NAME_PLAYERS_MAX: server.max_players,
+            NAME_RESOURCES: len(resources_list),
+            NAME_STATUS: self.last_update_success,
+            ATTR_PLAYERS_LIST: players_list,
+            ATTR_RESOURCES_LIST: resources_list,
+        }
diff --git a/homeassistant/components/fivem/entity.py b/homeassistant/components/fivem/entity.py
new file mode 100644
index 00000000000000..53c357162760f0
--- /dev/null
+++ b/homeassistant/components/fivem/entity.py
@@ -0,0 +1,64 @@
+"""The FiveM entity."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from dataclasses import dataclass
+import logging
+from typing import Any
+
+from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+)
+
+from .const import (
+    DOMAIN,
+    MANUFACTURER,
+)
+from .coordinator import FiveMDataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class FiveMEntityDescription(EntityDescription):
+    """Describes FiveM entity."""
+
+    extra_attrs: list[str] | None = None
+
+
+class FiveMEntity(CoordinatorEntity[FiveMDataUpdateCoordinator]):
+    """Representation of a FiveM base entity."""
+
+    _attr_has_entity_name = True
+
+    entity_description: FiveMEntityDescription
+
+    def __init__(
+        self,
+        coordinator: FiveMDataUpdateCoordinator,
+        description: FiveMEntityDescription,
+    ) -> None:
+        """Initialize base entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+
+        self._attr_unique_id = f"{self.coordinator.unique_id}-{description.key}".lower()
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self.coordinator.unique_id)},
+            manufacturer=MANUFACTURER,
+            model=self.coordinator.server,
+            name=self.coordinator.host,
+            sw_version=self.coordinator.version,
+        )
+
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        """Return the extra attributes of the sensor."""
+        if self.entity_description.extra_attrs is None:
+            return None
+
+        return {
+            attr: self.coordinator.data[attr]
+            for attr in self.entity_description.extra_attrs
+        }
diff --git a/homeassistant/components/fivem/sensor.py b/homeassistant/components/fivem/sensor.py
index 9afe5890162e09..1c4e4b77c45a97 100644
--- a/homeassistant/components/fivem/sensor.py
+++ b/homeassistant/components/fivem/sensor.py
@@ -7,7 +7,6 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import FiveMEntity, FiveMEntityDescription
 from .const import (
     ATTR_PLAYERS_LIST,
     ATTR_RESOURCES_LIST,
@@ -22,6 +21,7 @@
     UNIT_PLAYERS_ONLINE,
     UNIT_RESOURCES,
 )
+from .entity import FiveMEntity, FiveMEntityDescription
 
 
 @dataclass
@@ -32,20 +32,20 @@ class FiveMSensorEntityDescription(SensorEntityDescription, FiveMEntityDescripti
 SENSORS: tuple[FiveMSensorEntityDescription, ...] = (
     FiveMSensorEntityDescription(
         key=NAME_PLAYERS_MAX,
-        name=NAME_PLAYERS_MAX,
+        translation_key="max_players",
         icon=ICON_PLAYERS_MAX,
         native_unit_of_measurement=UNIT_PLAYERS_MAX,
     ),
     FiveMSensorEntityDescription(
         key=NAME_PLAYERS_ONLINE,
-        name=NAME_PLAYERS_ONLINE,
+        translation_key="online_players",
         icon=ICON_PLAYERS_ONLINE,
         native_unit_of_measurement=UNIT_PLAYERS_ONLINE,
         extra_attrs=[ATTR_PLAYERS_LIST],
     ),
     FiveMSensorEntityDescription(
         key=NAME_RESOURCES,
-        name=NAME_RESOURCES,
+        translation_key="resources",
         icon=ICON_RESOURCES,
         native_unit_of_measurement=UNIT_RESOURCES,
         extra_attrs=[ATTR_RESOURCES_LIST],
diff --git a/homeassistant/components/fivem/strings.json b/homeassistant/components/fivem/strings.json
index 4378ef535bdd19..2ffb401f8c06dd 100644
--- a/homeassistant/components/fivem/strings.json
+++ b/homeassistant/components/fivem/strings.json
@@ -17,5 +17,23 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "status": {
+        "name": "Status"
+      }
+    },
+    "sensor": {
+      "max_players": {
+        "name": "Players max"
+      },
+      "online_players": {
+        "name": "Players online"
+      },
+      "resources": {
+        "name": "Resources"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fjaraskupan/__init__.py b/homeassistant/components/fjaraskupan/__init__.py
index 044d17662cffaf..e867e624e8ab76 100644
--- a/homeassistant/components/fjaraskupan/__init__.py
+++ b/homeassistant/components/fjaraskupan/__init__.py
@@ -1,28 +1,23 @@
 """The Fjäråskupan integration."""
 from __future__ import annotations
 
-from collections.abc import AsyncIterator, Callable
-from contextlib import asynccontextmanager
+from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import timedelta
 import logging
 
-from fjaraskupan import Device, State
+from fjaraskupan import Device
 
 from homeassistant.components.bluetooth import (
     BluetoothCallbackMatcher,
     BluetoothChange,
     BluetoothScanningMode,
     BluetoothServiceInfoBleak,
-    async_address_present,
-    async_ble_device_from_address,
     async_rediscover_address,
     async_register_callback,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -30,14 +25,9 @@
 )
 from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DISPATCH_DETECTION, DOMAIN
-
-
-class UnableToConnect(HomeAssistantError):
-    """Exception to indicate that we cannot connect to device."""
-
+from .coordinator import FjaraskupanCoordinator
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -50,81 +40,11 @@ class UnableToConnect(HomeAssistantError):
 _LOGGER = logging.getLogger(__name__)
 
 
-class Coordinator(DataUpdateCoordinator[State]):
-    """Update coordinator for each device."""
-
-    def __init__(
-        self, hass: HomeAssistant, device: Device, device_info: DeviceInfo
-    ) -> None:
-        """Initialize the coordinator."""
-        self.device = device
-        self.device_info = device_info
-        self._refresh_was_scheduled = False
-
-        super().__init__(
-            hass, _LOGGER, name="Fjäråskupan", update_interval=timedelta(seconds=120)
-        )
-
-    async def _async_refresh(
-        self,
-        log_failures: bool = True,
-        raise_on_auth_failed: bool = False,
-        scheduled: bool = False,
-        raise_on_entry_error: bool = False,
-    ) -> None:
-        self._refresh_was_scheduled = scheduled
-        await super()._async_refresh(
-            log_failures=log_failures,
-            raise_on_auth_failed=raise_on_auth_failed,
-            scheduled=scheduled,
-            raise_on_entry_error=raise_on_entry_error,
-        )
-
-    async def _async_update_data(self) -> State:
-        """Handle an explicit update request."""
-        if self._refresh_was_scheduled:
-            if async_address_present(self.hass, self.device.address, False):
-                return self.device.state
-            raise UpdateFailed(
-                "No data received within schedule, and device is no longer present"
-            )
-
-        if (
-            ble_device := async_ble_device_from_address(
-                self.hass, self.device.address, True
-            )
-        ) is None:
-            raise UpdateFailed("No connectable path to device")
-        async with self.device.connect(ble_device) as device:
-            await device.update()
-        return self.device.state
-
-    def detection_callback(self, service_info: BluetoothServiceInfoBleak) -> None:
-        """Handle a new announcement of data."""
-        self.device.detection_callback(service_info.device, service_info.advertisement)
-        self.async_set_updated_data(self.device.state)
-
-    @asynccontextmanager
-    async def async_connect_and_update(self) -> AsyncIterator[Device]:
-        """Provide an up to date device for use during connections."""
-        if (
-            ble_device := async_ble_device_from_address(
-                self.hass, self.device.address, True
-            )
-        ) is None:
-            raise UnableToConnect("No connectable path to device")
-
-        async with self.device.connect(ble_device) as device:
-            yield device
-
-        self.async_set_updated_data(self.device.state)
-
-
 @dataclass
 class EntryState:
     """Store state of config entry."""
 
-    coordinators: dict[str, Coordinator]
+    coordinators: dict[str, FjaraskupanCoordinator]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -153,7 +73,9 @@ def detection_callback(
                 name="Fjäråskupan",
             )
 
-            coordinator: Coordinator = Coordinator(hass, device, device_info)
+            coordinator: FjaraskupanCoordinator = FjaraskupanCoordinator(
+                hass, device, device_info
+            )
             coordinator.detection_callback(service_info)
 
             state.coordinators[service_info.address] = coordinator
@@ -183,7 +105,7 @@ def async_setup_entry_platform(
     hass: HomeAssistant,
     entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    constructor: Callable[[Coordinator], list[Entity]],
+    constructor: Callable[[FjaraskupanCoordinator], list[Entity]],
 ) -> None:
     """Set up a platform with added entities."""
 
@@ -195,7 +117,7 @@ def async_setup_entry_platform(
     )
 
     @callback
-    def _detection(coordinator: Coordinator) -> None:
+    def _detection(coordinator: FjaraskupanCoordinator) -> None:
         async_add_entities(constructor(coordinator))
 
     entry.async_on_unload(
diff --git a/homeassistant/components/fjaraskupan/binary_sensor.py b/homeassistant/components/fjaraskupan/binary_sensor.py
index 0ea5c1669dbd6d..8b641013eb4735 100644
--- a/homeassistant/components/fjaraskupan/binary_sensor.py
+++ b/homeassistant/components/fjaraskupan/binary_sensor.py
@@ -17,7 +17,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 @dataclass
@@ -30,13 +31,13 @@ class EntityDescription(BinarySensorEntityDescription):
 SENSORS = (
     EntityDescription(
         key="grease-filter",
-        name="Grease filter",
+        translation_key="grease_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         is_on=lambda state: state.grease_filter_full,
     ),
     EntityDescription(
         key="carbon-filter",
-        name="Carbon filter",
+        translation_key="carbon_filter",
         device_class=BinarySensorDeviceClass.PROBLEM,
         is_on=lambda state: state.carbon_filter_full,
     ),
@@ -50,7 +51,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [
             BinarySensor(
                 coordinator,
@@ -64,7 +65,7 @@ def _constructor(coordinator: Coordinator) -> list[Entity]:
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class BinarySensor(CoordinatorEntity[Coordinator], BinarySensorEntity):
+class BinarySensor(CoordinatorEntity[FjaraskupanCoordinator], BinarySensorEntity):
     """Grease filter sensor."""
 
     entity_description: EntityDescription
@@ -72,7 +73,7 @@ class BinarySensor(CoordinatorEntity[Coordinator], BinarySensorEntity):
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device: Device,
         device_info: DeviceInfo,
         entity_description: EntityDescription,
diff --git a/homeassistant/components/fjaraskupan/coordinator.py b/homeassistant/components/fjaraskupan/coordinator.py
new file mode 100644
index 00000000000000..16e8157b09474f
--- /dev/null
+++ b/homeassistant/components/fjaraskupan/coordinator.py
@@ -0,0 +1,95 @@
+"""The Fjäråskupan data update coordinator."""
+from __future__ import annotations
+
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from datetime import timedelta
+import logging
+
+from fjaraskupan import Device, State
+
+from homeassistant.components.bluetooth import (
+    BluetoothServiceInfoBleak,
+    async_address_present,
+    async_ble_device_from_address,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class UnableToConnect(HomeAssistantError):
+    """Exception to indicate that we cannot connect to device."""
+
+
+class FjaraskupanCoordinator(DataUpdateCoordinator[State]):
+    """Update coordinator for each device."""
+
+    def __init__(
+        self, hass: HomeAssistant, device: Device, device_info: DeviceInfo
+    ) -> None:
+        """Initialize the coordinator."""
+        self.device = device
+        self.device_info = device_info
+        self._refresh_was_scheduled = False
+
+        super().__init__(
+            hass, _LOGGER, name="Fjäråskupan", update_interval=timedelta(seconds=120)
+        )
+
+    async def _async_refresh(
+        self,
+        log_failures: bool = True,
+        raise_on_auth_failed: bool = False,
+        scheduled: bool = False,
+        raise_on_entry_error: bool = False,
+    ) -> None:
+        self._refresh_was_scheduled = scheduled
+        await super()._async_refresh(
+            log_failures=log_failures,
+            raise_on_auth_failed=raise_on_auth_failed,
+            scheduled=scheduled,
+            raise_on_entry_error=raise_on_entry_error,
+        )
+
+    async def _async_update_data(self) -> State:
+        """Handle an explicit update request."""
+        if self._refresh_was_scheduled:
+            if async_address_present(self.hass, self.device.address, False):
+                return self.device.state
+            raise UpdateFailed(
+                "No data received within schedule, and device is no longer present"
+            )
+
+        if (
+            ble_device := async_ble_device_from_address(
+                self.hass, self.device.address, True
+            )
+        ) is None:
+            raise UpdateFailed("No connectable path to device")
+        async with self.device.connect(ble_device) as device:
+            await device.update()
+        return self.device.state
+
+    def detection_callback(self, service_info: BluetoothServiceInfoBleak) -> None:
+        """Handle a new announcement of data."""
+        self.device.detection_callback(service_info.device, service_info.advertisement)
+        self.async_set_updated_data(self.device.state)
+
+    @asynccontextmanager
+    async def async_connect_and_update(self) -> AsyncIterator[Device]:
+        """Provide an up-to-date device for use during connections."""
+        if (
+            ble_device := async_ble_device_from_address(
+                self.hass, self.device.address, True
+            )
+        ) is None:
+            raise UnableToConnect("No connectable path to device")
+
+        async with self.device.connect(ble_device) as device:
+            yield device
+
+        self.async_set_updated_data(self.device.state)
diff --git a/homeassistant/components/fjaraskupan/fan.py b/homeassistant/components/fjaraskupan/fan.py
index c856a94fa074b2..e19a0965524d2d 100644
--- a/homeassistant/components/fjaraskupan/fan.py
+++ b/homeassistant/components/fjaraskupan/fan.py
@@ -23,7 +23,8 @@
     percentage_to_ordered_list_item,
 )
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 ORDERED_NAMED_FAN_SPEEDS = ["1", "2", "3", "4", "5", "6", "7", "8"]
 
@@ -54,21 +55,22 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator):
+    def _constructor(coordinator: FjaraskupanCoordinator):
         return [Fan(coordinator, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class Fan(CoordinatorEntity[Coordinator], FanEntity):
+class Fan(CoordinatorEntity[FjaraskupanCoordinator], FanEntity):
     """Fan entity."""
 
     _attr_supported_features = FanEntityFeature.SET_SPEED | FanEntityFeature.PRESET_MODE
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init fan entity."""
diff --git a/homeassistant/components/fjaraskupan/light.py b/homeassistant/components/fjaraskupan/light.py
index b6028e017d4f87..f4aa8c5a2dcd9f 100644
--- a/homeassistant/components/fjaraskupan/light.py
+++ b/homeassistant/components/fjaraskupan/light.py
@@ -12,7 +12,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -22,20 +23,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up tuya sensors dynamically through tuya discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [Light(coordinator, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class Light(CoordinatorEntity[Coordinator], LightEntity):
+class Light(CoordinatorEntity[FjaraskupanCoordinator], LightEntity):
     """Light device."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init light entity."""
@@ -50,9 +52,8 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         async with self.coordinator.async_connect_and_update() as device:
             if ATTR_BRIGHTNESS in kwargs:
                 await device.send_dim(int(kwargs[ATTR_BRIGHTNESS] * (100.0 / 255.0)))
-            else:
-                if not self.is_on:
-                    await device.send_command(COMMAND_LIGHT_ON_OFF)
+            elif not self.is_on:
+                await device.send_command(COMMAND_LIGHT_ON_OFF)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
diff --git a/homeassistant/components/fjaraskupan/number.py b/homeassistant/components/fjaraskupan/number.py
index a7f9226b57a1e9..46c5f6db90b85d 100644
--- a/homeassistant/components/fjaraskupan/number.py
+++ b/homeassistant/components/fjaraskupan/number.py
@@ -9,7 +9,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -19,7 +20,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up number entities dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [
             PeriodicVentingTime(coordinator, coordinator.device_info),
         ]
@@ -27,7 +28,7 @@ def _constructor(coordinator: Coordinator) -> list[Entity]:
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity):
+class PeriodicVentingTime(CoordinatorEntity[FjaraskupanCoordinator], NumberEntity):
     """Periodic Venting."""
 
     _attr_has_entity_name = True
@@ -37,17 +38,17 @@ class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity):
     _attr_native_step: float = 1
     _attr_entity_category = EntityCategory.CONFIG
     _attr_native_unit_of_measurement = UnitOfTime.MINUTES
+    _attr_translation_key = "periodic_venting"
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device_info: DeviceInfo,
     ) -> None:
         """Init number entities."""
         super().__init__(coordinator)
         self._attr_unique_id = f"{coordinator.device.address}-periodic-venting"
         self._attr_device_info = device_info
-        self._attr_name = "Periodic venting"
 
     @property
     def native_value(self) -> float | None:
diff --git a/homeassistant/components/fjaraskupan/sensor.py b/homeassistant/components/fjaraskupan/sensor.py
index e06790bf9acd5a..e9bf84e0ed06d8 100644
--- a/homeassistant/components/fjaraskupan/sensor.py
+++ b/homeassistant/components/fjaraskupan/sensor.py
@@ -16,7 +16,8 @@
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import Coordinator, async_setup_entry_platform
+from . import async_setup_entry_platform
+from .coordinator import FjaraskupanCoordinator
 
 
 async def async_setup_entry(
@@ -26,20 +27,25 @@ async def async_setup_entry(
 ) -> None:
     """Set up sensors dynamically through discovery."""
 
-    def _constructor(coordinator: Coordinator) -> list[Entity]:
+    def _constructor(coordinator: FjaraskupanCoordinator) -> list[Entity]:
         return [RssiSensor(coordinator, coordinator.device, coordinator.device_info)]
 
     async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor)
 
 
-class RssiSensor(CoordinatorEntity[Coordinator], SensorEntity):
+class RssiSensor(CoordinatorEntity[FjaraskupanCoordinator], SensorEntity):
     """Sensor device."""
 
     _attr_has_entity_name = True
+    _attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH
+    _attr_state_class = SensorStateClass.MEASUREMENT
+    _attr_native_unit_of_measurement = SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    _attr_entity_registry_enabled_default = False
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     def __init__(
         self,
-        coordinator: Coordinator,
+        coordinator: FjaraskupanCoordinator,
         device: Device,
         device_info: DeviceInfo,
     ) -> None:
@@ -47,12 +53,6 @@ def __init__(
         super().__init__(coordinator)
         self._attr_unique_id = f"{device.address}-signal-strength"
         self._attr_device_info = device_info
-        self._attr_name = "Signal strength"
-        self._attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH
-        self._attr_state_class = SensorStateClass.MEASUREMENT
-        self._attr_native_unit_of_measurement = SIGNAL_STRENGTH_DECIBELS_MILLIWATT
-        self._attr_entity_registry_enabled_default = False
-        self._attr_entity_category = EntityCategory.DIAGNOSTIC
 
     @property
     def native_value(self) -> StateType:
diff --git a/homeassistant/components/fjaraskupan/strings.json b/homeassistant/components/fjaraskupan/strings.json
index c6d5edd02d497e..d91cc47dea137b 100644
--- a/homeassistant/components/fjaraskupan/strings.json
+++ b/homeassistant/components/fjaraskupan/strings.json
@@ -9,5 +9,20 @@
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "grease_filter": {
+        "name": "Grease filter"
+      },
+      "carbon_filter": {
+        "name": "Carbon filter"
+      }
+    },
+    "number": {
+      "periodic_venting": {
+        "name": "Periodic venting"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flexit/climate.py b/homeassistant/components/flexit/climate.py
index ac8f4b4da8c3d1..838d2c934f9619 100644
--- a/homeassistant/components/flexit/climate.py
+++ b/homeassistant/components/flexit/climate.py
@@ -192,7 +192,7 @@ async def _async_read_temp_from_register(
         result = float(
             await self._async_read_int16_from_register(register_type, register)
         )
-        if result == -1:
+        if not result:
             return -1
         return result / 10.0
 
@@ -200,6 +200,6 @@ async def _async_write_int16_to_register(self, register: int, value: int) -> boo
         result = await self._hub.async_pymodbus_call(
             self._slave, register, value, CALL_TYPE_WRITE_REGISTER
         )
-        if result == -1:
+        if not result:
             return False
         return True
diff --git a/homeassistant/components/flick_electric/sensor.py b/homeassistant/components/flick_electric/sensor.py
index 18daaa9d4e240d..a0844fe6cdb7c9 100644
--- a/homeassistant/components/flick_electric/sensor.py
+++ b/homeassistant/components/flick_electric/sensor.py
@@ -8,7 +8,7 @@
 
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_FRIENDLY_NAME, CURRENCY_CENT, UnitOfEnergy
+from homeassistant.const import CURRENCY_CENT, UnitOfEnergy
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utcnow
@@ -19,8 +19,6 @@
 
 SCAN_INTERVAL = timedelta(minutes=5)
 
-FRIENDLY_NAME = "Flick Power Price"
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -36,19 +34,14 @@ class FlickPricingSensor(SensorEntity):
 
     _attr_attribution = "Data provided by Flick Electric"
     _attr_native_unit_of_measurement = f"{CURRENCY_CENT}/{UnitOfEnergy.KILO_WATT_HOUR}"
+    _attr_has_entity_name = True
+    _attr_translation_key = "power_price"
+    _attributes: dict[str, Any] = {}
 
     def __init__(self, api: FlickAPI) -> None:
         """Entity object for Flick Electric sensor."""
         self._api: FlickAPI = api
         self._price: FlickPrice = None
-        self._attributes: dict[str, Any] = {
-            ATTR_FRIENDLY_NAME: FRIENDLY_NAME,
-        }
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return FRIENDLY_NAME
 
     @property
     def native_value(self):
diff --git a/homeassistant/components/flick_electric/strings.json b/homeassistant/components/flick_electric/strings.json
index cb8382539b4e95..8b55bef939e53c 100644
--- a/homeassistant/components/flick_electric/strings.json
+++ b/homeassistant/components/flick_electric/strings.json
@@ -19,5 +19,12 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "power_price": {
+        "name": "Flick power price"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flipr/__init__.py b/homeassistant/components/flipr/__init__.py
index f02911e30d5e28..9eba320672002e 100644
--- a/homeassistant/components/flipr/__init__.py
+++ b/homeassistant/components/flipr/__init__.py
@@ -15,7 +15,7 @@
     UpdateFailed,
 )
 
-from .const import ATTRIBUTION, CONF_FLIPR_ID, DOMAIN, MANUFACTURER, NAME
+from .const import ATTRIBUTION, CONF_FLIPR_ID, DOMAIN, MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,6 +84,7 @@ class FliprEntity(CoordinatorEntity):
     """Implements a common class elements representing the Flipr component."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
 
     def __init__(
         self, coordinator: DataUpdateCoordinator, description: EntityDescription
@@ -98,7 +99,5 @@ def __init__(
             self._attr_device_info = DeviceInfo(
                 identifiers={(DOMAIN, flipr_id)},
                 manufacturer=MANUFACTURER,
-                name=NAME,
+                name=f"Flipr {flipr_id}",
             )
-
-            self._attr_name = f"Flipr {flipr_id} {description.name}"
diff --git a/homeassistant/components/flipr/binary_sensor.py b/homeassistant/components/flipr/binary_sensor.py
index 646e260bd6023c..76385167d385dc 100644
--- a/homeassistant/components/flipr/binary_sensor.py
+++ b/homeassistant/components/flipr/binary_sensor.py
@@ -16,12 +16,12 @@
 BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key="ph_status",
-        name="PH Status",
+        translation_key="ph_status",
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     BinarySensorEntityDescription(
         key="chlorine_status",
-        name="Chlorine Status",
+        translation_key="chlorine_status",
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
 )
diff --git a/homeassistant/components/flipr/sensor.py b/homeassistant/components/flipr/sensor.py
index 570442891103de..078e581edda489 100644
--- a/homeassistant/components/flipr/sensor.py
+++ b/homeassistant/components/flipr/sensor.py
@@ -18,39 +18,38 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="chlorine",
-        name="Chlorine",
+        translation_key="chlorine",
         native_unit_of_measurement=UnitOfElectricPotential.MILLIVOLT,
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="ph",
-        name="pH",
+        translation_key="ph",
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="temperature",
-        name="Water Temp",
+        translation_key="water_temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="date_time",
-        name="Last Measured",
+        translation_key="last_measured",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     SensorEntityDescription(
         key="red_ox",
-        name="Red OX",
+        translation_key="red_ox",
         native_unit_of_measurement=UnitOfElectricPotential.MILLIVOLT,
         icon="mdi:pool",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="battery",
-        name="Battery Level",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/flipr/strings.json b/homeassistant/components/flipr/strings.json
index 55feaa691f72b3..24557ff177b36b 100644
--- a/homeassistant/components/flipr/strings.json
+++ b/homeassistant/components/flipr/strings.json
@@ -26,5 +26,32 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "ph_status": {
+        "name": "pH status"
+      },
+      "chlorine_status": {
+        "name": "Chlorine status"
+      }
+    },
+    "sensor": {
+      "chlorine": {
+        "name": "Chlorine"
+      },
+      "ph": {
+        "name": "pH"
+      },
+      "water_temperature": {
+        "name": "Water temperature"
+      },
+      "last_measured": {
+        "name": "Last measured"
+      },
+      "red_ox": {
+        "name": "Red OX"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flo/binary_sensor.py b/homeassistant/components/flo/binary_sensor.py
index f5c051d1a70461..d61f67cc623029 100644
--- a/homeassistant/components/flo/binary_sensor.py
+++ b/homeassistant/components/flo/binary_sensor.py
@@ -45,10 +45,11 @@ class FloPendingAlertsBinarySensor(FloEntity, BinarySensorEntity):
     """Binary sensor that reports on if there are any pending system alerts."""
 
     _attr_device_class = BinarySensorDeviceClass.PROBLEM
+    _attr_translation_key = "pending_system_alerts"
 
     def __init__(self, device):
         """Initialize the pending alerts binary sensor."""
-        super().__init__("pending_system_alerts", "Pending system alerts", device)
+        super().__init__("pending_system_alerts", device)
 
     @property
     def is_on(self):
@@ -71,10 +72,11 @@ class FloWaterDetectedBinarySensor(FloEntity, BinarySensorEntity):
     """Binary sensor that reports if water is detected (for leak detectors)."""
 
     _attr_device_class = BinarySensorDeviceClass.PROBLEM
+    _attr_translation_key = "water_detected"
 
     def __init__(self, device):
         """Initialize the pending alerts binary sensor."""
-        super().__init__("water_detected", "Water detected", device)
+        super().__init__("water_detected", device)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/flo/entity.py b/homeassistant/components/flo/entity.py
index 39ad57f5c03339..e9d02432598781 100644
--- a/homeassistant/components/flo/entity.py
+++ b/homeassistant/components/flo/entity.py
@@ -20,12 +20,10 @@ class FloEntity(Entity):
     def __init__(
         self,
         entity_type: str,
-        name: str,
         device: FloDeviceDataUpdateCoordinator,
         **kwargs,
     ) -> None:
         """Init Flo entity."""
-        self._attr_name = name
         self._attr_unique_id = f"{device.mac_address}_{entity_type}"
 
         self._device: FloDeviceDataUpdateCoordinator = device
diff --git a/homeassistant/components/flo/sensor.py b/homeassistant/components/flo/sensor.py
index 2c89123dac15ba..f0aca366cfbca2 100644
--- a/homeassistant/components/flo/sensor.py
+++ b/homeassistant/components/flo/sensor.py
@@ -22,14 +22,6 @@
 
 WATER_ICON = "mdi:water"
 GAUGE_ICON = "mdi:gauge"
-NAME_DAILY_USAGE = "Today's water usage"
-NAME_CURRENT_SYSTEM_MODE = "Current system mode"
-NAME_FLOW_RATE = "Water flow rate"
-NAME_WATER_TEMPERATURE = "Water temperature"
-NAME_AIR_TEMPERATURE = "Temperature"
-NAME_WATER_PRESSURE = "Water pressure"
-NAME_HUMIDITY = "Humidity"
-NAME_BATTERY = "Battery"
 
 
 async def async_setup_entry(
@@ -46,7 +38,7 @@ async def async_setup_entry(
         if device.device_type == "puck_oem":
             entities.extend(
                 [
-                    FloTemperatureSensor(NAME_AIR_TEMPERATURE, device),
+                    FloTemperatureSensor(device, False),
                     FloHumiditySensor(device),
                     FloBatterySensor(device),
                 ]
@@ -57,7 +49,7 @@ async def async_setup_entry(
                     FloDailyUsageSensor(device),
                     FloSystemModeSensor(device),
                     FloCurrentFlowRateSensor(device),
-                    FloTemperatureSensor(NAME_WATER_TEMPERATURE, device),
+                    FloTemperatureSensor(device, True),
                     FloPressureSensor(device),
                 ]
             )
@@ -71,10 +63,11 @@ class FloDailyUsageSensor(FloEntity, SensorEntity):
     _attr_native_unit_of_measurement = UnitOfVolume.GALLONS
     _attr_state_class: SensorStateClass = SensorStateClass.TOTAL_INCREASING
     _attr_device_class = SensorDeviceClass.WATER
+    _attr_translation_key = "daily_consumption"
 
     def __init__(self, device):
         """Initialize the daily water usage sensor."""
-        super().__init__("daily_consumption", NAME_DAILY_USAGE, device)
+        super().__init__("daily_consumption", device)
         self._state: float = None
 
     @property
@@ -88,9 +81,11 @@ def native_value(self) -> float | None:
 class FloSystemModeSensor(FloEntity, SensorEntity):
     """Monitors the current Flo system mode."""
 
+    _attr_translation_key = "current_system_mode"
+
     def __init__(self, device):
         """Initialize the system mode sensor."""
-        super().__init__("current_system_mode", NAME_CURRENT_SYSTEM_MODE, device)
+        super().__init__("current_system_mode", device)
         self._state: str = None
 
     @property
@@ -107,10 +102,11 @@ class FloCurrentFlowRateSensor(FloEntity, SensorEntity):
     _attr_icon = GAUGE_ICON
     _attr_native_unit_of_measurement = "gpm"
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
+    _attr_translation_key = "current_flow_rate"
 
     def __init__(self, device):
         """Initialize the flow rate sensor."""
-        super().__init__("current_flow_rate", NAME_FLOW_RATE, device)
+        super().__init__("current_flow_rate", device)
         self._state: float = None
 
     @property
@@ -128,9 +124,11 @@ class FloTemperatureSensor(FloEntity, SensorEntity):
     _attr_native_unit_of_measurement = UnitOfTemperature.FAHRENHEIT
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
 
-    def __init__(self, name, device):
+    def __init__(self, device, is_water):
         """Initialize the temperature sensor."""
-        super().__init__("temperature", name, device)
+        super().__init__("temperature", device)
+        if is_water:
+            self._attr_translation_key = "water_temperature"
         self._state: float = None
 
     @property
@@ -150,7 +148,7 @@ class FloHumiditySensor(FloEntity, SensorEntity):
 
     def __init__(self, device):
         """Initialize the humidity sensor."""
-        super().__init__("humidity", NAME_HUMIDITY, device)
+        super().__init__("humidity", device)
         self._state: float = None
 
     @property
@@ -167,10 +165,11 @@ class FloPressureSensor(FloEntity, SensorEntity):
     _attr_device_class = SensorDeviceClass.PRESSURE
     _attr_native_unit_of_measurement = UnitOfPressure.PSI
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
+    _attr_translation_key = "water_pressure"
 
     def __init__(self, device):
         """Initialize the pressure sensor."""
-        super().__init__("water_pressure", NAME_WATER_PRESSURE, device)
+        super().__init__("water_pressure", device)
         self._state: float = None
 
     @property
@@ -190,7 +189,7 @@ class FloBatterySensor(FloEntity, SensorEntity):
 
     def __init__(self, device):
         """Initialize the battery sensor."""
-        super().__init__("battery", NAME_BATTERY, device)
+        super().__init__("battery", device)
         self._state: float = None
 
     @property
diff --git a/homeassistant/components/flo/strings.json b/homeassistant/components/flo/strings.json
index d6e3212b4eab64..fadfc304fce415 100644
--- a/homeassistant/components/flo/strings.json
+++ b/homeassistant/components/flo/strings.json
@@ -17,5 +17,37 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "pending_system_alerts": {
+        "name": "Pending system alerts"
+      },
+      "water_detected": {
+        "name": "Water detected"
+      }
+    },
+    "sensor": {
+      "daily_consumption": {
+        "name": "Today's water usage"
+      },
+      "current_system_mode": {
+        "name": "Current system mode"
+      },
+      "current_flow_rate": {
+        "name": "Water flow rate"
+      },
+      "water_temperature": {
+        "name": "Water temperature"
+      },
+      "water_pressure": {
+        "name": "Water pressure"
+      }
+    },
+    "switch": {
+      "shutoff_valve": {
+        "name": "Shutoff valve"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flo/switch.py b/homeassistant/components/flo/switch.py
index 84c37bb4987ca1..cd522ed177d5f8 100644
--- a/homeassistant/components/flo/switch.py
+++ b/homeassistant/components/flo/switch.py
@@ -68,9 +68,11 @@ async def async_setup_entry(
 class FloSwitch(FloEntity, SwitchEntity):
     """Switch class for the Flo by Moen valve."""
 
+    _attr_translation_key = "shutoff_valve"
+
     def __init__(self, device: FloDeviceDataUpdateCoordinator) -> None:
         """Initialize the Flo switch."""
-        super().__init__("shutoff_valve", "Shutoff valve", device)
+        super().__init__("shutoff_valve", device)
         self._state = self._device.last_known_valve_state == "open"
 
     @property
diff --git a/homeassistant/components/flume/binary_sensor.py b/homeassistant/components/flume/binary_sensor.py
index 0d7b7b5dd568c6..453e259bf4668e 100644
--- a/homeassistant/components/flume/binary_sensor.py
+++ b/homeassistant/components/flume/binary_sensor.py
@@ -34,8 +34,7 @@
 from .util import get_valid_flume_devices
 
 BINARY_SENSOR_DESCRIPTION_CONNECTED = BinarySensorEntityDescription(
-    name="Connected",
-    key="connected",
+    key="connected", device_class=BinarySensorDeviceClass.CONNECTIVITY
 )
 
 
@@ -56,14 +55,14 @@ class FlumeBinarySensorEntityDescription(
 FLUME_BINARY_NOTIFICATION_SENSORS: tuple[FlumeBinarySensorEntityDescription, ...] = (
     FlumeBinarySensorEntityDescription(
         key="leak",
-        name="Leak detected",
+        translation_key="leak",
         entity_category=EntityCategory.DIAGNOSTIC,
         event_rule=NOTIFICATION_LEAK_DETECTED,
         icon="mdi:pipe-leak",
     ),
     FlumeBinarySensorEntityDescription(
         key="flow",
-        name="High flow",
+        translation_key="flow",
         entity_category=EntityCategory.DIAGNOSTIC,
         event_rule=NOTIFICATION_HIGH_FLOW,
         icon="mdi:waves",
diff --git a/homeassistant/components/flume/manifest.json b/homeassistant/components/flume/manifest.json
index f3b2bacbafe76f..17a2b0b53be873 100644
--- a/homeassistant/components/flume/manifest.json
+++ b/homeassistant/components/flume/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/flume/",
   "iot_class": "cloud_polling",
   "loggers": ["pyflume"],
-  "requirements": ["pyflume==0.6.5"]
+  "requirements": ["PyFlume==0.6.5"]
 }
diff --git a/homeassistant/components/flume/sensor.py b/homeassistant/components/flume/sensor.py
index b656f5e9715576..fc08fee476c5a7 100644
--- a/homeassistant/components/flume/sensor.py
+++ b/homeassistant/components/flume/sensor.py
@@ -1,5 +1,4 @@
 """Sensor for displaying the number of result from Flume."""
-from numbers import Number
 
 from pyflume import FlumeData
 
@@ -34,45 +33,52 @@
 FLUME_QUERIES_SENSOR: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="current_interval",
-        name="Current",
+        translation_key="current_interval",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/m",
     ),
     SensorEntityDescription(
         key="month_to_date",
-        name="Current Month",
+        translation_key="month_to_date",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="week_to_date",
-        name="Current Week",
+        translation_key="week_to_date",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="today",
-        name="Current Day",
+        translation_key="today",
+        suggested_display_precision=2,
         native_unit_of_measurement=UnitOfVolume.GALLONS,
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="last_60_min",
-        name="60 Minutes",
+        translation_key="last_60_min",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/h",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="last_24_hrs",
-        name="24 Hours",
+        translation_key="last_24_hrs",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/d",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="last_30_days",
-        name="30 Days",
+        translation_key="last_30_days",
+        suggested_display_precision=2,
         native_unit_of_measurement=f"{UnitOfVolume.GALLONS}/mo",
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -139,8 +145,4 @@ def native_value(self):
         if sensor_key not in self.coordinator.flume_device.values:
             return None
 
-        return _format_state_value(self.coordinator.flume_device.values[sensor_key])
-
-
-def _format_state_value(value):
-    return round(value, 1) if isinstance(value, Number) else None
+        return self.coordinator.flume_device.values[sensor_key]
diff --git a/homeassistant/components/flume/strings.json b/homeassistant/components/flume/strings.json
index 080f10deee1cfa..2c1a900c091842 100644
--- a/homeassistant/components/flume/strings.json
+++ b/homeassistant/components/flume/strings.json
@@ -28,5 +28,38 @@
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "leak": {
+        "name": "Leak detected"
+      },
+      "flow": {
+        "name": "High flow"
+      }
+    },
+    "sensor": {
+      "current_interval": {
+        "name": "Current"
+      },
+      "month_to_date": {
+        "name": "Current month"
+      },
+      "week_to_date": {
+        "name": "Current week"
+      },
+      "today": {
+        "name": "Current day"
+      },
+      "last_60_min": {
+        "name": "60 minutes"
+      },
+      "last_24_hrs": {
+        "name": "24 hours"
+      },
+      "last_30_days": {
+        "name": "30 days"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flux_led/__init__.py b/homeassistant/components/flux_led/__init__.py
index 94f50caa1a2cdd..100d63d8bf7fa7 100644
--- a/homeassistant/components/flux_led/__init__.py
+++ b/homeassistant/components/flux_led/__init__.py
@@ -14,7 +14,11 @@
 from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STARTED, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -71,6 +75,8 @@
     option.name.lower(): option for option in WhiteChannelType
 }
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 @callback
 def async_wifi_bulb_for_host(
diff --git a/homeassistant/components/flux_led/button.py b/homeassistant/components/flux_led/button.py
index ead25930c7798d..eb3a7341d4db1d 100644
--- a/homeassistant/components/flux_led/button.py
+++ b/homeassistant/components/flux_led/button.py
@@ -10,7 +10,7 @@
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -22,10 +22,13 @@
 _UNPAIR_REMOTES_KEY = "unpair_remotes"
 
 RESTART_BUTTON_DESCRIPTION = ButtonEntityDescription(
-    key=_RESTART_KEY, name="Restart", device_class=ButtonDeviceClass.RESTART
+    key=_RESTART_KEY,
+    device_class=ButtonDeviceClass.RESTART,
 )
 UNPAIR_REMOTES_DESCRIPTION = ButtonEntityDescription(
-    key=_UNPAIR_REMOTES_KEY, name="Unpair Remotes", icon="mdi:remote-off"
+    key=_UNPAIR_REMOTES_KEY,
+    translation_key="unpair_remotes",
+    icon="mdi:remote-off",
 )
 
 
@@ -62,7 +65,6 @@ def __init__(
         """Initialize the button."""
         self.entity_description = description
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} {description.name}"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_{description.key}"
 
diff --git a/homeassistant/components/flux_led/entity.py b/homeassistant/components/flux_led/entity.py
index ef9038b1435bcd..85600dd4dabf54 100644
--- a/homeassistant/components/flux_led/entity.py
+++ b/homeassistant/components/flux_led/entity.py
@@ -54,6 +54,7 @@ def _async_device_info(
 class FluxBaseEntity(Entity):
     """Representation of a Flux entity without a coordinator."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
     def __init__(
@@ -70,18 +71,18 @@ def __init__(
 class FluxEntity(CoordinatorEntity[FluxLedUpdateCoordinator]):
     """Representation of a Flux entity with a coordinator."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str | None,
     ) -> None:
         """Initialize the light."""
         super().__init__(coordinator)
         self._device: AIOWifiLedBulb = coordinator.device
         self._responding = True
-        self._attr_name = name
         if key:
             self._attr_unique_id = f"{base_unique_id}_{key}"
         else:
diff --git a/homeassistant/components/flux_led/light.py b/homeassistant/components/flux_led/light.py
index 202f0f95e23a28..d880d517f1ab6c 100644
--- a/homeassistant/components/flux_led/light.py
+++ b/homeassistant/components/flux_led/light.py
@@ -22,7 +22,6 @@
     LightEntity,
     LightEntityFeature,
 )
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
@@ -177,7 +176,6 @@ async def async_setup_entry(
             FluxLight(
                 coordinator,
                 entry.unique_id or entry.entry_id,
-                entry.data.get(CONF_NAME, entry.title),
                 list(custom_effect_colors),
                 options.get(CONF_CUSTOM_EFFECT_SPEED_PCT, DEFAULT_EFFECT_SPEED),
                 options.get(CONF_CUSTOM_EFFECT_TRANSITION, TRANSITION_GRADUAL),
@@ -191,19 +189,20 @@ class FluxLight(
 ):
     """Representation of a Flux light."""
 
+    _attr_name = None
+
     _attr_supported_features = LightEntityFeature.TRANSITION | LightEntityFeature.EFFECT
 
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         custom_effect_colors: list[tuple[int, int, int]],
         custom_effect_speed_pct: int,
         custom_effect_transition: str,
     ) -> None:
         """Initialize the light."""
-        super().__init__(coordinator, base_unique_id, name, None)
+        super().__init__(coordinator, base_unique_id, None)
         self._attr_min_mireds = color_temperature_kelvin_to_mired(self._device.max_temp)
         self._attr_max_mireds = color_temperature_kelvin_to_mired(self._device.min_temp)
         self._attr_supported_color_modes = _hass_color_modes(self._device)
diff --git a/homeassistant/components/flux_led/manifest.json b/homeassistant/components/flux_led/manifest.json
index a6e8183bcdb998..13f7ba36bcd146 100644
--- a/homeassistant/components/flux_led/manifest.json
+++ b/homeassistant/components/flux_led/manifest.json
@@ -51,5 +51,5 @@
   "iot_class": "local_push",
   "loggers": ["flux_led"],
   "quality_scale": "platinum",
-  "requirements": ["flux_led==0.28.37"]
+  "requirements": ["flux-led==0.28.37"]
 }
diff --git a/homeassistant/components/flux_led/number.py b/homeassistant/components/flux_led/number.py
index a5324efe6804be..ac23fbe64b51f4 100644
--- a/homeassistant/components/flux_led/number.py
+++ b/homeassistant/components/flux_led/number.py
@@ -18,7 +18,7 @@
 from homeassistant import config_entries
 from homeassistant.components.light import EFFECT_RANDOM
 from homeassistant.components.number import NumberEntity, NumberMode
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.debounce import Debouncer
@@ -50,7 +50,6 @@ async def async_setup_entry(
         | FluxMusicPixelsPerSegmentNumber
         | FluxMusicSegmentsNumber
     ] = []
-    name = entry.data.get(CONF_NAME, entry.title)
     base_unique_id = entry.unique_id or entry.entry_id
 
     if device.pixels_per_segment is not None:
@@ -58,35 +57,25 @@ async def async_setup_entry(
             FluxPixelsPerSegmentNumber(
                 coordinator,
                 base_unique_id,
-                f"{name} Pixels Per Segment",
                 "pixels_per_segment",
             )
         )
     if device.segments is not None:
-        entities.append(
-            FluxSegmentsNumber(
-                coordinator, base_unique_id, f"{name} Segments", "segments"
-            )
-        )
+        entities.append(FluxSegmentsNumber(coordinator, base_unique_id, "segments"))
     if device.music_pixels_per_segment is not None:
         entities.append(
             FluxMusicPixelsPerSegmentNumber(
                 coordinator,
                 base_unique_id,
-                f"{name} Music Pixels Per Segment",
                 "music_pixels_per_segment",
             )
         )
     if device.music_segments is not None:
         entities.append(
-            FluxMusicSegmentsNumber(
-                coordinator, base_unique_id, f"{name} Music Segments", "music_segments"
-            )
+            FluxMusicSegmentsNumber(coordinator, base_unique_id, "music_segments")
         )
     if device.effect_list and device.effect_list != [EFFECT_RANDOM]:
-        entities.append(
-            FluxSpeedNumber(coordinator, base_unique_id, f"{name} Effect Speed", None)
-        )
+        entities.append(FluxSpeedNumber(coordinator, base_unique_id, None))
 
     async_add_entities(entities)
 
@@ -101,6 +90,7 @@ class FluxSpeedNumber(
     _attr_native_step = 1
     _attr_mode = NumberMode.SLIDER
     _attr_icon = "mdi:speedometer"
+    _attr_translation_key = "effect_speed"
 
     @property
     def native_value(self) -> float:
@@ -137,11 +127,10 @@ def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str | None,
     ) -> None:
         """Initialize the flux number."""
-        super().__init__(coordinator, base_unique_id, name, key)
+        super().__init__(coordinator, base_unique_id, key)
         self._debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None
         self._pending_value: int | None = None
 
@@ -185,6 +174,7 @@ def _pixels_and_segments_fit_in_music_mode(self) -> bool:
 class FluxPixelsPerSegmentNumber(FluxConfigNumber):
     """Defines a flux_led pixels per segment number."""
 
+    _attr_translation_key = "pixels_per_segment"
     _attr_icon = "mdi:dots-grid"
 
     @property
@@ -211,6 +201,7 @@ async def _async_set_native_value(self) -> None:
 class FluxSegmentsNumber(FluxConfigNumber):
     """Defines a flux_led segments number."""
 
+    _attr_translation_key = "segments"
     _attr_icon = "mdi:segment"
 
     @property
@@ -245,6 +236,7 @@ def available(self) -> bool:
 class FluxMusicPixelsPerSegmentNumber(FluxMusicNumber):
     """Defines a flux_led music pixels per segment number."""
 
+    _attr_translation_key = "music_pixels_per_segment"
     _attr_icon = "mdi:dots-grid"
 
     @property
@@ -273,6 +265,7 @@ async def _async_set_native_value(self) -> None:
 class FluxMusicSegmentsNumber(FluxMusicNumber):
     """Defines a flux_led music segments number."""
 
+    _attr_translation_key = "music_segments"
     _attr_icon = "mdi:segment"
 
     @property
diff --git a/homeassistant/components/flux_led/select.py b/homeassistant/components/flux_led/select.py
index 2b23f695b154be..cca86e5a216ea9 100644
--- a/homeassistant/components/flux_led/select.py
+++ b/homeassistant/components/flux_led/select.py
@@ -52,30 +52,22 @@ async def async_setup_entry(
         | FluxRemoteConfigSelect
         | FluxWhiteChannelSelect
     ] = []
-    name = entry.data.get(CONF_NAME, entry.title)
+    entry.data.get(CONF_NAME, entry.title)
     base_unique_id = entry.unique_id or entry.entry_id
 
     if device.device_type == DeviceType.Switch:
         entities.append(FluxPowerStateSelect(coordinator.device, entry))
     if device.operating_modes:
         entities.append(
-            FluxOperatingModesSelect(
-                coordinator, base_unique_id, f"{name} Operating Mode", "operating_mode"
-            )
+            FluxOperatingModesSelect(coordinator, base_unique_id, "operating_mode")
         )
     if device.wirings and device.wiring is not None:
-        entities.append(
-            FluxWiringsSelect(coordinator, base_unique_id, f"{name} Wiring", "wiring")
-        )
+        entities.append(FluxWiringsSelect(coordinator, base_unique_id, "wiring"))
     if device.ic_types:
-        entities.append(
-            FluxICTypeSelect(coordinator, base_unique_id, f"{name} IC Type", "ic_type")
-        )
+        entities.append(FluxICTypeSelect(coordinator, base_unique_id, "ic_type"))
     if device.remote_config:
         entities.append(
-            FluxRemoteConfigSelect(
-                coordinator, base_unique_id, f"{name} Remote Config", "remote_config"
-            )
+            FluxRemoteConfigSelect(coordinator, base_unique_id, "remote_config")
         )
     if FLUX_COLOR_MODE_RGBW in device.color_modes:
         entities.append(FluxWhiteChannelSelect(coordinator.device, entry))
@@ -98,6 +90,7 @@ class FluxConfigSelect(FluxEntity, SelectEntity):
 class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
     """Representation of a Flux power restore state option."""
 
+    _attr_translation_key = "power_restored"
     _attr_icon = "mdi:transmission-tower-off"
     _attr_options = list(NAME_TO_POWER_RESTORE_STATE)
 
@@ -108,7 +101,6 @@ def __init__(
     ) -> None:
         """Initialize the power state select."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Power Restored"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_power_restored"
         self._async_set_current_option_from_device()
@@ -134,6 +126,7 @@ class FluxICTypeSelect(FluxConfigSelect):
     """Representation of Flux ic type."""
 
     _attr_icon = "mdi:chip"
+    _attr_translation_key = "ic_type"
 
     @property
     def options(self) -> list[str]:
@@ -156,6 +149,7 @@ class FluxWiringsSelect(FluxConfigSelect):
     """Representation of Flux wirings."""
 
     _attr_icon = "mdi:led-strip-variant"
+    _attr_translation_key = "wiring"
 
     @property
     def options(self) -> list[str]:
@@ -176,6 +170,8 @@ async def async_select_option(self, option: str) -> None:
 class FluxOperatingModesSelect(FluxConfigSelect):
     """Representation of Flux operating modes."""
 
+    _attr_translation_key = "operating_mode"
+
     @property
     def options(self) -> list[str]:
         """Return the current operating mode."""
@@ -196,15 +192,16 @@ async def async_select_option(self, option: str) -> None:
 class FluxRemoteConfigSelect(FluxConfigSelect):
     """Representation of Flux remote config type."""
 
+    _attr_translation_key = "remote_config"
+
     def __init__(
         self,
         coordinator: FluxLedUpdateCoordinator,
         base_unique_id: str,
-        name: str,
         key: str,
     ) -> None:
         """Initialize the remote config type select."""
-        super().__init__(coordinator, base_unique_id, name, key)
+        super().__init__(coordinator, base_unique_id, key)
         assert self._device.remote_config is not None
         self._name_to_state = {
             _human_readable_option(option.name): option for option in RemoteConfig
@@ -226,6 +223,8 @@ async def async_select_option(self, option: str) -> None:
 class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
     """Representation of Flux white channel."""
 
+    _attr_translation_key = "white_channel"
+
     _attr_options = [_human_readable_option(option.name) for option in WhiteChannelType]
 
     def __init__(
@@ -235,7 +234,6 @@ def __init__(
     ) -> None:
         """Initialize the white channel select."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} White Channel"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_white_channel"
 
diff --git a/homeassistant/components/flux_led/sensor.py b/homeassistant/components/flux_led/sensor.py
index 3cff6d017f029a..9a19c62938300b 100644
--- a/homeassistant/components/flux_led/sensor.py
+++ b/homeassistant/components/flux_led/sensor.py
@@ -3,7 +3,7 @@
 
 from homeassistant import config_entries
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -25,7 +25,6 @@ async def async_setup_entry(
                 FluxPairedRemotes(
                     coordinator,
                     entry.unique_id or entry.entry_id,
-                    f"{entry.data.get(CONF_NAME, entry.title)} Paired Remotes",
                     "paired_remotes",
                 )
             ]
@@ -37,6 +36,7 @@ class FluxPairedRemotes(FluxEntity, SensorEntity):
 
     _attr_icon = "mdi:remote"
     _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_translation_key = "paired_remotes"
 
     @property
     def native_value(self) -> int:
diff --git a/homeassistant/components/flux_led/services.yaml b/homeassistant/components/flux_led/services.yaml
index b17d81f9174076..5d880370818bb2 100644
--- a/homeassistant/components/flux_led/services.yaml
+++ b/homeassistant/components/flux_led/services.yaml
@@ -1,4 +1,5 @@
 set_custom_effect:
+  name: Set custom effect
   description: Set a custom light effect.
   target:
     entity:
@@ -37,6 +38,7 @@ set_custom_effect:
             - "jump"
             - "strobe"
 set_zones:
+  name: Set zones
   description: Set strip zones for Addressable v3 controllers (0xA3).
   target:
     entity:
@@ -78,6 +80,7 @@ set_zones:
             - "jump"
             - "breathing"
 set_music_mode:
+  name: Set music mode
   description: Configure music mode on Controller RGB with MIC (0x08), Addressable v2 (0xA2), and Addressable v3 (0xA3) devices that have a built-in microphone.
   target:
     entity:
diff --git a/homeassistant/components/flux_led/strings.json b/homeassistant/components/flux_led/strings.json
index 09d9ed399ffb51..51edd207e95073 100644
--- a/homeassistant/components/flux_led/strings.json
+++ b/homeassistant/components/flux_led/strings.json
@@ -32,5 +32,62 @@
         }
       }
     }
+  },
+  "entity": {
+    "button": {
+      "unpair_remotes": {
+        "name": "Unpair remotes"
+      }
+    },
+    "number": {
+      "pixels_per_segment": {
+        "name": "Pixels per segment"
+      },
+      "segments": {
+        "name": "Segments"
+      },
+      "music_pixels_per_segment": {
+        "name": "Music pixels per segment"
+      },
+      "music_segments": {
+        "name": "Music segments"
+      },
+      "effect_speed": {
+        "name": "Effect speed"
+      }
+    },
+    "select": {
+      "operating_mode": {
+        "name": "Operating mode"
+      },
+      "wiring": {
+        "name": "Wiring"
+      },
+      "ic_type": {
+        "name": "IC type"
+      },
+      "remote_config": {
+        "name": "Remote config"
+      },
+      "white_channel": {
+        "name": "White channel"
+      },
+      "power_restored": {
+        "name": "Power restored"
+      }
+    },
+    "sensor": {
+      "paired_remotes": {
+        "name": "Paired remotes"
+      }
+    },
+    "switch": {
+      "remote_access": {
+        "name": "Remote access"
+      },
+      "music": {
+        "name": "Music"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/flux_led/switch.py b/homeassistant/components/flux_led/switch.py
index d89f0020ba339f..58aee1322168bd 100644
--- a/homeassistant/components/flux_led/switch.py
+++ b/homeassistant/components/flux_led/switch.py
@@ -9,7 +9,7 @@
 
 from homeassistant import config_entries
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.const import CONF_NAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -34,18 +34,15 @@ async def async_setup_entry(
     coordinator: FluxLedUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities: list[FluxSwitch | FluxRemoteAccessSwitch | FluxMusicSwitch] = []
     base_unique_id = entry.unique_id or entry.entry_id
-    name = entry.data.get(CONF_NAME, entry.title)
 
     if coordinator.device.device_type == DeviceType.Switch:
-        entities.append(FluxSwitch(coordinator, base_unique_id, name, None))
+        entities.append(FluxSwitch(coordinator, base_unique_id, None))
 
     if entry.data.get(CONF_REMOTE_ACCESS_HOST):
         entities.append(FluxRemoteAccessSwitch(coordinator.device, entry))
 
     if coordinator.device.microphone:
-        entities.append(
-            FluxMusicSwitch(coordinator, base_unique_id, f"{name} Music", "music")
-        )
+        entities.append(FluxMusicSwitch(coordinator, base_unique_id, "music"))
 
     async_add_entities(entities)
 
@@ -55,6 +52,8 @@ class FluxSwitch(
 ):
     """Representation of a Flux switch."""
 
+    _attr_name = None
+
     async def _async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         if not self.is_on:
@@ -65,6 +64,7 @@ class FluxRemoteAccessSwitch(FluxBaseEntity, SwitchEntity):
     """Representation of a Flux remote access switch."""
 
     _attr_entity_category = EntityCategory.CONFIG
+    _attr_translation_key = "remote_access"
 
     def __init__(
         self,
@@ -73,7 +73,6 @@ def __init__(
     ) -> None:
         """Initialize the light."""
         super().__init__(device, entry)
-        self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Remote Access"
         base_unique_id = entry.unique_id or entry.entry_id
         self._attr_unique_id = f"{base_unique_id}_remote_access"
 
@@ -113,6 +112,8 @@ def icon(self) -> str:
 class FluxMusicSwitch(FluxEntity, SwitchEntity):
     """Representation of a Flux music switch."""
 
+    _attr_translation_key = "music"
+
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the microphone on."""
         await self._async_ensure_device_on()
diff --git a/homeassistant/components/foobot/manifest.json b/homeassistant/components/foobot/manifest.json
index a517f1fea6fa03..890cd95784cc5a 100644
--- a/homeassistant/components/foobot/manifest.json
+++ b/homeassistant/components/foobot/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/foobot",
   "iot_class": "cloud_polling",
   "loggers": ["foobot_async"],
-  "requirements": ["foobot_async==1.0.0"]
+  "requirements": ["foobot-async==1.0.0"]
 }
diff --git a/homeassistant/components/forecast_solar/const.py b/homeassistant/components/forecast_solar/const.py
index 0e47fa9701b48d..e566733413be65 100644
--- a/homeassistant/components/forecast_solar/const.py
+++ b/homeassistant/components/forecast_solar/const.py
@@ -1,14 +1,8 @@
 """Constants for the Forecast.Solar integration."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
-from homeassistant.const import UnitOfEnergy, UnitOfPower
-
-from .models import ForecastSolarSensorEntityDescription
-
 DOMAIN = "forecast_solar"
 LOGGER = logging.getLogger(__package__)
 
@@ -17,99 +11,3 @@
 CONF_MODULES_POWER = "modules power"
 CONF_DAMPING = "damping"
 CONF_INVERTER_SIZE = "inverter_size"
-
-SENSORS: tuple[ForecastSolarSensorEntityDescription, ...] = (
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_today",
-        name="Estimated energy production - today",
-        state=lambda estimate: estimate.energy_production_today,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_today_remaining",
-        name="Estimated energy production - remaining today",
-        state=lambda estimate: estimate.energy_production_today_remaining,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_production_tomorrow",
-        name="Estimated energy production - tomorrow",
-        state=lambda estimate: estimate.energy_production_tomorrow,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_highest_peak_time_today",
-        name="Highest power peak time - today",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_highest_peak_time_tomorrow",
-        name="Highest power peak time - tomorrow",
-        device_class=SensorDeviceClass.TIMESTAMP,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_now",
-        name="Estimated power production - now",
-        device_class=SensorDeviceClass.POWER,
-        state=lambda estimate: estimate.power_production_now,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_hour",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=1)
-        ),
-        name="Estimated power production - next hour",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_12hours",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=12)
-        ),
-        name="Estimated power production - next 12 hours",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="power_production_next_24hours",
-        state=lambda estimate: estimate.power_production_at_time(
-            estimate.now() + timedelta(hours=24)
-        ),
-        name="Estimated power production - next 24 hours",
-        device_class=SensorDeviceClass.POWER,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfPower.WATT,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_current_hour",
-        name="Estimated energy production - this hour",
-        state=lambda estimate: estimate.energy_current_hour,
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-    ForecastSolarSensorEntityDescription(
-        key="energy_next_hour",
-        state=lambda estimate: estimate.sum_energy_production(1),
-        name="Estimated energy production - next hour",
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-    ),
-)
diff --git a/homeassistant/components/forecast_solar/manifest.json b/homeassistant/components/forecast_solar/manifest.json
index ac6a3f7c3083e2..94b603e108c654 100644
--- a/homeassistant/components/forecast_solar/manifest.json
+++ b/homeassistant/components/forecast_solar/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "quality_scale": "platinum",
-  "requirements": ["forecast_solar==3.0.0"]
+  "requirements": ["forecast-solar==3.0.0"]
 }
diff --git a/homeassistant/components/forecast_solar/models.py b/homeassistant/components/forecast_solar/models.py
deleted file mode 100644
index af9b6125713b58..00000000000000
--- a/homeassistant/components/forecast_solar/models.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Models for the Forecast.Solar integration."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
-from forecast_solar.models import Estimate
-
-from homeassistant.components.sensor import SensorEntityDescription
-
-
-@dataclass
-class ForecastSolarSensorEntityDescription(SensorEntityDescription):
-    """Describes a Forecast.Solar Sensor."""
-
-    state: Callable[[Estimate], Any] | None = None
diff --git a/homeassistant/components/forecast_solar/sensor.py b/homeassistant/components/forecast_solar/sensor.py
index 681e04f434f0e3..2858bff098ea04 100644
--- a/homeassistant/components/forecast_solar/sensor.py
+++ b/homeassistant/components/forecast_solar/sensor.py
@@ -1,10 +1,22 @@
 """Support for the Forecast.Solar sensor service."""
 from __future__ import annotations
 
-from datetime import datetime
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+from typing import Any
 
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorEntity
+from forecast_solar.models import Estimate
+
+from homeassistant.components.sensor import (
+    DOMAIN as SENSOR_DOMAIN,
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import UnitOfEnergy, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
@@ -12,9 +24,112 @@
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, SENSORS
+from .const import DOMAIN
 from .coordinator import ForecastSolarDataUpdateCoordinator
-from .models import ForecastSolarSensorEntityDescription
+
+
+@dataclass
+class ForecastSolarSensorEntityDescription(SensorEntityDescription):
+    """Describes a Forecast.Solar Sensor."""
+
+    state: Callable[[Estimate], Any] | None = None
+
+
+SENSORS: tuple[ForecastSolarSensorEntityDescription, ...] = (
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_today",
+        name="Estimated energy production - today",
+        state=lambda estimate: estimate.energy_production_today,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_today_remaining",
+        name="Estimated energy production - remaining today",
+        state=lambda estimate: estimate.energy_production_today_remaining,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_production_tomorrow",
+        name="Estimated energy production - tomorrow",
+        state=lambda estimate: estimate.energy_production_tomorrow,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_highest_peak_time_today",
+        name="Highest power peak time - today",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_highest_peak_time_tomorrow",
+        name="Highest power peak time - tomorrow",
+        device_class=SensorDeviceClass.TIMESTAMP,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_now",
+        name="Estimated power production - now",
+        device_class=SensorDeviceClass.POWER,
+        state=lambda estimate: estimate.power_production_now,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_hour",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=1)
+        ),
+        name="Estimated power production - next hour",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_12hours",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=12)
+        ),
+        name="Estimated power production - next 12 hours",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="power_production_next_24hours",
+        state=lambda estimate: estimate.power_production_at_time(
+            estimate.now() + timedelta(hours=24)
+        ),
+        name="Estimated power production - next 24 hours",
+        device_class=SensorDeviceClass.POWER,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_current_hour",
+        name="Estimated energy production - this hour",
+        state=lambda estimate: estimate.energy_current_hour,
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+    ForecastSolarSensorEntityDescription(
+        key="energy_next_hour",
+        state=lambda estimate: estimate.sum_energy_production(1),
+        name="Estimated energy production - next hour",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=1,
+    ),
+)
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/fortios/device_tracker.py b/homeassistant/components/fortios/device_tracker.py
index 95a418ae40faaa..d941375c8a3e17 100644
--- a/homeassistant/components/fortios/device_tracker.py
+++ b/homeassistant/components/fortios/device_tracker.py
@@ -43,7 +43,7 @@ def get_scanner(hass: HomeAssistant, config: ConfigType) -> FortiOSDeviceScanner
     fgt = FortiOSAPI()
 
     try:
-        fgt.tokenlogin(host, token, verify_ssl)
+        fgt.tokenlogin(host, token, verify_ssl, None, 12, "root")
     except ConnectionError as ex:
         _LOGGER.error("ConnectionError to FortiOS API: %s", ex)
         return None
@@ -77,7 +77,12 @@ def __init__(self, fgt) -> None:
 
     def update(self):
         """Update clients from the device."""
-        clients_json = self._fgt.monitor("user/device/query", "")
+        clients_json = self._fgt.monitor(
+            "user/device/query",
+            "",
+            parameters={"filter": "format=master_mac|hostname|is_online"},
+        )
+
         self._clients_json = clients_json
 
         self._clients = []
@@ -85,8 +90,12 @@ def update(self):
         if clients_json:
             try:
                 for client in clients_json["results"]:
-                    if client["is_online"]:
-                        self._clients.append(client["mac"].upper())
+                    if (
+                        "is_online" in client
+                        and "master_mac" in client
+                        and client["is_online"]
+                    ):
+                        self._clients.append(client["master_mac"].upper())
             except KeyError as kex:
                 _LOGGER.error("Key not found in clients: %s", kex)
 
@@ -106,17 +115,10 @@ def get_device_name(self, device):
             return None
 
         for client in data["results"]:
-            if client["mac"] == device:
-                try:
+            if "master_mac" in client and client["master_mac"] == device:
+                if "hostname" in client:
                     name = client["hostname"]
-                    _LOGGER.debug("Getting device name=%s", name)
-                    return name
-                except KeyError as kex:
-                    _LOGGER.debug(
-                        "No hostname found for %s in client data: %s",
-                        device,
-                        kex,
-                    )
-                    return device.replace(":", "_")
-
+                else:
+                    name = client["master_mac"].replace(":", "_")
+                return name
         return None
diff --git a/homeassistant/components/freebox/binary_sensor.py b/homeassistant/components/freebox/binary_sensor.py
new file mode 100644
index 00000000000000..aabd07366b40f7
--- /dev/null
+++ b/homeassistant/components/freebox/binary_sensor.py
@@ -0,0 +1,100 @@
+"""Support for Freebox devices (Freebox v6 and Freebox mini 4K)."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    EntityCategory,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .router import FreeboxRouter
+
+_LOGGER = logging.getLogger(__name__)
+
+RAID_SENSORS: tuple[BinarySensorEntityDescription, ...] = (
+    BinarySensorEntityDescription(
+        key="raid_degraded",
+        name="degraded",
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the binary sensors."""
+    router: FreeboxRouter = hass.data[DOMAIN][entry.unique_id]
+
+    _LOGGER.debug("%s - %s - %s raid(s)", router.name, router.mac, len(router.raids))
+
+    binary_entities = [
+        FreeboxRaidDegradedSensor(router, raid, description)
+        for raid in router.raids.values()
+        for description in RAID_SENSORS
+    ]
+
+    if binary_entities:
+        async_add_entities(binary_entities, True)
+
+
+class FreeboxRaidDegradedSensor(BinarySensorEntity):
+    """Representation of a Freebox raid sensor."""
+
+    _attr_should_poll = False
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        router: FreeboxRouter,
+        raid: dict[str, Any],
+        description: BinarySensorEntityDescription,
+    ) -> None:
+        """Initialize a Freebox raid degraded sensor."""
+        self.entity_description = description
+        self._router = router
+        self._attr_device_info = router.device_info
+        self._raid = raid
+        self._attr_name = f"Raid array {raid['id']} {description.name}"
+        self._attr_unique_id = (
+            f"{router.mac} {description.key} {raid['name']} {raid['id']}"
+        )
+
+    @callback
+    def async_update_state(self) -> None:
+        """Update the Freebox Raid sensor."""
+        self._raid = self._router.raids[self._raid["id"]]
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if degraded."""
+        return self._raid["degraded"]
+
+    @callback
+    def async_on_demand_update(self):
+        """Update state."""
+        self.async_update_state()
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register state update callback."""
+        self.async_update_state()
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                self._router.signal_sensor_update,
+                self.async_on_demand_update,
+            )
+        )
diff --git a/homeassistant/components/freebox/const.py b/homeassistant/components/freebox/const.py
index 767cb94de48afc..5a7c7863b4e0b8 100644
--- a/homeassistant/components/freebox/const.py
+++ b/homeassistant/components/freebox/const.py
@@ -20,6 +20,7 @@
     Platform.BUTTON,
     Platform.DEVICE_TRACKER,
     Platform.SENSOR,
+    Platform.BINARY_SENSOR,
     Platform.SWITCH,
     Platform.CAMERA,
 ]
diff --git a/homeassistant/components/freebox/home_base.py b/homeassistant/components/freebox/home_base.py
index f10a9e047f73ac..c74f072a5be412 100644
--- a/homeassistant/components/freebox/home_base.py
+++ b/homeassistant/components/freebox/home_base.py
@@ -30,8 +30,8 @@ def __init__(
         self._node = node
         self._sub_node = sub_node
         self._id = node["id"]
-        self._device_name = node["label"].strip()
-        self._attr_name = self._device_name
+        self._attr_name = node["label"].strip()
+        self._device_name = self._attr_name
         self._attr_unique_id = f"{self._router.mac}-node_{self._id}"
 
         if sub_node is not None:
diff --git a/homeassistant/components/freebox/router.py b/homeassistant/components/freebox/router.py
index 5622da48e673a0..4a9c22847aebfe 100644
--- a/homeassistant/components/freebox/router.py
+++ b/homeassistant/components/freebox/router.py
@@ -72,6 +72,7 @@ def __init__(
 
         self.devices: dict[str, dict[str, Any]] = {}
         self.disks: dict[int, dict[str, Any]] = {}
+        self.raids: dict[int, dict[str, Any]] = {}
         self.sensors_temperature: dict[str, int] = {}
         self.sensors_connection: dict[str, float] = {}
         self.call_list: list[dict[str, Any]] = []
@@ -145,6 +146,8 @@ async def update_sensors(self) -> None:
 
         await self._update_disks_sensors()
 
+        await self._update_raids_sensors()
+
         async_dispatcher_send(self.hass, self.signal_sensor_update)
 
     async def _update_disks_sensors(self) -> None:
@@ -155,6 +158,14 @@ async def _update_disks_sensors(self) -> None:
         for fbx_disk in fbx_disks:
             self.disks[fbx_disk["id"]] = fbx_disk
 
+    async def _update_raids_sensors(self) -> None:
+        """Update Freebox raids."""
+        # None at first request
+        fbx_raids: list[dict[str, Any]] = await self._api.storage.get_raids() or []
+
+        for fbx_raid in fbx_raids:
+            self.raids[fbx_raid["id"]] = fbx_raid
+
     async def update_home_devices(self) -> None:
         """Update Home devices (alarm, light, sensor, switch, remote ...)."""
         if not self.home_granted:
diff --git a/homeassistant/components/freedompro/__init__.py b/homeassistant/components/freedompro/__init__.py
index 5e1f8e0b577d2b..78871bc99bfb75 100644
--- a/homeassistant/components/freedompro/__init__.py
+++ b/homeassistant/components/freedompro/__init__.py
@@ -1,19 +1,15 @@
 """Support for freedompro."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
-from typing import Any, Final
-
-from pyfreedompro import get_list, get_states
+from typing import Final
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -58,39 +54,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
     """Update listener."""
     await hass.config_entries.async_reload(config_entry.entry_id)
-
-
-class FreedomproDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
-    """Class to manage fetching Freedompro data API."""
-
-    def __init__(self, hass, api_key):
-        """Initialize."""
-        self._hass = hass
-        self._api_key = api_key
-        self._devices: list[dict[str, Any]] | None = None
-
-        update_interval = timedelta(minutes=1)
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def _async_update_data(self):
-        if self._devices is None:
-            result = await get_list(
-                aiohttp_client.async_get_clientsession(self._hass), self._api_key
-            )
-            if result["state"]:
-                self._devices = result["devices"]
-            else:
-                raise UpdateFailed()
-
-        result = await get_states(
-            aiohttp_client.async_get_clientsession(self._hass), self._api_key
-        )
-
-        for device in self._devices:
-            dev = next(
-                (dev for dev in result if dev["uid"] == device["uid"]),
-                None,
-            )
-            if dev is not None and "state" in dev:
-                device["state"] = dev["state"]
-        return self._devices
diff --git a/homeassistant/components/freedompro/binary_sensor.py b/homeassistant/components/freedompro/binary_sensor.py
index c56d3cb2ad882a..9f397d32899f4e 100644
--- a/homeassistant/components/freedompro/binary_sensor.py
+++ b/homeassistant/components/freedompro/binary_sensor.py
@@ -11,8 +11,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "smokeSensor": BinarySensorDeviceClass.SMOKE,
@@ -44,14 +44,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], BinarySensorEntity):
-    """Representation of an Freedompro binary_sensor."""
+    """Representation of a Freedompro binary_sensor."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, device: dict[str, Any], coordinator: FreedomproDataUpdateCoordinator
     ) -> None:
         """Initialize the Freedompro binary_sensor."""
         super().__init__(coordinator)
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._attr_device_info = DeviceInfo(
@@ -60,7 +62,7 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
 
diff --git a/homeassistant/components/freedompro/climate.py b/homeassistant/components/freedompro/climate.py
index 0ec08f0fdd0487..8a0a706c0d93d7 100644
--- a/homeassistant/components/freedompro/climate.py
+++ b/homeassistant/components/freedompro/climate.py
@@ -22,8 +22,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -58,10 +58,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], ClimateEntity):
-    """Representation of an Freedompro climate."""
+    """Representation of a Freedompro climate."""
 
+    _attr_has_entity_name = True
     _attr_hvac_modes = SUPPORTED_HVAC_MODES
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_name = None
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+    _attr_current_temperature = 0
+    _attr_target_temperature = 0
+    _attr_hvac_mode = HVACMode.OFF
 
     def __init__(
         self,
@@ -74,7 +80,6 @@ def __init__(
         super().__init__(coordinator)
         self._session = session
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._characteristics = device["characteristics"]
         self._attr_device_info = DeviceInfo(
@@ -83,12 +88,8 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
-        self._attr_current_temperature = 0
-        self._attr_target_temperature = 0
-        self._attr_hvac_mode = HVACMode.OFF
 
     @callback
     def _handle_coordinator_update(self) -> None:
@@ -121,8 +122,7 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         if hvac_mode not in SUPPORTED_HVAC_MODES:
             raise ValueError(f"Got unsupported hvac_mode {hvac_mode}")
 
-        payload = {}
-        payload["heatingCoolingState"] = HVAC_INVERT_MAP[hvac_mode]
+        payload = {"heatingCoolingState": HVAC_INVERT_MAP[hvac_mode]}
         await put_state(
             self._session,
             self._api_key,
diff --git a/homeassistant/components/freedompro/coordinator.py b/homeassistant/components/freedompro/coordinator.py
new file mode 100644
index 00000000000000..c896f5ec203406
--- /dev/null
+++ b/homeassistant/components/freedompro/coordinator.py
@@ -0,0 +1,51 @@
+"""Freedompro data update coordinator."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from pyfreedompro import get_list, get_states
+
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class FreedomproDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]):
+    """Class to manage fetching Freedompro data API."""
+
+    def __init__(self, hass, api_key):
+        """Initialize."""
+        self._hass = hass
+        self._api_key = api_key
+        self._devices: list[dict[str, Any]] | None = None
+
+        update_interval = timedelta(minutes=1)
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+
+    async def _async_update_data(self):
+        if self._devices is None:
+            result = await get_list(
+                aiohttp_client.async_get_clientsession(self._hass), self._api_key
+            )
+            if result["state"]:
+                self._devices = result["devices"]
+            else:
+                raise UpdateFailed()
+
+        result = await get_states(
+            aiohttp_client.async_get_clientsession(self._hass), self._api_key
+        )
+
+        for device in self._devices:
+            dev = next(
+                (dev for dev in result if dev["uid"] == device["uid"]),
+                None,
+            )
+            if dev is not None and "state" in dev:
+                device["state"] = dev["state"]
+        return self._devices
diff --git a/homeassistant/components/freedompro/cover.py b/homeassistant/components/freedompro/cover.py
index 3839415d31b8a0..59e58d75c43b8e 100644
--- a/homeassistant/components/freedompro/cover.py
+++ b/homeassistant/components/freedompro/cover.py
@@ -18,8 +18,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "windowCovering": CoverDeviceClass.BLIND,
@@ -46,7 +46,17 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], CoverEntity):
-    """Representation of an Freedompro cover."""
+    """Representation of a Freedompro cover."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_current_cover_position = 0
+    _attr_is_closed = True
+    _attr_supported_features = (
+        CoverEntityFeature.CLOSE
+        | CoverEntityFeature.OPEN
+        | CoverEntityFeature.SET_POSITION
+    )
 
     def __init__(
         self,
@@ -59,7 +69,6 @@ def __init__(
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={
@@ -67,14 +76,7 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
-        )
-        self._attr_current_cover_position = 0
-        self._attr_is_closed = True
-        self._attr_supported_features = (
-            CoverEntityFeature.CLOSE
-            | CoverEntityFeature.OPEN
-            | CoverEntityFeature.SET_POSITION
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
 
diff --git a/homeassistant/components/freedompro/fan.py b/homeassistant/components/freedompro/fan.py
index 036c6c91471f3c..68149b65fd73bd 100644
--- a/homeassistant/components/freedompro/fan.py
+++ b/homeassistant/components/freedompro/fan.py
@@ -15,8 +15,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -33,7 +33,12 @@ async def async_setup_entry(
 
 
 class FreedomproFan(CoordinatorEntity[FreedomproDataUpdateCoordinator], FanEntity):
-    """Representation of an Freedompro fan."""
+    """Representation of a Freedompro fan."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_is_on = False
+    _attr_percentage = 0
 
     def __init__(
         self,
@@ -46,7 +51,6 @@ def __init__(
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._characteristics = device["characteristics"]
         self._attr_device_info = DeviceInfo(
@@ -55,10 +59,8 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_is_on = False
-        self._attr_percentage = 0
         if "rotationSpeed" in self._characteristics:
             self._attr_supported_features = FanEntityFeature.SET_SPEED
 
diff --git a/homeassistant/components/freedompro/light.py b/homeassistant/components/freedompro/light.py
index 7dc573f922517d..2a101d5c82a762 100644
--- a/homeassistant/components/freedompro/light.py
+++ b/homeassistant/components/freedompro/light.py
@@ -20,8 +20,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -38,7 +38,12 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LightEntity):
-    """Representation of an Freedompro light."""
+    """Representation of a Freedompro light."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_is_on = False
+    _attr_brightness = 0
 
     def __init__(
         self,
@@ -51,16 +56,13 @@ def __init__(
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, device["uid"])},
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
-        self._attr_is_on = False
-        self._attr_brightness = 0
         color_mode = ColorMode.ONOFF
         if "hue" in device["characteristics"]:
             color_mode = ColorMode.HS
diff --git a/homeassistant/components/freedompro/lock.py b/homeassistant/components/freedompro/lock.py
index d803354c255663..e1e8ee44b2dbea 100644
--- a/homeassistant/components/freedompro/lock.py
+++ b/homeassistant/components/freedompro/lock.py
@@ -13,8 +13,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -31,7 +31,10 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], LockEntity):
-    """Representation of an Freedompro lock."""
+    """Representation of a Freedompro lock."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -45,7 +48,6 @@ def __init__(
         self._hass = hass
         self._session = aiohttp_client.async_get_clientsession(self._hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._characteristics = device["characteristics"]
@@ -55,7 +57,7 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=self._type,
-            name=self.name,
+            name=device["name"],
         )
 
     @callback
diff --git a/homeassistant/components/freedompro/sensor.py b/homeassistant/components/freedompro/sensor.py
index 286a528013ac53..85d70c3095658c 100644
--- a/homeassistant/components/freedompro/sensor.py
+++ b/homeassistant/components/freedompro/sensor.py
@@ -13,8 +13,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 DEVICE_CLASS_MAP = {
     "temperatureSensor": SensorDeviceClass.TEMPERATURE,
@@ -52,14 +52,16 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SensorEntity):
-    """Representation of an Freedompro sensor."""
+    """Representation of a Freedompro sensor."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, device: dict[str, Any], coordinator: FreedomproDataUpdateCoordinator
     ) -> None:
         """Initialize the Freedompro sensor."""
         super().__init__(coordinator)
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._type = device["type"]
         self._attr_device_info = DeviceInfo(
@@ -68,7 +70,7 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_device_class = DEVICE_CLASS_MAP[device["type"]]
         self._attr_state_class = STATE_CLASS_MAP[device["type"]]
diff --git a/homeassistant/components/freedompro/switch.py b/homeassistant/components/freedompro/switch.py
index 4a7ed80de1e29a..97f0a968cff4f2 100644
--- a/homeassistant/components/freedompro/switch.py
+++ b/homeassistant/components/freedompro/switch.py
@@ -13,8 +13,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import FreedomproDataUpdateCoordinator
 from .const import DOMAIN
+from .coordinator import FreedomproDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -31,7 +31,10 @@ async def async_setup_entry(
 
 
 class Device(CoordinatorEntity[FreedomproDataUpdateCoordinator], SwitchEntity):
-    """Representation of an Freedompro switch."""
+    """Representation of a Freedompro switch."""
+
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -44,7 +47,6 @@ def __init__(
         super().__init__(coordinator)
         self._session = aiohttp_client.async_get_clientsession(hass)
         self._api_key = api_key
-        self._attr_name = device["name"]
         self._attr_unique_id = device["uid"]
         self._attr_device_info = DeviceInfo(
             identifiers={
@@ -52,7 +54,7 @@ def __init__(
             },
             manufacturer="Freedompro",
             model=device["type"],
-            name=self.name,
+            name=device["name"],
         )
         self._attr_is_on = False
 
diff --git a/homeassistant/components/fritz/button.py b/homeassistant/components/fritz/button.py
index f732e32b75ab9c..d76279a0f14b5a 100644
--- a/homeassistant/components/fritz/button.py
+++ b/homeassistant/components/fritz/button.py
@@ -46,7 +46,6 @@ class FritzButtonDescription(ButtonEntityDescription, FritzButtonDescriptionMixi
     ),
     FritzButtonDescription(
         key="reboot",
-        translation_key="reboot",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda avm_wrapper: avm_wrapper.async_trigger_reboot(),
diff --git a/homeassistant/components/fritz/const.py b/homeassistant/components/fritz/const.py
index d43ba2eda6219f..1ce21081f9c8b5 100644
--- a/homeassistant/components/fritz/const.py
+++ b/homeassistant/components/fritz/const.py
@@ -31,6 +31,7 @@ class MeshRoles(StrEnum):
     Platform.BUTTON,
     Platform.BINARY_SENSOR,
     Platform.DEVICE_TRACKER,
+    Platform.IMAGE,
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.UPDATE,
diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py
index e32ee1527969dc..d4ba53aa6a2664 100644
--- a/homeassistant/components/fritz/device_tracker.py
+++ b/homeassistant/components/fritz/device_tracker.py
@@ -21,9 +21,6 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-YAML_DEFAULT_HOST = "169.254.1.1"
-YAML_DEFAULT_USERNAME = "admin"
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
diff --git a/homeassistant/components/fritz/image.py b/homeassistant/components/fritz/image.py
new file mode 100644
index 00000000000000..597dd8ddb5390f
--- /dev/null
+++ b/homeassistant/components/fritz/image.py
@@ -0,0 +1,95 @@
+"""FRITZ image integration."""
+
+from __future__ import annotations
+
+from io import BytesIO
+import logging
+
+from homeassistant.components.image import ImageEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import dt as dt_util, slugify
+
+from .common import AvmWrapper, FritzBoxBaseEntity
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up guest WiFi QR code for device."""
+    avm_wrapper: AvmWrapper = hass.data[DOMAIN][entry.entry_id]
+
+    guest_wifi_info = await hass.async_add_executor_job(
+        avm_wrapper.fritz_guest_wifi.get_info
+    )
+
+    if not guest_wifi_info.get("NewEnable"):
+        return
+
+    async_add_entities(
+        [
+            FritzGuestWifiQRImage(
+                hass, avm_wrapper, entry.title, guest_wifi_info["NewSSID"]
+            )
+        ]
+    )
+
+
+class FritzGuestWifiQRImage(FritzBoxBaseEntity, ImageEntity):
+    """Implementation of the FritzBox guest wifi QR code image entity."""
+
+    _attr_content_type = "image/png"
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_has_entity_name = True
+    _attr_should_poll = True
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        avm_wrapper: AvmWrapper,
+        device_friendly_name: str,
+        ssid: str,
+    ) -> None:
+        """Initialize the image entity."""
+        self._attr_name = ssid
+        self._attr_unique_id = slugify(f"{avm_wrapper.unique_id}-{ssid}-qr-code")
+        self._current_qr_bytes: bytes | None = None
+        super().__init__(avm_wrapper, device_friendly_name)
+        ImageEntity.__init__(self, hass)
+
+    async def _fetch_image(self) -> bytes:
+        """Fetch the QR code from the Fritz!Box."""
+        qr_stream: BytesIO = await self.hass.async_add_executor_job(
+            self._avm_wrapper.fritz_guest_wifi.get_wifi_qr_code, "png"
+        )
+        qr_bytes = qr_stream.getvalue()
+        _LOGGER.debug("fetched %s bytes", len(qr_bytes))
+
+        return qr_bytes
+
+    async def async_added_to_hass(self) -> None:
+        """Fetch and set initial data and state."""
+        self._current_qr_bytes = await self._fetch_image()
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_update(self) -> None:
+        """Update the image entity data."""
+        qr_bytes = await self._fetch_image()
+
+        if self._current_qr_bytes != qr_bytes:
+            dt_now = dt_util.utcnow()
+            _LOGGER.debug("qr code has changed, reset image last updated property")
+            self._attr_image_last_updated = dt_now
+            self._current_qr_bytes = qr_bytes
+            self.async_write_ha_state()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return self._current_qr_bytes
diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json
index b117218e23dec9..54419d5ae3fddf 100644
--- a/homeassistant/components/fritz/manifest.json
+++ b/homeassistant/components/fritz/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/fritz",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.12.0", "xmltodict==0.13.0"],
+  "requirements": ["fritzconnection[qr]==1.12.0", "xmltodict==0.13.0"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"
diff --git a/homeassistant/components/fritz/services.yaml b/homeassistant/components/fritz/services.yaml
index 3c7ed6438417a6..95527257ea9c48 100644
--- a/homeassistant/components/fritz/services.yaml
+++ b/homeassistant/components/fritz/services.yaml
@@ -1,4 +1,5 @@
 reconnect:
+  name: Reconnect
   description: Reconnects your FRITZ!Box internet connection
   fields:
     device_id:
@@ -11,6 +12,7 @@ reconnect:
           entity:
             device_class: connectivity
 reboot:
+  name: Reboot
   description: Reboots your FRITZ!Box
   fields:
     device_id:
@@ -24,6 +26,7 @@ reboot:
             device_class: connectivity
 
 cleanup:
+  name: Remove stale device tracker entities
   description: Remove FRITZ!Box stale device_tracker entities
   fields:
     device_id:
diff --git a/homeassistant/components/fritz/strings.json b/homeassistant/components/fritz/strings.json
index 45262d6f8ac1d7..fcaa56424f1b65 100644
--- a/homeassistant/components/fritz/strings.json
+++ b/homeassistant/components/fritz/strings.json
@@ -61,9 +61,6 @@
     "button": {
       "cleanup": { "name": "Cleanup" },
       "firmware_update": { "name": "Firmware update" },
-      "reboot": {
-        "name": "[%key:component::button::entity_component::restart::name%]"
-      },
       "reconnect": { "name": "Reconnect" }
     },
     "sensor": {
diff --git a/homeassistant/components/fritz/switch.py b/homeassistant/components/fritz/switch.py
index 5b8c40485306cf..1352d9cb42e08e 100644
--- a/homeassistant/components/fritz/switch.py
+++ b/homeassistant/components/fritz/switch.py
@@ -518,7 +518,6 @@ def __init__(self, avm_wrapper: AvmWrapper, device: FritzDevice) -> None:
             default_manufacturer="AVM",
             default_model="FRITZ!Box Tracked device",
             default_name=device.hostname,
-            identifiers={(DOMAIN, self._mac)},
             via_device=(
                 DOMAIN,
                 avm_wrapper.unique_id,
diff --git a/homeassistant/components/fritzbox/binary_sensor.py b/homeassistant/components/fritzbox/binary_sensor.py
index f87beb34079c9e..dc56bc0473e589 100644
--- a/homeassistant/components/fritzbox/binary_sensor.py
+++ b/homeassistant/components/fritzbox/binary_sensor.py
@@ -42,8 +42,8 @@ class FritzBinarySensorEntityDescription(
         key="alarm",
         translation_key="alarm",
         device_class=BinarySensorDeviceClass.WINDOW,
-        suitable=lambda device: device.has_alarm,  # type: ignore[no-any-return]
-        is_on=lambda device: device.alert_state,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_alarm,
+        is_on=lambda device: device.alert_state,
     ),
     FritzBinarySensorEntityDescription(
         key="lock",
diff --git a/homeassistant/components/fritzbox/climate.py b/homeassistant/components/fritzbox/climate.py
index 31cdac47ec2ce7..7c84678963772e 100644
--- a/homeassistant/components/fritzbox/climate.py
+++ b/homeassistant/components/fritzbox/climate.py
@@ -101,7 +101,7 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
         await self.coordinator.async_refresh()
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return the current operation mode."""
         if self.data.target_temperature in (
             OFF_REPORT_SET_TEMPERATURE,
diff --git a/homeassistant/components/fritzbox/sensor.py b/homeassistant/components/fritzbox/sensor.py
index 7922224e195feb..46fa1a265611aa 100644
--- a/homeassistant/components/fritzbox/sensor.py
+++ b/homeassistant/components/fritzbox/sensor.py
@@ -91,66 +91,59 @@ def value_scheduled_preset(device: FritzhomeDevice) -> str:
 SENSOR_TYPES: Final[tuple[FritzSensorEntityDescription, ...]] = (
     FritzSensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_temperature,
-        native_value=lambda device: device.temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.temperature,
     ),
     FritzSensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         suitable=lambda device: device.rel_humidity is not None,
-        native_value=lambda device: device.rel_humidity,  # type: ignore[no-any-return]
+        native_value=lambda device: device.rel_humidity,
     ),
     FritzSensorEntityDescription(
         key="battery",
-        translation_key="battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=lambda device: device.battery_level is not None,
-        native_value=lambda device: device.battery_level,  # type: ignore[no-any-return]
+        native_value=lambda device: device.battery_level,
     ),
     FritzSensorEntityDescription(
         key="power_consumption",
-        translation_key="power_consumption",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.power or 0.0) / 1000, 3),
     ),
     FritzSensorEntityDescription(
         key="voltage",
-        translation_key="voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.voltage or 0.0) / 1000, 2),
     ),
     FritzSensorEntityDescription(
         key="electric_current",
-        translation_key="electric_current",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: round((device.current or 0.0) / 1000, 3),
     ),
     FritzSensorEntityDescription(
         key="total_energy",
-        translation_key="total_energy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suitable=lambda device: device.has_powermeter,  # type: ignore[no-any-return]
+        suitable=lambda device: device.has_powermeter,
         native_value=lambda device: (device.energy or 0.0) / 1000,
     ),
     # Thermostat Sensors
@@ -161,7 +154,7 @@ def value_scheduled_preset(device: FritzhomeDevice) -> str:
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_comfort_temperature,
-        native_value=lambda device: device.comfort_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.comfort_temperature,
     ),
     FritzSensorEntityDescription(
         key="eco_temperature",
@@ -170,7 +163,7 @@ def value_scheduled_preset(device: FritzhomeDevice) -> str:
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_eco_temperature,
-        native_value=lambda device: device.eco_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.eco_temperature,
     ),
     FritzSensorEntityDescription(
         key="nextchange_temperature",
@@ -179,7 +172,7 @@ def value_scheduled_preset(device: FritzhomeDevice) -> str:
         device_class=SensorDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.DIAGNOSTIC,
         suitable=suitable_nextchange_temperature,
-        native_value=lambda device: device.nextchange_temperature,  # type: ignore[no-any-return]
+        native_value=lambda device: device.nextchange_temperature,
     ),
     FritzSensorEntityDescription(
         key="nextchange_time",
diff --git a/homeassistant/components/fritzbox/strings.json b/homeassistant/components/fritzbox/strings.json
index 0b4becd6ff7e49..d5607aa3090078 100644
--- a/homeassistant/components/fritzbox/strings.json
+++ b/homeassistant/components/fritzbox/strings.json
@@ -44,33 +44,12 @@
       "lock": { "name": "Button lock on device" }
     },
     "sensor": {
-      "battery": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      },
       "comfort_temperature": { "name": "Comfort temperature" },
       "eco_temperature": { "name": "Eco temperature" },
-      "electric_current": {
-        "name": "[%key:component::sensor::entity_component::current::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
       "nextchange_preset": { "name": "Next scheduled preset" },
       "nextchange_temperature": { "name": "Next scheduled temperature" },
       "nextchange_time": { "name": "Next scheduled change time" },
-      "power_consumption": {
-        "name": "[%key:component::sensor::entity_component::power::name%]"
-      },
-      "scheduled_preset": { "name": "Current scheduled preset" },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "total_energy": {
-        "name": "[%key:component::sensor::entity_component::energy::name%]"
-      },
-      "voltage": {
-        "name": "[%key:component::sensor::entity_component::voltage::name%]"
-      }
+      "scheduled_preset": { "name": "Current scheduled preset" }
     }
   }
 }
diff --git a/homeassistant/components/fritzbox_callmonitor/manifest.json b/homeassistant/components/fritzbox_callmonitor/manifest.json
index cde955caa1e6cc..d445c12e4dab4f 100644
--- a/homeassistant/components/fritzbox_callmonitor/manifest.json
+++ b/homeassistant/components/fritzbox_callmonitor/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.12.0"]
+  "requirements": ["fritzconnection[qr]==1.12.0"]
 }
diff --git a/homeassistant/components/fronius/manifest.json b/homeassistant/components/fronius/manifest.json
index 7120530c9736db..ecf3f81b38043f 100644
--- a/homeassistant/components/fronius/manifest.json
+++ b/homeassistant/components/fronius/manifest.json
@@ -12,5 +12,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyfronius"],
   "quality_scale": "platinum",
-  "requirements": ["pyfronius==0.7.1"]
+  "requirements": ["PyFronius==0.7.1"]
 }
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 4e1e0a74fe9ba7..07c5585833dd20 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20230503.3"]
+  "requirements": ["home-assistant-frontend==20230705.1"]
 }
diff --git a/homeassistant/components/frontier_silicon/config_flow.py b/homeassistant/components/frontier_silicon/config_flow.py
index 5179b02bbc3c70..2274b1cdb4499c 100644
--- a/homeassistant/components/frontier_silicon/config_flow.py
+++ b/homeassistant/components/frontier_silicon/config_flow.py
@@ -16,7 +16,7 @@
 
 from homeassistant import config_entries
 from homeassistant.components import ssdp
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.data_entry_flow import FlowResult
 
 from .const import (
@@ -61,42 +61,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     _webfsapi_url: str
     _reauth_entry: config_entries.ConfigEntry | None = None  # Only used in reauth flows
 
-    async def async_step_import(self, import_info: dict[str, Any]) -> FlowResult:
-        """Handle the import of legacy configuration.yaml entries."""
-
-        device_url = f"http://{import_info[CONF_HOST]}:{import_info[CONF_PORT]}/device"
-        try:
-            webfsapi_url = await AFSAPI.get_webfsapi_endpoint(device_url)
-        except FSConnectionError:
-            return self.async_abort(reason="cannot_connect")
-        except Exception as exception:  # pylint: disable=broad-except
-            _LOGGER.exception(exception)
-            return self.async_abort(reason="unknown")
-
-        afsapi = AFSAPI(webfsapi_url, import_info[CONF_PIN])
-        try:
-            unique_id = await afsapi.get_radio_id()
-        except NotImplementedException:
-            unique_id = None  # Not all radios have this call implemented
-        except FSConnectionError:
-            return self.async_abort(reason="cannot_connect")
-        except InvalidPinException:
-            return self.async_abort(reason="invalid_auth")
-        except Exception as exception:  # pylint: disable=broad-except
-            _LOGGER.exception(exception)
-            return self.async_abort(reason="unknown")
-
-        await self.async_set_unique_id(unique_id, raise_on_progress=False)
-        self._abort_if_unique_id_configured()
-
-        return self.async_create_entry(
-            title=import_info[CONF_NAME] or "Radio",
-            data={
-                CONF_WEBFSAPI_URL: webfsapi_url,
-                CONF_PIN: import_info[CONF_PIN],
-            },
-        )
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
diff --git a/homeassistant/components/frontier_silicon/media_player.py b/homeassistant/components/frontier_silicon/media_player.py
index 54c17429b56e43..04b689ae917ccd 100644
--- a/homeassistant/components/frontier_silicon/media_player.py
+++ b/homeassistant/components/frontier_silicon/media_player.py
@@ -10,10 +10,8 @@
     NotImplementedException as FSNotImplementedException,
     PlayState,
 )
-import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA,
     BrowseError,
     BrowseMedia,
     MediaPlayerEntity,
@@ -21,62 +19,16 @@
     MediaPlayerState,
     MediaType,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .browse_media import browse_node, browse_top_level
-from .const import CONF_PIN, DEFAULT_PIN, DEFAULT_PORT, DOMAIN, MEDIA_CONTENT_ID_PRESET
+from .const import DOMAIN, MEDIA_CONTENT_ID_PRESET
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_HOST): cv.string,
-        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-        vol.Optional(CONF_PASSWORD, default=DEFAULT_PIN): cv.string,
-        vol.Optional(CONF_NAME): cv.string,
-    }
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Frontier Silicon platform.
-
-    YAML is deprecated, and imported automatically.
-    """
-
-    ir.async_create_issue(
-        hass,
-        DOMAIN,
-        "remove_yaml",
-        breaks_in_ha_version="2023.6.0",
-        is_fixable=False,
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="removed_yaml",
-    )
-
-    await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data={
-            CONF_NAME: config.get(CONF_NAME),
-            CONF_HOST: config.get(CONF_HOST),
-            CONF_PORT: config.get(CONF_PORT, DEFAULT_PORT),
-            CONF_PIN: config.get(CONF_PASSWORD, DEFAULT_PIN),
-        },
-    )
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/frontier_silicon/strings.json b/homeassistant/components/frontier_silicon/strings.json
index 193ca7123f4563..a10c3f535a1053 100644
--- a/homeassistant/components/frontier_silicon/strings.json
+++ b/homeassistant/components/frontier_silicon/strings.json
@@ -30,11 +30,5 @@
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
-  },
-  "issues": {
-    "removed_yaml": {
-      "title": "The Frontier Silicon YAML configuration has been removed",
-      "description": "Configuring Frontier Silicon using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/fully_kiosk/__init__.py b/homeassistant/components/fully_kiosk/__init__.py
index e417d7c0bcb0f9..8b350433858db7 100644
--- a/homeassistant/components/fully_kiosk/__init__.py
+++ b/homeassistant/components/fully_kiosk/__init__.py
@@ -2,6 +2,8 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
 from .coordinator import FullyKioskDataUpdateCoordinator
@@ -16,6 +18,16 @@
     Platform.SWITCH,
 ]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up Fully Kiosk Browser."""
+
+    await async_setup_services(hass)
+
+    return True
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Fully Kiosk Browser from a config entry."""
@@ -26,8 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    await async_setup_services(hass)
+    coordinator.async_update_listeners()
 
     return True
 
diff --git a/homeassistant/components/fully_kiosk/binary_sensor.py b/homeassistant/components/fully_kiosk/binary_sensor.py
index f7371f4caedd00..5eebf8a77ab3d2 100644
--- a/homeassistant/components/fully_kiosk/binary_sensor.py
+++ b/homeassistant/components/fully_kiosk/binary_sensor.py
@@ -18,18 +18,18 @@
 SENSORS: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
         key="kioskMode",
-        name="Kiosk mode",
+        translation_key="kiosk_mode",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key="plugged",
-        name="Plugged in",
+        translation_key="plugged_in",
         device_class=BinarySensorDeviceClass.PLUG,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     BinarySensorEntityDescription(
         key="isDeviceAdmin",
-        name="Device admin",
+        translation_key="device_admin",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
 )
diff --git a/homeassistant/components/fully_kiosk/button.py b/homeassistant/components/fully_kiosk/button.py
index 65b44262c8b65d..9f4d60e9574803 100644
--- a/homeassistant/components/fully_kiosk/button.py
+++ b/homeassistant/components/fully_kiosk/button.py
@@ -39,31 +39,31 @@ class FullyButtonEntityDescription(
 BUTTONS: tuple[FullyButtonEntityDescription, ...] = (
     FullyButtonEntityDescription(
         key="restartApp",
-        name="Restart browser",
+        translation_key="restart_browser",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda fully: fully.restartApp(),
     ),
     FullyButtonEntityDescription(
         key="rebootDevice",
-        name="Reboot device",
+        translation_key="restart_device",
         device_class=ButtonDeviceClass.RESTART,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda fully: fully.rebootDevice(),
     ),
     FullyButtonEntityDescription(
         key="toForeground",
-        name="Bring to foreground",
+        translation_key="to_foreground",
         press_action=lambda fully: fully.toForeground(),
     ),
     FullyButtonEntityDescription(
         key="toBackground",
-        name="Send to background",
+        translation_key="to_background",
         press_action=lambda fully: fully.toBackground(),
     ),
     FullyButtonEntityDescription(
         key="loadStartUrl",
-        name="Load start URL",
+        translation_key="load_start_url",
         press_action=lambda fully: fully.loadStartUrl(),
     ),
 )
diff --git a/homeassistant/components/fully_kiosk/const.py b/homeassistant/components/fully_kiosk/const.py
index b4fe90e01eba5a..3db33d21ef0ed5 100644
--- a/homeassistant/components/fully_kiosk/const.py
+++ b/homeassistant/components/fully_kiosk/const.py
@@ -25,6 +25,9 @@
 
 SERVICE_LOAD_URL = "load_url"
 SERVICE_START_APPLICATION = "start_application"
+SERVICE_SET_CONFIG = "set_config"
 
 ATTR_URL = "url"
 ATTR_APPLICATION = "application"
+ATTR_KEY = "key"
+ATTR_VALUE = "value"
diff --git a/homeassistant/components/fully_kiosk/entity.py b/homeassistant/components/fully_kiosk/entity.py
index 0e4329a5917877..d1f98c5afff680 100644
--- a/homeassistant/components/fully_kiosk/entity.py
+++ b/homeassistant/components/fully_kiosk/entity.py
@@ -9,6 +9,18 @@
 from .coordinator import FullyKioskDataUpdateCoordinator
 
 
+def valid_global_mac_address(mac: str | None) -> bool:
+    """Check if a MAC address is valid, non-locally administered address."""
+    if not isinstance(mac, str):
+        return False
+    try:
+        first_octet = int(mac.split(":")[0], 16)
+        # If the second least-significant bit is set, it's a locally administered address, should not be used as an ID
+        return not bool(first_octet & 0x2)
+    except ValueError:
+        return False
+
+
 class FullyKioskEntity(CoordinatorEntity[FullyKioskDataUpdateCoordinator], Entity):
     """Defines a Fully Kiosk Browser entity."""
 
@@ -25,7 +37,9 @@ def __init__(self, coordinator: FullyKioskDataUpdateCoordinator) -> None:
             sw_version=coordinator.data["appVersionName"],
             configuration_url=f"http://{coordinator.data['ip4']}:2323",
         )
-        if "Mac" in coordinator.data and coordinator.data["Mac"]:
+        if "Mac" in coordinator.data and valid_global_mac_address(
+            coordinator.data["Mac"]
+        ):
             device_info["connections"] = {
                 (CONNECTION_NETWORK_MAC, coordinator.data["Mac"])
             }
diff --git a/homeassistant/components/fully_kiosk/media_player.py b/homeassistant/components/fully_kiosk/media_player.py
index 8c73d47dd74368..0984d6a220ff7e 100644
--- a/homeassistant/components/fully_kiosk/media_player.py
+++ b/homeassistant/components/fully_kiosk/media_player.py
@@ -33,6 +33,7 @@ async def async_setup_entry(
 class FullyMediaPlayer(FullyKioskEntity, MediaPlayerEntity):
     """Representation of a Fully Kiosk Browser media player entity."""
 
+    _attr_name = None
     _attr_supported_features = MEDIA_SUPPORT_FULLYKIOSK
     _attr_assumed_state = True
 
diff --git a/homeassistant/components/fully_kiosk/number.py b/homeassistant/components/fully_kiosk/number.py
index 11f5bd2745298d..298a58e2a112ad 100644
--- a/homeassistant/components/fully_kiosk/number.py
+++ b/homeassistant/components/fully_kiosk/number.py
@@ -16,7 +16,7 @@
 ENTITY_TYPES: tuple[NumberEntityDescription, ...] = (
     NumberEntityDescription(
         key="timeToScreensaverV2",
-        name="Screensaver timer",
+        translation_key="screensaver_time",
         native_max_value=9999,
         native_step=1,
         native_min_value=0,
@@ -25,7 +25,7 @@
     ),
     NumberEntityDescription(
         key="screensaverBrightness",
-        name="Screensaver brightness",
+        translation_key="screensaver_brightness",
         native_max_value=255,
         native_step=1,
         native_min_value=0,
@@ -33,7 +33,7 @@
     ),
     NumberEntityDescription(
         key="timeToScreenOffV2",
-        name="Screen off timer",
+        translation_key="screen_off_time",
         native_max_value=9999,
         native_step=1,
         native_min_value=0,
@@ -42,7 +42,7 @@
     ),
     NumberEntityDescription(
         key="screenBrightness",
-        name="Screen brightness",
+        translation_key="screen_brightness",
         native_max_value=255,
         native_step=1,
         native_min_value=0,
diff --git a/homeassistant/components/fully_kiosk/sensor.py b/homeassistant/components/fully_kiosk/sensor.py
index 60009eb6ae4dce..dd775e7d55a8f1 100644
--- a/homeassistant/components/fully_kiosk/sensor.py
+++ b/homeassistant/components/fully_kiosk/sensor.py
@@ -3,6 +3,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import Any
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -12,7 +13,7 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfInformation
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
@@ -26,72 +27,86 @@ def round_storage(value: int) -> float:
     return round(value * 0.000001, 1)
 
 
+def truncate_url(value: StateType) -> tuple[StateType, dict[str, Any]]:
+    """Truncate URL if longer than 256."""
+    url = str(value)
+    truncated = len(url) > 256
+    extra_state_attributes = {
+        "full_url": url,
+        "truncated": truncated,
+    }
+    if truncated:
+        return (url[0:255], extra_state_attributes)
+    return (url, extra_state_attributes)
+
+
 @dataclass
 class FullySensorEntityDescription(SensorEntityDescription):
     """Fully Kiosk Browser sensor description."""
 
-    state_fn: Callable[[int], float] | None = None
+    round_state_value: bool = False
+    state_fn: Callable[[StateType], tuple[StateType, dict[str, Any]]] | None = None
 
 
 SENSORS: tuple[FullySensorEntityDescription, ...] = (
     FullySensorEntityDescription(
         key="batteryLevel",
-        name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     FullySensorEntityDescription(
-        key="screenOrientation",
-        name="Screen orientation",
+        key="currentPage",
+        translation_key="current_page",
         entity_category=EntityCategory.DIAGNOSTIC,
+        state_fn=truncate_url,
     ),
     FullySensorEntityDescription(
-        key="foregroundApp",
-        name="Foreground app",
+        key="screenOrientation",
+        translation_key="screen_orientation",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     FullySensorEntityDescription(
-        key="currentPage",
-        name="Current page",
+        key="foregroundApp",
+        translation_key="foreground_app",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     FullySensorEntityDescription(
         key="internalStorageFreeSpace",
-        name="Internal storage free space",
+        translation_key="internal_storage_free_space",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
-        state_fn=round_storage,
+        round_state_value=True,
     ),
     FullySensorEntityDescription(
         key="internalStorageTotalSpace",
-        name="Internal storage total space",
+        translation_key="internal_storage_total_space",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
-        state_fn=round_storage,
+        round_state_value=True,
     ),
     FullySensorEntityDescription(
         key="ramFreeMemory",
-        name="Free memory",
+        translation_key="ram_free_memory",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
-        state_fn=round_storage,
+        round_state_value=True,
     ),
     FullySensorEntityDescription(
         key="ramTotalMemory",
-        name="Total memory",
+        translation_key="ram_total_memory",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         state_class=SensorStateClass.MEASUREMENT,
-        state_fn=round_storage,
+        round_state_value=True,
     ),
 )
 
@@ -129,13 +144,19 @@ def __init__(
 
         super().__init__(coordinator)
 
-    @property
-    def native_value(self) -> StateType:
-        """Return the state of the sensor."""
-        if (value := self.coordinator.data.get(self.entity_description.key)) is None:
-            return None
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        extra_state_attributes: dict[str, Any] = {}
+        value = self.coordinator.data.get(self.entity_description.key)
+
+        if value is not None:
+            if self.entity_description.state_fn is not None:
+                value, extra_state_attributes = self.entity_description.state_fn(value)
+
+            if self.entity_description.round_state_value:
+                value = round_storage(value)
 
-        if self.entity_description.state_fn is not None:
-            return self.entity_description.state_fn(value)
+        self._attr_native_value = value
+        self._attr_extra_state_attributes = extra_state_attributes
 
-        return value  # type: ignore[no-any-return]
+        self.async_write_ha_state()
diff --git a/homeassistant/components/fully_kiosk/services.py b/homeassistant/components/fully_kiosk/services.py
index 3fca92287359e2..5106fd2e06eed3 100644
--- a/homeassistant/components/fully_kiosk/services.py
+++ b/homeassistant/components/fully_kiosk/services.py
@@ -1,74 +1,85 @@
 """Services for the Fully Kiosk Browser integration."""
 from __future__ import annotations
 
-from collections.abc import Callable
-from typing import Any
-
-from fullykiosk import FullyKiosk
 import voluptuous as vol
 
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 import homeassistant.helpers.device_registry as dr
 
 from .const import (
     ATTR_APPLICATION,
+    ATTR_KEY,
     ATTR_URL,
+    ATTR_VALUE,
     DOMAIN,
-    LOGGER,
     SERVICE_LOAD_URL,
+    SERVICE_SET_CONFIG,
     SERVICE_START_APPLICATION,
 )
+from .coordinator import FullyKioskDataUpdateCoordinator
 
 
 async def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the services for the Fully Kiosk Browser integration."""
 
-    async def execute_service(
-        call: ServiceCall,
-        fully_method: Callable,
-        *args: list[str],
-        **kwargs: dict[str, Any],
-    ) -> None:
-        """Execute a Fully service call.
-
-        :param call: {ServiceCall} HA service call.
-        :param fully_method: {Callable} A method of the FullyKiosk class.
-        :param args: Arguments for fully_method.
-        :param kwargs: Key-word arguments for fully_method.
-        :return: None
-        """
-        LOGGER.debug(
-            "Calling Fully service %s with args: %s, %s", ServiceCall, args, kwargs
-        )
+    async def collect_coordinators(
+        device_ids: list[str],
+    ) -> list[FullyKioskDataUpdateCoordinator]:
+        config_entries = list[ConfigEntry]()
         registry = dr.async_get(hass)
-        for target in call.data[ATTR_DEVICE_ID]:
+        for target in device_ids:
             device = registry.async_get(target)
             if device:
-                for key in device.config_entries:
-                    entry = hass.config_entries.async_get_entry(key)
-                    if not entry:
-                        continue
-                    if entry.domain != DOMAIN:
-                        continue
-                    coordinator = hass.data[DOMAIN][key]
-                    # fully_method(coordinator.fully, *args, **kwargs) would make
-                    # test_services.py fail.
-                    await getattr(coordinator.fully, fully_method.__name__)(
-                        *args, **kwargs
+                device_entries = list[ConfigEntry]()
+                for entry_id in device.config_entries:
+                    entry = hass.config_entries.async_get_entry(entry_id)
+                    if entry and entry.domain == DOMAIN:
+                        device_entries.append(entry)
+                if not device_entries:
+                    raise HomeAssistantError(
+                        f"Device '{target}' is not a {DOMAIN} device"
                     )
-                    break
+                config_entries.extend(device_entries)
+            else:
+                raise HomeAssistantError(
+                    f"Device '{target}' not found in device registry"
+                )
+        coordinators = list[FullyKioskDataUpdateCoordinator]()
+        for config_entry in config_entries:
+            if config_entry.state != ConfigEntryState.LOADED:
+                raise HomeAssistantError(f"{config_entry.title} is not loaded")
+            coordinators.append(hass.data[DOMAIN][config_entry.entry_id])
+        return coordinators
 
     async def async_load_url(call: ServiceCall) -> None:
         """Load a URL on the Fully Kiosk Browser."""
-        await execute_service(call, FullyKiosk.loadUrl, call.data[ATTR_URL])
+        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
+            await coordinator.fully.loadUrl(call.data[ATTR_URL])
 
     async def async_start_app(call: ServiceCall) -> None:
         """Start an app on the device."""
-        await execute_service(
-            call, FullyKiosk.startApplication, call.data[ATTR_APPLICATION]
-        )
+        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
+            await coordinator.fully.startApplication(call.data[ATTR_APPLICATION])
+
+    async def async_set_config(call: ServiceCall) -> None:
+        """Set a Fully Kiosk Browser config value on the device."""
+        for coordinator in await collect_coordinators(call.data[ATTR_DEVICE_ID]):
+            # Fully API has different methods for setting string and bool values.
+            # check if call.data[ATTR_VALUE] is a bool
+            if isinstance(call.data[ATTR_VALUE], bool) or call.data[
+                ATTR_VALUE
+            ].lower() in ("true", "false"):
+                await coordinator.fully.setConfigurationBool(
+                    call.data[ATTR_KEY], call.data[ATTR_VALUE]
+                )
+            else:
+                await coordinator.fully.setConfigurationString(
+                    call.data[ATTR_KEY], call.data[ATTR_VALUE]
+                )
 
     # Register all the above services
     service_mapping = [
@@ -89,3 +100,18 @@ async def async_start_app(call: ServiceCall) -> None:
                 )
             ),
         )
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        async_set_config,
+        schema=vol.Schema(
+            vol.All(
+                {
+                    vol.Required(ATTR_DEVICE_ID): cv.ensure_list,
+                    vol.Required(ATTR_KEY): cv.string,
+                    vol.Required(ATTR_VALUE): vol.Any(str, bool),
+                }
+            )
+        ),
+    )
diff --git a/homeassistant/components/fully_kiosk/services.yaml b/homeassistant/components/fully_kiosk/services.yaml
index 88178e35809a0d..1f75e4a0347368 100644
--- a/homeassistant/components/fully_kiosk/services.yaml
+++ b/homeassistant/components/fully_kiosk/services.yaml
@@ -13,6 +13,28 @@ load_url:
       selector:
         text:
 
+set_config:
+  name: Set Configuration
+  description: Set a configuration parameter on Fully Kiosk Browser.
+  target:
+    device:
+      integration: fully_kiosk
+  fields:
+    key:
+      name: Key
+      description: Configuration parameter to set.
+      example: "motionSensitivity"
+      required: true
+      selector:
+        text:
+    value:
+      name: Value
+      description: Value for the configuration parameter.
+      example: "90"
+      required: true
+      selector:
+        text:
+
 start_application:
   name: Start Application
   description: Start an application on the device running Fully Kiosk Browser.
diff --git a/homeassistant/components/fully_kiosk/strings.json b/homeassistant/components/fully_kiosk/strings.json
index a6442085683bea..c10b6162859a08 100644
--- a/homeassistant/components/fully_kiosk/strings.json
+++ b/homeassistant/components/fully_kiosk/strings.json
@@ -21,5 +21,89 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "kiosk_mode": {
+        "name": "Kiosk mode"
+      },
+      "plugged_in": {
+        "name": "Plugged in"
+      },
+      "device_admin": {
+        "name": "Device admin"
+      }
+    },
+    "button": {
+      "restart_browser": {
+        "name": "Restart browser"
+      },
+      "restart_device": {
+        "name": "Restart device"
+      },
+      "to_foreground": {
+        "name": "Bring to foreground"
+      },
+      "to_background": {
+        "name": "Send to background"
+      },
+      "load_start_url": {
+        "name": "Load start URL"
+      }
+    },
+    "number": {
+      "screensaver_time": {
+        "name": "Screensaver timer"
+      },
+      "screensaver_brightness": {
+        "name": "Screensaver brightness"
+      },
+      "screen_off_time": {
+        "name": "Screen off timer"
+      },
+      "screen_brightness": {
+        "name": "Screen brightness"
+      }
+    },
+    "sensor": {
+      "current_page": {
+        "name": "Current page"
+      },
+      "screen_orientation": {
+        "name": "Screen orientation"
+      },
+      "foreground_app": {
+        "name": "Foreground app"
+      },
+      "internal_storage_total_space": {
+        "name": "Internal storage total space"
+      },
+      "internal_storage_free_space": {
+        "name": "Internal storage free space"
+      },
+      "ram_free_memory": {
+        "name": "Free memory"
+      },
+      "ram_total_memory": {
+        "name": "Total memory"
+      }
+    },
+    "switch": {
+      "screensaver": {
+        "name": "Screensaver"
+      },
+      "maintenance": {
+        "name": "Maintenance mode"
+      },
+      "kiosk": {
+        "name": "Kiosk lock"
+      },
+      "motion_detection": {
+        "name": "Motion detection"
+      },
+      "screen_on": {
+        "name": "Screen"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/fully_kiosk/switch.py b/homeassistant/components/fully_kiosk/switch.py
index 1bd2a10fd21fa1..500e154abd8339 100644
--- a/homeassistant/components/fully_kiosk/switch.py
+++ b/homeassistant/components/fully_kiosk/switch.py
@@ -37,14 +37,14 @@ class FullySwitchEntityDescription(
 SWITCHES: tuple[FullySwitchEntityDescription, ...] = (
     FullySwitchEntityDescription(
         key="screensaver",
-        name="Screensaver",
+        translation_key="screensaver",
         on_action=lambda fully: fully.startScreensaver(),
         off_action=lambda fully: fully.stopScreensaver(),
         is_on_fn=lambda data: data.get("isInScreensaver"),
     ),
     FullySwitchEntityDescription(
         key="maintenance",
-        name="Maintenance mode",
+        translation_key="maintenance",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.enableLockedMode(),
         off_action=lambda fully: fully.disableLockedMode(),
@@ -52,7 +52,7 @@ class FullySwitchEntityDescription(
     ),
     FullySwitchEntityDescription(
         key="kiosk",
-        name="Kiosk lock",
+        translation_key="kiosk",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.lockKiosk(),
         off_action=lambda fully: fully.unlockKiosk(),
@@ -60,7 +60,7 @@ class FullySwitchEntityDescription(
     ),
     FullySwitchEntityDescription(
         key="motion-detection",
-        name="Motion detection",
+        translation_key="motion_detection",
         entity_category=EntityCategory.CONFIG,
         on_action=lambda fully: fully.enableMotionDetection(),
         off_action=lambda fully: fully.disableMotionDetection(),
@@ -68,7 +68,7 @@ class FullySwitchEntityDescription(
     ),
     FullySwitchEntityDescription(
         key="screenOn",
-        name="Screen",
+        translation_key="screen_on",
         on_action=lambda fully: fully.screenOn(),
         off_action=lambda fully: fully.screenOff(),
         is_on_fn=lambda data: data.get("screenOn"),
diff --git a/homeassistant/components/gdacs/manifest.json b/homeassistant/components/gdacs/manifest.json
index 86904e3e9bc427..b6fb3d8cee33ed 100644
--- a/homeassistant/components/gdacs/manifest.json
+++ b/homeassistant/components/gdacs/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aio_georss_gdacs", "aio_georss_client"],
   "quality_scale": "platinum",
-  "requirements": ["aio_georss_gdacs==0.8"]
+  "requirements": ["aio-georss-gdacs==0.8"]
 }
diff --git a/homeassistant/components/gdacs/sensor.py b/homeassistant/components/gdacs/sensor.py
index 6563e26368ab70..e1535037d35375 100644
--- a/homeassistant/components/gdacs/sensor.py
+++ b/homeassistant/components/gdacs/sensor.py
@@ -8,7 +8,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_ICON, DOMAIN, FEED
 
@@ -93,10 +93,12 @@ def _update_from_status_info(self, status_info):
         """Update the internal state from the provided information."""
         self._status = status_info.status
         self._last_update = (
-            dt.as_utc(status_info.last_update) if status_info.last_update else None
+            dt_util.as_utc(status_info.last_update) if status_info.last_update else None
         )
         if status_info.last_update_successful:
-            self._last_update_successful = dt.as_utc(status_info.last_update_successful)
+            self._last_update_successful = dt_util.as_utc(
+                status_info.last_update_successful
+            )
         else:
             self._last_update_successful = None
         self._last_timestamp = status_info.last_timestamp
diff --git a/homeassistant/components/generic/camera.py b/homeassistant/components/generic/camera.py
index b039b32d73d959..234795e9014c31 100644
--- a/homeassistant/components/generic/camera.py
+++ b/homeassistant/components/generic/camera.py
@@ -200,7 +200,7 @@ async def async_camera_image(
         try:
             async_client = get_async_client(self.hass, verify_ssl=self.verify_ssl)
             response = await async_client.get(
-                url, auth=self._auth, timeout=GET_IMAGE_TIMEOUT
+                url, auth=self._auth, follow_redirects=True, timeout=GET_IMAGE_TIMEOUT
             )
             response.raise_for_status()
             self._last_image = response.content
diff --git a/homeassistant/components/generic/config_flow.py b/homeassistant/components/generic/config_flow.py
index 94a885a7c5d31b..34fc571327111c 100644
--- a/homeassistant/components/generic/config_flow.py
+++ b/homeassistant/components/generic/config_flow.py
@@ -9,10 +9,10 @@
 import logging
 from typing import Any
 
-import PIL
 from aiohttp import web
 from async_timeout import timeout
 from httpx import HTTPStatusError, RequestError, TimeoutException
+import PIL
 import voluptuous as vol
 import yarl
 
@@ -426,24 +426,12 @@ async def async_step_init(
                     # is always jpeg
                     still_format = "image/jpeg"
                 data = {
-                    CONF_AUTHENTICATION: user_input.get(CONF_AUTHENTICATION),
-                    CONF_STREAM_SOURCE: user_input.get(CONF_STREAM_SOURCE),
-                    CONF_PASSWORD: user_input.get(CONF_PASSWORD),
-                    CONF_STILL_IMAGE_URL: user_input.get(CONF_STILL_IMAGE_URL),
+                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: self.config_entry.options.get(
+                        CONF_USE_WALLCLOCK_AS_TIMESTAMPS, False
+                    ),
+                    **user_input,
                     CONF_CONTENT_TYPE: still_format
                     or self.config_entry.options.get(CONF_CONTENT_TYPE),
-                    CONF_USERNAME: user_input.get(CONF_USERNAME),
-                    CONF_LIMIT_REFETCH_TO_URL_CHANGE: user_input[
-                        CONF_LIMIT_REFETCH_TO_URL_CHANGE
-                    ],
-                    CONF_FRAMERATE: user_input[CONF_FRAMERATE],
-                    CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
-                    CONF_USE_WALLCLOCK_AS_TIMESTAMPS: user_input.get(
-                        CONF_USE_WALLCLOCK_AS_TIMESTAMPS,
-                        self.config_entry.options.get(
-                            CONF_USE_WALLCLOCK_AS_TIMESTAMPS, False
-                        ),
-                    ),
                 }
                 self.user_input = data
                 # temporary preview for user to check the image
diff --git a/homeassistant/components/generic/manifest.json b/homeassistant/components/generic/manifest.json
index 693959561d2f14..134ce00ef70846 100644
--- a/homeassistant/components/generic/manifest.json
+++ b/homeassistant/components/generic/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/generic",
   "iot_class": "local_push",
-  "requirements": ["ha-av==10.0.0", "pillow==9.5.0"]
+  "requirements": ["ha-av==10.1.0", "Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/generic_hygrostat/humidifier.py b/homeassistant/components/generic_hygrostat/humidifier.py
index a6e76330f29b31..959b0a8e8dfcdd 100644
--- a/homeassistant/components/generic_hygrostat/humidifier.py
+++ b/homeassistant/components/generic_hygrostat/humidifier.py
@@ -9,6 +9,7 @@
     MODE_AWAY,
     MODE_NORMAL,
     PLATFORM_SCHEMA,
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -158,6 +159,7 @@ def __init__(
         self._is_away = False
         if not self._device_class:
             self._device_class = HumidifierDeviceClass.HUMIDIFIER
+        self._attr_action = HumidifierAction.IDLE
 
     async def async_added_to_hass(self):
         """Run when entity about to be added."""
@@ -248,6 +250,11 @@ def is_on(self):
         """Return true if the hygrostat is on."""
         return self._state
 
+    @property
+    def current_humidity(self):
+        """Return the measured humidity."""
+        return self._cur_humidity
+
     @property
     def target_humidity(self):
         """Return the humidity we try to reach."""
@@ -356,6 +363,15 @@ def _async_switch_changed(self, entity_id, old_state, new_state):
         """Handle humidifier switch state changes."""
         if new_state is None:
             return
+
+        if new_state.state == STATE_ON:
+            if self._device_class == HumidifierDeviceClass.DEHUMIDIFIER:
+                self._attr_action = HumidifierAction.DRYING
+            else:
+                self._attr_action = HumidifierAction.HUMIDIFYING
+        else:
+            self._attr_action = HumidifierAction.IDLE
+
         self.async_schedule_update_ha_state()
 
     async def _async_update_humidity(self, humidity):
@@ -430,17 +446,14 @@ async def _async_operate(self, time=None, force=False):
                 elif time is not None:
                     # The time argument is passed only in keep-alive case
                     await self._async_device_turn_on()
-            else:
-                if (
-                    self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_dry
-                ) or (
-                    self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_wet
-                ):
-                    _LOGGER.info("Turning on humidifier %s", self._switch_entity_id)
-                    await self._async_device_turn_on()
-                elif time is not None:
-                    # The time argument is passed only in keep-alive case
-                    await self._async_device_turn_off()
+            elif (
+                self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_dry
+            ) or (self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_wet):
+                _LOGGER.info("Turning on humidifier %s", self._switch_entity_id)
+                await self._async_device_turn_on()
+            elif time is not None:
+                # The time argument is passed only in keep-alive case
+                await self._async_device_turn_off()
 
     @property
     def _is_device_active(self):
diff --git a/homeassistant/components/generic_thermostat/climate.py b/homeassistant/components/generic_thermostat/climate.py
index 22a3f98a9f0525..e3eed8866c8d58 100644
--- a/homeassistant/components/generic_thermostat/climate.py
+++ b/homeassistant/components/generic_thermostat/climate.py
@@ -494,16 +494,15 @@ async def _async_control_heating(self, time=None, force=False):
                         self.heater_entity_id,
                     )
                     await self._async_heater_turn_on()
-            else:
-                if (self.ac_mode and too_hot) or (not self.ac_mode and too_cold):
-                    _LOGGER.info("Turning on heater %s", self.heater_entity_id)
-                    await self._async_heater_turn_on()
-                elif time is not None:
-                    # The time argument is passed only in keep-alive case
-                    _LOGGER.info(
-                        "Keep-alive - Turning off heater %s", self.heater_entity_id
-                    )
-                    await self._async_heater_turn_off()
+            elif (self.ac_mode and too_hot) or (not self.ac_mode and too_cold):
+                _LOGGER.info("Turning on heater %s", self.heater_entity_id)
+                await self._async_heater_turn_on()
+            elif time is not None:
+                # The time argument is passed only in keep-alive case
+                _LOGGER.info(
+                    "Keep-alive - Turning off heater %s", self.heater_entity_id
+                )
+                await self._async_heater_turn_off()
 
     @property
     def _is_device_active(self):
diff --git a/homeassistant/components/geniushub/climate.py b/homeassistant/components/geniushub/climate.py
index c2b32582cef56a..bafda44501b7d1 100644
--- a/homeassistant/components/geniushub/climate.py
+++ b/homeassistant/components/geniushub/climate.py
@@ -66,17 +66,17 @@ def icon(self) -> str:
         return "mdi:radiator"
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return GH_HVAC_TO_HA.get(self._zone.data["mode"], HVACMode.HEAT)
 
     @property
-    def hvac_modes(self) -> list[str]:
+    def hvac_modes(self) -> list[HVACMode]:
         """Return the list of available hvac operation modes."""
         return list(HA_HVAC_TO_GH)
 
     @property
-    def hvac_action(self) -> str | None:
+    def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac operation if supported."""
         if "_state" in self._zone.data:  # only for v3 API
             if self._zone.data["output"] == 1:
diff --git a/homeassistant/components/geo_json_events/geo_location.py b/homeassistant/components/geo_json_events/geo_location.py
index def8f77994eff7..b922d98f25e1e2 100644
--- a/homeassistant/components/geo_json_events/geo_location.py
+++ b/homeassistant/components/geo_json_events/geo_location.py
@@ -83,7 +83,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.8.0",
+        breaks_in_ha_version="2023.12.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/geo_json_events/manifest.json b/homeassistant/components/geo_json_events/manifest.json
index b02339eb20acb6..9f77f9b112e177 100644
--- a/homeassistant/components/geo_json_events/manifest.json
+++ b/homeassistant/components/geo_json_events/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_generic_client"],
-  "requirements": ["aio_geojson_generic_client==0.3"]
+  "requirements": ["aio-geojson-generic-client==0.3"]
 }
diff --git a/homeassistant/components/geo_rss_events/manifest.json b/homeassistant/components/geo_rss_events/manifest.json
index 3ed5418fa0f7b0..bdf8f1266802a2 100644
--- a/homeassistant/components/geo_rss_events/manifest.json
+++ b/homeassistant/components/geo_rss_events/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/geo_rss_events",
   "iot_class": "cloud_polling",
   "loggers": ["georss_client", "georss_generic_client"],
-  "requirements": ["georss_generic_client==0.6"]
+  "requirements": ["georss-generic-client==0.6"]
 }
diff --git a/homeassistant/components/geocaching/sensor.py b/homeassistant/components/geocaching/sensor.py
index 134877d7509bfb..d1be775e3706e5 100644
--- a/homeassistant/components/geocaching/sensor.py
+++ b/homeassistant/components/geocaching/sensor.py
@@ -36,14 +36,14 @@ class GeocachingSensorEntityDescription(
 SENSORS: tuple[GeocachingSensorEntityDescription, ...] = (
     GeocachingSensorEntityDescription(
         key="find_count",
-        name="Total finds",
+        translation_key="find_count",
         icon="mdi:notebook-edit-outline",
         native_unit_of_measurement="caches",
         value_fn=lambda status: status.user.find_count,
     ),
     GeocachingSensorEntityDescription(
         key="hide_count",
-        name="Total hides",
+        translation_key="hide_count",
         icon="mdi:eye-off-outline",
         native_unit_of_measurement="caches",
         entity_registry_visible_default=False,
@@ -51,7 +51,7 @@ class GeocachingSensorEntityDescription(
     ),
     GeocachingSensorEntityDescription(
         key="favorite_points",
-        name="Favorite points",
+        translation_key="favorite_points",
         icon="mdi:heart-outline",
         native_unit_of_measurement="points",
         entity_registry_visible_default=False,
@@ -59,14 +59,14 @@ class GeocachingSensorEntityDescription(
     ),
     GeocachingSensorEntityDescription(
         key="souvenir_count",
-        name="Total souvenirs",
+        translation_key="souvenir_count",
         icon="mdi:license",
         native_unit_of_measurement="souvenirs",
         value_fn=lambda status: status.user.souvenir_count,
     ),
     GeocachingSensorEntityDescription(
         key="awarded_favorite_points",
-        name="Awarded favorite points",
+        translation_key="awarded_favorite_points",
         icon="mdi:heart",
         native_unit_of_measurement="points",
         entity_registry_visible_default=False,
diff --git a/homeassistant/components/geocaching/strings.json b/homeassistant/components/geocaching/strings.json
index 7c8547805d13a3..6dc2fe8ec1ca66 100644
--- a/homeassistant/components/geocaching/strings.json
+++ b/homeassistant/components/geocaching/strings.json
@@ -21,5 +21,24 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "find_count": {
+        "name": "Total finds"
+      },
+      "hide_count": {
+        "name": "Total hides"
+      },
+      "favorite_points": {
+        "name": "Favorite points"
+      },
+      "souvenir_count": {
+        "name": "Total souvenirs"
+      },
+      "awarded_favorite_points": {
+        "name": "Awarded favorite points"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/geonetnz_quakes/manifest.json b/homeassistant/components/geonetnz_quakes/manifest.json
index 74ca640678291b..9ed59b2bc9749b 100644
--- a/homeassistant/components/geonetnz_quakes/manifest.json
+++ b/homeassistant/components/geonetnz_quakes/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_geonetnz_quakes"],
   "quality_scale": "platinum",
-  "requirements": ["aio_geojson_geonetnz_quakes==0.15"]
+  "requirements": ["aio-geojson-geonetnz-quakes==0.15"]
 }
diff --git a/homeassistant/components/geonetnz_quakes/sensor.py b/homeassistant/components/geonetnz_quakes/sensor.py
index 8fb2ff8535b445..e69ba6eb005c64 100644
--- a/homeassistant/components/geonetnz_quakes/sensor.py
+++ b/homeassistant/components/geonetnz_quakes/sensor.py
@@ -8,7 +8,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, FEED
 
@@ -94,10 +94,12 @@ def _update_from_status_info(self, status_info):
         """Update the internal state from the provided information."""
         self._status = status_info.status
         self._last_update = (
-            dt.as_utc(status_info.last_update) if status_info.last_update else None
+            dt_util.as_utc(status_info.last_update) if status_info.last_update else None
         )
         if status_info.last_update_successful:
-            self._last_update_successful = dt.as_utc(status_info.last_update_successful)
+            self._last_update_successful = dt_util.as_utc(
+                status_info.last_update_successful
+            )
         else:
             self._last_update_successful = None
         self._last_timestamp = status_info.last_timestamp
diff --git a/homeassistant/components/geonetnz_volcano/manifest.json b/homeassistant/components/geonetnz_volcano/manifest.json
index c6cffad477d214..6e9503e0243aa2 100644
--- a/homeassistant/components/geonetnz_volcano/manifest.json
+++ b/homeassistant/components/geonetnz_volcano/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_geonetnz_volcano"],
-  "requirements": ["aio_geojson_geonetnz_volcano==0.8"]
+  "requirements": ["aio-geojson-geonetnz-volcano==0.8"]
 }
diff --git a/homeassistant/components/geonetnz_volcano/sensor.py b/homeassistant/components/geonetnz_volcano/sensor.py
index 33a879eeb255bb..583b75a24eb309 100644
--- a/homeassistant/components/geonetnz_volcano/sensor.py
+++ b/homeassistant/components/geonetnz_volcano/sensor.py
@@ -9,7 +9,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import DistanceConverter
 
 from .const import (
@@ -124,9 +124,9 @@ def _update_from_feed(self, feed_entry, last_update, last_update_successful):
         self._alert_level = feed_entry.alert_level
         self._activity = feed_entry.activity
         self._hazards = feed_entry.hazards
-        self._feed_last_update = dt.as_utc(last_update) if last_update else None
+        self._feed_last_update = dt_util.as_utc(last_update) if last_update else None
         self._feed_last_update_successful = (
-            dt.as_utc(last_update_successful) if last_update_successful else None
+            dt_util.as_utc(last_update_successful) if last_update_successful else None
         )
 
     @property
diff --git a/homeassistant/components/gios/sensor.py b/homeassistant/components/gios/sensor.py
index f078cc074e9c4c..641194362308ec 100644
--- a/homeassistant/components/gios/sensor.py
+++ b/homeassistant/components/gios/sensor.py
@@ -91,7 +91,6 @@ class GiosSensorEntityDescription(SensorEntityDescription, GiosSensorRequiredKey
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="no2",
     ),
     GiosSensorEntityDescription(
         key=ATTR_NO2,
@@ -109,7 +108,6 @@ class GiosSensorEntityDescription(SensorEntityDescription, GiosSensorRequiredKey
         device_class=SensorDeviceClass.OZONE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="o3",
     ),
     GiosSensorEntityDescription(
         key=ATTR_O3,
@@ -127,7 +125,6 @@ class GiosSensorEntityDescription(SensorEntityDescription, GiosSensorRequiredKey
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="pm10",
     ),
     GiosSensorEntityDescription(
         key=ATTR_PM10,
@@ -145,7 +142,6 @@ class GiosSensorEntityDescription(SensorEntityDescription, GiosSensorRequiredKey
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="pm25",
     ),
     GiosSensorEntityDescription(
         key=ATTR_PM25,
@@ -163,7 +159,6 @@ class GiosSensorEntityDescription(SensorEntityDescription, GiosSensorRequiredKey
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="so2",
     ),
     GiosSensorEntityDescription(
         key=ATTR_SO2,
diff --git a/homeassistant/components/gios/strings.json b/homeassistant/components/gios/strings.json
index 5387c043fc3f52..ee0f50ef40cb53 100644
--- a/homeassistant/components/gios/strings.json
+++ b/homeassistant/components/gios/strings.json
@@ -42,9 +42,6 @@
       "co": {
         "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
       },
-      "no2": {
-        "name": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]"
-      },
       "no2_index": {
         "name": "Nitrogen dioxide index",
         "state": {
@@ -56,9 +53,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "o3": {
-        "name": "[%key:component::sensor::entity_component::ozone::name%]"
-      },
       "o3_index": {
         "name": "Ozone index",
         "state": {
@@ -70,9 +64,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
       "pm10_index": {
         "name": "PM10 index",
         "state": {
@@ -84,9 +75,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
       "pm25_index": {
         "name": "PM2.5 index",
         "state": {
@@ -98,9 +86,6 @@
           "very_good": "[%key:component::gios::entity::sensor::aqi::state::very_good%]"
         }
       },
-      "so2": {
-        "name": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
-      },
       "so2_index": {
         "name": "Sulphur dioxide index",
         "state": {
diff --git a/homeassistant/components/github/sensor.py b/homeassistant/components/github/sensor.py
index af6e5e2ca4ac64..edcdd8c057b85a 100644
--- a/homeassistant/components/github/sensor.py
+++ b/homeassistant/components/github/sensor.py
@@ -47,7 +47,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
 SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
     GitHubSensorEntityDescription(
         key="discussions_count",
-        name="Discussions",
+        translation_key="discussions_count",
         native_unit_of_measurement="Discussions",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -55,7 +55,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="stargazers_count",
-        name="Stars",
+        translation_key="stargazers_count",
         icon="mdi:star",
         native_unit_of_measurement="Stars",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -64,7 +64,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="subscribers_count",
-        name="Watchers",
+        translation_key="subscribers_count",
         icon="mdi:glasses",
         native_unit_of_measurement="Watchers",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -73,7 +73,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="forks_count",
-        name="Forks",
+        translation_key="forks_count",
         icon="mdi:source-fork",
         native_unit_of_measurement="Forks",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -82,7 +82,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="issues_count",
-        name="Issues",
+        translation_key="issues_count",
         native_unit_of_measurement="Issues",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -90,7 +90,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="pulls_count",
-        name="Pull requests",
+        translation_key="pulls_count",
         native_unit_of_measurement="Pull Requests",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -98,7 +98,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_commit",
-        name="Latest commit",
+        translation_key="latest_commit",
         value_fn=lambda data: data["default_branch_ref"]["commit"]["message"][:255],
         attr_fn=lambda data: {
             "sha": data["default_branch_ref"]["commit"]["sha"],
@@ -107,7 +107,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_discussion",
-        name="Latest discussion",
+        translation_key="latest_discussion",
         avabl_fn=lambda data: data["discussion"]["discussions"],
         value_fn=lambda data: data["discussion"]["discussions"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -117,7 +117,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_release",
-        name="Latest release",
+        translation_key="latest_release",
         avabl_fn=lambda data: data["release"] is not None,
         value_fn=lambda data: data["release"]["name"][:255],
         attr_fn=lambda data: {
@@ -127,7 +127,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_issue",
-        name="Latest issue",
+        translation_key="latest_issue",
         avabl_fn=lambda data: data["issue"]["issues"],
         value_fn=lambda data: data["issue"]["issues"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -137,7 +137,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_pull_request",
-        name="Latest pull request",
+        translation_key="latest_pull_request",
         avabl_fn=lambda data: data["pull_request"]["pull_requests"],
         value_fn=lambda data: data["pull_request"]["pull_requests"][0]["title"][:255],
         attr_fn=lambda data: {
@@ -147,7 +147,7 @@ class GitHubSensorEntityDescription(BaseEntityDescription, BaseEntityDescription
     ),
     GitHubSensorEntityDescription(
         key="latest_tag",
-        name="Latest tag",
+        translation_key="latest_tag",
         avabl_fn=lambda data: data["refs"]["tags"],
         value_fn=lambda data: data["refs"]["tags"][0]["name"][:255],
         attr_fn=lambda data: {
diff --git a/homeassistant/components/github/strings.json b/homeassistant/components/github/strings.json
index fa981d3dcb5d1b..7b7ae91b9fd6ef 100644
--- a/homeassistant/components/github/strings.json
+++ b/homeassistant/components/github/strings.json
@@ -15,5 +15,45 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "could_not_register": "Could not register integration with GitHub"
     }
+  },
+  "entity": {
+    "sensor": {
+      "discussions_count": {
+        "name": "Discussions"
+      },
+      "stargazers_count": {
+        "name": "Stars"
+      },
+      "subscribers_count": {
+        "name": "Watchers"
+      },
+      "forks_count": {
+        "name": "Forks"
+      },
+      "issues_count": {
+        "name": "Issues"
+      },
+      "pulls_count": {
+        "name": "Pull requests"
+      },
+      "latest_commit": {
+        "name": "Latest commit"
+      },
+      "latest_discussion": {
+        "name": "Latest discussion"
+      },
+      "latest_release": {
+        "name": "Latest release"
+      },
+      "latest_issue": {
+        "name": "Latest issue"
+      },
+      "latest_pull_request": {
+        "name": "Latest pull request"
+      },
+      "latest_tag": {
+        "name": "Latest tag"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/glances/const.py b/homeassistant/components/glances/const.py
index b704ab326f41be..37da60bdea80ec 100644
--- a/homeassistant/components/glances/const.py
+++ b/homeassistant/components/glances/const.py
@@ -1,5 +1,6 @@
 """Constants for Glances component."""
 
+from datetime import timedelta
 import sys
 
 DOMAIN = "glances"
@@ -8,7 +9,7 @@
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 61208
 DEFAULT_VERSION = 3
-DEFAULT_SCAN_INTERVAL = 60
+DEFAULT_SCAN_INTERVAL = timedelta(seconds=60)
 
 SUPPORTED_VERSIONS = [2, 3]
 
diff --git a/homeassistant/components/glances/coordinator.py b/homeassistant/components/glances/coordinator.py
index 01e498a88979af..24a2e23a013f75 100644
--- a/homeassistant/components/glances/coordinator.py
+++ b/homeassistant/components/glances/coordinator.py
@@ -1,5 +1,4 @@
 """Coordinator for Glances integration."""
-from datetime import timedelta
 import logging
 from typing import Any
 
@@ -10,7 +9,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,7 +29,7 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry, api: Glances) -> Non
             hass,
             _LOGGER,
             name=f"{DOMAIN} - {self.host}",
-            update_interval=timedelta(seconds=60),
+            update_interval=DEFAULT_SCAN_INTERVAL,
         )
 
     async def _async_update_data(self) -> dict[str, Any]:
diff --git a/homeassistant/components/glances/manifest.json b/homeassistant/components/glances/manifest.json
index 767a27ffdfdc1d..d90f7b8274cbe5 100644
--- a/homeassistant/components/glances/manifest.json
+++ b/homeassistant/components/glances/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/glances",
   "iot_class": "local_polling",
   "loggers": ["glances_api"],
-  "requirements": ["glances_api==0.4.2"]
+  "requirements": ["glances-api==0.4.3"]
 }
diff --git a/homeassistant/components/glances/sensor.py b/homeassistant/components/glances/sensor.py
index 8b836fba3eaa38..e952164792fe74 100644
--- a/homeassistant/components/glances/sensor.py
+++ b/homeassistant/components/glances/sensor.py
@@ -223,17 +223,17 @@ class GlancesSensorEntityDescription(
         icon="mdi:docker",
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    ("raid", "used"): GlancesSensorEntityDescription(
-        key="used",
+    ("raid", "available"): GlancesSensorEntityDescription(
+        key="available",
         type="raid",
-        name_suffix="Raid used",
+        name_suffix="Raid available",
         icon="mdi:harddisk",
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    ("raid", "available"): GlancesSensorEntityDescription(
-        key="available",
+    ("raid", "used"): GlancesSensorEntityDescription(
+        key="used",
         type="raid",
-        name_suffix="Raid available",
+        name_suffix="Raid used",
         icon="mdi:harddisk",
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -269,36 +269,36 @@ def _migrate_old_unique_ids(
         if sensor_type in ["fs", "sensors", "raid"]:
             for sensor_label, params in sensors.items():
                 for param in params:
-                    sensor_description = SENSOR_TYPES[(sensor_type, param)]
+                    if sensor_description := SENSOR_TYPES.get((sensor_type, param)):
+                        _migrate_old_unique_ids(
+                            hass,
+                            f"{coordinator.host}-{name} {sensor_label} {sensor_description.name_suffix}",
+                            f"{sensor_label}-{sensor_description.key}",
+                        )
+                        entities.append(
+                            GlancesSensor(
+                                coordinator,
+                                name,
+                                sensor_label,
+                                sensor_description,
+                            )
+                        )
+        else:
+            for sensor in sensors:
+                if sensor_description := SENSOR_TYPES.get((sensor_type, sensor)):
                     _migrate_old_unique_ids(
                         hass,
-                        f"{coordinator.host}-{name} {sensor_label} {sensor_description.name_suffix}",
-                        f"{sensor_label}-{sensor_description.key}",
+                        f"{coordinator.host}-{name}  {sensor_description.name_suffix}",
+                        f"-{sensor_description.key}",
                     )
                     entities.append(
                         GlancesSensor(
                             coordinator,
                             name,
-                            sensor_label,
+                            "",
                             sensor_description,
                         )
                     )
-        else:
-            for sensor in sensors:
-                sensor_description = SENSOR_TYPES[(sensor_type, sensor)]
-                _migrate_old_unique_ids(
-                    hass,
-                    f"{coordinator.host}-{name}  {sensor_description.name_suffix}",
-                    f"-{sensor_description.key}",
-                )
-                entities.append(
-                    GlancesSensor(
-                        coordinator,
-                        name,
-                        "",
-                        sensor_description,
-                    )
-                )
 
     async_add_entities(entities)
 
@@ -328,6 +328,18 @@ def __init__(
         )
         self._attr_unique_id = f"{coordinator.config_entry.entry_id}-{sensor_name_prefix}-{description.key}"
 
+    @property
+    def available(self) -> bool:
+        """Set sensor unavailable when native value is invalid."""
+        if super().available:
+            return (
+                not self._numeric_state_expected
+                or isinstance(value := self.native_value, (int, float))
+                or isinstance(value, str)
+                and value.isnumeric()
+            )
+        return False
+
     @property
     def native_value(self) -> StateType:
         """Return the state of the resources."""
diff --git a/homeassistant/components/goalfeed/__init__.py b/homeassistant/components/goalfeed/__init__.py
deleted file mode 100644
index f452b858e799aa..00000000000000
--- a/homeassistant/components/goalfeed/__init__.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""Component for the Goalfeed service."""
-import json
-
-import pysher
-import requests
-import voluptuous as vol
-
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.typing import ConfigType
-
-# Version downgraded due to regression in library
-# For details: https://github.com/nlsdfnbch/Pysher/issues/38
-DOMAIN = "goalfeed"
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_USERNAME): cv.string,
-                vol.Required(CONF_PASSWORD): cv.string,
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-GOALFEED_HOST = "feed.goalfeed.ca"
-GOALFEED_AUTH_ENDPOINT = "https://goalfeed.ca/feed/auth"
-GOALFEED_APP_ID = "bfd4ed98c1ff22c04074"
-
-
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Goalfeed component."""
-    conf = config[DOMAIN]
-    username = conf.get(CONF_USERNAME)
-    password = conf.get(CONF_PASSWORD)
-
-    def goal_handler(data):
-        """Handle goal events."""
-        goal = json.loads(json.loads(data))
-
-        hass.bus.fire("goal", event_data=goal)
-
-    def connect_handler(data):
-        """Handle connection."""
-        post_data = {
-            "username": username,
-            "password": password,
-            "connection_info": data,
-        }
-        resp = requests.post(GOALFEED_AUTH_ENDPOINT, post_data, timeout=30).json()
-
-        channel = pusher.subscribe("private-goals", resp["auth"])
-        channel.bind("goal", goal_handler)
-
-    pusher = pysher.Pusher(
-        GOALFEED_APP_ID, secure=False, port=8080, custom_host=GOALFEED_HOST
-    )
-
-    pusher.connection.bind("pusher:connection_established", connect_handler)
-    pusher.connect()
-
-    return True
diff --git a/homeassistant/components/goalfeed/manifest.json b/homeassistant/components/goalfeed/manifest.json
deleted file mode 100644
index 077596b01853f8..00000000000000
--- a/homeassistant/components/goalfeed/manifest.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "domain": "goalfeed",
-  "name": "Goalfeed",
-  "codeowners": [],
-  "documentation": "https://www.home-assistant.io/integrations/goalfeed",
-  "iot_class": "cloud_push",
-  "loggers": ["pysher"],
-  "requirements": ["pysher==1.0.7"]
-}
diff --git a/homeassistant/components/goalzero/manifest.json b/homeassistant/components/goalzero/manifest.json
index 88bcdd4987b9c8..f1bfc7de876748 100644
--- a/homeassistant/components/goalzero/manifest.json
+++ b/homeassistant/components/goalzero/manifest.json
@@ -16,5 +16,5 @@
   "iot_class": "local_polling",
   "loggers": ["goalzero"],
   "quality_scale": "silver",
-  "requirements": ["goalzero==0.2.1"]
+  "requirements": ["goalzero==0.2.2"]
 }
diff --git a/homeassistant/components/goalzero/sensor.py b/homeassistant/components/goalzero/sensor.py
index 61ec45a98f9d02..9001824d678d80 100644
--- a/homeassistant/components/goalzero/sensor.py
+++ b/homeassistant/components/goalzero/sensor.py
@@ -72,7 +72,7 @@
         name="Wh stored",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        state_class=SensorStateClass.MEASUREMENT,
+        state_class=SensorStateClass.TOTAL,
     ),
     SensorEntityDescription(
         key="volts",
diff --git a/homeassistant/components/gogogate2/manifest.json b/homeassistant/components/gogogate2/manifest.json
index ec2834d00d8818..faebcf7e35328a 100644
--- a/homeassistant/components/gogogate2/manifest.json
+++ b/homeassistant/components/gogogate2/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "gogogate2",
   "name": "Gogogate2 and ismartgate",
-  "codeowners": ["@vangorra", "@bdraco"],
+  "codeowners": ["@vangorra"],
   "config_flow": true,
   "dhcp": [
     {
diff --git a/homeassistant/components/goodwe/sensor.py b/homeassistant/components/goodwe/sensor.py
index d76d6202832928..4a4296bc526187 100644
--- a/homeassistant/components/goodwe/sensor.py
+++ b/homeassistant/components/goodwe/sensor.py
@@ -243,7 +243,7 @@ def async_reset(self, now):
         In contrast to "total" sensors, these "daily" sensors need to be reset to 0 on midnight.
         """
         if not self.coordinator.last_update_success:
-            self.coordinator.reset_sensor(self._sensor.id)
+            self.coordinator.reset_sensor(self._sensor.id_)
             self.async_write_ha_state()
             _LOGGER.debug("Goodwe reset %s to 0", self.name)
         next_midnight = dt_util.start_of_local_day(
diff --git a/homeassistant/components/google/api.py b/homeassistant/components/google/api.py
index 47aa32dcd11cde..a3a5b7246b6160 100644
--- a/homeassistant/components/google/api.py
+++ b/homeassistant/components/google/api.py
@@ -24,7 +24,7 @@
     async_track_point_in_utc_time,
     async_track_time_interval,
 )
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_CALENDAR_ACCESS,
@@ -51,7 +51,9 @@ class DeviceAuth(AuthImplementation):
     async def async_resolve_external_data(self, external_data: Any) -> dict:
         """Resolve a Google API Credentials object to Home Assistant token."""
         creds: Credentials = external_data[DEVICE_AUTH_CREDS]
-        delta = creds.token_expiry.replace(tzinfo=datetime.timezone.utc) - dt.utcnow()
+        delta = (
+            creds.token_expiry.replace(tzinfo=datetime.timezone.utc) - dt_util.utcnow()
+        )
         _LOGGER.debug(
             "Token expires at %s (in %s)", creds.token_expiry, delta.total_seconds()
         )
@@ -108,7 +110,9 @@ def creds(self) -> Credentials | None:
     def async_start_exchange(self) -> None:
         """Start the device auth exchange flow polling."""
         _LOGGER.debug("Starting exchange flow")
-        max_timeout = dt.utcnow() + datetime.timedelta(seconds=EXCHANGE_TIMEOUT_SECONDS)
+        max_timeout = dt_util.utcnow() + datetime.timedelta(
+            seconds=EXCHANGE_TIMEOUT_SECONDS
+        )
         # For some reason, oauth.step1_get_device_and_user_codes() returns a datetime
         # object without tzinfo. For the comparison below to work, it needs one.
         user_code_expiry = self._device_flow_info.user_code_expiry.replace(
diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index 3a0315a59312d7..37f3a2c3edc282 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -28,10 +28,10 @@
     DEFAULT_EXPOSE_BY_DEFAULT,
     DEFAULT_EXPOSED_DOMAINS,
     DOMAIN,
+    EVENT_QUERY_RECEIVED,  # noqa: F401
     SERVICE_REQUEST_SYNC,
     SOURCE_CLOUD,
 )
-from .const import EVENT_QUERY_RECEIVED  # noqa: F401
 from .http import GoogleAssistantView, GoogleConfig
 
 from .const import EVENT_COMMAND_RECEIVED, EVENT_SYNC_RECEIVED  # noqa: F401, isort:skip
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index bf511f8eaebb95..6ec8ca5d747fba 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -170,6 +170,7 @@
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.RECEIVER): TYPE_RECEIVER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.SPEAKER): TYPE_SPEAKER,
     (media_player.DOMAIN, media_player.MediaPlayerDeviceClass.TV): TYPE_TV,
+    (sensor.DOMAIN, sensor.SensorDeviceClass.AQI): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.HUMIDITY): TYPE_SENSOR,
     (sensor.DOMAIN, sensor.SensorDeviceClass.TEMPERATURE): TYPE_SENSOR,
     (switch.DOMAIN, switch.SwitchDeviceClass.OUTLET): TYPE_OUTLET,
@@ -186,7 +187,7 @@
 SOURCE_CLOUD = "cloud"
 SOURCE_LOCAL = "local"
 
-NOT_EXPOSE_LOCAL = {TYPE_ALARM, TYPE_LOCK}
+NOT_EXPOSE_LOCAL = {TYPE_ALARM, TYPE_LOCK, TYPE_THERMOSTAT}
 
 FAN_SPEEDS = {
     "5/5": ["High", "Max", "Fast", "5"],
diff --git a/homeassistant/components/google_assistant/helpers.py b/homeassistant/components/google_assistant/helpers.py
index e194242df91ac3..49d130d665692c 100644
--- a/homeassistant/components/google_assistant/helpers.py
+++ b/homeassistant/components/google_assistant/helpers.py
@@ -21,7 +21,7 @@
     CONF_NAME,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import Context, HomeAssistant, State, callback
+from homeassistant.core import CALLBACK_TYPE, Context, HomeAssistant, State, callback
 from homeassistant.helpers import (
     area_registry as ar,
     device_registry as dr,
@@ -86,19 +86,19 @@ def _get_registry_entries(
 class AbstractConfig(ABC):
     """Hold the configuration for Google Assistant."""
 
+    _store: GoogleConfigStore
     _unsub_report_state: Callable[[], None] | None = None
 
-    def __init__(self, hass):
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize abstract config."""
         self.hass = hass
-        self._store = None
-        self._google_sync_unsub = {}
+        self._google_sync_unsub: dict[str, CALLBACK_TYPE] = {}
         self._local_sdk_active = False
         self._local_last_active: datetime | None = None
         self._local_sdk_version_warn = False
         self.is_supported_cache: dict[str, tuple[int | None, bool]] = {}
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Perform async initialization of config."""
         self._store = GoogleConfigStore(self.hass)
         await self._store.async_initialize()
@@ -195,7 +195,7 @@ async def async_report_state_all(self, message):
         await gather(*jobs)
 
     @callback
-    def async_enable_report_state(self):
+    def async_enable_report_state(self) -> None:
         """Enable proactive mode."""
         # Circular dep
         # pylint: disable-next=import-outside-toplevel
@@ -205,7 +205,7 @@ def async_enable_report_state(self):
             self._unsub_report_state = async_enable_report_state(self.hass, self)
 
     @callback
-    def async_disable_report_state(self):
+    def async_disable_report_state(self) -> None:
         """Disable report state."""
         if self._unsub_report_state is not None:
             self._unsub_report_state()
@@ -220,7 +220,7 @@ async def async_sync_entities(self, agent_user_id: str):
             await self.async_disconnect_agent_user(agent_user_id)
         return status
 
-    async def async_sync_entities_all(self):
+    async def async_sync_entities_all(self) -> int:
         """Sync all entities to Google for all registered agents."""
         if not self._store.agent_user_ids:
             return 204
@@ -249,7 +249,7 @@ async def _schedule_callback(_now):
         )
 
     @callback
-    def async_schedule_google_sync_all(self):
+    def async_schedule_google_sync_all(self) -> None:
         """Schedule a sync for all registered agents."""
         for agent_user_id in self._store.agent_user_ids:
             self.async_schedule_google_sync(agent_user_id)
@@ -279,7 +279,7 @@ async def async_disconnect_agent_user(self, agent_user_id: str):
         self._store.pop_agent_user_id(agent_user_id)
 
     @callback
-    def async_enable_local_sdk(self):
+    def async_enable_local_sdk(self) -> None:
         """Enable the local SDK."""
         setup_successful = True
         setup_webhook_ids = []
@@ -323,7 +323,7 @@ def async_enable_local_sdk(self):
         self._local_sdk_active = setup_successful
 
     @callback
-    def async_disable_local_sdk(self):
+    def async_disable_local_sdk(self) -> None:
         """Disable the local SDK."""
         if not self._local_sdk_active:
             return
@@ -500,7 +500,7 @@ def __init__(
         self.hass = hass
         self.config = config
         self.state = state
-        self._traits = None
+        self._traits: list[trait._Trait] | None = None
 
     @property
     def entity_id(self):
@@ -508,7 +508,7 @@ def entity_id(self):
         return self.state.entity_id
 
     @callback
-    def traits(self):
+    def traits(self) -> list[trait._Trait]:
         """Return traits for entity."""
         if self._traits is not None:
             return self._traits
diff --git a/homeassistant/components/google_assistant/smart_home.py b/homeassistant/components/google_assistant/smart_home.py
index 1b1b443baac001..b8c57812540cfe 100644
--- a/homeassistant/components/google_assistant/smart_home.py
+++ b/homeassistant/components/google_assistant/smart_home.py
@@ -278,7 +278,6 @@ async def async_devices_disconnect(
     """
     assert data.context.user_id is not None
     await data.config.async_disconnect_agent_user(data.context.user_id)
-    return None
 
 
 @HANDLERS.register("action.devices.IDENTIFY")
diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index 3752574f31f138..36660820efbc2c 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -1,6 +1,7 @@
 """Implement the Google Smart Home traits."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import logging
 from typing import Any, TypeVar
 
@@ -67,7 +68,7 @@
 )
 from homeassistant.core import DOMAIN as HA_DOMAIN
 from homeassistant.helpers.network import get_url
-from homeassistant.util import color as color_util, dt
+from homeassistant.util import color as color_util, dt as dt_util
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
@@ -196,9 +197,10 @@ def _next_selected(items: list[str], selected: str | None) -> str | None:
     return items[next_item]
 
 
-class _Trait:
+class _Trait(ABC):
     """Represents a Trait inside Google Assistant skill."""
 
+    name: str
     commands: list[str] = []
 
     @staticmethod
@@ -206,6 +208,11 @@ def might_2fa(domain, features, device_class):
         """Return if the trait might ask for 2FA."""
         return False
 
+    @staticmethod
+    @abstractmethod
+    def supported(domain, features, device_class, attributes):
+        """Test if state is supported."""
+
     def __init__(self, hass, state, config):
         """Initialize a trait for a state."""
         self.hass = hass
@@ -915,9 +922,28 @@ def climate_google_modes(self):
     def sync_attributes(self):
         """Return temperature point and modes attributes for a sync request."""
         response = {}
-        response["thermostatTemperatureUnit"] = _google_temp_unit(
-            self.hass.config.units.temperature_unit
+        attrs = self.state.attributes
+        unit = self.hass.config.units.temperature_unit
+        response["thermostatTemperatureUnit"] = _google_temp_unit(unit)
+
+        min_temp = round(
+            TemperatureConverter.convert(
+                float(attrs[climate.ATTR_MIN_TEMP]),
+                unit,
+                UnitOfTemperature.CELSIUS,
+            )
         )
+        max_temp = round(
+            TemperatureConverter.convert(
+                float(attrs[climate.ATTR_MAX_TEMP]),
+                unit,
+                UnitOfTemperature.CELSIUS,
+            )
+        )
+        response["thermostatTemperatureRange"] = {
+            "minThresholdCelsius": min_temp,
+            "maxThresholdCelsius": max_temp,
+        }
 
         modes = self.climate_google_modes
 
@@ -982,24 +1008,22 @@ def query_attributes(self):
                     ),
                     1,
                 )
-            else:
-                if (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
-                    target_temp = round(
-                        TemperatureConverter.convert(
-                            target_temp, unit, UnitOfTemperature.CELSIUS
-                        ),
-                        1,
-                    )
-                    response["thermostatTemperatureSetpointHigh"] = target_temp
-                    response["thermostatTemperatureSetpointLow"] = target_temp
-        else:
-            if (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
-                response["thermostatTemperatureSetpoint"] = round(
+            elif (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
+                target_temp = round(
                     TemperatureConverter.convert(
                         target_temp, unit, UnitOfTemperature.CELSIUS
                     ),
                     1,
                 )
+                response["thermostatTemperatureSetpointHigh"] = target_temp
+                response["thermostatTemperatureSetpointLow"] = target_temp
+        elif (target_temp := attrs.get(ATTR_TEMPERATURE)) is not None:
+            response["thermostatTemperatureSetpoint"] = round(
+                TemperatureConverter.convert(
+                    target_temp, unit, UnitOfTemperature.CELSIUS
+                ),
+                1,
+            )
 
         return response
 
@@ -1190,9 +1214,12 @@ def query_attributes(self):
                     response["humidityAmbientPercent"] = round(float(current_humidity))
 
         elif domain == humidifier.DOMAIN:
-            target_humidity = attrs.get(humidifier.ATTR_HUMIDITY)
+            target_humidity: int | None = attrs.get(humidifier.ATTR_HUMIDITY)
             if target_humidity is not None:
-                response["humiditySetpointPercent"] = round(float(target_humidity))
+                response["humiditySetpointPercent"] = target_humidity
+            current_humidity: int | None = attrs.get(humidifier.ATTR_CURRENT_HUMIDITY)
+            if current_humidity is not None:
+                response["humidityAmbientPercent"] = current_humidity
 
         return response
 
@@ -2211,7 +2238,7 @@ async def execute(self, command, data, params, challenge):
             rel_position = params["relativePositionMs"] / 1000
             seconds_since = 0  # Default to 0 seconds
             if self.state.state == STATE_PLAYING:
-                now = dt.utcnow()
+                now = dt_util.utcnow()
                 upd_at = self.state.attributes.get(
                     media_player.ATTR_MEDIA_POSITION_UPDATED_AT, now
                 )
@@ -2386,6 +2413,23 @@ class SensorStateTrait(_Trait):
     name = TRAIT_SENSOR_STATE
     commands: list[str] = []
 
+    def _air_quality_description_for_aqi(self, aqi):
+        if aqi is None or aqi.isnumeric() is False:
+            return "unknown"
+        aqi = int(aqi)
+        if aqi <= 50:
+            return "healthy"
+        if aqi <= 100:
+            return "moderate"
+        if aqi <= 150:
+            return "unhealthy for sensitive groups"
+        if aqi <= 200:
+            return "unhealthy"
+        if aqi <= 300:
+            return "very unhealthy"
+
+        return "hazardous"
+
     @classmethod
     def supported(cls, domain, features, device_class, _):
         """Test if state is supported."""
@@ -2394,20 +2438,44 @@ def supported(cls, domain, features, device_class, _):
     def sync_attributes(self):
         """Return attributes for a sync request."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
-        if (data := self.sensor_types.get(device_class)) is not None:
-            return {
-                "sensorStatesSupported": {
-                    "name": data[0],
-                    "numericCapabilities": {"rawValueUnit": data[1]},
-                }
+        data = self.sensor_types.get(device_class)
+
+        if device_class is None or data is None:
+            return {}
+
+        sensor_state = {
+            "name": data[0],
+            "numericCapabilities": {"rawValueUnit": data[1]},
+        }
+
+        if device_class == sensor.SensorDeviceClass.AQI:
+            sensor_state["descriptiveCapabilities"] = {
+                "availableStates": [
+                    "healthy",
+                    "moderate",
+                    "unhealthy for sensitive groups",
+                    "unhealthy",
+                    "very unhealthy",
+                    "hazardous",
+                    "unknown",
+                ],
             }
 
+        return {"sensorStatesSupported": [sensor_state]}
+
     def query_attributes(self):
         """Return the attributes of this trait for this entity."""
         device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
-        if (data := self.sensor_types.get(device_class)) is not None:
-            return {
-                "currentSensorStateData": [
-                    {"name": data[0], "rawValue": self.state.state}
-                ]
-            }
+        data = self.sensor_types.get(device_class)
+
+        if device_class is None or data is None:
+            return {}
+
+        sensor_data = {"name": data[0], "rawValue": self.state.state}
+
+        if device_class == sensor.SensorDeviceClass.AQI:
+            sensor_data["currentSensorState"] = self._air_quality_description_for_aqi(
+                self.state.state
+            )
+
+        return {"currentSensorStateData": [sensor_data]}
diff --git a/homeassistant/components/google_assistant_sdk/__init__.py b/homeassistant/components/google_assistant_sdk/__init__.py
index 7a9ca70bf14197..db2a8d9512ed4a 100644
--- a/homeassistant/components/google_assistant_sdk/__init__.py
+++ b/homeassistant/components/google_assistant_sdk/__init__.py
@@ -18,18 +18,11 @@
 )
 from homeassistant.helpers.typing import ConfigType
 
-from .const import (
-    CONF_ENABLE_CONVERSATION_AGENT,
-    CONF_LANGUAGE_CODE,
-    DATA_MEM_STORAGE,
-    DATA_SESSION,
-    DOMAIN,
-)
+from .const import DATA_MEM_STORAGE, DATA_SESSION, DOMAIN, SUPPORTED_LANGUAGE_CODES
 from .helpers import (
     GoogleAssistantSDKAudioView,
     InMemoryStorage,
     async_send_text_commands,
-    default_language_code,
 )
 
 SERVICE_SEND_TEXT_COMMAND = "send_text_command"
@@ -44,6 +37,8 @@
     },
 )
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Google Assistant SDK component."""
@@ -80,8 +75,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await async_setup_service(hass)
 
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-    await update_listener(hass, entry)
+    agent = GoogleAssistantConversationAgent(hass, entry)
+    conversation.async_set_agent(hass, entry, agent)
 
     return True
 
@@ -98,8 +93,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         for service_name in hass.services.async_services()[DOMAIN]:
             hass.services.async_remove(DOMAIN, service_name)
 
-    if entry.options.get(CONF_ENABLE_CONVERSATION_AGENT, False):
-        conversation.async_unset_agent(hass, entry)
+    conversation.async_unset_agent(hass, entry)
 
     return True
 
@@ -123,15 +117,6 @@ async def send_text_command(call: ServiceCall) -> None:
     )
 
 
-async def update_listener(hass, entry):
-    """Handle options update."""
-    if entry.options.get(CONF_ENABLE_CONVERSATION_AGENT, False):
-        agent = GoogleAssistantConversationAgent(hass, entry)
-        conversation.async_set_agent(hass, entry, agent)
-    else:
-        conversation.async_unset_agent(hass, entry)
-
-
 class GoogleAssistantConversationAgent(conversation.AbstractConversationAgent):
     """Google Assistant SDK conversation agent."""
 
@@ -141,6 +126,7 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         self.entry = entry
         self.assistant: TextAssistant | None = None
         self.session: OAuth2Session | None = None
+        self.language: str | None = None
 
     @property
     def attribution(self):
@@ -153,10 +139,7 @@ def attribution(self):
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
-        language_code = self.entry.options.get(
-            CONF_LANGUAGE_CODE, default_language_code(self.hass)
-        )
-        return [language_code]
+        return SUPPORTED_LANGUAGE_CODES
 
     async def async_process(
         self, user_input: conversation.ConversationInput
@@ -170,12 +153,10 @@ async def async_process(
         if not session.valid_token:
             await session.async_ensure_token_valid()
             self.assistant = None
-        if not self.assistant:
+        if not self.assistant or user_input.language != self.language:
             credentials = Credentials(session.token[CONF_ACCESS_TOKEN])
-            language_code = self.entry.options.get(
-                CONF_LANGUAGE_CODE, default_language_code(self.hass)
-            )
-            self.assistant = TextAssistant(credentials, language_code)
+            self.language = user_input.language
+            self.assistant = TextAssistant(credentials, self.language)
 
         resp = self.assistant.assist(user_input.text)
         text_response = resp[0] or "<empty response>"
diff --git a/homeassistant/components/google_assistant_sdk/config_flow.py b/homeassistant/components/google_assistant_sdk/config_flow.py
index b93a3be93f2fde..b4f617ca029258 100644
--- a/homeassistant/components/google_assistant_sdk/config_flow.py
+++ b/homeassistant/components/google_assistant_sdk/config_flow.py
@@ -13,13 +13,7 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import config_entry_oauth2_flow
 
-from .const import (
-    CONF_ENABLE_CONVERSATION_AGENT,
-    CONF_LANGUAGE_CODE,
-    DEFAULT_NAME,
-    DOMAIN,
-    SUPPORTED_LANGUAGE_CODES,
-)
+from .const import CONF_LANGUAGE_CODE, DEFAULT_NAME, DOMAIN, SUPPORTED_LANGUAGE_CODES
 from .helpers import default_language_code
 
 _LOGGER = logging.getLogger(__name__)
@@ -114,12 +108,6 @@ async def async_step_init(
                         CONF_LANGUAGE_CODE,
                         default=self.config_entry.options.get(CONF_LANGUAGE_CODE),
                     ): vol.In(SUPPORTED_LANGUAGE_CODES),
-                    vol.Required(
-                        CONF_ENABLE_CONVERSATION_AGENT,
-                        default=self.config_entry.options.get(
-                            CONF_ENABLE_CONVERSATION_AGENT
-                        ),
-                    ): bool,
                 }
             ),
         )
diff --git a/homeassistant/components/google_assistant_sdk/const.py b/homeassistant/components/google_assistant_sdk/const.py
index c9f86160bb4c13..d63aec0ebd5309 100644
--- a/homeassistant/components/google_assistant_sdk/const.py
+++ b/homeassistant/components/google_assistant_sdk/const.py
@@ -5,7 +5,6 @@
 
 DEFAULT_NAME: Final = "Google Assistant SDK"
 
-CONF_ENABLE_CONVERSATION_AGENT: Final = "enable_conversation_agent"
 CONF_LANGUAGE_CODE: Final = "language_code"
 
 DATA_MEM_STORAGE: Final = "mem_storage"
diff --git a/homeassistant/components/google_assistant_sdk/strings.json b/homeassistant/components/google_assistant_sdk/strings.json
index d4c85be91e50c0..66a2b975b5e15a 100644
--- a/homeassistant/components/google_assistant_sdk/strings.json
+++ b/homeassistant/components/google_assistant_sdk/strings.json
@@ -31,10 +31,8 @@
     "step": {
       "init": {
         "data": {
-          "enable_conversation_agent": "Enable the conversation agent",
           "language_code": "Language code"
-        },
-        "description": "Set language for interactions with Google Assistant and whether you want to enable the conversation agent."
+        }
       }
     }
   },
diff --git a/homeassistant/components/google_cloud/tts.py b/homeassistant/components/google_cloud/tts.py
index 89da3433815bd4..c8f6869f6e4e72 100644
--- a/homeassistant/components/google_cloud/tts.py
+++ b/homeassistant/components/google_cloud/tts.py
@@ -241,7 +241,7 @@ def default_options(self):
             CONF_TEXT_TYPE: self._text_type,
         }
 
-    async def async_get_tts_audio(self, message, language, options=None):
+    async def async_get_tts_audio(self, message, language, options):
         """Load TTS from google."""
         options_schema = vol.Schema(
             {
diff --git a/homeassistant/components/google_generative_ai_conversation/manifest.json b/homeassistant/components/google_generative_ai_conversation/manifest.json
index 52de921553544e..65d9e0b38943fc 100644
--- a/homeassistant/components/google_generative_ai_conversation/manifest.json
+++ b/homeassistant/components/google_generative_ai_conversation/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google_generative_ai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["google-generativeai==0.1.0rc2"]
+  "requirements": ["google-generativeai==0.1.0"]
 }
diff --git a/homeassistant/components/google_mail/__init__.py b/homeassistant/components/google_mail/__init__.py
index a24d5c1787451b..15c4192ccf5cf3 100644
--- a/homeassistant/components/google_mail/__init__.py
+++ b/homeassistant/components/google_mail/__init__.py
@@ -7,8 +7,7 @@
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
@@ -21,6 +20,8 @@
 
 PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Google Mail platform."""
@@ -33,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Google Mail from a config entry."""
     implementation = await async_get_config_entry_implementation(hass, entry)
     session = OAuth2Session(hass, entry, implementation)
-    auth = AsyncConfigEntryAuth(async_get_clientsession(hass), session)
+    auth = AsyncConfigEntryAuth(session)
     try:
         await auth.check_and_refresh_token()
     except ClientResponseError as err:
diff --git a/homeassistant/components/google_mail/api.py b/homeassistant/components/google_mail/api.py
index 202fa5b56b65fe..ffa33deae14b63 100644
--- a/homeassistant/components/google_mail/api.py
+++ b/homeassistant/components/google_mail/api.py
@@ -1,25 +1,21 @@
 """API for Google Mail bound to Home Assistant OAuth."""
-from aiohttp import ClientSession
 from google.auth.exceptions import RefreshError
 from google.oauth2.credentials import Credentials
-from google.oauth2.utils import OAuthClientAuthHandler
 from googleapiclient.discovery import Resource, build
 
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 
 
-class AsyncConfigEntryAuth(OAuthClientAuthHandler):
+class AsyncConfigEntryAuth:
     """Provide Google Mail authentication tied to an OAuth2 based config entry."""
 
     def __init__(
         self,
-        websession: ClientSession,
-        oauth2Session: config_entry_oauth2_flow.OAuth2Session,
+        oauth2_session: config_entry_oauth2_flow.OAuth2Session,
     ) -> None:
         """Initialize Google Mail Auth."""
-        self.oauth_session = oauth2Session
-        super().__init__(websession)
+        self.oauth_session = oauth2_session
 
     @property
     def access_token(self) -> str:
diff --git a/homeassistant/components/google_mail/sensor.py b/homeassistant/components/google_mail/sensor.py
index 8023b9222a04d4..a65e845095cea2 100644
--- a/homeassistant/components/google_mail/sensor.py
+++ b/homeassistant/components/google_mail/sensor.py
@@ -21,7 +21,7 @@
 
 SENSOR_TYPE = SensorEntityDescription(
     key="vacation_end_date",
-    name="Vacation end date",
+    translation_key="vacation_end_date",
     icon="mdi:clock",
     device_class=SensorDeviceClass.TIMESTAMP,
 )
diff --git a/homeassistant/components/google_mail/strings.json b/homeassistant/components/google_mail/strings.json
index eb44bffb13488e..2f76806dfd351a 100644
--- a/homeassistant/components/google_mail/strings.json
+++ b/homeassistant/components/google_mail/strings.json
@@ -30,5 +30,12 @@
   },
   "application_credentials": {
     "description": "Follow the [instructions]({more_info_url}) for [OAuth consent screen]({oauth_consent_url}) to give Home Assistant access to your Google Mail. You also need to create Application Credentials linked to your account:\n1. Go to [Credentials]({oauth_creds_url}) and click **Create Credentials**.\n1. From the drop-down list select **OAuth client ID**.\n1. Select **Web application** for the Application Type.\n\n"
+  },
+  "entity": {
+    "sensor": {
+      "vacation_end_date": {
+        "name": "Vacation end date"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/google_sheets/__init__.py b/homeassistant/components/google_sheets/__init__.py
index 803b737283b331..590c7bd0c90295 100644
--- a/homeassistant/components/google_sheets/__init__.py
+++ b/homeassistant/components/google_sheets/__init__.py
@@ -7,13 +7,18 @@
 from google.auth.exceptions import RefreshError
 from google.oauth2.credentials import Credentials
 from gspread import Client
+from gspread.exceptions import APIError
 from gspread.utils import ValueInputOption
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryNotReady,
+    HomeAssistantError,
+)
 from homeassistant.helpers.config_entry_oauth2_flow import (
     OAuth2Session,
     async_get_config_entry_implementation,
@@ -93,6 +98,9 @@ def _append_to_sheet(call: ServiceCall, entry: ConfigEntry) -> None:
         except RefreshError as ex:
             entry.async_start_reauth(hass)
             raise ex
+        except APIError as ex:
+            raise HomeAssistantError("Failed to write data") from ex
+
         worksheet = sheet.worksheet(call.data.get(WORKSHEET, sheet.sheet1.title))
         row_data = {"created": str(datetime.now())} | call.data[DATA]
         columns: list[str] = next(iter(worksheet.get_values("A1:ZZ1")), [])
diff --git a/homeassistant/components/google_translate/__init__.py b/homeassistant/components/google_translate/__init__.py
index f7860c57d993fc..ac6b07bd4b37be 100644
--- a/homeassistant/components/google_translate/__init__.py
+++ b/homeassistant/components/google_translate/__init__.py
@@ -1 +1,20 @@
-"""The google_translate component."""
+"""The Google Translate text-to-speech integration."""
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+PLATFORMS: list[Platform] = [Platform.TTS]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Google Translate text-to-speech from a config entry."""
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/google_translate/config_flow.py b/homeassistant/components/google_translate/config_flow.py
new file mode 100644
index 00000000000000..3996d41df35e05
--- /dev/null
+++ b/homeassistant/components/google_translate/config_flow.py
@@ -0,0 +1,58 @@
+"""Config flow for Google Translate text-to-speech integration."""
+from __future__ import annotations
+
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components.tts import CONF_LANG
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import (
+    CONF_TLD,
+    DEFAULT_LANG,
+    DEFAULT_TLD,
+    DOMAIN,
+    SUPPORT_LANGUAGES,
+    SUPPORT_TLD,
+)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_LANG, default=DEFAULT_LANG): vol.In(SUPPORT_LANGUAGES),
+        vol.Optional(CONF_TLD, default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Google Translate text-to-speech."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is not None:
+            self._async_abort_entries_match(
+                {
+                    CONF_LANG: user_input[CONF_LANG],
+                    CONF_TLD: user_input[CONF_TLD],
+                }
+            )
+            return self.async_create_entry(
+                title="Google Translate text-to-speech", data=user_input
+            )
+
+        return self.async_show_form(step_id="user", data_schema=STEP_USER_DATA_SCHEMA)
+
+    async def async_step_onboarding(
+        self, data: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle a flow initialized by onboarding."""
+        return self.async_create_entry(
+            title="Google Translate text-to-speech",
+            data={CONF_LANG: DEFAULT_LANG, CONF_TLD: DEFAULT_TLD},
+        )
diff --git a/homeassistant/components/google_translate/const.py b/homeassistant/components/google_translate/const.py
index e6361c1025ef68..0bb8663119b044 100644
--- a/homeassistant/components/google_translate/const.py
+++ b/homeassistant/components/google_translate/const.py
@@ -1,6 +1,11 @@
-"""Constant for google_translate integration."""
+"""Constants for the Google Translate text-to-speech integration."""
 from dataclasses import dataclass
 
+CONF_TLD = "tld"
+DEFAULT_LANG = "en"
+DEFAULT_TLD = "com"
+DOMAIN = "google_translate"
+
 SUPPORT_LANGUAGES = [
     "af",
     "ar",
@@ -35,6 +40,7 @@
     "ko",
     "la",
     "lv",
+    "lt",
     "mk",
     "ml",
     "mr",
diff --git a/homeassistant/components/google_translate/manifest.json b/homeassistant/components/google_translate/manifest.json
index 5321d13c5d617a..7074d0ed444198 100644
--- a/homeassistant/components/google_translate/manifest.json
+++ b/homeassistant/components/google_translate/manifest.json
@@ -1,7 +1,8 @@
 {
   "domain": "google_translate",
-  "name": "Google Translate Text-to-Speech",
+  "name": "Google Translate text-to-speech",
   "codeowners": [],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/google_translate",
   "iot_class": "cloud_push",
   "loggers": ["gtts"],
diff --git a/homeassistant/components/google_translate/strings.json b/homeassistant/components/google_translate/strings.json
new file mode 100644
index 00000000000000..a83e61f01f9a68
--- /dev/null
+++ b/homeassistant/components/google_translate/strings.json
@@ -0,0 +1,15 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "language": "Language",
+          "tld": "TLD"
+        }
+      }
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
+  }
+}
diff --git a/homeassistant/components/google_translate/tts.py b/homeassistant/components/google_translate/tts.py
index b720498b4f1b4e..45288e81996f2d 100644
--- a/homeassistant/components/google_translate/tts.py
+++ b/homeassistant/components/google_translate/tts.py
@@ -1,33 +1,120 @@
 """Support for the Google speech service."""
+from __future__ import annotations
+
 from io import BytesIO
 import logging
+from typing import Any
 
 from gtts import gTTS, gTTSError
 import voluptuous as vol
 
-from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider
-
-from .const import MAP_LANG_TLD, SUPPORT_LANGUAGES, SUPPORT_TLD
+from homeassistant.components.tts import (
+    CONF_LANG,
+    PLATFORM_SCHEMA,
+    Provider,
+    TextToSpeechEntity,
+    TtsAudioType,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from .const import (
+    CONF_TLD,
+    DEFAULT_LANG,
+    DEFAULT_TLD,
+    MAP_LANG_TLD,
+    SUPPORT_LANGUAGES,
+    SUPPORT_TLD,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_LANG = "en"
-
 SUPPORT_OPTIONS = ["tld"]
 
-DEFAULT_TLD = "com"
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_LANG, default=DEFAULT_LANG): vol.In(SUPPORT_LANGUAGES),
-        vol.Optional("tld", default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
+        vol.Optional(CONF_TLD, default=DEFAULT_TLD): vol.In(SUPPORT_TLD),
     }
 )
 
 
-async def async_get_engine(hass, config, discovery_info=None):
+async def async_get_engine(
+    hass: HomeAssistant,
+    config: ConfigType,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> GoogleProvider:
     """Set up Google speech component."""
-    return GoogleProvider(hass, config[CONF_LANG], config["tld"])
+    return GoogleProvider(hass, config[CONF_LANG], config[CONF_TLD])
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Google Translate speech platform via config entry."""
+    default_language = config_entry.data[CONF_LANG]
+    default_tld = config_entry.data[CONF_TLD]
+    async_add_entities([GoogleTTSEntity(config_entry, default_language, default_tld)])
+
+
+class GoogleTTSEntity(TextToSpeechEntity):
+    """The Google speech API entity."""
+
+    def __init__(self, config_entry: ConfigEntry, lang: str, tld: str) -> None:
+        """Init Google TTS service."""
+        if lang in MAP_LANG_TLD:
+            self._lang = MAP_LANG_TLD[lang].lang
+            self._tld = MAP_LANG_TLD[lang].tld
+        else:
+            self._lang = lang
+            self._tld = tld
+        self._attr_name = f"Google {self._lang} {self._tld}"
+        self._attr_unique_id = config_entry.entry_id
+
+    @property
+    def default_language(self):
+        """Return the default language."""
+        return self._lang
+
+    @property
+    def supported_languages(self):
+        """Return list of supported languages."""
+        return SUPPORT_LANGUAGES
+
+    @property
+    def supported_options(self):
+        """Return a list of supported options."""
+        return SUPPORT_OPTIONS
+
+    def get_tts_audio(
+        self, message: str, language: str, options: dict[str, Any] | None = None
+    ) -> TtsAudioType:
+        """Load TTS from google."""
+        tld = self._tld
+        if language in MAP_LANG_TLD:
+            tld_language = MAP_LANG_TLD[language]
+            tld = tld_language.tld
+            language = tld_language.lang
+        if options is not None and "tld" in options:
+            tld = options["tld"]
+
+        tts = gTTS(text=message, lang=language, tld=tld)
+        mp3_data = BytesIO()
+
+        try:
+            tts.write_to_fp(mp3_data)
+        except gTTSError as exc:
+            _LOGGER.debug(
+                "Error during processing of TTS request %s", exc, exc_info=True
+            )
+            raise HomeAssistantError(exc) from exc
+
+        return "mp3", mp3_data.getvalue()
 
 
 class GoogleProvider(Provider):
@@ -59,13 +146,13 @@ def supported_options(self):
         """Return a list of supported options."""
         return SUPPORT_OPTIONS
 
-    def get_tts_audio(self, message, language, options=None):
+    def get_tts_audio(self, message, language, options):
         """Load TTS from google."""
         tld = self._tld
         if language in MAP_LANG_TLD:
             tld = MAP_LANG_TLD[language].tld
             language = MAP_LANG_TLD[language].lang
-        if options is not None and "tld" in options:
+        if "tld" in options:
             tld = options["tld"]
         tts = gTTS(text=message, lang=language, tld=tld)
         mp3_data = BytesIO()
diff --git a/homeassistant/components/google_wifi/sensor.py b/homeassistant/components/google_wifi/sensor.py
index 9fe264219ecef2..6bf552b824be80 100644
--- a/homeassistant/components/google_wifi/sensor.py
+++ b/homeassistant/components/google_wifi/sensor.py
@@ -23,7 +23,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle, dt
+from homeassistant.util import Throttle, dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -212,7 +212,7 @@ def data_format(self):
                     elif attr_key == ATTR_UPTIME:
                         sensor_value = round(sensor_value / (3600 * 24), 2)
                     elif attr_key == ATTR_LAST_RESTART:
-                        last_restart = dt.now() - timedelta(seconds=sensor_value)
+                        last_restart = dt_util.now() - timedelta(seconds=sensor_value)
                         sensor_value = last_restart.strftime("%Y-%m-%d %H:%M:%S")
                     elif attr_key == ATTR_STATUS:
                         if sensor_value:
diff --git a/homeassistant/components/gpslogger/__init__.py b/homeassistant/components/gpslogger/__init__.py
index 5331f6e7029092..9f00e2cb52d9c4 100644
--- a/homeassistant/components/gpslogger/__init__.py
+++ b/homeassistant/components/gpslogger/__init__.py
@@ -12,7 +12,6 @@
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ATTR_ACCURACY,
@@ -55,12 +54,6 @@ def _id(value: str) -> str:
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the GPSLogger component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook with GPSLogger request."""
     try:
@@ -95,6 +88,7 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    hass.data.setdefault(DOMAIN, {"devices": set(), "unsub_device_tracker": {}})
     webhook.async_register(
         hass, DOMAIN, "GPSLogger", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/gree/switch.py b/homeassistant/components/gree/switch.py
index 01f98b996ddddb..68c11ad6e1f458 100644
--- a/homeassistant/components/gree/switch.py
+++ b/homeassistant/components/gree/switch.py
@@ -3,7 +3,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, cast
+from typing import Any
 
 from greeclimate.device import Device
 
@@ -33,6 +33,10 @@ class GreeRequiredKeysMixin:
 class GreeSwitchEntityDescription(SwitchEntityDescription, GreeRequiredKeysMixin):
     """Describes Gree switch entity."""
 
+    # GreeSwitch does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
 
 def _set_light(device: Device, value: bool) -> None:
     """Typed helper to set device light property."""
@@ -130,7 +134,7 @@ def __init__(self, coordinator, description: GreeSwitchEntityDescription) -> Non
         """Initialize the Gree device."""
         self.entity_description = description
 
-        super().__init__(coordinator, cast(str, description.name))
+        super().__init__(coordinator, description.name)
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/greeneye_monitor/manifest.json b/homeassistant/components/greeneye_monitor/manifest.json
index fcf4d004d26565..33a4947c01d230 100644
--- a/homeassistant/components/greeneye_monitor/manifest.json
+++ b/homeassistant/components/greeneye_monitor/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/greeneye_monitor",
   "iot_class": "local_push",
   "loggers": ["greeneye"],
-  "requirements": ["greeneye_monitor==3.0.3"]
+  "requirements": ["greeneye-monitor==3.0.3"]
 }
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 4543bf79d523d7..9480fa3ce1712b 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -196,9 +196,8 @@ def expand_entity_ids(hass: HomeAssistant, entity_ids: Iterable[Any]) -> list[st
                     if ent_id not in found_ids
                 )
 
-            else:
-                if entity_id not in found_ids:
-                    found_ids.append(entity_id)
+            elif entity_id not in found_ids:
+                found_ids.append(entity_id)
 
         except AttributeError:
             # Raised by split_entity_id if entity_id is not a string
diff --git a/homeassistant/components/group/config_flow.py b/homeassistant/components/group/config_flow.py
index 53a8fd0626414b..6cdc47f9e85627 100644
--- a/homeassistant/components/group/config_flow.py
+++ b/homeassistant/components/group/config_flow.py
@@ -24,14 +24,14 @@
 from .const import CONF_HIDE_MEMBERS, CONF_IGNORE_NON_NUMERIC
 
 _STATISTIC_MEASURES = [
-    selector.SelectOptionDict(value="min", label="Minimum"),
-    selector.SelectOptionDict(value="max", label="Maximum"),
-    selector.SelectOptionDict(value="mean", label="Arithmetic mean"),
-    selector.SelectOptionDict(value="median", label="Median"),
-    selector.SelectOptionDict(value="last", label="Most recently updated"),
-    selector.SelectOptionDict(value="range", label="Statistical range"),
-    selector.SelectOptionDict(value="sum", label="Sum"),
-    selector.SelectOptionDict(value="product", label="Product"),
+    "min",
+    "max",
+    "mean",
+    "median",
+    "last",
+    "range",
+    "sum",
+    "product",
 ]
 
 
@@ -80,13 +80,17 @@ async def binary_sensor_options_schema(handler: SchemaCommonFlowHandler) -> vol.
 
 SENSOR_CONFIG_EXTENDS = {
     vol.Required(CONF_TYPE): selector.SelectSelector(
-        selector.SelectSelectorConfig(options=_STATISTIC_MEASURES),
+        selector.SelectSelectorConfig(
+            options=_STATISTIC_MEASURES, translation_key=CONF_TYPE
+        ),
     ),
 }
 SENSOR_OPTIONS = {
     vol.Optional(CONF_IGNORE_NON_NUMERIC, default=False): selector.BooleanSelector(),
     vol.Required(CONF_TYPE): selector.SelectSelector(
-        selector.SelectSelectorConfig(options=_STATISTIC_MEASURES),
+        selector.SelectSelectorConfig(
+            options=_STATISTIC_MEASURES, translation_key=CONF_TYPE
+        ),
     ),
 }
 
diff --git a/homeassistant/components/group/notify.py b/homeassistant/components/group/notify.py
index 378a7852343bc9..2747ba55ee15b2 100644
--- a/homeassistant/components/group/notify.py
+++ b/homeassistant/components/group/notify.py
@@ -66,7 +66,7 @@ async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
         payload: dict[str, Any] = {ATTR_MESSAGE: message}
         payload.update({key: val for key, val in kwargs.items() if val})
 
-        tasks: list[asyncio.Task[bool | None]] = []
+        tasks: list[asyncio.Task[Any]] = []
         for entity in self.entities:
             sending_payload = deepcopy(payload.copy())
             if (default_data := entity.get(ATTR_DATA)) is not None:
@@ -74,7 +74,7 @@ async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
             tasks.append(
                 asyncio.create_task(
                     self.hass.services.async_call(
-                        DOMAIN, entity[ATTR_SERVICE], sending_payload
+                        DOMAIN, entity[ATTR_SERVICE], sending_payload, blocking=True
                     )
                 )
             )
diff --git a/homeassistant/components/group/strings.json b/homeassistant/components/group/strings.json
index 9f5054546812a2..192823cef6515b 100644
--- a/homeassistant/components/group/strings.json
+++ b/homeassistant/components/group/strings.json
@@ -176,5 +176,19 @@
         }
       }
     }
+  },
+  "selector": {
+    "type": {
+      "options": {
+        "min": "Minimum",
+        "max": "Maximum",
+        "mean": "Arithmetic mean",
+        "median": "Median",
+        "last": "Most recently updated",
+        "range": "Statistical range",
+        "sum": "Sum",
+        "product": "Product"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/growatt_server/sensor.py b/homeassistant/components/growatt_server/sensor.py
index f4150068399fba..87822227cefe93 100644
--- a/homeassistant/components/growatt_server/sensor.py
+++ b/homeassistant/components/growatt_server/sensor.py
@@ -13,7 +13,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import Throttle, dt
+from homeassistant.util import Throttle, dt as dt_util
 
 from .const import (
     CONF_PLANT_ID,
@@ -138,6 +138,8 @@ async def async_setup_entry(
 class GrowattInverter(SensorEntity):
     """Representation of a Growatt Sensor."""
 
+    _attr_has_entity_name = True
+
     entity_description: GrowattSensorEntityDescription
 
     def __init__(
@@ -147,7 +149,6 @@ def __init__(
         self.probe = probe
         self.entity_description = description
 
-        self._attr_name = f"{name} {description.name}"
         self._attr_unique_id = unique_id
         self._attr_icon = "mdi:solar-power"
 
@@ -234,10 +235,10 @@ def update(self):
                 sorted_keys = sorted(mix_chart_entries)
 
                 # Create datetime from the latest entry
-                date_now = dt.now().date()
-                last_updated_time = dt.parse_time(str(sorted_keys[-1]))
+                date_now = dt_util.now().date()
+                last_updated_time = dt_util.parse_time(str(sorted_keys[-1]))
                 mix_detail["lastdataupdate"] = datetime.datetime.combine(
-                    date_now, last_updated_time, dt.DEFAULT_TIME_ZONE
+                    date_now, last_updated_time, dt_util.DEFAULT_TIME_ZONE
                 )
 
                 # Dashboard data is largely inaccurate for mix system but it is the only
diff --git a/homeassistant/components/growatt_server/sensor_types/inverter.py b/homeassistant/components/growatt_server/sensor_types/inverter.py
index 746e4880cef787..cfacadce528fb0 100644
--- a/homeassistant/components/growatt_server/sensor_types/inverter.py
+++ b/homeassistant/components/growatt_server/sensor_types/inverter.py
@@ -16,7 +16,7 @@
 INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="inverter_energy_today",
-        name="Energy today",
+        translation_key="inverter_energy_today",
         api_key="powerToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -24,7 +24,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_energy_total",
-        name="Lifetime energy output",
+        translation_key="inverter_energy_total",
         api_key="powerTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -33,7 +33,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_1",
-        name="Input 1 voltage",
+        translation_key="inverter_voltage_input_1",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -41,7 +41,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_1",
-        name="Input 1 Amperage",
+        translation_key="inverter_amperage_input_1",
         api_key="ipv1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -49,7 +49,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_1",
-        name="Input 1 Wattage",
+        translation_key="inverter_wattage_input_1",
         api_key="ppv1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -57,7 +57,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_2",
-        name="Input 2 voltage",
+        translation_key="inverter_voltage_input_2",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -65,7 +65,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_2",
-        name="Input 2 Amperage",
+        translation_key="inverter_amperage_input_2",
         api_key="ipv2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -73,7 +73,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_2",
-        name="Input 2 Wattage",
+        translation_key="inverter_wattage_input_2",
         api_key="ppv2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -81,7 +81,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_3",
-        name="Input 3 voltage",
+        translation_key="inverter_voltage_input_3",
         api_key="vpv3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -89,7 +89,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_3",
-        name="Input 3 Amperage",
+        translation_key="inverter_amperage_input_3",
         api_key="ipv3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -97,7 +97,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_3",
-        name="Input 3 Wattage",
+        translation_key="inverter_wattage_input_3",
         api_key="ppv3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -105,7 +105,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_internal_wattage",
-        name="Internal wattage",
+        translation_key="inverter_internal_wattage",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -113,7 +113,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_reactive_voltage",
-        name="Reactive voltage",
+        translation_key="inverter_reactive_voltage",
         api_key="vacr",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -121,7 +121,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_inverter_reactive_amperage",
-        name="Reactive amperage",
+        translation_key="inverter_reactive_amperage",
         api_key="iacr",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -129,7 +129,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_frequency",
-        name="AC frequency",
+        translation_key="inverter_frequency",
         api_key="fac",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -137,7 +137,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_wattage",
-        name="Output power",
+        translation_key="inverter_current_wattage",
         api_key="pac",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -145,7 +145,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_reactive_wattage",
-        name="Reactive wattage",
+        translation_key="inverter_current_reactive_wattage",
         api_key="pacr",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -153,7 +153,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_ipm_temperature",
-        name="Intelligent Power Management temperature",
+        translation_key="inverter_ipm_temperature",
         api_key="ipmTemperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -161,7 +161,7 @@
     ),
     GrowattSensorEntityDescription(
         key="inverter_temperature",
-        name="Temperature",
+        translation_key="inverter_temperature",
         api_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
diff --git a/homeassistant/components/growatt_server/sensor_types/mix.py b/homeassistant/components/growatt_server/sensor_types/mix.py
index 76d37f4d193709..e9722abda11399 100644
--- a/homeassistant/components/growatt_server/sensor_types/mix.py
+++ b/homeassistant/components/growatt_server/sensor_types/mix.py
@@ -15,21 +15,21 @@
     # Values from 'mix_info' API call
     GrowattSensorEntityDescription(
         key="mix_statement_of_charge",
-        name="Statement of charge",
+        translation_key="mix_statement_of_charge",
         api_key="capacity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_charge_today",
-        name="Battery charged today",
+        translation_key="mix_battery_charge_today",
         api_key="eBatChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_charge_lifetime",
-        name="Lifetime battery charged",
+        translation_key="mix_battery_charge_lifetime",
         api_key="eBatChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -37,14 +37,14 @@
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_today",
-        name="Battery discharged today",
+        translation_key="mix_battery_discharge_today",
         api_key="eBatDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_lifetime",
-        name="Lifetime battery discharged",
+        translation_key="mix_battery_discharge_lifetime",
         api_key="eBatDisChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -52,14 +52,14 @@
     ),
     GrowattSensorEntityDescription(
         key="mix_solar_generation_today",
-        name="Solar energy today",
+        translation_key="mix_solar_generation_today",
         api_key="epvToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_solar_generation_lifetime",
-        name="Lifetime solar energy",
+        translation_key="mix_solar_generation_lifetime",
         api_key="epvTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -67,28 +67,28 @@
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_w",
-        name="Battery discharging W",
+        translation_key="mix_battery_discharge_w",
         api_key="pDischarge1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_voltage",
-        name="Battery voltage",
+        translation_key="mix_battery_voltage",
         api_key="vbat",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
     GrowattSensorEntityDescription(
         key="mix_pv1_voltage",
-        name="PV1 voltage",
+        translation_key="mix_pv1_voltage",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
     ),
     GrowattSensorEntityDescription(
         key="mix_pv2_voltage",
-        name="PV2 voltage",
+        translation_key="mix_pv2_voltage",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -96,14 +96,14 @@
     # Values from 'mix_totals' API call
     GrowattSensorEntityDescription(
         key="mix_load_consumption_today",
-        name="Load consumption today",
+        translation_key="mix_load_consumption_today",
         api_key="elocalLoadToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_lifetime",
-        name="Lifetime load consumption",
+        translation_key="mix_load_consumption_lifetime",
         api_key="elocalLoadTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -111,14 +111,14 @@
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid_today",
-        name="Export to grid today",
+        translation_key="mix_export_to_grid_today",
         api_key="etoGridToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid_lifetime",
-        name="Lifetime export to grid",
+        translation_key="mix_export_to_grid_lifetime",
         api_key="etogridTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -127,63 +127,63 @@
     # Values from 'mix_system_status' API call
     GrowattSensorEntityDescription(
         key="mix_battery_charge",
-        name="Battery charging",
+        translation_key="mix_battery_charge",
         api_key="chargePower",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption",
-        name="Load consumption",
+        translation_key="mix_load_consumption",
         api_key="pLocalLoad",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_1",
-        name="PV1 Wattage",
+        translation_key="mix_wattage_pv_1",
         api_key="pPv1",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_2",
-        name="PV2 Wattage",
+        translation_key="mix_wattage_pv_2",
         api_key="pPv2",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_wattage_pv_all",
-        name="All PV Wattage",
+        translation_key="mix_wattage_pv_all",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_export_to_grid",
-        name="Export to grid",
+        translation_key="mix_export_to_grid",
         api_key="pactogrid",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_import_from_grid",
-        name="Import from grid",
+        translation_key="mix_import_from_grid",
         api_key="pactouser",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_battery_discharge_kw",
-        name="Battery discharging kW",
+        translation_key="mix_battery_discharge_kw",
         api_key="pdisCharge1",
         native_unit_of_measurement=UnitOfPower.KILO_WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="mix_grid_voltage",
-        name="Grid voltage",
+        translation_key="mix_grid_voltage",
         api_key="vAc1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -191,35 +191,35 @@
     # Values from 'mix_detail' API call
     GrowattSensorEntityDescription(
         key="mix_system_production_today",
-        name="System production today (self-consumption + export)",
+        translation_key="mix_system_production_today",
         api_key="eCharge",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_solar_today",
-        name="Load consumption today (solar)",
+        translation_key="mix_load_consumption_solar_today",
         api_key="eChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_self_consumption_today",
-        name="Self consumption today (solar + battery)",
+        translation_key="mix_self_consumption_today",
         api_key="eChargeToday1",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_battery_today",
-        name="Load consumption today (battery)",
+        translation_key="mix_load_consumption_battery_today",
         api_key="echarge1",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="mix_import_from_grid_today",
-        name="Import from grid today (load)",
+        translation_key="mix_import_from_grid_today",
         api_key="etouser",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -227,14 +227,14 @@
     # This sensor is manually created using the most recent X-Axis value from the chartData
     GrowattSensorEntityDescription(
         key="mix_last_update",
-        name="Last Data Update",
+        translation_key="mix_last_update",
         api_key="lastdataupdate",
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     # Values from 'dashboard_data' API call
     GrowattSensorEntityDescription(
         key="mix_import_from_grid_today_combined",
-        name="Import from grid today (load + charging)",
+        translation_key="mix_import_from_grid_today_combined",
         api_key="etouser_combined",  # This id is not present in the raw API data, it is added by the sensor
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
diff --git a/homeassistant/components/growatt_server/sensor_types/storage.py b/homeassistant/components/growatt_server/sensor_types/storage.py
index d1305aa879d918..4b60a73c979ffa 100644
--- a/homeassistant/components/growatt_server/sensor_types/storage.py
+++ b/homeassistant/components/growatt_server/sensor_types/storage.py
@@ -16,14 +16,14 @@
 STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="storage_storage_production_today",
-        name="Storage production today",
+        translation_key="storage_storage_production_today",
         api_key="eBatDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_storage_production_lifetime",
-        name="Lifetime Storage production",
+        translation_key="storage_storage_production_lifetime",
         api_key="eBatDisChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -31,21 +31,21 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_discharge_today",
-        name="Grid discharged today",
+        translation_key="storage_grid_discharge_today",
         api_key="eacDisChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_today",
-        name="Load consumption today",
+        translation_key="storage_load_consumption_today",
         api_key="eopDischrToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_lifetime",
-        name="Lifetime load consumption",
+        translation_key="storage_load_consumption_lifetime",
         api_key="eopDischrTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -53,14 +53,14 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_charged_today",
-        name="Grid charged today",
+        translation_key="storage_grid_charged_today",
         api_key="eacChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_charge_storage_lifetime",
-        name="Lifetime storaged charged",
+        translation_key="storage_charge_storage_lifetime",
         api_key="eChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -68,55 +68,55 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_solar_production",
-        name="Solar power production",
+        translation_key="storage_solar_production",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_battery_percentage",
-        name="Battery percentage",
+        translation_key="storage_battery_percentage",
         api_key="capacity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
     ),
     GrowattSensorEntityDescription(
         key="storage_power_flow",
-        name="Storage charging/ discharging(-ve)",
+        translation_key="storage_power_flow",
         api_key="pCharge",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption_solar_storage",
-        name="Load consumption(Solar + Storage)",
+        translation_key="storage_load_consumption_solar_storage",
         api_key="rateVA",
         native_unit_of_measurement="VA",
     ),
     GrowattSensorEntityDescription(
         key="storage_charge_today",
-        name="Charge today",
+        translation_key="storage_charge_today",
         api_key="eChargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid",
-        name="Import from grid",
+        translation_key="storage_import_from_grid",
         api_key="pAcInPut",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid_today",
-        name="Import from grid today",
+        translation_key="storage_import_from_grid_today",
         api_key="eToUserToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="storage_import_from_grid_total",
-        name="Import from grid total",
+        translation_key="storage_import_from_grid_total",
         api_key="eToUserTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -124,14 +124,14 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_load_consumption",
-        name="Load consumption",
+        translation_key="storage_load_consumption",
         api_key="outPutPower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_voltage",
-        name="AC input voltage",
+        translation_key="storage_grid_voltage",
         api_key="vGrid",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -139,7 +139,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_pv_charging_voltage",
-        name="PV charging voltage",
+        translation_key="storage_pv_charging_voltage",
         api_key="vpv",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -147,7 +147,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_input_frequency_out",
-        name="AC input frequency",
+        translation_key="storage_ac_input_frequency_out",
         api_key="freqOutPut",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -155,7 +155,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_output_voltage",
-        name="Output voltage",
+        translation_key="storage_output_voltage",
         api_key="outPutVolt",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -163,7 +163,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_output_frequency",
-        name="Ac output frequency",
+        translation_key="storage_ac_output_frequency",
         api_key="freqGrid",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -171,7 +171,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_current_PV",
-        name="Solar charge current",
+        translation_key="storage_current_pv",
         api_key="iAcCharge",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -179,7 +179,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_current_1",
-        name="Solar current to storage",
+        translation_key="storage_current_1",
         api_key="iChargePV1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -187,7 +187,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_amperage_input",
-        name="Grid charge current",
+        translation_key="storage_grid_amperage_input",
         api_key="chgCurr",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -195,7 +195,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_out_current",
-        name="Grid out current",
+        translation_key="storage_grid_out_current",
         api_key="outPutCurrent",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -203,7 +203,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_battery_voltage",
-        name="Battery voltage",
+        translation_key="storage_battery_voltage",
         api_key="vBat",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -211,7 +211,7 @@
     ),
     GrowattSensorEntityDescription(
         key="storage_load_percentage",
-        name="Load percentage",
+        translation_key="storage_load_percentage",
         api_key="loadPercent",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/growatt_server/sensor_types/tlx.py b/homeassistant/components/growatt_server/sensor_types/tlx.py
index 9c9bbd488d52b6..645b32db9d0fdb 100644
--- a/homeassistant/components/growatt_server/sensor_types/tlx.py
+++ b/homeassistant/components/growatt_server/sensor_types/tlx.py
@@ -20,7 +20,7 @@
 TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="tlx_energy_today",
-        name="Energy today",
+        translation_key="tlx_energy_today",
         api_key="eacToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -29,7 +29,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total",
-        name="Lifetime energy output",
+        translation_key="tlx_energy_total",
         api_key="eacTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -39,7 +39,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_1",
-        name="Lifetime total energy input 1",
+        translation_key="tlx_energy_total_input_1",
         api_key="epv1Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -49,7 +49,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_1",
-        name="Energy Today Input 1",
+        translation_key="tlx_energy_today_input_1",
         api_key="epv1Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -58,7 +58,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_1",
-        name="Input 1 voltage",
+        translation_key="tlx_voltage_input_1",
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -66,7 +66,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_1",
-        name="Input 1 Amperage",
+        translation_key="tlx_amperage_input_1",
         api_key="ipv1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -74,7 +74,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_1",
-        name="Input 1 Wattage",
+        translation_key="tlx_wattage_input_1",
         api_key="ppv1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -82,7 +82,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_2",
-        name="Lifetime total energy input 2",
+        translation_key="tlx_energy_total_input_2",
         api_key="epv2Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -92,7 +92,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_2",
-        name="Energy Today Input 2",
+        translation_key="tlx_energy_today_input_2",
         api_key="epv2Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -101,7 +101,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_2",
-        name="Input 2 voltage",
+        translation_key="tlx_voltage_input_2",
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -109,7 +109,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_2",
-        name="Input 2 Amperage",
+        translation_key="tlx_amperage_input_2",
         api_key="ipv2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -117,7 +117,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_2",
-        name="Input 2 Wattage",
+        translation_key="tlx_wattage_input_2",
         api_key="ppv2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -125,7 +125,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_3",
-        name="Lifetime total energy input 3",
+        translation_key="tlx_energy_total_input_3",
         api_key="epv3Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -135,7 +135,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_3",
-        name="Energy Today Input 3",
+        translation_key="tlx_energy_today_input_3",
         api_key="epv3Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -144,7 +144,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_3",
-        name="Input 3 voltage",
+        translation_key="tlx_voltage_input_3",
         api_key="vpv3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -152,7 +152,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_3",
-        name="Input 3 Amperage",
+        translation_key="tlx_amperage_input_3",
         api_key="ipv3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -160,7 +160,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_3",
-        name="Input 3 Wattage",
+        translation_key="tlx_wattage_input_3",
         api_key="ppv3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -168,7 +168,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_4",
-        name="Lifetime total energy input 4",
+        translation_key="tlx_energy_total_input_4",
         api_key="epv4Total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -178,7 +178,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_today_input_4",
-        name="Energy Today Input 4",
+        translation_key="tlx_energy_today_input_4",
         api_key="epv4Today",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -187,7 +187,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_4",
-        name="Input 4 voltage",
+        translation_key="tlx_voltage_input_4",
         api_key="vpv4",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -195,7 +195,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_4",
-        name="Input 4 Amperage",
+        translation_key="tlx_amperage_input_4",
         api_key="ipv4",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
@@ -203,7 +203,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_4",
-        name="Input 4 Wattage",
+        translation_key="tlx_wattage_input_4",
         api_key="ppv4",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -211,7 +211,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_solar_generation_total",
-        name="Lifetime total solar energy",
+        translation_key="tlx_solar_generation_total",
         api_key="epvTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -220,7 +220,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_internal_wattage",
-        name="Internal wattage",
+        translation_key="tlx_internal_wattage",
         api_key="ppv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -228,7 +228,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_reactive_voltage",
-        name="Reactive voltage",
+        translation_key="tlx_reactive_voltage",
         api_key="vacrs",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
@@ -236,7 +236,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_frequency",
-        name="AC frequency",
+        translation_key="tlx_frequency",
         api_key="fac",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
@@ -244,7 +244,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_current_wattage",
-        name="Output power",
+        translation_key="tlx_current_wattage",
         api_key="pac",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
@@ -252,7 +252,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_1",
-        name="Temperature 1",
+        translation_key="tlx_temperature_1",
         api_key="temp1",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -260,7 +260,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_2",
-        name="Temperature 2",
+        translation_key="tlx_temperature_2",
         api_key="temp2",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -268,7 +268,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_3",
-        name="Temperature 3",
+        translation_key="tlx_temperature_3",
         api_key="temp3",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -276,7 +276,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_4",
-        name="Temperature 4",
+        translation_key="tlx_temperature_4",
         api_key="temp4",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -284,7 +284,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_5",
-        name="Temperature 5",
+        translation_key="tlx_temperature_5",
         api_key="temp5",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -292,7 +292,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_discharge_today",
-        name="All batteries discharged today",
+        translation_key="tlx_all_batteries_discharge_today",
         api_key="edischargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -300,7 +300,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_discharge_total",
-        name="Lifetime total all batteries discharged",
+        translation_key="tlx_all_batteries_discharge_total",
         api_key="edischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -309,14 +309,14 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_discharge_w",
-        name="Battery 1 discharging W",
+        translation_key="tlx_battery_1_discharge_w",
         api_key="bdc1DischargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_discharge_total",
-        name="Lifetime total battery 1 discharged",
+        translation_key="tlx_battery_1_discharge_total",
         api_key="bdc1DischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -325,14 +325,14 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_discharge_w",
-        name="Battery 2 discharging W",
+        translation_key="tlx_battery_2_discharge_w",
         api_key="bdc1DischargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_discharge_total",
-        name="Lifetime total battery 2 discharged",
+        translation_key="tlx_battery_2_discharge_total",
         api_key="bdc1DischargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -341,7 +341,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_charge_today",
-        name="All batteries charged today",
+        translation_key="tlx_all_batteries_charge_today",
         api_key="echargeToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -349,7 +349,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_charge_total",
-        name="Lifetime total all batteries charged",
+        translation_key="tlx_all_batteries_charge_total",
         api_key="echargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -358,14 +358,14 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_charge_w",
-        name="Battery 1 charging W",
+        translation_key="tlx_battery_1_charge_w",
         api_key="bdc1ChargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_1_charge_total",
-        name="Lifetime total battery 1 charged",
+        translation_key="tlx_battery_1_charge_total",
         api_key="bdc1ChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -374,14 +374,14 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_charge_w",
-        name="Battery 2 charging W",
+        translation_key="tlx_battery_2_charge_w",
         api_key="bdc1ChargePower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="tlx_battery_2_charge_total",
-        name="Lifetime total battery 2 charged",
+        translation_key="tlx_battery_2_charge_total",
         api_key="bdc1ChargeTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -390,7 +390,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_export_to_grid_today",
-        name="Export to grid today",
+        translation_key="tlx_export_to_grid_today",
         api_key="etoGridToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -398,7 +398,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_export_to_grid_total",
-        name="Lifetime total export to grid",
+        translation_key="tlx_export_to_grid_total",
         api_key="etoGridTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -407,7 +407,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_load_consumption_today",
-        name="Load consumption today",
+        translation_key="tlx_load_consumption_today",
         api_key="elocalLoadToday",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -415,7 +415,7 @@
     ),
     GrowattSensorEntityDescription(
         key="mix_load_consumption_total",
-        name="Lifetime total load consumption",
+        translation_key="mix_load_consumption_total",
         api_key="elocalLoadTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -424,7 +424,7 @@
     ),
     GrowattSensorEntityDescription(
         key="tlx_statement_of_charge",
-        name="Statement of charge (SoC)",
+        translation_key="tlx_statement_of_charge",
         api_key="bmsSoc",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
diff --git a/homeassistant/components/growatt_server/sensor_types/total.py b/homeassistant/components/growatt_server/sensor_types/total.py
index 2056443af3dc87..5945ad20e40466 100644
--- a/homeassistant/components/growatt_server/sensor_types/total.py
+++ b/homeassistant/components/growatt_server/sensor_types/total.py
@@ -9,33 +9,33 @@
 TOTAL_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
     GrowattSensorEntityDescription(
         key="total_money_today",
-        name="Total money today",
+        translation_key="total_money_today",
         api_key="plantMoneyText",
         currency=True,
     ),
     GrowattSensorEntityDescription(
         key="total_money_total",
-        name="Money lifetime",
+        translation_key="total_money_total",
         api_key="totalMoneyText",
         currency=True,
     ),
     GrowattSensorEntityDescription(
         key="total_energy_today",
-        name="Energy Today",
+        translation_key="total_energy_today",
         api_key="todayEnergy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     GrowattSensorEntityDescription(
         key="total_output_power",
-        name="Output Power",
+        translation_key="total_output_power",
         api_key="invTodayPpv",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     GrowattSensorEntityDescription(
         key="total_energy_output",
-        name="Lifetime energy output",
+        translation_key="total_energy_output",
         api_key="totalEnergy",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
@@ -43,7 +43,7 @@
     ),
     GrowattSensorEntityDescription(
         key="total_maximum_output",
-        name="Maximum power",
+        translation_key="total_maximum_output",
         api_key="nominalPower",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
diff --git a/homeassistant/components/growatt_server/strings.json b/homeassistant/components/growatt_server/strings.json
index 695b8a08c1c0f5..d2c196dbfdd395 100644
--- a/homeassistant/components/growatt_server/strings.json
+++ b/homeassistant/components/growatt_server/strings.json
@@ -25,5 +25,405 @@
       }
     }
   },
-  "title": "Growatt Server"
+  "title": "Growatt Server",
+  "entity": {
+    "sensor": {
+      "inverter_energy_today": {
+        "name": "Energy today"
+      },
+      "inverter_energy_total": {
+        "name": "Lifetime energy output"
+      },
+      "inverter_voltage_input_1": {
+        "name": "Input 1 voltage"
+      },
+      "inverter_amperage_input_1": {
+        "name": "Input 1 Amperage"
+      },
+      "inverter_wattage_input_1": {
+        "name": "Input 1 Wattage"
+      },
+      "inverter_voltage_input_2": {
+        "name": "Input 2 voltage"
+      },
+      "inverter_amperage_input_2": {
+        "name": "Input 2 Amperage"
+      },
+      "inverter_wattage_input_2": {
+        "name": "Input 2 Wattage"
+      },
+      "inverter_voltage_input_3": {
+        "name": "Input 3 voltage"
+      },
+      "inverter_amperage_input_3": {
+        "name": "Input 3 Amperage"
+      },
+      "inverter_wattage_input_3": {
+        "name": "Input 3 Wattage"
+      },
+      "inverter_internal_wattage": {
+        "name": "Internal wattage"
+      },
+      "inverter_reactive_voltage": {
+        "name": "Reactive voltage"
+      },
+      "inverter_reactive_amperage": {
+        "name": "Reactive amperage"
+      },
+      "inverter_frequency": {
+        "name": "AC frequency"
+      },
+      "inverter_current_wattage": {
+        "name": "Output power"
+      },
+      "inverter_current_reactive_wattage": {
+        "name": "Reactive wattage"
+      },
+      "inverter_ipm_temperature": {
+        "name": "Intelligent Power Management temperature"
+      },
+      "inverter_temperature": {
+        "name": "Inverter temperature"
+      },
+      "mix_statement_of_charge": {
+        "name": "Statement of charge"
+      },
+      "mix_battery_charge_today": {
+        "name": "Battery charged today"
+      },
+      "mix_battery_charge_lifetime": {
+        "name": "Lifetime battery charged"
+      },
+      "mix_battery_discharge_today": {
+        "name": "Battery discharged today"
+      },
+      "mix_battery_discharge_lifetime": {
+        "name": "Lifetime battery discharged"
+      },
+      "mix_solar_generation_today": {
+        "name": "Solar energy today"
+      },
+      "mix_solar_generation_lifetime": {
+        "name": "Lifetime solar energy"
+      },
+      "mix_battery_discharge_w": {
+        "name": "Battery discharging W"
+      },
+      "mix_battery_voltage": {
+        "name": "Battery voltage"
+      },
+      "mix_pv1_voltage": {
+        "name": "PV1 voltage"
+      },
+      "mix_pv2_voltage": {
+        "name": "PV2 voltage"
+      },
+      "mix_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "mix_load_consumption_lifetime": {
+        "name": "Lifetime load consumption"
+      },
+      "mix_export_to_grid_today": {
+        "name": "Export to grid today"
+      },
+      "mix_export_to_grid_lifetime": {
+        "name": "Lifetime export to grid"
+      },
+      "mix_battery_charge": {
+        "name": "Battery charging"
+      },
+      "mix_load_consumption": {
+        "name": "Load consumption"
+      },
+      "mix_wattage_pv_1": {
+        "name": "PV1 Wattage"
+      },
+      "mix_wattage_pv_2": {
+        "name": "PV2 Wattage"
+      },
+      "mix_wattage_pv_all": {
+        "name": "All PV Wattage"
+      },
+      "mix_export_to_grid": {
+        "name": "Export to grid"
+      },
+      "mix_import_from_grid": {
+        "name": "Import from grid"
+      },
+      "mix_battery_discharge_kw": {
+        "name": "Battery discharging kW"
+      },
+      "mix_grid_voltage": {
+        "name": "Grid voltage"
+      },
+      "mix_system_production_today": {
+        "name": "System production today (self-consumption + export)"
+      },
+      "mix_load_consumption_solar_today": {
+        "name": "Load consumption today (solar)"
+      },
+      "mix_self_consumption_today": {
+        "name": "Self consumption today (solar + battery)"
+      },
+      "mix_load_consumption_battery_today": {
+        "name": "Load consumption today (battery)"
+      },
+      "mix_import_from_grid_today": {
+        "name": "Import from grid today (load)"
+      },
+      "mix_last_update": {
+        "name": "Last Data Update"
+      },
+      "mix_import_from_grid_today_combined": {
+        "name": "Import from grid today (load + charging)"
+      },
+      "storage_storage_production_today": {
+        "name": "Storage production today"
+      },
+      "storage_storage_production_lifetime": {
+        "name": "Lifetime Storage production"
+      },
+      "storage_grid_discharge_today": {
+        "name": "Grid discharged today"
+      },
+      "storage_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "storage_load_consumption_lifetime": {
+        "name": "Lifetime load consumption"
+      },
+      "storage_grid_charged_today": {
+        "name": "Grid charged today"
+      },
+      "storage_charge_storage_lifetime": {
+        "name": "Lifetime stored charged"
+      },
+      "storage_solar_production": {
+        "name": "Solar power production"
+      },
+      "storage_battery_percentage": {
+        "name": "Battery percentage"
+      },
+      "storage_power_flow": {
+        "name": "Storage charging/ discharging(-ve)"
+      },
+      "storage_load_consumption_solar_storage": {
+        "name": "Load consumption (Solar + Storage)"
+      },
+      "storage_charge_today": {
+        "name": "Charge today"
+      },
+      "storage_import_from_grid": {
+        "name": "Import from grid"
+      },
+      "storage_import_from_grid_today": {
+        "name": "Import from grid today"
+      },
+      "storage_import_from_grid_total": {
+        "name": "Import from grid total"
+      },
+      "storage_load_consumption": {
+        "name": "Load consumption"
+      },
+      "storage_grid_voltage": {
+        "name": "AC input voltage"
+      },
+      "storage_pv_charging_voltage": {
+        "name": "PV charging voltage"
+      },
+      "storage_ac_input_frequency_out": {
+        "name": "AC input frequency"
+      },
+      "storage_output_voltage": {
+        "name": "Output voltage"
+      },
+      "storage_ac_output_frequency": {
+        "name": "Ac output frequency"
+      },
+      "storage_current_pv": {
+        "name": "Solar charge current"
+      },
+      "storage_current_1": {
+        "name": "Solar current to storage"
+      },
+      "storage_grid_amperage_input": {
+        "name": "Grid charge current"
+      },
+      "storage_grid_out_current": {
+        "name": "Grid out current"
+      },
+      "storage_battery_voltage": {
+        "name": "Battery voltage"
+      },
+      "storage_load_percentage": {
+        "name": "Load percentage"
+      },
+      "tlx_energy_today": {
+        "name": "Energy today"
+      },
+      "tlx_energy_total": {
+        "name": "Lifetime energy output"
+      },
+      "tlx_energy_total_input_1": {
+        "name": "Lifetime total energy input 1"
+      },
+      "tlx_energy_today_input_1": {
+        "name": "Energy Today Input 1"
+      },
+      "tlx_voltage_input_1": {
+        "name": "Input 1 voltage"
+      },
+      "tlx_amperage_input_1": {
+        "name": "Input 1 Amperage"
+      },
+      "tlx_wattage_input_1": {
+        "name": "Input 1 Wattage"
+      },
+      "tlx_energy_total_input_2": {
+        "name": "Lifetime total energy input 2"
+      },
+      "tlx_energy_today_input_2": {
+        "name": "Energy Today Input 2"
+      },
+      "tlx_voltage_input_2": {
+        "name": "Input 2 voltage"
+      },
+      "tlx_amperage_input_2": {
+        "name": "Input 2 Amperage"
+      },
+      "tlx_wattage_input_2": {
+        "name": "Input 2 Wattage"
+      },
+      "tlx_energy_total_input_3": {
+        "name": "Lifetime total energy input 3"
+      },
+      "tlx_energy_today_input_3": {
+        "name": "Energy Today Input 3"
+      },
+      "tlx_voltage_input_3": {
+        "name": "Input 3 voltage"
+      },
+      "tlx_amperage_input_3": {
+        "name": "Input 3 Amperage"
+      },
+      "tlx_wattage_input_3": {
+        "name": "Input 3 Wattage"
+      },
+      "tlx_energy_total_input_4": {
+        "name": "Lifetime total energy input 4"
+      },
+      "tlx_energy_today_input_4": {
+        "name": "Energy Today Input 4"
+      },
+      "tlx_voltage_input_4": {
+        "name": "Input 4 voltage"
+      },
+      "tlx_amperage_input_4": {
+        "name": "Input 4 Amperage"
+      },
+      "tlx_wattage_input_4": {
+        "name": "Input 4 Wattage"
+      },
+      "tlx_solar_generation_total": {
+        "name": "Lifetime total solar energy"
+      },
+      "tlx_internal_wattage": {
+        "name": "Internal wattage"
+      },
+      "tlx_reactive_voltage": {
+        "name": "Reactive voltage"
+      },
+      "tlx_frequency": {
+        "name": "AC frequency"
+      },
+      "tlx_current_wattage": {
+        "name": "Output power"
+      },
+      "tlx_temperature_1": {
+        "name": "Temperature 1"
+      },
+      "tlx_temperature_2": {
+        "name": "Temperature 2"
+      },
+      "tlx_temperature_3": {
+        "name": "Temperature 3"
+      },
+      "tlx_temperature_4": {
+        "name": "Temperature 4"
+      },
+      "tlx_temperature_5": {
+        "name": "Temperature 5"
+      },
+      "tlx_all_batteries_discharge_today": {
+        "name": "All batteries discharged today"
+      },
+      "tlx_all_batteries_discharge_total": {
+        "name": "Lifetime total all batteries discharged"
+      },
+      "tlx_battery_1_discharge_w": {
+        "name": "Battery 1 discharging W"
+      },
+      "tlx_battery_1_discharge_total": {
+        "name": "Lifetime total battery 1 discharged"
+      },
+      "tlx_battery_2_discharge_w": {
+        "name": "Battery 2 discharging W"
+      },
+      "tlx_battery_2_discharge_total": {
+        "name": "Lifetime total battery 2 discharged"
+      },
+      "tlx_all_batteries_charge_today": {
+        "name": "All batteries charged today"
+      },
+      "tlx_all_batteries_charge_total": {
+        "name": "Lifetime total all batteries charged"
+      },
+      "tlx_battery_1_charge_w": {
+        "name": "Battery 1 charging W"
+      },
+      "tlx_battery_1_charge_total": {
+        "name": "Lifetime total battery 1 charged"
+      },
+      "tlx_battery_2_charge_w": {
+        "name": "Battery 2 charging W"
+      },
+      "tlx_battery_2_charge_total": {
+        "name": "Lifetime total battery 2 charged"
+      },
+      "tlx_export_to_grid_today": {
+        "name": "Export to grid today"
+      },
+      "tlx_export_to_grid_total": {
+        "name": "Lifetime total export to grid"
+      },
+      "tlx_load_consumption_today": {
+        "name": "Load consumption today"
+      },
+      "mix_load_consumption_total": {
+        "name": "Lifetime total load consumption"
+      },
+      "tlx_statement_of_charge": {
+        "name": "Statement of charge (SoC)"
+      },
+      "total_money_today": {
+        "name": "Total money today"
+      },
+      "total_money_total": {
+        "name": "Money lifetime"
+      },
+      "total_energy_today": {
+        "name": "Energy Today"
+      },
+      "total_output_power": {
+        "name": "Output Power"
+      },
+      "total_energy_output": {
+        "name": "Lifetime energy output"
+      },
+      "total_maximum_output": {
+        "name": "Maximum power"
+      }
+    }
+  }
 }
diff --git a/homeassistant/components/gtfs/sensor.py b/homeassistant/components/gtfs/sensor.py
index 9fac4d0192671e..6f8daf2918d765 100644
--- a/homeassistant/components/gtfs/sensor.py
+++ b/homeassistant/components/gtfs/sensor.py
@@ -341,7 +341,7 @@ def get_next_departure(
                  {tomorrow_order}
                  origin_stop_time.departure_time
         LIMIT :limit
-        """
+        """  # noqa: S608
     result = schedule.engine.connect().execute(
         text(sql_query),
         {
@@ -643,15 +643,14 @@ def update(self) -> None:
             # Define the state as a UTC timestamp with ISO 8601 format
             if not self._departure:
                 self._state = None
+            elif self._agency:
+                self._state = self._departure["departure_time"].replace(
+                    tzinfo=dt_util.get_time_zone(self._agency.agency_timezone)
+                )
             else:
-                if self._agency:
-                    self._state = self._departure["departure_time"].replace(
-                        tzinfo=dt_util.get_time_zone(self._agency.agency_timezone)
-                    )
-                else:
-                    self._state = self._departure["departure_time"].replace(
-                        tzinfo=dt_util.UTC
-                    )
+                self._state = self._departure["departure_time"].replace(
+                    tzinfo=dt_util.UTC
+                )
 
             # Assign attributes, icon and name
             self.update_attributes()
diff --git a/homeassistant/components/guardian/binary_sensor.py b/homeassistant/components/guardian/binary_sensor.py
index f9e8819a6afb79..7114d33f93a663 100644
--- a/homeassistant/components/guardian/binary_sensor.py
+++ b/homeassistant/components/guardian/binary_sensor.py
@@ -49,12 +49,12 @@ class ValveControllerBinarySensorDescription(
 PAIRED_SENSOR_DESCRIPTIONS = (
     BinarySensorEntityDescription(
         key=SENSOR_KIND_LEAK_DETECTED,
-        name="Leak detected",
+        translation_key="leak",
         device_class=BinarySensorDeviceClass.MOISTURE,
     ),
     BinarySensorEntityDescription(
         key=SENSOR_KIND_MOVED,
-        name="Recently moved",
+        translation_key="moved",
         device_class=BinarySensorDeviceClass.MOVING,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -63,7 +63,7 @@ class ValveControllerBinarySensorDescription(
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerBinarySensorDescription(
         key=SENSOR_KIND_LEAK_DETECTED,
-        name="Leak detected",
+        translation_key="leak",
         device_class=BinarySensorDeviceClass.MOISTURE,
         api_category=API_SYSTEM_ONBOARD_SENSOR_STATUS,
     ),
diff --git a/homeassistant/components/guardian/button.py b/homeassistant/components/guardian/button.py
index 7680707641c096..c6363c9bcec798 100644
--- a/homeassistant/components/guardian/button.py
+++ b/homeassistant/components/guardian/button.py
@@ -56,15 +56,15 @@ async def _async_valve_reset(client: Client) -> None:
 BUTTON_DESCRIPTIONS = (
     ValveControllerButtonDescription(
         key=BUTTON_KIND_REBOOT,
-        name="Reboot",
         push_action=_async_reboot,
+        device_class=ButtonDeviceClass.RESTART,
         # Buttons don't actually need a coordinator; we give them one so they can
         # properly inherit from GuardianEntity:
         api_category=API_SYSTEM_DIAGNOSTICS,
     ),
     ValveControllerButtonDescription(
         key=BUTTON_KIND_RESET_VALVE_DIAGNOSTICS,
-        name="Reset valve diagnostics",
+        translation_key="reset_diagnostics",
         push_action=_async_valve_reset,
         # Buttons don't actually need a coordinator; we give them one so they can
         # properly inherit from GuardianEntity:
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index c46f6e221b2e59..c5fc77cc8f910f 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -49,14 +49,12 @@ class ValveControllerSensorDescription(
 PAIRED_SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key=SENSOR_KIND_BATTERY,
-        name="Battery",
         device_class=SensorDeviceClass.VOLTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
     ),
     SensorEntityDescription(
         key=SENSOR_KIND_TEMPERATURE,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         state_class=SensorStateClass.MEASUREMENT,
@@ -65,7 +63,6 @@ class ValveControllerSensorDescription(
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSensorDescription(
         key=SENSOR_KIND_TEMPERATURE,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         state_class=SensorStateClass.MEASUREMENT,
@@ -73,7 +70,7 @@ class ValveControllerSensorDescription(
     ),
     ValveControllerSensorDescription(
         key=SENSOR_KIND_UPTIME,
-        name="Uptime",
+        translation_key="uptime",
         icon="mdi:timer",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfTime.MINUTES,
diff --git a/homeassistant/components/guardian/strings.json b/homeassistant/components/guardian/strings.json
index 683f13c8d36cc0..dc3e6f4c17df50 100644
--- a/homeassistant/components/guardian/strings.json
+++ b/homeassistant/components/guardian/strings.json
@@ -30,5 +30,33 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "leak": {
+        "name": "Leak detected"
+      },
+      "moved": {
+        "name": "Recently moved"
+      }
+    },
+    "button": {
+      "reset_diagnostics": {
+        "name": "Reset valve diagnostics"
+      }
+    },
+    "sensor": {
+      "uptime": {
+        "name": "Uptime"
+      }
+    },
+    "switch": {
+      "onboard_access_point": {
+        "name": "Onboard access point"
+      },
+      "valve_controller": {
+        "name": "Valve controller"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/guardian/switch.py b/homeassistant/components/guardian/switch.py
index fe6ff937b84a77..4e2be5ae17965c 100644
--- a/homeassistant/components/guardian/switch.py
+++ b/homeassistant/components/guardian/switch.py
@@ -67,7 +67,7 @@ async def _async_open_valve(client: Client) -> None:
 VALVE_CONTROLLER_DESCRIPTIONS = (
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_ONBOARD_AP,
-        name="Onboard AP",
+        translation_key="onboard_access_point",
         icon="mdi:wifi",
         entity_category=EntityCategory.CONFIG,
         api_category=API_WIFI_STATUS,
@@ -76,7 +76,7 @@ async def _async_open_valve(client: Client) -> None:
     ),
     ValveControllerSwitchDescription(
         key=SWITCH_KIND_VALVE,
-        name="Valve controller",
+        translation_key="valve_controller",
         icon="mdi:water",
         api_category=API_VALVE_STATUS,
         off_action=_async_close_valve,
diff --git a/homeassistant/components/habitica/sensor.py b/homeassistant/components/habitica/sensor.py
index e085167301f785..d9e0fb227c0b3b 100644
--- a/homeassistant/components/habitica/sensor.py
+++ b/homeassistant/components/habitica/sensor.py
@@ -24,7 +24,7 @@
 SensorType = namedtuple("SensorType", ["name", "icon", "unit", "path"])
 
 SENSORS_TYPES = {
-    "name": SensorType("Name", None, "", ["profile", "name"]),
+    "name": SensorType("Name", None, None, ["profile", "name"]),
     "hp": SensorType("HP", "mdi:heart", "HP", ["stats", "hp"]),
     "maxHealth": SensorType("max HP", "mdi:heart", "HP", ["stats", "maxHealth"]),
     "mp": SensorType("Mana", "mdi:auto-fix", "MP", ["stats", "mp"]),
@@ -35,7 +35,7 @@
         "Lvl", "mdi:arrow-up-bold-circle-outline", "Lvl", ["stats", "lvl"]
     ),
     "gp": SensorType("Gold", "mdi:circle-multiple", "Gold", ["stats", "gp"]),
-    "class": SensorType("Class", "mdi:sword", "", ["stats", "class"]),
+    "class": SensorType("Class", "mdi:sword", None, ["stats", "class"]),
 }
 
 TASKS_TYPES = {
diff --git a/homeassistant/components/hardware/__init__.py b/homeassistant/components/hardware/__init__.py
index a1198534213170..2e00771199cd92 100644
--- a/homeassistant/components/hardware/__init__.py
+++ b/homeassistant/components/hardware/__init__.py
@@ -2,11 +2,14 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from . import websocket_api
 from .const import DOMAIN
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Hardware."""
diff --git a/homeassistant/components/harmony/remote.py b/homeassistant/components/harmony/remote.py
index 1482c8aaa4dc44..c1e85c867874ea 100644
--- a/homeassistant/components/harmony/remote.py
+++ b/homeassistant/components/harmony/remote.py
@@ -216,9 +216,8 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         if not activity or activity == PREVIOUS_ACTIVE_ACTIVITY:
             if self._last_activity:
                 activity = self._last_activity
-            else:
-                if all_activities := self._data.activity_names:
-                    activity = all_activities[0]
+            elif all_activities := self._data.activity_names:
+                activity = all_activities[0]
 
         if activity:
             await self._data.async_start_activity(activity)
diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py
index c8f4b69d429d9d..8c7f86700e7a07 100644
--- a/homeassistant/components/hassio/__init__.py
+++ b/homeassistant/components/hassio/__init__.py
@@ -61,6 +61,7 @@
     ATTR_FOLDERS,
     ATTR_HOMEASSISTANT,
     ATTR_INPUT,
+    ATTR_LOCATION,
     ATTR_PASSWORD,
     ATTR_REPOSITORY,
     ATTR_SLUG,
@@ -158,9 +159,14 @@
 
 SCHEMA_BACKUP_FULL = vol.Schema(
     {
-        vol.Optional(ATTR_NAME): cv.string,
+        vol.Optional(
+            ATTR_NAME, default=lambda: utcnow().strftime("%Y-%m-%d %H:%M:%S")
+        ): cv.string,
         vol.Optional(ATTR_PASSWORD): cv.string,
         vol.Optional(ATTR_COMPRESSED): cv.boolean,
+        vol.Optional(ATTR_LOCATION): vol.All(
+            cv.string, lambda v: None if v == "/backup" else v
+        ),
     }
 )
 
@@ -295,7 +301,7 @@ def get_supervisor_info(hass: HomeAssistant) -> dict[str, Any] | None:
 
 @callback
 @bind_hass
-def get_addons_info(hass):
+def get_addons_info(hass: HomeAssistant) -> dict[str, dict[str, Any]] | None:
     """Return Addons info.
 
     Async friendly.
@@ -363,6 +369,16 @@ def get_core_info(hass: HomeAssistant) -> dict[str, Any] | None:
     return hass.data.get(DATA_CORE_INFO)
 
 
+@callback
+@bind_hass
+def get_issues_info(hass: HomeAssistant) -> SupervisorIssues | None:
+    """Return Supervisor issues info.
+
+    Async friendly.
+    """
+    return hass.data.get(DATA_KEY_SUPERVISOR_ISSUES)
+
+
 @callback
 @bind_hass
 def is_hassio(hass: HomeAssistant) -> bool:
@@ -774,7 +790,7 @@ async def _async_update_data(self) -> dict[str, Any]:
 
         new_data: dict[str, Any] = {}
         supervisor_info = get_supervisor_info(self.hass) or {}
-        addons_info = get_addons_info(self.hass)
+        addons_info = get_addons_info(self.hass) or {}
         addons_stats = get_addons_stats(self.hass)
         addons_changelogs = get_addons_changelogs(self.hass)
         store_data = get_store(self.hass) or {}
diff --git a/homeassistant/components/hassio/const.py b/homeassistant/components/hassio/const.py
index 1dfd5ce53cd603..2bc314f169a492 100644
--- a/homeassistant/components/hassio/const.py
+++ b/homeassistant/components/hassio/const.py
@@ -1,5 +1,5 @@
 """Hass.io const variables."""
-from enum import Enum
+from homeassistant.backports.enum import StrEnum
 
 DOMAIN = "hassio"
 
@@ -61,6 +61,7 @@
 ATTR_VERSION_LATEST = "version_latest"
 ATTR_CPU_PERCENT = "cpu_percent"
 ATTR_CHANGELOG = "changelog"
+ATTR_LOCATION = "location"
 ATTR_MEMORY_PERCENT = "memory_percent"
 ATTR_SLUG = "slug"
 ATTR_STATE = "state"
@@ -76,9 +77,12 @@
 DATA_KEY_SUPERVISOR_ISSUES = "supervisor_issues"
 
 PLACEHOLDER_KEY_REFERENCE = "reference"
+PLACEHOLDER_KEY_COMPONENTS = "components"
 
+ISSUE_KEY_SYSTEM_DOCKER_CONFIG = "issue_system_docker_config"
 
-class SupervisorEntityModel(str, Enum):
+
+class SupervisorEntityModel(StrEnum):
     """Supervisor entity model."""
 
     ADDON = "Home Assistant Add-on"
@@ -86,3 +90,17 @@ class SupervisorEntityModel(str, Enum):
     CORE = "Home Assistant Core"
     SUPERVIOSR = "Home Assistant Supervisor"
     HOST = "Home Assistant Host"
+
+
+class SupervisorIssueContext(StrEnum):
+    """Context for supervisor issues."""
+
+    ADDON = "addon"
+    CORE = "core"
+    DNS_SERVER = "dns_server"
+    MOUNT = "mount"
+    OS = "os"
+    PLUGIN = "plugin"
+    SUPERVISOR = "supervisor"
+    STORE = "store"
+    SYSTEM = "system"
diff --git a/homeassistant/components/hassio/issues.py b/homeassistant/components/hassio/issues.py
index ac6af7f3489ee2..0bbd89aab86852 100644
--- a/homeassistant/components/hassio/issues.py
+++ b/homeassistant/components/hassio/issues.py
@@ -35,8 +35,10 @@
     EVENT_SUPERVISOR_EVENT,
     EVENT_SUPERVISOR_UPDATE,
     EVENT_SUPPORTED_CHANGED,
+    ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
     PLACEHOLDER_KEY_REFERENCE,
     UPDATE_KEY_SUPERVISOR,
+    SupervisorIssueContext,
 )
 from .handler import HassIO, HassioAPIError
 
@@ -85,8 +87,10 @@
 
 # Keys (type + context) of issues that when found should be made into a repair
 ISSUE_KEYS_FOR_REPAIRS = {
+    "issue_mount_mount_failed",
     "issue_system_multiple_data_disks",
     "issue_system_reboot_required",
+    ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -106,22 +110,22 @@ class Suggestion:
     """Suggestion from Supervisor which resolves an issue."""
 
     uuid: str
-    type_: str
-    context: str
+    type: str
+    context: SupervisorIssueContext
     reference: str | None = None
 
     @property
     def key(self) -> str:
         """Get key for suggestion (combination of context and type)."""
-        return f"{self.context}_{self.type_}"
+        return f"{self.context}_{self.type}"
 
     @classmethod
     def from_dict(cls, data: SuggestionDataType) -> Suggestion:
         """Convert from dictionary representation."""
         return cls(
             uuid=data["uuid"],
-            type_=data["type"],
-            context=data["context"],
+            type=data["type"],
+            context=SupervisorIssueContext(data["context"]),
             reference=data["reference"],
         )
 
@@ -141,15 +145,15 @@ class Issue:
     """Issue from Supervisor."""
 
     uuid: str
-    type_: str
-    context: str
+    type: str
+    context: SupervisorIssueContext
     reference: str | None = None
     suggestions: list[Suggestion] = field(default_factory=list, compare=False)
 
     @property
     def key(self) -> str:
         """Get key for issue (combination of context and type)."""
-        return f"issue_{self.context}_{self.type_}"
+        return f"issue_{self.context}_{self.type}"
 
     @classmethod
     def from_dict(cls, data: IssueDataType) -> Issue:
@@ -157,8 +161,8 @@ def from_dict(cls, data: IssueDataType) -> Issue:
         suggestions: list[SuggestionDataType] = data.get("suggestions", [])
         return cls(
             uuid=data["uuid"],
-            type_=data["type"],
-            context=data["context"],
+            type=data["type"],
+            context=SupervisorIssueContext(data["context"]),
             reference=data["reference"],
             suggestions=[
                 Suggestion.from_dict(suggestion) for suggestion in suggestions
@@ -241,6 +245,11 @@ def unsupported_reasons(self, reasons: set[str]) -> None:
 
         self._unsupported_reasons = reasons
 
+    @property
+    def issues(self) -> set[Issue]:
+        """Get issues."""
+        return set(self._issues.values())
+
     def add_issue(self, issue: Issue) -> None:
         """Add or update an issue in the list. Create or update a repair if necessary."""
         if issue.key in ISSUE_KEYS_FOR_REPAIRS:
@@ -262,25 +271,16 @@ def add_issue(self, issue: Issue) -> None:
     async def add_issue_from_data(self, data: IssueDataType) -> None:
         """Add issue from data to list after getting latest suggestions."""
         try:
-            suggestions = (await self._client.get_suggestions_for_issue(data["uuid"]))[
-                ATTR_SUGGESTIONS
-            ]
-            self.add_issue(
-                Issue(
-                    uuid=data["uuid"],
-                    type_=data["type"],
-                    context=data["context"],
-                    reference=data["reference"],
-                    suggestions=[
-                        Suggestion.from_dict(suggestion) for suggestion in suggestions
-                    ],
-                )
-            )
+            data["suggestions"] = (
+                await self._client.get_suggestions_for_issue(data["uuid"])
+            )[ATTR_SUGGESTIONS]
         except HassioAPIError:
             _LOGGER.error(
                 "Could not get suggestions for supervisor issue %s, skipping it",
                 data["uuid"],
             )
+            return
+        self.add_issue(Issue.from_dict(data))
 
     def remove_issue(self, issue: Issue) -> None:
         """Remove an issue from the list. Delete a repair if necessary."""
@@ -306,7 +306,11 @@ async def setup(self) -> None:
 
     async def update(self) -> None:
         """Update issues from Supervisor resolution center."""
-        data = await self._client.get_resolution_info()
+        try:
+            data = await self._client.get_resolution_info()
+        except HassioAPIError as err:
+            _LOGGER.error("Failed to update supervisor issues: %r", err)
+            return
         self.unhealthy_reasons = set(data[ATTR_UNHEALTHY])
         self.unsupported_reasons = set(data[ATTR_UNSUPPORTED])
 
diff --git a/homeassistant/components/hassio/repairs.py b/homeassistant/components/hassio/repairs.py
index 50a9b087a7cde5..d5e26d4670f44f 100644
--- a/homeassistant/components/hassio/repairs.py
+++ b/homeassistant/components/hassio/repairs.py
@@ -10,12 +10,24 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
 
-from .const import DATA_KEY_SUPERVISOR_ISSUES, PLACEHOLDER_KEY_REFERENCE
+from . import get_addons_info, get_issues_info
+from .const import (
+    ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
+    PLACEHOLDER_KEY_COMPONENTS,
+    PLACEHOLDER_KEY_REFERENCE,
+    SupervisorIssueContext,
+)
 from .handler import HassioAPIError, async_apply_suggestion
-from .issues import Issue, Suggestion, SupervisorIssues
+from .issues import Issue, Suggestion
 
 SUGGESTION_CONFIRMATION_REQUIRED = {"system_execute_reboot"}
 
+EXTRA_PLACEHOLDERS = {
+    "issue_mount_mount_failed": {
+        "storage_url": "/config/storage",
+    }
+}
+
 
 class SupervisorIssueRepairFlow(RepairsFlow):
     """Handler for an issue fixing flow."""
@@ -31,10 +43,8 @@ def __init__(self, issue_id: str) -> None:
     @property
     def issue(self) -> Issue | None:
         """Get associated issue."""
-        if not self._issue:
-            supervisor_issues: SupervisorIssues = self.hass.data[
-                DATA_KEY_SUPERVISOR_ISSUES
-            ]
+        supervisor_issues = get_issues_info(self.hass)
+        if not self._issue and supervisor_issues:
             self._issue = supervisor_issues.get_issue(self._issue_id)
 
         return self._issue
@@ -42,11 +52,13 @@ def issue(self) -> Issue | None:
     @property
     def description_placeholders(self) -> dict[str, str] | None:
         """Get description placeholders for steps."""
-        return (
-            {PLACEHOLDER_KEY_REFERENCE: self.issue.reference}
-            if self.issue and self.issue.reference
-            else None
-        )
+        placeholders = {}
+        if self.issue:
+            placeholders = EXTRA_PLACEHOLDERS.get(self.issue.key, {})
+            if self.issue.reference:
+                placeholders |= {PLACEHOLDER_KEY_REFERENCE: self.issue.reference}
+
+        return placeholders or None
 
     def _async_form_for_suggestion(self, suggestion: Suggestion) -> FlowResult:
         """Return form for suggestion."""
@@ -113,10 +125,49 @@ async def _async_step(
         return _async_step
 
 
+class DockerConfigIssueRepairFlow(SupervisorIssueRepairFlow):
+    """Handler for docker config issue fixing flow."""
+
+    @property
+    def description_placeholders(self) -> dict[str, str] | None:
+        """Get description placeholders for steps."""
+        placeholders = {PLACEHOLDER_KEY_COMPONENTS: ""}
+        supervisor_issues = get_issues_info(self.hass)
+        if supervisor_issues and self.issue:
+            addons = get_addons_info(self.hass) or {}
+            components: list[str] = []
+            for issue in supervisor_issues.issues:
+                if issue.key == self.issue.key or issue.type != self.issue.type:
+                    continue
+
+                if issue.context == SupervisorIssueContext.CORE:
+                    components.insert(0, "Home Assistant")
+                elif issue.context == SupervisorIssueContext.ADDON:
+                    components.append(
+                        next(
+                            (
+                                info["name"]
+                                for slug, info in addons.items()
+                                if slug == issue.reference
+                            ),
+                            issue.reference or "",
+                        )
+                    )
+
+            placeholders[PLACEHOLDER_KEY_COMPONENTS] = "\n- ".join(components)
+
+        return placeholders
+
+
 async def async_create_fix_flow(
     hass: HomeAssistant,
     issue_id: str,
     data: dict[str, str | int | float | None] | None,
 ) -> RepairsFlow:
     """Create flow."""
+    supervisor_issues = get_issues_info(hass)
+    issue = supervisor_issues and supervisor_issues.get_issue(issue_id)
+    if issue and issue.key == ISSUE_KEY_SYSTEM_DOCKER_CONFIG:
+        return DockerConfigIssueRepairFlow(issue_id)
+
     return SupervisorIssueRepairFlow(issue_id)
diff --git a/homeassistant/components/hassio/services.yaml b/homeassistant/components/hassio/services.yaml
index e526074b1a9bf9..60b547354932f6 100644
--- a/homeassistant/components/hassio/services.yaml
+++ b/homeassistant/components/hassio/services.yaml
@@ -88,6 +88,12 @@ backup_full:
       default: true
       selector:
         boolean:
+    location:
+      name: Location
+      description: Name of a backup network storage to put backup (or /backup)
+      example: my_backup_mount
+      selector:
+        backup_location:
 
 backup_partial:
   name: Create a partial backup.
@@ -128,6 +134,12 @@ backup_partial:
       default: true
       selector:
         boolean:
+    location:
+      name: Location
+      description: Name of a backup network storage to put backup (or /backup)
+      example: my_backup_mount
+      selector:
+        backup_location:
 
 restore_full:
   name: Restore from full backup.
diff --git a/homeassistant/components/hassio/strings.json b/homeassistant/components/hassio/strings.json
index 078aac39a5ba5e..f9c212f946c912 100644
--- a/homeassistant/components/hassio/strings.json
+++ b/homeassistant/components/hassio/strings.json
@@ -17,16 +17,46 @@
     }
   },
   "issues": {
+    "issue_mount_mount_failed": {
+      "title": "Network storage device failed",
+      "fix_flow": {
+        "step": {
+          "fix_menu": {
+            "description": "Could not connect to `{reference}`. Check host logs for errors from the mount service for more details.\n\nUse reload to try to connect again. If you need to update `{reference}`, go to [storage]({storage_url}).",
+            "menu_options": {
+              "mount_execute_reload": "Reload",
+              "mount_execute_remove": "Remove"
+            }
+          }
+        },
+        "abort": {
+          "apply_suggestion_fail": "Could not apply the fix. Check the Supervisor logs for more details."
+        }
+      }
+    },
+    "issue_system_docker_config": {
+      "title": "Restart(s) required",
+      "fix_flow": {
+        "step": {
+          "system_execute_rebuild": {
+            "description": "The default configuration for add-ons and Home Assistant has changed. To update the configuration with the new defaults, a restart is required for the following:\n\n- {components}"
+          }
+        },
+        "abort": {
+          "apply_suggestion_fail": "One or more of the restarts failed. Check the Supervisor logs for more details."
+        }
+      }
+    },
     "issue_system_multiple_data_disks": {
       "title": "Multiple data disks detected",
       "fix_flow": {
         "step": {
           "system_rename_data_disk": {
-            "description": "'{reference}' is a filesystem with the name 'hassos-data' and is not the active data disk. This can cause Home Assistant to choose the wrong data disk at system reboot.\n\nUse the fix option to rename the filesystem to prevent this. Alternatively you can move the data disk to the drive (overwriting its contents) or remove the drive from the system."
+            "description": "`{reference}` is a filesystem with the name hassos-data and is not the active data disk. This can cause Home Assistant to choose the wrong data disk at system reboot.\n\nUse the fix option to rename the filesystem to prevent this. Alternatively you can move the data disk to the drive (overwriting its contents) or remove the drive from the system."
           }
         },
         "abort": {
-          "apply_suggestion_fail": "Could not rename the filesystem. Check the supervisor logs for more details."
+          "apply_suggestion_fail": "Could not rename the filesystem. Check the Supervisor logs for more details."
         }
       }
     },
@@ -39,7 +69,7 @@
           }
         },
         "abort": {
-          "apply_suggestion_fail": "Could not reboot the system. Check the supervisor logs for more details."
+          "apply_suggestion_fail": "Could not reboot the system. Check the Supervisor logs for more details."
         }
       }
     },
diff --git a/homeassistant/components/hassio/websocket_api.py b/homeassistant/components/hassio/websocket_api.py
index 8a9a145f2d6f6e..c8fefe65e1f79e 100644
--- a/homeassistant/components/hassio/websocket_api.py
+++ b/homeassistant/components/hassio/websocket_api.py
@@ -41,9 +41,14 @@
 
 # Endpoints needed for ingress can't require admin because addons can set `panel_admin: false`
 # pylint: disable=implicit-str-concat
+# fmt: off
 WS_NO_ADMIN_ENDPOINTS = re.compile(
-    r"^(?:" r"|/ingress/(session|validate_session)" r"|/addons/[^/]+/info" r")$"
+    r"^(?:"
+    r"|/ingress/(session|validate_session)"
+    r"|/addons/[^/]+/info"
+    r")$" # noqa: ISC001
 )
+# fmt: on
 # pylint: enable=implicit-str-concat
 
 _LOGGER: logging.Logger = logging.getLogger(__package__)
diff --git a/homeassistant/components/here_travel_time/__init__.py b/homeassistant/components/here_travel_time/__init__.py
index 2ce91946f86ec6..1c728bcc12c31a 100644
--- a/homeassistant/components/here_travel_time/__init__.py
+++ b/homeassistant/components/here_travel_time/__init__.py
@@ -4,7 +4,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_MODE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_ARRIVAL_TIME,
@@ -32,8 +32,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     """Set up HERE Travel Time from a config entry."""
     api_key = config_entry.data[CONF_API_KEY]
 
-    arrival = dt.parse_time(config_entry.options.get(CONF_ARRIVAL_TIME, ""))
-    departure = dt.parse_time(config_entry.options.get(CONF_DEPARTURE_TIME, ""))
+    arrival = dt_util.parse_time(config_entry.options.get(CONF_ARRIVAL_TIME, ""))
+    departure = dt_util.parse_time(config_entry.options.get(CONF_DEPARTURE_TIME, ""))
 
     here_travel_time_config = HERETravelTimeConfig(
         destination_latitude=config_entry.data.get(CONF_DESTINATION_LATITUDE),
diff --git a/homeassistant/components/here_travel_time/coordinator.py b/homeassistant/components/here_travel_time/coordinator.py
index ae8bfc34a42f58..dbb17b58336e5a 100644
--- a/homeassistant/components/here_travel_time/coordinator.py
+++ b/homeassistant/components/here_travel_time/coordinator.py
@@ -29,7 +29,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.location import find_coordinates
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import DistanceConverter
 
 from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, ROUTE_MODE_FASTEST
@@ -336,7 +336,7 @@ def build_hass_attribution(sections: list[dict[str, Any]]) -> str | None:
 
 def next_datetime(simple_time: time) -> datetime:
     """Take a time like 08:00:00 and combine it with the current date."""
-    combined = datetime.combine(dt.start_of_local_day(), simple_time)
+    combined = datetime.combine(dt_util.start_of_local_day(), simple_time)
     if combined < datetime.now():
         combined = combined + timedelta(days=1)
     return combined
diff --git a/homeassistant/components/here_travel_time/manifest.json b/homeassistant/components/here_travel_time/manifest.json
index f024b55d009dd1..19c5c4d73d9d67 100644
--- a/homeassistant/components/here_travel_time/manifest.json
+++ b/homeassistant/components/here_travel_time/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/here_travel_time",
   "iot_class": "cloud_polling",
   "loggers": ["here_routing", "here_transit", "homeassistant.helpers.location"],
-  "requirements": ["here_routing==0.2.0", "here_transit==1.2.0"]
+  "requirements": ["here-routing==0.2.0", "here-transit==1.2.0"]
 }
diff --git a/homeassistant/components/here_travel_time/sensor.py b/homeassistant/components/here_travel_time/sensor.py
index 91abfbd765240b..537f782ad09a56 100644
--- a/homeassistant/components/here_travel_time/sensor.py
+++ b/homeassistant/components/here_travel_time/sensor.py
@@ -52,21 +52,21 @@ def sensor_descriptions(travel_mode: str) -> tuple[SensorEntityDescription, ...]
     """Construct SensorEntityDescriptions."""
     return (
         SensorEntityDescription(
-            name="Duration",
+            translation_key="duration",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DURATION,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),
         SensorEntityDescription(
-            name="Duration in traffic",
+            translation_key="duration_in_traffic",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DURATION_IN_TRAFFIC,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfTime.MINUTES,
         ),
         SensorEntityDescription(
-            name="Distance",
+            translation_key="distance",
             icon=ICONS.get(travel_mode, ICON_CAR),
             key=ATTR_DISTANCE,
             state_class=SensorStateClass.MEASUREMENT,
@@ -110,6 +110,8 @@ class HERETravelTimeSensor(
 ):
     """Representation of a HERE travel time sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         unique_id_prefix: str,
@@ -128,7 +130,6 @@ def __init__(
             name=name,
             manufacturer="HERE Technologies",
         )
-        self._attr_has_entity_name = True
 
     async def _async_restore_state(self) -> None:
         """Restore state."""
@@ -174,7 +175,7 @@ def __init__(
     ) -> None:
         """Initialize the sensor."""
         sensor_description = SensorEntityDescription(
-            name="Origin",
+            translation_key="origin",
             icon="mdi:store-marker",
             key=ATTR_ORIGIN_NAME,
         )
@@ -202,7 +203,7 @@ def __init__(
     ) -> None:
         """Initialize the sensor."""
         sensor_description = SensorEntityDescription(
-            name="Destination",
+            translation_key="destination",
             icon="mdi:store-marker",
             key=ATTR_DESTINATION_NAME,
         )
diff --git a/homeassistant/components/here_travel_time/strings.json b/homeassistant/components/here_travel_time/strings.json
index dab135efc82807..2c031dc0a02881 100644
--- a/homeassistant/components/here_travel_time/strings.json
+++ b/homeassistant/components/here_travel_time/strings.json
@@ -85,5 +85,24 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "duration": {
+        "name": "Duration"
+      },
+      "duration_in_traffic": {
+        "name": "Duration in traffic"
+      },
+      "distance": {
+        "name": "Distance"
+      },
+      "origin": {
+        "name": "Origin"
+      },
+      "destination": {
+        "name": "Destination"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/hikvision/manifest.json b/homeassistant/components/hikvision/manifest.json
index 1e175a2a0df8f9..e37e149ccdab76 100644
--- a/homeassistant/components/hikvision/manifest.json
+++ b/homeassistant/components/hikvision/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hikvision",
   "iot_class": "local_push",
   "loggers": ["pyhik"],
-  "requirements": ["pyhik==0.3.2"]
+  "requirements": ["pyHik==0.3.2"]
 }
diff --git a/homeassistant/components/home_connect/sensor.py b/homeassistant/components/home_connect/sensor.py
index 38a45ccf7095e1..efd2a9b34dd483 100644
--- a/homeassistant/components/home_connect/sensor.py
+++ b/homeassistant/components/home_connect/sensor.py
@@ -62,28 +62,27 @@ async def async_update(self) -> None:
         status = self.device.appliance.status
         if self._key not in status:
             self._state = None
-        else:
-            if self.device_class == SensorDeviceClass.TIMESTAMP:
-                if ATTR_VALUE not in status[self._key]:
-                    self._state = None
-                elif (
-                    self._state is not None
-                    and self._sign == 1
-                    and self._state < dt_util.utcnow()
-                ):
-                    # if the date is supposed to be in the future but we're
-                    # already past it, set state to None.
-                    self._state = None
-                else:
-                    seconds = self._sign * float(status[self._key][ATTR_VALUE])
-                    self._state = dt_util.utcnow() + timedelta(seconds=seconds)
+        elif self.device_class == SensorDeviceClass.TIMESTAMP:
+            if ATTR_VALUE not in status[self._key]:
+                self._state = None
+            elif (
+                self._state is not None
+                and self._sign == 1
+                and self._state < dt_util.utcnow()
+            ):
+                # if the date is supposed to be in the future but we're
+                # already past it, set state to None.
+                self._state = None
             else:
-                self._state = status[self._key].get(ATTR_VALUE)
-                if self._key == BSH_OPERATION_STATE:
-                    # Value comes back as an enum, we only really care about the
-                    # last part, so split it off
-                    # https://developer.home-connect.com/docs/status/operation_state
-                    self._state = self._state.split(".")[-1]
+                seconds = self._sign * float(status[self._key][ATTR_VALUE])
+                self._state = dt_util.utcnow() + timedelta(seconds=seconds)
+        else:
+            self._state = status[self._key].get(ATTR_VALUE)
+            if self._key == BSH_OPERATION_STATE:
+                # Value comes back as an enum, we only really care about the
+                # last part, so split it off
+                # https://developer.home-connect.com/docs/status/operation_state
+                self._state = self._state.split(".")[-1]
         _LOGGER.debug("Updated, new state: %s", self._state)
 
     @property
diff --git a/homeassistant/components/homeassistant/strings.json b/homeassistant/components/homeassistant/strings.json
index 06ecd4fe3ef0ba..edb26c3622ef1e 100644
--- a/homeassistant/components/homeassistant/strings.json
+++ b/homeassistant/components/homeassistant/strings.json
@@ -11,6 +11,18 @@
     "python_version": {
       "title": "Support for Python {current_python_version} is being removed",
       "description": "Support for running Home Assistant in the current used Python version {current_python_version} is deprecated and will be removed in Home Assistant {breaks_in_ha_version}. Please upgrade Python to {required_python_version} to prevent your Home Assistant instance from breaking."
+    },
+    "config_entry_only": {
+      "title": "The {domain} integration does not support YAML configuration",
+      "description": "The {domain} integration does not support configuration via YAML file. You may not notice any obvious issues with the integration, but any configuration settings defined in YAML are not actually applied.\n\nTo resolve this:\n\n1. If you've not already done so, [set up the integration]({add_integration}).\n\n2. Remove `{domain}:` from your YAML configuration file.\n\n3. Restart Home Assistant."
+    },
+    "platform_only": {
+      "title": "The {domain} integration does not support YAML configuration under its own key",
+      "description": "The {domain} integration does not support configuration under its own key, it must be configured under its supported platforms.\n\nTo resolve this:\n\n1. Remove `{domain}:` from your YAML configuration file.\n\n2. Restart Home Assistant."
+    },
+    "no_platform_setup": {
+      "title": "Unused YAML configuration for the {platform} integration",
+      "description": "It's not possible to configure {platform} {domain} by adding `{platform_key}` to the {domain} configuration. Please check the documentation for more information on how to set up this integration.\n\nTo resolve this:\n1. Remove `{platform_key}` occurences from the `{domain}:` configuration in your YAML configuration file.\n2. Restart Home Assistant.\n\nExample that should be removed:\n{yaml_example}\n"
     }
   },
   "system_health": {
diff --git a/homeassistant/components/homeassistant_alerts/__init__.py b/homeassistant/components/homeassistant_alerts/__init__.py
index 234f5ae4fed9df..8241c1712654e7 100644
--- a/homeassistant/components/homeassistant_alerts/__init__.py
+++ b/homeassistant/components/homeassistant_alerts/__init__.py
@@ -12,6 +12,7 @@
 from homeassistant.components.hassio import get_supervisor_info, is_hassio
 from homeassistant.const import EVENT_COMPONENT_LOADED, __version__
 from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.issue_registry import (
@@ -28,6 +29,8 @@
 UPDATE_INTERVAL = timedelta(hours=3)
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up alerts."""
diff --git a/homeassistant/components/homeassistant_hardware/__init__.py b/homeassistant/components/homeassistant_hardware/__init__.py
index f3a63a7f76779c..057cdd3b0db821 100644
--- a/homeassistant/components/homeassistant_hardware/__init__.py
+++ b/homeassistant/components/homeassistant_hardware/__init__.py
@@ -2,8 +2,12 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
+DOMAIN = "homeassistant_hardware"
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the component."""
diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
index 8c502f080f6ce6..e4d9902346c167 100644
--- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
+++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
@@ -5,7 +5,7 @@
 import asyncio
 import dataclasses
 import logging
-from typing import Any
+from typing import Any, Protocol
 
 import voluptuous as vol
 import yarl
@@ -19,12 +19,19 @@
     hostname_from_addon_slug,
     is_hassio,
 )
-from homeassistant.components.zha import DOMAIN as ZHA_DOMAIN
-from homeassistant.components.zha.radio_manager import ZhaMultiPANMigrationHelper
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow, FlowResult
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.integration_platform import (
+    async_process_integration_platforms,
+)
+from homeassistant.helpers.selector import (
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
 from homeassistant.helpers.singleton import singleton
+from homeassistant.helpers.storage import Store
 
 from .const import LOGGER, SILABS_MULTIPROTOCOL_ADDON_SLUG
 
@@ -39,17 +46,165 @@
 CONF_ADDON_DEVICE = "device"
 CONF_ENABLE_MULTI_PAN = "enable_multi_pan"
 
+DEFAULT_CHANNEL = 15
+DEFAULT_CHANNEL_CHANGE_DELAY = 5 * 60  # Thread recommendation
+
+STORAGE_KEY = "homeassistant_hardware.silabs"
+STORAGE_VERSION_MAJOR = 1
+STORAGE_VERSION_MINOR = 1
+SAVE_DELAY = 10
+
 
 @singleton(DATA_ADDON_MANAGER)
-@callback
-def get_addon_manager(hass: HomeAssistant) -> AddonManager:
+async def get_addon_manager(hass: HomeAssistant) -> MultiprotocolAddonManager:
     """Get the add-on manager."""
-    return AddonManager(
-        hass,
-        LOGGER,
-        "Silicon Labs Multiprotocol",
-        SILABS_MULTIPROTOCOL_ADDON_SLUG,
-    )
+    manager = MultiprotocolAddonManager(hass)
+    await manager.async_setup()
+    return manager
+
+
+class MultiprotocolAddonManager(AddonManager):
+    """Silicon Labs Multiprotocol add-on manager."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the manager."""
+        super().__init__(
+            hass,
+            LOGGER,
+            "Silicon Labs Multiprotocol",
+            SILABS_MULTIPROTOCOL_ADDON_SLUG,
+        )
+        self._channel: int | None = None
+        self._platforms: dict[str, MultipanProtocol] = {}
+        self._store: Store[dict[str, Any]] = Store(
+            hass,
+            STORAGE_VERSION_MAJOR,
+            STORAGE_KEY,
+            atomic_writes=True,
+            minor_version=STORAGE_VERSION_MINOR,
+        )
+
+    async def async_setup(self) -> None:
+        """Set up the manager."""
+        await async_process_integration_platforms(
+            self._hass, "silabs_multiprotocol", self._register_multipan_platform
+        )
+        await self.async_load()
+
+    async def _register_multipan_platform(
+        self, hass: HomeAssistant, integration_domain: str, platform: MultipanProtocol
+    ) -> None:
+        """Register a multipan platform."""
+        self._platforms[integration_domain] = platform
+
+        channel = await platform.async_get_channel(hass)
+        using_multipan = await platform.async_using_multipan(hass)
+
+        _LOGGER.info(
+            "Registering new multipan platform '%s', using multipan: %s, channel: %s",
+            integration_domain,
+            using_multipan,
+            channel,
+        )
+
+        if self._channel is not None or not using_multipan:
+            return
+
+        if channel is None:
+            return
+
+        _LOGGER.info(
+            "Setting multipan channel to %s (source: '%s')",
+            channel,
+            integration_domain,
+        )
+        self.async_set_channel(channel)
+
+    async def async_change_channel(
+        self, channel: int, delay: float
+    ) -> list[asyncio.Task]:
+        """Change the channel and notify platforms."""
+        self.async_set_channel(channel)
+
+        tasks = []
+
+        for platform in self._platforms.values():
+            if not await platform.async_using_multipan(self._hass):
+                continue
+            task = await platform.async_change_channel(self._hass, channel, delay)
+            if not task:
+                continue
+            tasks.append(task)
+
+        return tasks
+
+    async def async_active_platforms(self) -> list[str]:
+        """Return a list of platforms using the multipan radio."""
+        active_platforms: list[str] = []
+
+        for integration_domain, platform in self._platforms.items():
+            if not await platform.async_using_multipan(self._hass):
+                continue
+            active_platforms.append(integration_domain)
+
+        return active_platforms
+
+    @callback
+    def async_get_channel(self) -> int | None:
+        """Get the channel."""
+        return self._channel
+
+    @callback
+    def async_set_channel(self, channel: int) -> None:
+        """Set the channel without notifying platforms.
+
+        This must only be called when first initializing the manager.
+        """
+        self._channel = channel
+        self.async_schedule_save()
+
+    async def async_load(self) -> None:
+        """Load the store."""
+        data = await self._store.async_load()
+
+        if data is not None:
+            self._channel = data["channel"]
+
+    @callback
+    def async_schedule_save(self) -> None:
+        """Schedule saving the store."""
+        self._store.async_delay_save(self._data_to_save, SAVE_DELAY)
+
+    @callback
+    def _data_to_save(self) -> dict[str, list[dict[str, str | None]]]:
+        """Return data to store in a file."""
+        data: dict[str, Any] = {}
+        data["channel"] = self._channel
+        return data
+
+
+class MultipanProtocol(Protocol):
+    """Define the format of multipan platforms."""
+
+    async def async_change_channel(
+        self, hass: HomeAssistant, channel: int, delay: float
+    ) -> asyncio.Task | None:
+        """Set the channel to be used.
+
+        Does nothing if not configured or the multiprotocol add-on is not used.
+        """
+
+    async def async_get_channel(self, hass: HomeAssistant) -> int | None:
+        """Return the channel.
+
+        Returns None if not configured or the multiprotocol add-on is not used.
+        """
+
+    async def async_using_multipan(self, hass: HomeAssistant) -> bool:
+        """Return if the multiprotocol device is used.
+
+        Returns False if not configured.
+        """
 
 
 @dataclasses.dataclass
@@ -82,6 +237,11 @@ class OptionsFlowHandler(config_entries.OptionsFlow, ABC):
 
     def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
         """Set up the options flow."""
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components.zha.radio_manager import (
+            ZhaMultiPANMigrationHelper,
+        )
+
         # If we install the add-on we should uninstall it on entry remove.
         self.install_task: asyncio.Task | None = None
         self.start_task: asyncio.Task | None = None
@@ -117,7 +277,7 @@ def flow_manager(self) -> config_entries.OptionsFlowManager:
 
     async def _async_get_addon_info(self) -> AddonInfo:
         """Return and cache Silicon Labs Multiprotocol add-on info."""
-        addon_manager: AddonManager = get_addon_manager(self.hass)
+        addon_manager: AddonManager = await get_addon_manager(self.hass)
         try:
             addon_info: AddonInfo = await addon_manager.async_get_addon_info()
         except AddonError as err:
@@ -128,7 +288,7 @@ async def _async_get_addon_info(self) -> AddonInfo:
 
     async def _async_set_addon_config(self, config: dict) -> None:
         """Set Silicon Labs Multiprotocol add-on config."""
-        addon_manager: AddonManager = get_addon_manager(self.hass)
+        addon_manager: AddonManager = await get_addon_manager(self.hass)
         try:
             await addon_manager.async_set_addon_options(config)
         except AddonError as err:
@@ -137,7 +297,7 @@ async def _async_set_addon_config(self, config: dict) -> None:
 
     async def _async_install_addon(self) -> None:
         """Install the Silicon Labs Multiprotocol add-on."""
-        addon_manager: AddonManager = get_addon_manager(self.hass)
+        addon_manager: AddonManager = await get_addon_manager(self.hass)
         try:
             await addon_manager.async_schedule_install_addon()
         finally:
@@ -213,6 +373,19 @@ async def async_step_configure_addon(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
         """Configure the Silicon Labs Multiprotocol add-on."""
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components.zha import DOMAIN as ZHA_DOMAIN
+
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components.zha.radio_manager import (
+            ZhaMultiPANMigrationHelper,
+        )
+
+        # pylint: disable-next=import-outside-toplevel
+        from homeassistant.components.zha.silabs_multiprotocol import (
+            async_get_channel as async_get_zha_channel,
+        )
+
         addon_info = await self._async_get_addon_info()
 
         addon_config = addon_info.options
@@ -224,6 +397,8 @@ async def async_step_configure_addon(
             **dataclasses.asdict(serial_port_settings),
         }
 
+        multipan_channel = DEFAULT_CHANNEL
+
         # Initiate ZHA migration
         zha_entries = self.hass.config_entries.async_entries(ZHA_DOMAIN)
 
@@ -247,6 +422,13 @@ async def async_step_configure_addon(
                 _LOGGER.exception("Unexpected exception during ZHA migration")
                 raise AbortFlow("zha_migration_failed") from err
 
+            if (zha_channel := await async_get_zha_channel(self.hass)) is not None:
+                multipan_channel = zha_channel
+
+        # Initialize the shared channel
+        multipan_manager = await get_addon_manager(self.hass)
+        multipan_manager.async_set_channel(multipan_channel)
+
         if new_addon_config != addon_config:
             # Copy the add-on config to keep the objects separate.
             self.original_addon_config = dict(addon_config)
@@ -283,7 +465,7 @@ async def async_step_start_failed(
 
     async def _async_start_addon(self) -> None:
         """Start Silicon Labs Multiprotocol add-on."""
-        addon_manager: AddonManager = get_addon_manager(self.hass)
+        addon_manager: AddonManager = await get_addon_manager(self.hass)
         try:
             await addon_manager.async_schedule_start_addon()
         finally:
@@ -319,9 +501,92 @@ async def async_step_addon_installed(
 
         serial_device = (await self._async_serial_port_settings()).device
         if addon_info.options.get(CONF_ADDON_DEVICE) == serial_device:
-            return await self.async_step_show_revert_guide()
+            return await self.async_step_show_addon_menu()
         return await self.async_step_addon_installed_other_device()
 
+    async def async_step_show_addon_menu(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Show menu options for the addon."""
+        return self.async_show_menu(
+            step_id="addon_menu",
+            menu_options=[
+                "reconfigure_addon",
+                "uninstall_addon",
+            ],
+        )
+
+    async def async_step_reconfigure_addon(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Reconfigure the addon."""
+        multipan_manager = await get_addon_manager(self.hass)
+        active_platforms = await multipan_manager.async_active_platforms()
+        if set(active_platforms) != {"otbr", "zha"}:
+            return await self.async_step_notify_unknown_multipan_user()
+        return await self.async_step_change_channel()
+
+    async def async_step_notify_unknown_multipan_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Notify that there may be unknown multipan platforms."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="notify_unknown_multipan_user",
+            )
+        return await self.async_step_change_channel()
+
+    async def async_step_change_channel(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Change the channel."""
+        multipan_manager = await get_addon_manager(self.hass)
+        if user_input is None:
+            channels = [str(x) for x in range(11, 27)]
+            suggested_channel = DEFAULT_CHANNEL
+            if (channel := multipan_manager.async_get_channel()) is not None:
+                suggested_channel = channel
+            data_schema = vol.Schema(
+                {
+                    vol.Required(
+                        "channel",
+                        description={"suggested_value": str(suggested_channel)},
+                    ): SelectSelector(
+                        SelectSelectorConfig(
+                            options=channels, mode=SelectSelectorMode.DROPDOWN
+                        )
+                    )
+                }
+            )
+            return self.async_show_form(
+                step_id="change_channel", data_schema=data_schema
+            )
+
+        # Change the shared channel
+        await multipan_manager.async_change_channel(
+            int(user_input["channel"]), DEFAULT_CHANNEL_CHANGE_DELAY
+        )
+        return await self.async_step_notify_channel_change()
+
+    async def async_step_notify_channel_change(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Notify that the channel change will take about five minutes."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="notify_channel_change",
+                description_placeholders={
+                    "delay_minutes": str(DEFAULT_CHANNEL_CHANGE_DELAY // 60)
+                },
+            )
+        return self.async_create_entry(title="", data={})
+
+    async def async_step_uninstall_addon(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Uninstall the addon (not implemented)."""
+        return await self.async_step_show_revert_guide()
+
     async def async_step_show_revert_guide(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
@@ -348,7 +613,7 @@ async def check_multi_pan_addon(hass: HomeAssistant) -> None:
     if not is_hassio(hass):
         return
 
-    addon_manager: AddonManager = get_addon_manager(hass)
+    addon_manager: AddonManager = await get_addon_manager(hass)
     try:
         addon_info: AddonInfo = await addon_manager.async_get_addon_info()
     except AddonError as err:
@@ -375,7 +640,7 @@ async def multi_pan_addon_using_device(hass: HomeAssistant, device_path: str) ->
     if not is_hassio(hass):
         return False
 
-    addon_manager: AddonManager = get_addon_manager(hass)
+    addon_manager: AddonManager = await get_addon_manager(hass)
     addon_info: AddonInfo = await addon_manager.async_get_addon_info()
 
     if addon_info.state != AddonState.RUNNING:
diff --git a/homeassistant/components/homeassistant_hardware/strings.json b/homeassistant/components/homeassistant_hardware/strings.json
index 47549794fc8f97..06221fc7b97f91 100644
--- a/homeassistant/components/homeassistant_hardware/strings.json
+++ b/homeassistant/components/homeassistant_hardware/strings.json
@@ -12,15 +12,41 @@
         "addon_installed_other_device": {
           "title": "Multiprotocol support is already enabled for another device"
         },
+        "addon_menu": {
+          "menu_options": {
+            "reconfigure_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::reconfigure_addon::title%]",
+            "uninstall_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::uninstall_addon::title%]"
+          }
+        },
+        "change_channel": {
+          "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::reconfigure_addon::title%]",
+          "data": {
+            "channel": "Channel"
+          }
+        },
         "install_addon": {
           "title": "The Silicon Labs Multiprotocol add-on installation has started"
         },
+        "notify_channel_change": {
+          "title": "Channel change initiated",
+          "description": "A Zigbee and Thread channel change has been initiated and will finish in {delay_minutes} minutes."
+        },
+        "notify_unknown_multipan_user": {
+          "title": "Manual configuration may be needed",
+          "description": "Home Assistant can automatically change the channels for otbr and zha. If you have configured another integration to use the radio, for example Zigbee2MQTT, you will have to reconfigure the channel in that integration after completing this guide."
+        },
+        "reconfigure_addon": {
+          "title": "Reconfigure IEEE 802.15.4 radio multiprotocol support"
+        },
         "show_revert_guide": {
           "title": "Multiprotocol support is enabled for this device",
           "description": "If you want to change to Zigbee only firmware, please complete the following manual steps:\n\n  * Remove the Silicon Labs Multiprotocol addon\n\n  * Flash the Zigbee only firmware, follow the guide at https://github.com/NabuCasa/silabs-firmware/wiki/Flash-Silicon-Labs-radio-firmware-manually.\n\n  * Reconfigure ZHA to migrate settings to the reflashed radio"
         },
         "start_addon": {
           "title": "The Silicon Labs Multiprotocol add-on is starting."
+        },
+        "uninstall_addon": {
+          "title": "Remove IEEE 802.15.4 radio multiprotocol support."
         }
       },
       "error": {
diff --git a/homeassistant/components/homeassistant_sky_connect/__init__.py b/homeassistant/components/homeassistant_sky_connect/__init__.py
index 0f7ec70471550a..5f17069f5d5e0c 100644
--- a/homeassistant/components/homeassistant_sky_connect/__init__.py
+++ b/homeassistant/components/homeassistant_sky_connect/__init__.py
@@ -32,6 +32,7 @@ async def _async_usb_scan_done(hass: HomeAssistant, entry: ConfigEntry) -> None:
         return
 
     usb_dev = entry.data["device"]
+    # The call to get_serial_by_id can be removed in HA Core 2024.1
     dev_path = await hass.async_add_executor_job(usb.get_serial_by_id, usb_dev)
 
     if not await multi_pan_addon_using_device(hass, dev_path):
diff --git a/homeassistant/components/homeassistant_sky_connect/config_flow.py b/homeassistant/components/homeassistant_sky_connect/config_flow.py
index 7bc514d5615302..5ac44f3f290d30 100644
--- a/homeassistant/components/homeassistant_sky_connect/config_flow.py
+++ b/homeassistant/components/homeassistant_sky_connect/config_flow.py
@@ -58,6 +58,7 @@ async def _async_serial_port_settings(
     ) -> silabs_multiprotocol_addon.SerialPortSettings:
         """Return the radio serial port settings."""
         usb_dev = self.config_entry.data["device"]
+        # The call to get_serial_by_id can be removed in HA Core 2024.1
         dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, usb_dev)
         return silabs_multiprotocol_addon.SerialPortSettings(
             device=dev_path,
diff --git a/homeassistant/components/homeassistant_sky_connect/strings.json b/homeassistant/components/homeassistant_sky_connect/strings.json
index 970f9d97a4c174..047130e787cac1 100644
--- a/homeassistant/components/homeassistant_sky_connect/strings.json
+++ b/homeassistant/components/homeassistant_sky_connect/strings.json
@@ -11,15 +11,41 @@
       "addon_installed_other_device": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_installed_other_device::title%]"
       },
+      "addon_menu": {
+        "menu_options": {
+          "reconfigure_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_menu::menu_options::reconfigure_addon%]",
+          "uninstall_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_menu::menu_options::uninstall_addon%]"
+        }
+      },
+      "change_channel": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::change_channel::title%]",
+        "data": {
+          "channel": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::change_channel::data::channel%]"
+        }
+      },
       "install_addon": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::install_addon::title%]"
       },
+      "notify_channel_change": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_channel_change::title%]",
+        "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_channel_change::description%]"
+      },
+      "notify_unknown_multipan_user": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_unknown_multipan_user::title%]",
+        "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_unknown_multipan_user::description%]"
+      },
+      "reconfigure_addon": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::reconfigure_addon::title%]"
+      },
       "show_revert_guide": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::show_revert_guide::title%]",
         "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::show_revert_guide::description%]"
       },
       "start_addon": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::start_addon::title%]"
+      },
+      "uninstall_addon": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::uninstall_addon::title%]"
       }
     },
     "error": {
diff --git a/homeassistant/components/homeassistant_yellow/strings.json b/homeassistant/components/homeassistant_yellow/strings.json
index d97b01c7c843f8..617e61336a5ef1 100644
--- a/homeassistant/components/homeassistant_yellow/strings.json
+++ b/homeassistant/components/homeassistant_yellow/strings.json
@@ -11,6 +11,18 @@
       "addon_installed_other_device": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_installed_other_device::title%]"
       },
+      "addon_menu": {
+        "menu_options": {
+          "reconfigure_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_menu::menu_options::reconfigure_addon%]",
+          "uninstall_addon": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::addon_menu::menu_options::uninstall_addon%]"
+        }
+      },
+      "change_channel": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::change_channel::title%]",
+        "data": {
+          "channel": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::change_channel::data::channel%]"
+        }
+      },
       "hardware_settings": {
         "title": "Configure hardware settings",
         "data": {
@@ -22,12 +34,20 @@
       "install_addon": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::install_addon::title%]"
       },
+      "notify_channel_change": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_channel_change::title%]",
+        "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_channel_change::description%]"
+      },
       "main_menu": {
         "menu_options": {
           "hardware_settings": "[%key:component::homeassistant_yellow::options::step::hardware_settings::title%]",
           "multipan_settings": "Configure IEEE 802.15.4 radio multiprotocol support"
         }
       },
+      "notify_unknown_multipan_user": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_unknown_multipan_user::title%]",
+        "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::notify_unknown_multipan_user::description%]"
+      },
       "reboot_menu": {
         "title": "Reboot required",
         "description": "The settings have changed, but the new settings will not take effect until the system is rebooted",
@@ -36,12 +56,18 @@
           "reboot_now": "Reboot now"
         }
       },
+      "reconfigure_addon": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::reconfigure_addon::title%]"
+      },
       "show_revert_guide": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::show_revert_guide::title%]",
         "description": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::show_revert_guide::description%]"
       },
       "start_addon": {
         "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::start_addon::title%]"
+      },
+      "uninstall_addon": {
+        "title": "[%key:component::homeassistant_hardware::silabs_multiprotocol_hardware::options::step::uninstall_addon::title%]"
       }
     },
     "error": {
diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index 2b56a056821ce0..514c218b1010b8 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -28,7 +28,6 @@
 )
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.components.humidifier import DOMAIN as HUMIDIFIER_DOMAIN
-from homeassistant.components.network import MDNS_TARGET_IP
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
@@ -168,7 +167,9 @@ def _has_all_unique_names_and_ports(
             ),
             vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
             vol.Optional(CONF_IP_ADDRESS): vol.All(ipaddress.ip_address, cv.string),
-            vol.Optional(CONF_ADVERTISE_IP): vol.All(ipaddress.ip_address, cv.string),
+            vol.Optional(CONF_ADVERTISE_IP): vol.All(
+                cv.ensure_list, [ipaddress.ip_address], [cv.string]
+            ),
             vol.Optional(CONF_FILTER, default={}): BASE_FILTER_SCHEMA,
             vol.Optional(CONF_ENTITY_CONFIG, default={}): validate_entity_config,
             vol.Optional(CONF_DEVICES): cv.ensure_list,
@@ -303,9 +304,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     # ip_address and advertise_ip are yaml only
     ip_address = conf.get(CONF_IP_ADDRESS, [None])
-    advertise_ip = conf.get(
-        CONF_ADVERTISE_IP, await network.async_get_source_ip(hass, MDNS_TARGET_IP)
-    )
+    advertise_ips: list[str] = conf.get(
+        CONF_ADVERTISE_IP
+    ) or await network.async_get_announce_addresses(hass)
+
     # exclude_accessory_mode is only used for config flow
     # to indicate that the config entry was setup after
     # we started creating config entries for entities that
@@ -331,7 +333,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         exclude_accessory_mode,
         entity_config,
         homekit_mode,
-        advertise_ip,
+        advertise_ips,
         entry.entry_id,
         entry.title,
         devices=devices,
@@ -508,7 +510,7 @@ def __init__(
         exclude_accessory_mode: bool,
         entity_config: dict,
         homekit_mode: str,
-        advertise_ip: str | None,
+        advertise_ips: list[str],
         entry_id: str,
         entry_title: str,
         devices: list[str] | None = None,
@@ -521,7 +523,7 @@ def __init__(
         self._filter = entity_filter
         self._config = entity_config
         self._exclude_accessory_mode = exclude_accessory_mode
-        self._advertise_ip = advertise_ip
+        self._advertise_ips = advertise_ips
         self._entry_id = entry_id
         self._entry_title = entry_title
         self._homekit_mode = homekit_mode
@@ -547,7 +549,7 @@ def setup(self, async_zeroconf_instance: AsyncZeroconf, uuid: str) -> None:
             address=self._ip_address,
             port=self._port,
             persist_file=persist_file,
-            advertised_address=self._advertise_ip,
+            advertised_address=self._advertise_ips,
             async_zeroconf_instance=async_zeroconf_instance,
             zeroconf_server=f"{uuid}-hap.local.",
             loader=get_loader(),
diff --git a/homeassistant/components/homekit/accessories.py b/homeassistant/components/homekit/accessories.py
index dc8a2a7c639b3c..00168ef3898fff 100644
--- a/homeassistant/components/homekit/accessories.py
+++ b/homeassistant/components/homekit/accessories.py
@@ -281,7 +281,7 @@ def __init__(
             display_name=cleanup_name_for_homekit(name),
             aid=aid,
             iid_manager=HomeIIDManager(driver.iid_storage),
-            *args,
+            *args,  # noqa: B026
             **kwargs,
         )
         self.config = config or {}
@@ -626,10 +626,10 @@ def __init__(
 
     @pyhap_callback  # type: ignore[misc]
     def pair(
-        self, client_uuid: UUID, client_public: str, client_permissions: int
+        self, client_username_bytes: bytes, client_public: str, client_permissions: int
     ) -> bool:
         """Override super function to dismiss setup message if paired."""
-        success = super().pair(client_uuid, client_public, client_permissions)
+        success = super().pair(client_username_bytes, client_public, client_permissions)
         if success:
             async_dismiss_setup_message(self.hass, self._entry_id)
         return cast(bool, success)
diff --git a/homeassistant/components/homekit/manifest.json b/homeassistant/components/homekit/manifest.json
index 746b097e99acb7..245dbd0a19e487 100644
--- a/homeassistant/components/homekit/manifest.json
+++ b/homeassistant/components/homekit/manifest.json
@@ -9,7 +9,7 @@
   "iot_class": "local_push",
   "loggers": ["pyhap"],
   "requirements": [
-    "HAP-python==4.6.0",
+    "HAP-python==4.7.0",
     "fnv-hash-fast==0.3.1",
     "PyQRCode==1.2.1",
     "base36==0.1.1"
diff --git a/homeassistant/components/homekit/type_triggers.py b/homeassistant/components/homekit/type_triggers.py
index eb2cd5d34ad4dc..ee737e01ff49e0 100644
--- a/homeassistant/components/homekit/type_triggers.py
+++ b/homeassistant/components/homekit/type_triggers.py
@@ -47,10 +47,12 @@ def __init__(
             type_: str = trigger["type"]
             subtype: str | None = trigger.get("subtype")
             unique_id = f'{type_}-{subtype or ""}'
-            if (entity_id := trigger.get("entity_id")) and (
-                entry := ent_reg.async_get(entity_id)
+            entity_id: str | None = None
+            if (entity_id_or_uuid := trigger.get("entity_id")) and (
+                entry := ent_reg.async_get(entity_id_or_uuid)
             ):
                 unique_id += f"-entity_unique_id:{get_system_unique_id(entry)}"
+                entity_id = entry.entity_id
             trigger_name_parts = []
             if entity_id and (state := self.hass.states.get(entity_id)):
                 trigger_name_parts.append(state.name)
diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py
index ecd8113a2bbfaf..ed9b8ca4622002 100644
--- a/homeassistant/components/homekit_controller/__init__.py
+++ b/homeassistant/components/homekit_controller/__init__.py
@@ -16,16 +16,18 @@
 from homeassistant.const import ATTR_IDENTIFIERS, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 
 from .config_flow import normalize_hkid
 from .connection import HKDevice
-from .const import KNOWN_DEVICES
+from .const import DOMAIN, KNOWN_DEVICES
 from .utils import async_get_controller
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a HomeKit connection on a config entry."""
diff --git a/homeassistant/components/homekit_controller/connection.py b/homeassistant/components/homekit_controller/connection.py
index db85dbda3d57b5..b937e7f2e0b0a7 100644
--- a/homeassistant/components/homekit_controller/connection.py
+++ b/homeassistant/components/homekit_controller/connection.py
@@ -272,7 +272,7 @@ async def async_setup(self) -> None:
                     self.hass,
                     self.async_update_available_state,
                     timedelta(seconds=BLE_AVAILABILITY_CHECK_INTERVAL),
-                    name=f"HomeKit Controller {self.unique_id} BLE availability "
+                    name=f"HomeKit Device {self.unique_id} BLE availability "
                     "check poll",
                 )
             )
@@ -291,7 +291,7 @@ def _async_start_polling(self) -> None:
                 self.hass,
                 self.async_request_update,
                 self.pairing.poll_interval,
-                name=f"HomeKit Controller {self.unique_id} availability check poll",
+                name=f"HomeKit Device {self.unique_id} availability check poll",
             )
         )
 
@@ -714,7 +714,7 @@ async def async_update(self, now=None):
             if not self._polling_lock_warned:
                 _LOGGER.warning(
                     (
-                        "HomeKit controller update skipped as previous poll still in"
+                        "HomeKit device update skipped as previous poll still in"
                         " flight: %s"
                     ),
                     self.unique_id,
@@ -725,7 +725,7 @@ async def async_update(self, now=None):
         if self._polling_lock_warned:
             _LOGGER.info(
                 (
-                    "HomeKit controller no longer detecting back pressure - not"
+                    "HomeKit device no longer detecting back pressure - not"
                     " skipping poll: %s"
                 ),
                 self.unique_id,
@@ -733,7 +733,7 @@ async def async_update(self, now=None):
             self._polling_lock_warned = False
 
         async with self._polling_lock:
-            _LOGGER.debug("Starting HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Starting HomeKit device update: %s", self.unique_id)
 
             try:
                 new_values_dict = await self.get_characteristics(
@@ -755,7 +755,7 @@ async def async_update(self, now=None):
             self._poll_failures = 0
             self.process_new_events(new_values_dict)
 
-            _LOGGER.debug("Finished HomeKit controller update: %s", self.unique_id)
+            _LOGGER.debug("Finished HomeKit device update: %s", self.unique_id)
 
     def process_new_events(
         self, new_values_dict: dict[tuple[int, int], dict[str, Any]]
diff --git a/homeassistant/components/homekit_controller/cover.py b/homeassistant/components/homekit_controller/cover.py
index fbe6f08bc75fdc..73eb699007c7fe 100644
--- a/homeassistant/components/homekit_controller/cover.py
+++ b/homeassistant/components/homekit_controller/cover.py
@@ -216,6 +216,26 @@ def current_cover_tilt_position(self) -> int:
             tilt_position = self.service.value(
                 CharacteristicsTypes.HORIZONTAL_TILT_CURRENT
             )
+        # Recalculate to convert from arcdegree scale to percentage scale.
+        if self.is_vertical_tilt:
+            scale = 0.9
+            if (
+                self.service[CharacteristicsTypes.VERTICAL_TILT_CURRENT].minValue == -90
+                and self.service[CharacteristicsTypes.VERTICAL_TILT_CURRENT].maxValue
+                == 0
+            ):
+                scale = -0.9
+            tilt_position = int(tilt_position / scale)
+        elif self.is_horizontal_tilt:
+            scale = 0.9
+            if (
+                self.service[CharacteristicsTypes.HORIZONTAL_TILT_TARGET].minValue
+                == -90
+                and self.service[CharacteristicsTypes.HORIZONTAL_TILT_TARGET].maxValue
+                == 0
+            ):
+                scale = -0.9
+            tilt_position = int(tilt_position / scale)
         return tilt_position
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
@@ -241,10 +261,29 @@ async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
         tilt_position = kwargs[ATTR_TILT_POSITION]
         if self.is_vertical_tilt:
+            # Recalculate to convert from percentage scale to arcdegree scale.
+            scale = 0.9
+            if (
+                self.service[CharacteristicsTypes.VERTICAL_TILT_TARGET].minValue == -90
+                and self.service[CharacteristicsTypes.VERTICAL_TILT_TARGET].maxValue
+                == 0
+            ):
+                scale = -0.9
+            tilt_position = int(tilt_position * scale)
             await self.async_put_characteristics(
                 {CharacteristicsTypes.VERTICAL_TILT_TARGET: tilt_position}
             )
         elif self.is_horizontal_tilt:
+            # Recalculate to convert from percentage scale to arcdegree scale.
+            scale = 0.9
+            if (
+                self.service[CharacteristicsTypes.HORIZONTAL_TILT_TARGET].minValue
+                == -90
+                and self.service[CharacteristicsTypes.HORIZONTAL_TILT_TARGET].maxValue
+                == 0
+            ):
+                scale = -0.9
+            tilt_position = int(tilt_position * scale)
             await self.async_put_characteristics(
                 {CharacteristicsTypes.HORIZONTAL_TILT_TARGET: tilt_position}
             )
diff --git a/homeassistant/components/homekit_controller/humidifier.py b/homeassistant/components/homekit_controller/humidifier.py
index e396b3c9c972f8..cd2cf4022e71fa 100644
--- a/homeassistant/components/homekit_controller/humidifier.py
+++ b/homeassistant/components/homekit_controller/humidifier.py
@@ -73,6 +73,11 @@ def target_humidity(self) -> int | None:
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD
         )
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self.service.value(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
+
     @property
     def mode(self) -> str | None:
         """Return the current mode, e.g., home, auto, baby.
@@ -177,6 +182,11 @@ def target_humidity(self) -> int | None:
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD
         )
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self.service.value(CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT)
+
     @property
     def mode(self) -> str | None:
         """Return the current mode, e.g., home, auto, baby.
diff --git a/homeassistant/components/homekit_controller/manifest.json b/homeassistant/components/homekit_controller/manifest.json
index 9db26d4c8e0739..d0a88bf8249afc 100644
--- a/homeassistant/components/homekit_controller/manifest.json
+++ b/homeassistant/components/homekit_controller/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "homekit_controller",
-  "name": "HomeKit Controller",
+  "name": "HomeKit Device",
   "after_dependencies": ["thread"],
   "bluetooth": [
     {
@@ -14,6 +14,6 @@
   "documentation": "https://www.home-assistant.io/integrations/homekit_controller",
   "iot_class": "local_push",
   "loggers": ["aiohomekit", "commentjson"],
-  "requirements": ["aiohomekit==2.6.3"],
+  "requirements": ["aiohomekit==2.6.5"],
   "zeroconf": ["_hap._tcp.local.", "_hap._udp.local."]
 }
diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json
index 2291f66d88a547..7420ef7f3f9cfa 100644
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@@ -1,18 +1,18 @@
 {
-  "title": "HomeKit Controller",
+  "title": "HomeKit Device",
   "config": {
     "flow_title": "{name} ({category})",
     "step": {
       "user": {
         "title": "Device selection",
-        "description": "HomeKit Controller communicates over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Select the device you want to pair with:",
+        "description": "HomeKit Device communicates over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Select the device you want to pair with:",
         "data": {
           "device": "Device"
         }
       },
       "pair": {
         "title": "Pair with a device via HomeKit Accessory Protocol",
-        "description": "HomeKit Controller communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
+        "description": "HomeKit Device communicates with {name} ({category}) over the local area network using a secure encrypted connection without a separate HomeKit Controller or iCloud. Enter your HomeKit pairing code (in the format XXX-XX-XXX) to use this accessory. This code is usually found on the device itself or in the packaging.",
         "data": {
           "pairing_code": "Pairing Code",
           "allow_insecure_setup_codes": "Allow pairing with insecure setup codes."
diff --git a/homeassistant/components/homematicip_cloud/generic_entity.py b/homeassistant/components/homematicip_cloud/generic_entity.py
index a52966752921f9..7a6e7c18e1375d 100644
--- a/homeassistant/components/homematicip_cloud/generic_entity.py
+++ b/homeassistant/components/homematicip_cloud/generic_entity.py
@@ -164,7 +164,7 @@ def async_remove_from_registries(self) -> None:
         else:
             # Remove from entity registry.
             # Only relevant for entities that do not belong to a device.
-            if entity_id := self.registry_entry.entity_id:
+            if entity_id := self.registry_entry.entity_id:  # noqa: PLR5501
                 entity_registry = er.async_get(self.hass)
                 if entity_id in entity_registry.entities:
                     entity_registry.async_remove(entity_id)
@@ -185,9 +185,8 @@ def name(self) -> str:
         if hasattr(self._device, "functionalChannels"):
             if self._is_multi_channel:
                 name = self._device.functionalChannels[self._channel].label
-            else:
-                if len(self._device.functionalChannels) > 1:
-                    name = self._device.functionalChannels[1].label
+            elif len(self._device.functionalChannels) > 1:
+                name = self._device.functionalChannels[1].label
 
         # Use device label, if name is not defined by channel label.
         if not name:
diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py
index 770687ef50ddcc..65919033801fc7 100644
--- a/homeassistant/components/homematicip_cloud/switch.py
+++ b/homeassistant/components/homematicip_cloud/switch.py
@@ -4,6 +4,7 @@
 from typing import Any
 
 from homematicip.aio.device import (
+    AsyncBrandSwitch2,
     AsyncBrandSwitchMeasuring,
     AsyncDinRailSwitch,
     AsyncDinRailSwitch4,
@@ -77,6 +78,9 @@ async def async_setup_entry(
         elif isinstance(device, AsyncPrintedCircuitBoardSwitch2):
             for channel in range(1, 3):
                 entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
+        elif isinstance(device, AsyncBrandSwitch2):
+            for channel in range(1, 3):
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
 
     for group in hap.home.groups:
         if isinstance(group, (AsyncExtendedLinkedSwitchingGroup, AsyncSwitchingGroup)):
diff --git a/homeassistant/components/homewizard/button.py b/homeassistant/components/homewizard/button.py
index 665406499e1a87..96fe1b157f86c0 100644
--- a/homeassistant/components/homewizard/button.py
+++ b/homeassistant/components/homewizard/button.py
@@ -1,6 +1,6 @@
 """Support for HomeWizard buttons."""
 
-from homeassistant.components.button import ButtonEntity
+from homeassistant.components.button import ButtonDeviceClass, ButtonEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
@@ -25,8 +25,7 @@ class HomeWizardIdentifyButton(HomeWizardEntity, ButtonEntity):
     """Representation of a identify button."""
 
     _attr_entity_category = EntityCategory.DIAGNOSTIC
-    _attr_icon = "mdi:magnify"
-    _attr_name = "Identify"
+    _attr_device_class = ButtonDeviceClass.IDENTIFY
 
     def __init__(
         self,
diff --git a/homeassistant/components/homewizard/number.py b/homeassistant/components/homewizard/number.py
index 0451aed973956c..d51d180edb1826 100644
--- a/homeassistant/components/homewizard/number.py
+++ b/homeassistant/components/homewizard/number.py
@@ -29,7 +29,7 @@ class HWEnergyNumberEntity(HomeWizardEntity, NumberEntity):
 
     _attr_entity_category = EntityCategory.CONFIG
     _attr_icon = "mdi:lightbulb-on"
-    _attr_name = "Status light brightness"
+    _attr_translation_key = "status_light_brightness"
     _attr_native_unit_of_measurement = PERCENTAGE
 
     def __init__(
@@ -55,4 +55,5 @@ def native_value(self) -> float | None:
             or self.coordinator.data.state.brightness is None
         ):
             return None
-        return round(self.coordinator.data.state.brightness * (100 / 255))
+        brightness: float = self.coordinator.data.state.brightness
+        return round(brightness * (100 / 255))
diff --git a/homeassistant/components/homewizard/sensor.py b/homeassistant/components/homewizard/sensor.py
index 6462c281346267..d8cc72ce45eeae 100644
--- a/homeassistant/components/homewizard/sensor.py
+++ b/homeassistant/components/homewizard/sensor.py
@@ -38,6 +38,7 @@
 class HomeWizardEntityDescriptionMixin:
     """Mixin values for HomeWizard entities."""
 
+    has_fn: Callable[[Data], bool]
     value_fn: Callable[[Data], float | int | str | None]
 
 
@@ -47,40 +48,47 @@ class HomeWizardSensorEntityDescription(
 ):
     """Class describing HomeWizard sensor entities."""
 
+    enabled_fn: Callable[[Data], bool] = lambda data: True
+
 
 SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     HomeWizardSensorEntityDescription(
         key="smr_version",
-        name="DSMR version",
+        translation_key="dsmr_version",
         icon="mdi:counter",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.smr_version is not None,
         value_fn=lambda data: data.smr_version,
     ),
     HomeWizardSensorEntityDescription(
         key="meter_model",
-        name="Smart meter model",
+        translation_key="meter_model",
         icon="mdi:gauge",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.meter_model is not None,
         value_fn=lambda data: data.meter_model,
     ),
     HomeWizardSensorEntityDescription(
         key="unique_meter_id",
-        name="Smart meter identifier",
+        translation_key="unique_meter_id",
         icon="mdi:alphabetical-variant",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.unique_meter_id is not None,
         value_fn=lambda data: data.unique_meter_id,
     ),
     HomeWizardSensorEntityDescription(
         key="wifi_ssid",
-        name="Wi-Fi SSID",
+        translation_key="wifi_ssid",
         icon="mdi:wifi",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.wifi_ssid is not None,
         value_fn=lambda data: data.wifi_ssid,
     ),
     HomeWizardSensorEntityDescription(
         key="active_tariff",
-        name="Active tariff",
+        translation_key="active_tariff",
         icon="mdi:calendar-clock",
+        has_fn=lambda data: data.active_tariff is not None,
         value_fn=lambda data: (
             None if data.active_tariff is None else str(data.active_tariff)
         ),
@@ -89,290 +97,331 @@ class HomeWizardSensorEntityDescription(
     ),
     HomeWizardSensorEntityDescription(
         key="wifi_strength",
-        name="Wi-Fi strength",
+        translation_key="wifi_strength",
         icon="mdi:wifi",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.wifi_strength is not None,
         value_fn=lambda data: data.wifi_strength,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_kwh",
-        name="Total power import",
+        translation_key="total_power_import_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_kwh,
+        has_fn=lambda data: data.total_power_import_kwh is not None,
+        value_fn=lambda data: data.total_power_import_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t1_kwh",
-        name="Total power import T1",
+        translation_key="total_power_import_t1_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t1_kwh,
+        has_fn=lambda data: data.total_power_import_t1_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t1_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t2_kwh",
-        name="Total power import T2",
+        translation_key="total_power_import_t2_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t2_kwh,
+        has_fn=lambda data: data.total_power_import_t2_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t2_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t3_kwh",
-        name="Total power import T3",
+        translation_key="total_power_import_t3_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t3_kwh,
+        has_fn=lambda data: data.total_power_import_t3_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t3_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_import_t4_kwh",
-        name="Total power import T4",
+        translation_key="total_power_import_t4_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_import_t4_kwh,
+        has_fn=lambda data: data.total_power_import_t4_kwh is not None,
+        value_fn=lambda data: data.total_power_import_t4_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_kwh",
-        name="Total power export",
+        translation_key="total_power_export_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_kwh,
+        has_fn=lambda data: data.total_power_export_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_kwh != 0,
+        value_fn=lambda data: data.total_power_export_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t1_kwh",
-        name="Total power export T1",
+        translation_key="total_power_export_t1_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t1_kwh,
+        has_fn=lambda data: data.total_power_export_t1_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t1_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t1_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t2_kwh",
-        name="Total power export T2",
+        translation_key="total_power_export_t2_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t2_kwh,
+        has_fn=lambda data: data.total_power_export_t2_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t2_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t2_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t3_kwh",
-        name="Total power export T3",
+        translation_key="total_power_export_t3_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t3_kwh,
+        has_fn=lambda data: data.total_power_export_t3_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t3_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t3_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="total_power_export_t4_kwh",
-        name="Total power export T4",
+        translation_key="total_power_export_t4_kwh",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_power_export_t4_kwh,
+        has_fn=lambda data: data.total_power_export_t4_kwh is not None,
+        enabled_fn=lambda data: data.total_power_export_t4_kwh != 0,
+        value_fn=lambda data: data.total_power_export_t4_kwh or None,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_w",
-        name="Active power",
+        translation_key="active_power_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_w is not None,
         value_fn=lambda data: data.active_power_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l1_w",
-        name="Active power L1",
+        translation_key="active_power_l1_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l1_w is not None,
         value_fn=lambda data: data.active_power_l1_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l2_w",
-        name="Active power L2",
+        translation_key="active_power_l2_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l2_w is not None,
         value_fn=lambda data: data.active_power_l2_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_l3_w",
-        name="Active power L3",
+        translation_key="active_power_l3_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_power_l3_w is not None,
         value_fn=lambda data: data.active_power_l3_w,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l1_v",
-        name="Active voltage L1",
+        translation_key="active_voltage_l1_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l1_v is not None,
         value_fn=lambda data: data.active_voltage_l1_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l2_v",
-        name="Active voltage L2",
+        translation_key="active_voltage_l2_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l2_v is not None,
         value_fn=lambda data: data.active_voltage_l2_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_voltage_l3_v",
-        name="Active voltage L3",
+        translation_key="active_voltage_l3_v",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_voltage_l3_v is not None,
         value_fn=lambda data: data.active_voltage_l3_v,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l1_a",
-        name="Active current L1",
+        translation_key="active_current_l1_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l1_a is not None,
         value_fn=lambda data: data.active_current_l1_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l2_a",
-        name="Active current L2",
+        translation_key="active_current_l2_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l2_a is not None,
         value_fn=lambda data: data.active_current_l2_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_current_l3_a",
-        name="Active current L3",
+        translation_key="active_current_l3_a",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_current_l3_a is not None,
         value_fn=lambda data: data.active_current_l3_a,
     ),
     HomeWizardSensorEntityDescription(
         key="active_frequency_hz",
-        name="Active frequency",
+        translation_key="active_frequency_hz",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
+        has_fn=lambda data: data.active_frequency_hz is not None,
         value_fn=lambda data: data.active_frequency_hz,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l1_count",
-        name="Voltage sags detected L1",
+        translation_key="voltage_sag_l1_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_sag_l1_count is not None,
         value_fn=lambda data: data.voltage_sag_l1_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l2_count",
-        name="Voltage sags detected L2",
+        translation_key="voltage_sag_l2_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_sag_l2_count is not None,
         value_fn=lambda data: data.voltage_sag_l2_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_sag_l3_count",
-        name="Voltage sags detected L3",
+        translation_key="voltage_sag_l3_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_sag_l3_count is not None,
         value_fn=lambda data: data.voltage_sag_l3_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l1_count",
-        name="Voltage swells detected L1",
+        translation_key="voltage_swell_l1_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_swell_l1_count is not None,
         value_fn=lambda data: data.voltage_swell_l1_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l2_count",
-        name="Voltage swells detected L2",
+        translation_key="voltage_swell_l2_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_swell_l2_count is not None,
         value_fn=lambda data: data.voltage_swell_l2_count,
     ),
     HomeWizardSensorEntityDescription(
         key="voltage_swell_l3_count",
-        name="Voltage swells detected L3",
+        translation_key="voltage_swell_l3_count",
         icon="mdi:alert",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.voltage_swell_l3_count is not None,
         value_fn=lambda data: data.voltage_swell_l3_count,
     ),
     HomeWizardSensorEntityDescription(
         key="any_power_fail_count",
-        name="Power failures detected",
+        translation_key="any_power_fail_count",
         icon="mdi:transmission-tower-off",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.any_power_fail_count is not None,
         value_fn=lambda data: data.any_power_fail_count,
     ),
     HomeWizardSensorEntityDescription(
         key="long_power_fail_count",
-        name="Long power failures detected",
+        translation_key="long_power_fail_count",
         icon="mdi:transmission-tower-off",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.long_power_fail_count is not None,
         value_fn=lambda data: data.long_power_fail_count,
     ),
     HomeWizardSensorEntityDescription(
         key="active_power_average_w",
-        name="Active average demand",
+        translation_key="active_power_average_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
+        has_fn=lambda data: data.active_power_average_w is not None,
         value_fn=lambda data: data.active_power_average_w,
     ),
     HomeWizardSensorEntityDescription(
         key="monthly_power_peak_w",
-        name="Peak demand current month",
+        translation_key="monthly_power_peak_w",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
+        has_fn=lambda data: data.monthly_power_peak_w is not None,
         value_fn=lambda data: data.monthly_power_peak_w,
     ),
     HomeWizardSensorEntityDescription(
         key="total_gas_m3",
-        name="Total gas",
+        translation_key="total_gas_m3",
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         device_class=SensorDeviceClass.GAS,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_gas_m3,
+        has_fn=lambda data: data.total_gas_m3 is not None,
+        value_fn=lambda data: data.total_gas_m3 or None,
     ),
     HomeWizardSensorEntityDescription(
         key="gas_unique_id",
-        name="Gas meter identifier",
+        translation_key="gas_unique_id",
         icon="mdi:alphabetical-variant",
         entity_category=EntityCategory.DIAGNOSTIC,
+        has_fn=lambda data: data.gas_unique_id is not None,
         value_fn=lambda data: data.gas_unique_id,
     ),
     HomeWizardSensorEntityDescription(
         key="active_liter_lpm",
-        name="Active water usage",
+        translation_key="active_liter_lpm",
         native_unit_of_measurement="l/min",
         icon="mdi:water",
         state_class=SensorStateClass.MEASUREMENT,
+        has_fn=lambda data: data.active_liter_lpm is not None,
         value_fn=lambda data: data.active_liter_lpm,
     ),
     HomeWizardSensorEntityDescription(
         key="total_liter_m3",
-        name="Total water usage",
+        translation_key="total_liter_m3",
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         icon="mdi:gauge",
         device_class=SensorDeviceClass.WATER,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda data: data.total_liter_m3,
+        has_fn=lambda data: data.total_liter_m3 is not None,
+        value_fn=lambda data: data.total_liter_m3 or None,
     ),
 )
 
@@ -386,7 +435,7 @@ async def async_setup_entry(
     async_add_entities(
         HomeWizardSensorEntity(coordinator, entry, description)
         for description in SENSORS
-        if description.value_fn(coordinator.data.data) is not None
+        if description.has_fn(coordinator.data.data)
     )
 
 
@@ -405,20 +454,7 @@ def __init__(
         super().__init__(coordinator)
         self.entity_description = description
         self._attr_unique_id = f"{entry.unique_id}_{description.key}"
-
-        # Special case for export, not everyone has solar panels
-        # The chance that 'export' is non-zero when you have solar panels is nil
-        if (
-            description.key
-            in [
-                "total_power_export_kwh",
-                "total_power_export_t1_kwh",
-                "total_power_export_t2_kwh",
-                "total_power_export_t3_kwh",
-                "total_power_export_t4_kwh",
-            ]
-            and self.native_value == 0
-        ):
+        if not description.enabled_fn(self.coordinator.data.data):
             self._attr_entity_registry_enabled_default = False
 
     @property
diff --git a/homeassistant/components/homewizard/strings.json b/homeassistant/components/homewizard/strings.json
index 53eeafe99e1dd7..7bb4b16c710e3f 100644
--- a/homeassistant/components/homewizard/strings.json
+++ b/homeassistant/components/homewizard/strings.json
@@ -27,5 +27,145 @@
       "unknown_error": "[%key:common::config_flow::error::unknown%]",
       "reauth_successful": "Enabling API was successful"
     }
+  },
+  "entity": {
+    "number": {
+      "status_light_brightness": {
+        "name": "Status light brightness"
+      }
+    },
+    "sensor": {
+      "dsmr_version": {
+        "name": "DSMR version"
+      },
+      "meter_model": {
+        "name": "Smart meter model"
+      },
+      "unique_meter_id": {
+        "name": "Smart meter identifier"
+      },
+      "wifi_ssid": {
+        "name": "Wi-Fi SSID"
+      },
+      "active_tariff": {
+        "name": "Active tariff"
+      },
+      "wifi_strength": {
+        "name": "Wi-Fi strength"
+      },
+      "total_power_import_kwh": {
+        "name": "Total power import"
+      },
+      "total_power_import_t1_kwh": {
+        "name": "Total power import tariff 1"
+      },
+      "total_power_import_t2_kwh": {
+        "name": "Total power import tariff 2"
+      },
+      "total_power_import_t3_kwh": {
+        "name": "Total power import tariff 3"
+      },
+      "total_power_import_t4_kwh": {
+        "name": "Total power import tariff 4"
+      },
+      "total_power_export_kwh": {
+        "name": "Total power export"
+      },
+      "total_power_export_t1_kwh": {
+        "name": "Total power export tariff 1"
+      },
+      "total_power_export_t2_kwh": {
+        "name": "Total power export tariff 2"
+      },
+      "total_power_export_t3_kwh": {
+        "name": "Total power export tariff 3"
+      },
+      "total_power_export_t4_kwh": {
+        "name": "Total power export tariff 4"
+      },
+      "active_power_w": {
+        "name": "Active power"
+      },
+      "active_power_l1_w": {
+        "name": "Active power phase 1"
+      },
+      "active_power_l2_w": {
+        "name": "Active power phase 2"
+      },
+      "active_power_l3_w": {
+        "name": "Active power phase 3"
+      },
+      "active_voltage_l1_v": {
+        "name": "Active voltage phase 1"
+      },
+      "active_voltage_l2_v": {
+        "name": "Active voltage phase 2"
+      },
+      "active_voltage_l3_v": {
+        "name": "Active voltage phase 3"
+      },
+      "active_current_l1_a": {
+        "name": "Active current phase 1"
+      },
+      "active_current_l2_a": {
+        "name": "Active current phase 2"
+      },
+      "active_current_l3_a": {
+        "name": "Active current phase 3"
+      },
+      "active_frequency_hz": {
+        "name": "Active frequency"
+      },
+      "voltage_sag_l1_count": {
+        "name": "Voltage sags detected phase 1"
+      },
+      "voltage_sag_l2_count": {
+        "name": "Voltage sags detected phase 2"
+      },
+      "voltage_sag_l3_count": {
+        "name": "Voltage sags detected phase 3"
+      },
+      "voltage_swell_l1_count": {
+        "name": "Voltage swells detected phase 1"
+      },
+      "voltage_swell_l2_count": {
+        "name": "Voltage swells detected phase 2"
+      },
+      "voltage_swell_l3_count": {
+        "name": "Voltage swells detected phase 3"
+      },
+      "any_power_fail_count": {
+        "name": "Power failures detected"
+      },
+      "long_power_fail_count": {
+        "name": "Long power failures detected"
+      },
+      "active_power_average_w": {
+        "name": "Active average demand"
+      },
+      "monthly_power_peak_w": {
+        "name": "Peak demand current month"
+      },
+      "total_gas_m3": {
+        "name": "Total gas"
+      },
+      "gas_unique_id": {
+        "name": "Gas meter identifier"
+      },
+      "active_liter_lpm": {
+        "name": "Active water usage"
+      },
+      "total_liter_m3": {
+        "name": "Total water usage"
+      }
+    },
+    "switch": {
+      "switch_lock": {
+        "name": "Switch lock"
+      },
+      "cloud_connection": {
+        "name": "Cloud connection"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/homewizard/switch.py b/homeassistant/components/homewizard/switch.py
index 1edb9e1e6056d5..cddcabc841ec2b 100644
--- a/homeassistant/components/homewizard/switch.py
+++ b/homeassistant/components/homewizard/switch.py
@@ -45,6 +45,7 @@ class HomeWizardSwitchEntityDescription(
 SWITCHES = [
     HomeWizardSwitchEntityDescription(
         key="power_on",
+        name=None,
         device_class=SwitchDeviceClass.OUTLET,
         create_fn=lambda coordinator: coordinator.supports_state(),
         available_fn=lambda data: data.state is not None and not data.state.switch_lock,
@@ -53,7 +54,7 @@ class HomeWizardSwitchEntityDescription(
     ),
     HomeWizardSwitchEntityDescription(
         key="switch_lock",
-        name="Switch lock",
+        translation_key="switch_lock",
         entity_category=EntityCategory.CONFIG,
         icon="mdi:lock",
         icon_off="mdi:lock-open",
@@ -64,7 +65,7 @@ class HomeWizardSwitchEntityDescription(
     ),
     HomeWizardSwitchEntityDescription(
         key="cloud_connection",
-        name="Cloud connection",
+        translation_key="cloud_connection",
         entity_category=EntityCategory.CONFIG,
         icon="mdi:cloud",
         icon_off="mdi:cloud-off-outline",
diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index dd33da562978b0..db31baa53a6cdf 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -101,6 +101,7 @@ class HoneywellUSThermostat(ClimateEntity):
     """Representation of a Honeywell US Thermostat."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/honeywell/manifest.json b/homeassistant/components/honeywell/manifest.json
index 8f3b66ddeacb8f..16b07e91446553 100644
--- a/homeassistant/components/honeywell/manifest.json
+++ b/homeassistant/components/honeywell/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/honeywell",
   "iot_class": "cloud_polling",
   "loggers": ["somecomfort"],
-  "requirements": ["aiosomecomfort==0.0.14"]
+  "requirements": ["AIOSomecomfort==0.0.14"]
 }
diff --git a/homeassistant/components/honeywell/sensor.py b/homeassistant/components/honeywell/sensor.py
index 4d6ea4d9528eb4..ae4ede2a079b23 100644
--- a/homeassistant/components/honeywell/sensor.py
+++ b/homeassistant/components/honeywell/sensor.py
@@ -48,7 +48,7 @@ class HoneywellSensorEntityDescription(
 SENSOR_TYPES: tuple[HoneywellSensorEntityDescription, ...] = (
     HoneywellSensorEntityDescription(
         key=TEMPERATURE_STATUS_KEY,
-        name="Outdoor temperature",
+        translation_key="outdoor_temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.outdoor_temperature,
@@ -56,7 +56,7 @@ class HoneywellSensorEntityDescription(
     ),
     HoneywellSensorEntityDescription(
         key=HUMIDITY_STATUS_KEY,
-        name="Outdoor humidity",
+        translation_key="outdoor_humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.outdoor_humidity,
diff --git a/homeassistant/components/honeywell/strings.json b/homeassistant/components/honeywell/strings.json
index 73986920b8a361..b0cd2a52c1be4d 100644
--- a/homeassistant/components/honeywell/strings.json
+++ b/homeassistant/components/honeywell/strings.json
@@ -31,5 +31,15 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "outdoor_temperature": {
+        "name": "Outdoor temperature"
+      },
+      "outdoor_humidity": {
+        "name": "Outdoor humidity"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index fda8717c3ddead..f559b09a1ff992 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -18,6 +18,11 @@
 from aiohttp.web_exceptions import HTTPMovedPermanently, HTTPRedirection
 from aiohttp.web_log import AccessLogger
 from aiohttp.web_protocol import RequestHandler
+from aiohttp.web_urldispatcher import (
+    AbstractResource,
+    UrlDispatcher,
+    UrlMappingMatchInfo,
+)
 from cryptography import x509
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -303,6 +308,10 @@ def __init__(
                 "max_field_size": MAX_LINE_SIZE,
             },
         )
+        # By default aiohttp does a linear search for routing rules,
+        # we have a lot of routes, so use a dict lookup with a fallback
+        # to the linear search.
+        self.app._router = FastUrlDispatcher()  # pylint: disable=protected-access
         self.hass = hass
         self.ssl_certificate = ssl_certificate
         self.ssl_peer_certificate = ssl_peer_certificate
@@ -565,3 +574,45 @@ async def start_http_server_and_save_config(
         ]
 
     store.async_delay_save(lambda: conf, SAVE_DELAY)
+
+
+class FastUrlDispatcher(UrlDispatcher):
+    """UrlDispatcher that uses a dict lookup for resolving."""
+
+    def __init__(self) -> None:
+        """Initialize the dispatcher."""
+        super().__init__()
+        self._resource_index: dict[str, list[AbstractResource]] = {}
+
+    def register_resource(self, resource: AbstractResource) -> None:
+        """Register a resource."""
+        super().register_resource(resource)
+        canonical = resource.canonical
+        if "{" in canonical:  # strip at the first { to allow for variables
+            canonical = canonical.split("{")[0].rstrip("/")
+        # There may be multiple resources for a canonical path
+        # so we use a list to avoid falling back to a full linear search
+        self._resource_index.setdefault(canonical, []).append(resource)
+
+    async def resolve(self, request: web.Request) -> UrlMappingMatchInfo:
+        """Resolve a request."""
+        url_parts = request.rel_url.raw_parts
+        resource_index = self._resource_index
+
+        # Walk the url parts looking for candidates
+        for i in range(len(url_parts), 1, -1):
+            url_part = "/" + "/".join(url_parts[1:i])
+            if (resource_candidates := resource_index.get(url_part)) is not None:
+                for candidate in resource_candidates:
+                    if (
+                        match_dict := (await candidate.resolve(request))[0]
+                    ) is not None:
+                        return match_dict
+        # Next try the index view if we don't have a match
+        if (index_view_candidates := resource_index.get("/")) is not None:
+            for candidate in index_view_candidates:
+                if (match_dict := (await candidate.resolve(request))[0]) is not None:
+                    return match_dict
+
+        # Finally, fallback to the linear search
+        return await super().resolve(request)
diff --git a/homeassistant/components/http/manifest.json b/homeassistant/components/http/manifest.json
index bce425adbdb6e9..dec1b9485b6921 100644
--- a/homeassistant/components/http/manifest.json
+++ b/homeassistant/components/http/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["aiohttp_cors==0.7.0"]
+  "requirements": ["aiohttp-cors==0.7.0"]
 }
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index f6c3b69ddeb614..6d7b0b9bb1158f 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -8,7 +8,6 @@
 
 from huawei_lte_api.Client import Client
 from huawei_lte_api.Connection import Connection
-from huawei_lte_api.Session import GetResponseType
 from huawei_lte_api.exceptions import (
     LoginErrorPasswordWrongException,
     LoginErrorUsernamePasswordOverrunException,
@@ -16,6 +15,7 @@
     LoginErrorUsernameWrongException,
     ResponseErrorException,
 )
+from huawei_lte_api.Session import GetResponseType
 from requests.exceptions import Timeout
 from url_normalize import url_normalize
 import voluptuous as vol
diff --git a/homeassistant/components/huawei_lte/sensor.py b/homeassistant/components/huawei_lte/sensor.py
index f63cc4aac397d1..133b569c75159e 100644
--- a/homeassistant/components/huawei_lte/sensor.py
+++ b/homeassistant/components/huawei_lte/sensor.py
@@ -117,6 +117,10 @@ class HuaweiSensorGroup:
 class HuaweiSensorEntityDescription(SensorEntityDescription):
     """Class describing Huawei LTE sensor entities."""
 
+    # HuaweiLteSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     format_fn: Callable[[str], tuple[StateType, str | None]] = format_default
     icon_fn: Callable[[StateType], str] | None = None
     device_class_fn: Callable[[StateType], SensorDeviceClass | None] | None = None
diff --git a/homeassistant/components/huisbaasje/sensor.py b/homeassistant/components/huisbaasje/sensor.py
index 369c6eba0750ff..8bc86d423a12cf 100644
--- a/homeassistant/components/huisbaasje/sensor.py
+++ b/homeassistant/components/huisbaasje/sensor.py
@@ -58,7 +58,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
 
 SENSORS_INFO = [
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power",
+        translation_key="current_power",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -67,7 +67,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power In Peak",
+        translation_key="current_power_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -76,7 +76,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power In Off Peak",
+        translation_key="current_power_off_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -85,7 +85,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power Out Peak",
+        translation_key="current_power_out_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -94,7 +94,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Power Out Off Peak",
+        translation_key="current_power_out_off_peak",
         sensor_type=SENSOR_TYPE_RATE,
         device_class=SensorDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
@@ -103,7 +103,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Consumption Peak Today",
+        translation_key="energy_consumption_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_IN,
@@ -113,7 +113,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Consumption Off Peak Today",
+        translation_key="energy_consumption_off_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_IN_LOW,
@@ -123,7 +123,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Production Peak Today",
+        translation_key="energy_production_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_OUT,
@@ -133,7 +133,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Production Off Peak Today",
+        translation_key="energy_production_off_peak_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         key=SOURCE_TYPE_ELECTRICITY_OUT_LOW,
@@ -143,7 +143,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy Today",
+        translation_key="energy_today",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -153,7 +153,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Week",
+        translation_key="energy_week",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -163,7 +163,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Month",
+        translation_key="energy_month",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -173,7 +173,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Energy This Year",
+        translation_key="energy_year",
         device_class=SensorDeviceClass.ENERGY,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -183,7 +183,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         icon="mdi:lightning-bolt",
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Current Gas",
+        translation_key="current_gas",
         native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
         sensor_type=SENSOR_TYPE_RATE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -192,7 +192,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas Today",
+        translation_key="gas_today",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -202,7 +202,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Week",
+        translation_key="gas_week",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -212,7 +212,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Month",
+        translation_key="gas_month",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -222,7 +222,7 @@ class HuisbaasjeSensorEntityDescription(SensorEntityDescription):
         precision=1,
     ),
     HuisbaasjeSensorEntityDescription(
-        name="Huisbaasje Gas This Year",
+        translation_key="gas_year",
         device_class=SensorDeviceClass.GAS,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         key=SOURCE_TYPE_GAS,
@@ -257,6 +257,7 @@ class HuisbaasjeSensor(
     """Defines a Huisbaasje sensor."""
 
     entity_description: HuisbaasjeSensorEntityDescription
+    _attr_has_entity_name = True
 
     def __init__(
         self,
diff --git a/homeassistant/components/huisbaasje/strings.json b/homeassistant/components/huisbaasje/strings.json
index 169b9a0e901c18..de112f7519f733 100644
--- a/homeassistant/components/huisbaasje/strings.json
+++ b/homeassistant/components/huisbaasje/strings.json
@@ -16,5 +16,63 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_power": {
+        "name": "Current power"
+      },
+      "current_power_peak": {
+        "name": "Current power in peak"
+      },
+      "current_power_off_peak": {
+        "name": "Current power in off peak"
+      },
+      "current_power_out_peak": {
+        "name": "Current power out peak"
+      },
+      "current_power_out_off_peak": {
+        "name": "Current power out off peak"
+      },
+      "energy_consumption_peak_today": {
+        "name": "Energy consumption peak today"
+      },
+      "energy_consumption_off_peak_today": {
+        "name": "Energy consumption off peak today"
+      },
+      "energy_production_peak_today": {
+        "name": "Energy production peak today"
+      },
+      "energy_production_off_peak_today": {
+        "name": "Energy production off peak today"
+      },
+      "energy_today": {
+        "name": "Energy today"
+      },
+      "energy_week": {
+        "name": "Energy this week"
+      },
+      "energy_month": {
+        "name": "Energy this month"
+      },
+      "energy_year": {
+        "name": "Energy this year"
+      },
+      "current_gas": {
+        "name": "Current gas"
+      },
+      "gas_today": {
+        "name": "Gas today"
+      },
+      "gas_week": {
+        "name": "Gas this week"
+      },
+      "gas_month": {
+        "name": "Gas this month"
+      },
+      "gas_year": {
+        "name": "Gas this year"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/humidifier/__init__.py b/homeassistant/components/humidifier/__init__.py
index 0bc7e242d55cbd..79effa6f0c2d9d 100644
--- a/homeassistant/components/humidifier/__init__.py
+++ b/homeassistant/components/humidifier/__init__.py
@@ -29,7 +29,9 @@
 from homeassistant.loader import bind_hass
 
 from .const import (  # noqa: F401
+    ATTR_ACTION,
     ATTR_AVAILABLE_MODES,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MAX_HUMIDITY,
     ATTR_MIN_HUMIDITY,
@@ -44,6 +46,7 @@
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
     SUPPORT_MODES,
+    HumidifierAction,
     HumidifierEntityFeature,
 )
 
@@ -132,7 +135,9 @@ class HumidifierEntity(ToggleEntity):
     """Base class for humidifier entities."""
 
     entity_description: HumidifierEntityDescription
+    _attr_action: HumidifierAction | None = None
     _attr_available_modes: list[str] | None
+    _attr_current_humidity: int | None = None
     _attr_device_class: HumidifierDeviceClass | None
     _attr_max_humidity: int = DEFAULT_MAX_HUMIDITY
     _attr_min_humidity: int = DEFAULT_MIN_HUMIDITY
@@ -168,6 +173,12 @@ def state_attributes(self) -> dict[str, Any]:
         """Return the optional state attributes."""
         data: dict[str, int | str | None] = {}
 
+        if self.action is not None:
+            data[ATTR_ACTION] = self.action if self.is_on else HumidifierAction.OFF
+
+        if self.current_humidity is not None:
+            data[ATTR_CURRENT_HUMIDITY] = self.current_humidity
+
         if self.target_humidity is not None:
             data[ATTR_HUMIDITY] = self.target_humidity
 
@@ -176,6 +187,16 @@ def state_attributes(self) -> dict[str, Any]:
 
         return data
 
+    @property
+    def action(self) -> HumidifierAction | None:
+        """Return the current action."""
+        return self._attr_action
+
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        return self._attr_current_humidity
+
     @property
     def target_humidity(self) -> int | None:
         """Return the humidity we try to reach."""
diff --git a/homeassistant/components/humidifier/const.py b/homeassistant/components/humidifier/const.py
index 1f802f7fa36baf..35601cf2b1f04e 100644
--- a/homeassistant/components/humidifier/const.py
+++ b/homeassistant/components/humidifier/const.py
@@ -1,6 +1,8 @@
 """Provides the constants needed for component."""
 from enum import IntFlag
 
+from homeassistant.backports.enum import StrEnum
+
 MODE_NORMAL = "normal"
 MODE_ECO = "eco"
 MODE_AWAY = "away"
@@ -11,7 +13,19 @@
 MODE_AUTO = "auto"
 MODE_BABY = "baby"
 
+
+class HumidifierAction(StrEnum):
+    """Actions for humidifier devices."""
+
+    HUMIDIFYING = "humidifying"
+    DRYING = "drying"
+    IDLE = "idle"
+    OFF = "off"
+
+
+ATTR_ACTION = "action"
 ATTR_AVAILABLE_MODES = "available_modes"
+ATTR_CURRENT_HUMIDITY = "current_humidity"
 ATTR_HUMIDITY = "humidity"
 ATTR_MAX_HUMIDITY = "max_humidity"
 ATTR_MIN_HUMIDITY = "min_humidity"
diff --git a/homeassistant/components/humidifier/device_action.py b/homeassistant/components/humidifier/device_action.py
index 1c027ba22e62e9..f1f25101e93342 100644
--- a/homeassistant/components/humidifier/device_action.py
+++ b/homeassistant/components/humidifier/device_action.py
@@ -3,7 +3,11 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
@@ -26,7 +30,7 @@
 SET_HUMIDITY_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_humidity",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(const.ATTR_HUMIDITY): vol.Coerce(int),
     }
 )
@@ -34,14 +38,21 @@
 SET_MODE_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): "set_mode",
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_MODE): cv.string,
     }
 )
 
 ONOFF_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
 
-ACTION_SCHEMA = vol.Any(SET_HUMIDITY_SCHEMA, SET_MODE_SCHEMA, ONOFF_SCHEMA)
+_ACTION_SCHEMA = vol.Any(SET_HUMIDITY_SCHEMA, SET_MODE_SCHEMA, ONOFF_SCHEMA)
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_get_actions(
@@ -61,7 +72,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
         actions.append({**base_action, CONF_TYPE: "set_humidity"})
 
@@ -108,9 +119,11 @@ async def async_get_action_capabilities(
         fields[vol.Required(const.ATTR_HUMIDITY)] = vol.Coerce(int)
     elif action_type == "set_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             available_modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_AVAILABLE_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_AVAILABLE_MODES) or []
             )
         except HomeAssistantError:
             available_modes = []
diff --git a/homeassistant/components/humidifier/device_condition.py b/homeassistant/components/humidifier/device_condition.py
index 05812e35a36281..c2c0378a746588 100644
--- a/homeassistant/components/humidifier/device_condition.py
+++ b/homeassistant/components/humidifier/device_condition.py
@@ -3,7 +3,10 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
@@ -32,7 +35,7 @@
 
 MODE_CONDITION = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): "is_mode",
         vol.Required(ATTR_MODE): str,
     }
@@ -61,7 +64,7 @@ async def async_get_conditions(
                     CONF_CONDITION: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "is_mode",
                 }
             )
@@ -79,11 +82,15 @@ def async_condition_from_config(
     else:
         return toggle_entity.async_condition_from_config(hass, config)
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        state = hass.states.get(config[ATTR_ENTITY_ID])
         return (
-            state is not None and state.attributes.get(attribute) == config[attribute]
+            entity_id is not None
+            and (state := hass.states.get(entity_id)) is not None
+            and state.attributes.get(attribute) == config[attribute]
         )
 
     return test_is_state
@@ -99,9 +106,11 @@ async def async_get_condition_capabilities(
 
     if condition_type == "is_mode":
         try:
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
             modes = (
-                get_capability(hass, config[ATTR_ENTITY_ID], const.ATTR_AVAILABLE_MODES)
-                or []
+                get_capability(hass, entry.entity_id, const.ATTR_AVAILABLE_MODES) or []
             )
         except HomeAssistantError:
             modes = []
diff --git a/homeassistant/components/humidifier/device_trigger.py b/homeassistant/components/humidifier/device_trigger.py
index 5fbb248a8bc901..0d689a35318f65 100644
--- a/homeassistant/components/humidifier/device_trigger.py
+++ b/homeassistant/components/humidifier/device_trigger.py
@@ -26,14 +26,27 @@
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
-from . import DOMAIN
+from . import ATTR_CURRENT_HUMIDITY, DOMAIN
 
 # mypy: disallow-any-generics
 
+CURRENT_TRIGGER_SCHEMA = vol.All(
+    DEVICE_TRIGGER_BASE_SCHEMA.extend(
+        {
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
+            vol.Required(CONF_TYPE): "current_humidity_changed",
+            vol.Optional(CONF_BELOW): vol.Any(vol.Coerce(float)),
+            vol.Optional(CONF_ABOVE): vol.Any(vol.Coerce(float)),
+            vol.Optional(CONF_FOR): cv.positive_time_period_dict,
+        }
+    ),
+    cv.has_at_least_one_key(CONF_BELOW, CONF_ABOVE),
+)
+
 HUMIDIFIER_TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): "target_humidity_changed",
             vol.Optional(CONF_BELOW): vol.Any(vol.Coerce(int)),
             vol.Optional(CONF_ABOVE): vol.Any(vol.Coerce(int)),
@@ -45,6 +58,7 @@
 
 TRIGGER_SCHEMA = vol.All(
     vol.Any(
+        CURRENT_TRIGGER_SCHEMA,
         HUMIDIFIER_TRIGGER_SCHEMA,
         toggle_entity.TRIGGER_SCHEMA,
     ),
@@ -64,15 +78,31 @@ async def async_get_triggers(
         if entry.domain != DOMAIN:
             continue
 
+        state = hass.states.get(entry.entity_id)
+
+        # Add triggers for each entity that belongs to this integration
+        base_trigger = {
+            CONF_PLATFORM: "device",
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DOMAIN,
+            CONF_ENTITY_ID: entry.id,
+        }
+
         triggers.append(
             {
-                CONF_PLATFORM: "device",
-                CONF_DEVICE_ID: device_id,
-                CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                **base_trigger,
                 CONF_TYPE: "target_humidity_changed",
             }
         )
+
+        if state and ATTR_CURRENT_HUMIDITY in state.attributes:
+            triggers.append(
+                {
+                    **base_trigger,
+                    CONF_TYPE: "current_humidity_changed",
+                }
+            )
+
     return triggers
 
 
@@ -83,7 +113,10 @@ async def async_attach_trigger(
     trigger_info: TriggerInfo,
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
-    if config[CONF_TYPE] == "target_humidity_changed":
+    if (trigger_type := config[CONF_TYPE]) in {
+        "current_humidity_changed",
+        "target_humidity_changed",
+    }:
         numeric_state_config = {
             numeric_state_trigger.CONF_PLATFORM: "numeric_state",
             numeric_state_trigger.CONF_ENTITY_ID: config[CONF_ENTITY_ID],
@@ -91,6 +124,14 @@ async def async_attach_trigger(
                 "{{ state.attributes.humidity }}"
             ),
         }
+        if trigger_type == "target_humidity_changed":
+            numeric_state_config[
+                numeric_state_trigger.CONF_VALUE_TEMPLATE
+            ] = "{{ state.attributes.humidity }}"
+        else:  # trigger_type == "current_humidity_changed"
+            numeric_state_config[
+                numeric_state_trigger.CONF_VALUE_TEMPLATE
+            ] = "{{ state.attributes.current_humidity }}"
 
         if CONF_ABOVE in config:
             numeric_state_config[CONF_ABOVE] = config[CONF_ABOVE]
@@ -115,7 +156,7 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
-    if config[CONF_TYPE] == "target_humidity_changed":
+    if config[CONF_TYPE] in {"current_humidity_changed", "target_humidity_changed"}:
         return {
             "extra_fields": vol.Schema(
                 {
diff --git a/homeassistant/components/humidifier/strings.json b/homeassistant/components/humidifier/strings.json
index afaa05df462cbd..f06bf7ccd598a7 100644
--- a/homeassistant/components/humidifier/strings.json
+++ b/homeassistant/components/humidifier/strings.json
@@ -28,9 +28,21 @@
         "on": "[%key:common::state::on%]"
       },
       "state_attributes": {
+        "action": {
+          "name": "Action",
+          "state": {
+            "humidifying": "Humidifying",
+            "drying": "Drying",
+            "idle": "Idle",
+            "off": "[%key:common::state::off%]"
+          }
+        },
         "available_modes": {
           "name": "Available modes"
         },
+        "current_humidity": {
+          "name": "Current humidity"
+        },
         "humidity": {
           "name": "Target humidity"
         },
diff --git a/homeassistant/components/hunterdouglas_powerview/sensor.py b/homeassistant/components/hunterdouglas_powerview/sensor.py
index 85192e0b7e40e0..b36457324e1da8 100644
--- a/homeassistant/components/hunterdouglas_powerview/sensor.py
+++ b/homeassistant/components/hunterdouglas_powerview/sensor.py
@@ -70,7 +70,7 @@ class PowerviewSensorDescription(
     PowerviewSensorDescription(
         key="signal",
         name="Signal",
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        icon="mdi:signal",
         native_unit_of_measurement=PERCENTAGE,
         native_value_fn=lambda shade: round(
             shade.raw_data[ATTR_SIGNAL_STRENGTH] / ATTR_SIGNAL_STRENGTH_MAX * 100
diff --git a/homeassistant/components/hvv_departures/binary_sensor.py b/homeassistant/components/hvv_departures/binary_sensor.py
index 36b1b5f927fa14..a50b2c4d09b65d 100644
--- a/homeassistant/components/hvv_departures/binary_sensor.py
+++ b/homeassistant/components/hvv_departures/binary_sensor.py
@@ -88,7 +88,7 @@ async def async_update_data():
         so entities can quickly look up their data.
         """
 
-        payload = {"station": station}
+        payload = {"station": {"id": station["id"], "type": station["type"]}}
 
         try:
             async with async_timeout.timeout(10):
diff --git a/homeassistant/components/hvv_departures/manifest.json b/homeassistant/components/hvv_departures/manifest.json
index c6d3060b4ee7b1..c18777613e81a5 100644
--- a/homeassistant/components/hvv_departures/manifest.json
+++ b/homeassistant/components/hvv_departures/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hvv_departures",
   "iot_class": "cloud_polling",
   "loggers": ["pygti"],
-  "requirements": ["pygti==0.9.3"]
+  "requirements": ["pygti==0.9.4"]
 }
diff --git a/homeassistant/components/hvv_departures/sensor.py b/homeassistant/components/hvv_departures/sensor.py
index dfc69e5171011d..c58ae6e3931420 100644
--- a/homeassistant/components/hvv_departures/sensor.py
+++ b/homeassistant/components/hvv_departures/sensor.py
@@ -58,16 +58,16 @@ class HVVDepartureSensor(SensorEntity):
     _attr_attribution = ATTRIBUTION
     _attr_device_class = SensorDeviceClass.TIMESTAMP
     _attr_icon = ICON
+    _attr_translation_key = "departures"
+    _attr_has_entity_name = True
+    _attr_available = False
 
     def __init__(self, hass, config_entry, session, hub):
         """Initialize."""
         self.config_entry = config_entry
         self.station_name = self.config_entry.data[CONF_STATION]["name"]
-        self._attr_extra_state_attributes = {}
-        self._attr_available = False
-        self._attr_has_entity_name = True
-        self._attr_name = "Departures"
         self._last_error = None
+        self._attr_extra_state_attributes = {}
 
         self.gti = hub.gti
 
@@ -84,8 +84,10 @@ async def async_update(self, **kwargs: Any) -> None:
 
         departure_time_tz_berlin = departure_time.astimezone(BERLIN_TIME_ZONE)
 
+        station = self.config_entry.data[CONF_STATION]
+
         payload = {
-            "station": self.config_entry.data[CONF_STATION],
+            "station": {"id": station["id"], "type": station["type"]},
             "time": {
                 "date": departure_time_tz_berlin.strftime("%d.%m.%Y"),
                 "time": departure_time_tz_berlin.strftime("%H:%M"),
diff --git a/homeassistant/components/hvv_departures/strings.json b/homeassistant/components/hvv_departures/strings.json
index 90b53bc0e6443f..8f9c06f53fbb9b 100644
--- a/homeassistant/components/hvv_departures/strings.json
+++ b/homeassistant/components/hvv_departures/strings.json
@@ -43,5 +43,12 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "departures": {
+        "name": "Departures"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/hydrawise/__init__.py b/homeassistant/components/hydrawise/__init__.py
index ba561a14f82de8..e09cabb74fc7fc 100644
--- a/homeassistant/components/hydrawise/__init__.py
+++ b/homeassistant/components/hydrawise/__init__.py
@@ -1,5 +1,6 @@
 """Support for Hydrawise cloud."""
 
+
 from hydrawiser.core import Hydrawiser
 from requests.exceptions import ConnectTimeout, HTTPError
 import voluptuous as vol
@@ -8,19 +9,10 @@
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
-from .const import (
-    DATA_HYDRAWISE,
-    DOMAIN,
-    LOGGER,
-    NOTIFICATION_ID,
-    NOTIFICATION_TITLE,
-    SCAN_INTERVAL,
-    SIGNAL_UPDATE_HYDRAWISE,
-)
+from .const import DOMAIN, LOGGER, NOTIFICATION_ID, NOTIFICATION_TITLE, SCAN_INTERVAL
+from .coordinator import HydrawiseDataUpdateCoordinator
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -35,40 +27,36 @@
 )
 
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Hunter Hydrawise component."""
     conf = config[DOMAIN]
     access_token = conf[CONF_ACCESS_TOKEN]
     scan_interval = conf.get(CONF_SCAN_INTERVAL)
 
     try:
-        hydrawise = Hydrawiser(user_token=access_token)
-        hass.data[DATA_HYDRAWISE] = HydrawiseHub(hydrawise)
+        hydrawise = await hass.async_add_executor_job(Hydrawiser, access_token)
     except (ConnectTimeout, HTTPError) as ex:
         LOGGER.error("Unable to connect to Hydrawise cloud service: %s", str(ex))
-        persistent_notification.create(
-            hass,
-            f"Error: {ex}<br />You will need to restart hass after fixing.",
-            title=NOTIFICATION_TITLE,
-            notification_id=NOTIFICATION_ID,
-        )
+        _show_failure_notification(hass, str(ex))
         return False
 
-    def hub_refresh(event_time):
-        """Call Hydrawise hub to refresh information."""
-        LOGGER.debug("Updating Hydrawise Hub component")
-        hass.data[DATA_HYDRAWISE].data.update_controller_info()
-        dispatcher_send(hass, SIGNAL_UPDATE_HYDRAWISE)
+    if not hydrawise.current_controller:
+        LOGGER.error("Failed to fetch Hydrawise data")
+        _show_failure_notification(hass, "Failed to fetch Hydrawise data.")
+        return False
 
-    # Call the Hydrawise API to refresh updates
-    track_time_interval(hass, hub_refresh, scan_interval)
+    hass.data[DOMAIN] = HydrawiseDataUpdateCoordinator(hass, hydrawise, scan_interval)
 
-    return True
+    # NOTE: We don't need to call async_config_entry_first_refresh() because
+    # data is fetched when the Hydrawiser object is instantiated.
 
+    return True
 
-class HydrawiseHub:
-    """Representation of a base Hydrawise device."""
 
-    def __init__(self, data):
-        """Initialize the entity."""
-        self.data = data
+def _show_failure_notification(hass: HomeAssistant, error: str) -> None:
+    persistent_notification.create(
+        hass,
+        f"Error: {error}<br />You will need to restart hass after fixing.",
+        title=NOTIFICATION_TITLE,
+        notification_id=NOTIFICATION_ID,
+    )
diff --git a/homeassistant/components/hydrawise/binary_sensor.py b/homeassistant/components/hydrawise/binary_sensor.py
index 93594d7143631f..2986bbb170eafd 100644
--- a/homeassistant/components/hydrawise/binary_sensor.py
+++ b/homeassistant/components/hydrawise/binary_sensor.py
@@ -1,6 +1,7 @@
 """Support for Hydrawise sprinkler binary sensors."""
 from __future__ import annotations
 
+from hydrawiser.core import Hydrawiser
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -10,12 +11,13 @@
     BinarySensorEntityDescription,
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import DATA_HYDRAWISE, LOGGER
+from .const import DOMAIN, LOGGER
+from .coordinator import HydrawiseDataUpdateCoordinator
 from .entity import HydrawiseEntity
 
 BINARY_SENSOR_STATUS = BinarySensorEntityDescription(
@@ -52,24 +54,30 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up a sensor for a Hydrawise device."""
-    hydrawise = hass.data[DATA_HYDRAWISE].data
+    coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN]
+    hydrawise: Hydrawiser = coordinator.api
     monitored_conditions = config[CONF_MONITORED_CONDITIONS]
 
     entities = []
     if BINARY_SENSOR_STATUS.key in monitored_conditions:
         entities.append(
-            HydrawiseBinarySensor(hydrawise.current_controller, BINARY_SENSOR_STATUS)
+            HydrawiseBinarySensor(
+                data=hydrawise.current_controller,
+                coordinator=coordinator,
+                description=BINARY_SENSOR_STATUS,
+            )
         )
 
     # create a sensor for each zone
-    entities.extend(
-        [
-            HydrawiseBinarySensor(zone, description)
-            for zone in hydrawise.relays
-            for description in BINARY_SENSOR_TYPES
-            if description.key in monitored_conditions
-        ]
-    )
+    for zone in hydrawise.relays:
+        for description in BINARY_SENSOR_TYPES:
+            if description.key not in monitored_conditions:
+                continue
+            entities.append(
+                HydrawiseBinarySensor(
+                    data=zone, coordinator=coordinator, description=description
+                )
+            )
 
     add_entities(entities, True)
 
@@ -77,12 +85,13 @@ def setup_platform(
 class HydrawiseBinarySensor(HydrawiseEntity, BinarySensorEntity):
     """A sensor implementation for Hydrawise device."""
 
-    def update(self) -> None:
+    @callback
+    def _handle_coordinator_update(self) -> None:
         """Get the latest data and updates the state."""
         LOGGER.debug("Updating Hydrawise binary sensor: %s", self.name)
-        mydata = self.hass.data[DATA_HYDRAWISE].data
         if self.entity_description.key == "status":
-            self._attr_is_on = mydata.status == "All good!"
+            self._attr_is_on = self.coordinator.api.status == "All good!"
         elif self.entity_description.key == "is_watering":
-            relay_data = mydata.relays[self.data["relay"] - 1]
+            relay_data = self.coordinator.api.relays[self.data["relay"] - 1]
             self._attr_is_on = relay_data["timestr"] == "Now"
+        super()._handle_coordinator_update()
diff --git a/homeassistant/components/hydrawise/const.py b/homeassistant/components/hydrawise/const.py
index 5a046530f014c6..515fdaec2b1524 100644
--- a/homeassistant/components/hydrawise/const.py
+++ b/homeassistant/components/hydrawise/const.py
@@ -11,7 +11,6 @@
 NOTIFICATION_ID = "hydrawise_notification"
 NOTIFICATION_TITLE = "Hydrawise Setup"
 
-DATA_HYDRAWISE = "hydrawise"
 DOMAIN = "hydrawise"
 DEFAULT_WATERING_TIME = 15
 
diff --git a/homeassistant/components/hydrawise/coordinator.py b/homeassistant/components/hydrawise/coordinator.py
new file mode 100644
index 00000000000000..ea2e2dd2c4c017
--- /dev/null
+++ b/homeassistant/components/hydrawise/coordinator.py
@@ -0,0 +1,29 @@
+"""DataUpdateCoordinator for the Hydrawise integration."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+
+from hydrawiser.core import Hydrawiser
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN, LOGGER
+
+
+class HydrawiseDataUpdateCoordinator(DataUpdateCoordinator[None]):
+    """The Hydrawise Data Update Coordinator."""
+
+    def __init__(
+        self, hass: HomeAssistant, api: Hydrawiser, scan_interval: timedelta
+    ) -> None:
+        """Initialize HydrawiseDataUpdateCoordinator."""
+        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=scan_interval)
+        self.api = api
+
+    async def _async_update_data(self) -> None:
+        """Fetch the latest data from Hydrawise."""
+        result = await self.hass.async_add_executor_job(self.api.update_controller_info)
+        if not result:
+            raise UpdateFailed("Failed to refresh Hydrawise data")
diff --git a/homeassistant/components/hydrawise/entity.py b/homeassistant/components/hydrawise/entity.py
index 5c54c1ee58086b..98b66069913b85 100644
--- a/homeassistant/components/hydrawise/entity.py
+++ b/homeassistant/components/hydrawise/entity.py
@@ -1,37 +1,33 @@
 """Base classes for Hydrawise entities."""
+from __future__ import annotations
 
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity, EntityDescription
+from typing import Any
 
-from .const import SIGNAL_UPDATE_HYDRAWISE
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from .coordinator import HydrawiseDataUpdateCoordinator
 
-class HydrawiseEntity(Entity):
+
+class HydrawiseEntity(CoordinatorEntity[HydrawiseDataUpdateCoordinator]):
     """Entity class for Hydrawise devices."""
 
     _attr_attribution = "Data provided by hydrawise.com"
 
-    def __init__(self, data, description: EntityDescription) -> None:
+    def __init__(
+        self,
+        *,
+        data: dict[str, Any],
+        coordinator: HydrawiseDataUpdateCoordinator,
+        description: EntityDescription,
+    ) -> None:
         """Initialize the Hydrawise entity."""
-        self.entity_description = description
+        super().__init__(coordinator=coordinator)
         self.data = data
+        self.entity_description = description
         self._attr_name = f"{self.data['name']} {description.name}"
 
-    async def async_added_to_hass(self):
-        """Register callbacks."""
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass, SIGNAL_UPDATE_HYDRAWISE, self._update_callback
-            )
-        )
-
-    @callback
-    def _update_callback(self):
-        """Call update method."""
-        self.async_schedule_update_ha_state(True)
-
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
         return {"identifier": self.data.get("relay")}
diff --git a/homeassistant/components/hydrawise/manifest.json b/homeassistant/components/hydrawise/manifest.json
index 2489317a6a2342..fc88c08b27ae02 100644
--- a/homeassistant/components/hydrawise/manifest.json
+++ b/homeassistant/components/hydrawise/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/hydrawise",
   "iot_class": "cloud_polling",
   "loggers": ["hydrawiser"],
-  "requirements": ["hydrawiser==0.2"]
+  "requirements": ["Hydrawiser==0.2"]
 }
diff --git a/homeassistant/components/hydrawise/sensor.py b/homeassistant/components/hydrawise/sensor.py
index 2cec1309ec9577..d1334143375d53 100644
--- a/homeassistant/components/hydrawise/sensor.py
+++ b/homeassistant/components/hydrawise/sensor.py
@@ -1,6 +1,7 @@
 """Support for Hydrawise sprinkler sensors."""
 from __future__ import annotations
 
+from hydrawiser.core import Hydrawiser
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
@@ -10,13 +11,14 @@
     SensorEntityDescription,
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, UnitOfTime
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
-from .const import DATA_HYDRAWISE, LOGGER
+from .const import DOMAIN, LOGGER
+from .coordinator import HydrawiseDataUpdateCoordinator
 from .entity import HydrawiseEntity
 
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
@@ -54,11 +56,12 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up a sensor for a Hydrawise device."""
-    hydrawise = hass.data[DATA_HYDRAWISE].data
+    coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN]
+    hydrawise: Hydrawiser = coordinator.api
     monitored_conditions = config[CONF_MONITORED_CONDITIONS]
 
     entities = [
-        HydrawiseSensor(zone, description)
+        HydrawiseSensor(data=zone, coordinator=coordinator, description=description)
         for zone in hydrawise.relays
         for description in SENSOR_TYPES
         if description.key in monitored_conditions
@@ -70,11 +73,11 @@ def setup_platform(
 class HydrawiseSensor(HydrawiseEntity, SensorEntity):
     """A sensor implementation for Hydrawise device."""
 
-    def update(self) -> None:
+    @callback
+    def _handle_coordinator_update(self) -> None:
         """Get the latest data and updates the states."""
-        mydata = self.hass.data[DATA_HYDRAWISE].data
         LOGGER.debug("Updating Hydrawise sensor: %s", self.name)
-        relay_data = mydata.relays[self.data["relay"] - 1]
+        relay_data = self.coordinator.api.relays[self.data["relay"] - 1]
         if self.entity_description.key == "watering_time":
             if relay_data["timestr"] == "Now":
                 self._attr_native_value = int(relay_data["run"] / 60)
@@ -83,6 +86,7 @@ def update(self) -> None:
         else:  # _sensor_type == 'next_cycle'
             next_cycle = min(relay_data["time"], TWO_YEAR_SECONDS)
             LOGGER.debug("New cycle time: %s", next_cycle)
-            self._attr_native_value = dt.utc_from_timestamp(
-                dt.as_timestamp(dt.now()) + next_cycle
+            self._attr_native_value = dt_util.utc_from_timestamp(
+                dt_util.as_timestamp(dt_util.now()) + next_cycle
             )
+        super()._handle_coordinator_update()
diff --git a/homeassistant/components/hydrawise/switch.py b/homeassistant/components/hydrawise/switch.py
index ac9b0d27025c19..00089bb8774f75 100644
--- a/homeassistant/components/hydrawise/switch.py
+++ b/homeassistant/components/hydrawise/switch.py
@@ -3,6 +3,7 @@
 
 from typing import Any
 
+from hydrawiser.core import Hydrawiser
 import voluptuous as vol
 
 from homeassistant.components.switch import (
@@ -12,7 +13,7 @@
     SwitchEntityDescription,
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -20,10 +21,11 @@
 from .const import (
     ALLOWED_WATERING_TIME,
     CONF_WATERING_TIME,
-    DATA_HYDRAWISE,
     DEFAULT_WATERING_TIME,
+    DOMAIN,
     LOGGER,
 )
+from .coordinator import HydrawiseDataUpdateCoordinator
 from .entity import HydrawiseEntity
 
 SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
@@ -60,12 +62,18 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up a sensor for a Hydrawise device."""
-    hydrawise = hass.data[DATA_HYDRAWISE].data
-    monitored_conditions = config[CONF_MONITORED_CONDITIONS]
-    default_watering_timer = config[CONF_WATERING_TIME]
+    coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN]
+    hydrawise: Hydrawiser = coordinator.api
+    monitored_conditions: list[str] = config[CONF_MONITORED_CONDITIONS]
+    default_watering_timer: int = config[CONF_WATERING_TIME]
 
     entities = [
-        HydrawiseSwitch(zone, description, default_watering_timer)
+        HydrawiseSwitch(
+            data=zone,
+            coordinator=coordinator,
+            description=description,
+            default_watering_timer=default_watering_timer,
+        )
         for zone in hydrawise.relays
         for description in SWITCH_TYPES
         if description.key in monitored_conditions
@@ -78,38 +86,41 @@ class HydrawiseSwitch(HydrawiseEntity, SwitchEntity):
     """A switch implementation for Hydrawise device."""
 
     def __init__(
-        self, data, description: SwitchEntityDescription, default_watering_timer
+        self,
+        *,
+        data: dict[str, Any],
+        coordinator: HydrawiseDataUpdateCoordinator,
+        description: SwitchEntityDescription,
+        default_watering_timer: int,
     ) -> None:
         """Initialize a switch for Hydrawise device."""
-        super().__init__(data, description)
+        super().__init__(data=data, coordinator=coordinator, description=description)
         self._default_watering_timer = default_watering_timer
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         relay_data = self.data["relay"] - 1
         if self.entity_description.key == "manual_watering":
-            self.hass.data[DATA_HYDRAWISE].data.run_zone(
-                self._default_watering_timer, relay_data
-            )
+            self.coordinator.api.run_zone(self._default_watering_timer, relay_data)
         elif self.entity_description.key == "auto_watering":
-            self.hass.data[DATA_HYDRAWISE].data.suspend_zone(0, relay_data)
+            self.coordinator.api.suspend_zone(0, relay_data)
 
     def turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         relay_data = self.data["relay"] - 1
         if self.entity_description.key == "manual_watering":
-            self.hass.data[DATA_HYDRAWISE].data.run_zone(0, relay_data)
+            self.coordinator.api.run_zone(0, relay_data)
         elif self.entity_description.key == "auto_watering":
-            self.hass.data[DATA_HYDRAWISE].data.suspend_zone(365, relay_data)
+            self.coordinator.api.suspend_zone(365, relay_data)
 
-    def update(self) -> None:
+    @callback
+    def _handle_coordinator_update(self) -> None:
         """Update device state."""
         relay_data = self.data["relay"] - 1
-        mydata = self.hass.data[DATA_HYDRAWISE].data
         LOGGER.debug("Updating Hydrawise switch: %s", self.name)
+        timestr = self.coordinator.api.relays[relay_data]["timestr"]
         if self.entity_description.key == "manual_watering":
-            self._attr_is_on = mydata.relays[relay_data]["timestr"] == "Now"
+            self._attr_is_on = timestr == "Now"
         elif self.entity_description.key == "auto_watering":
-            self._attr_is_on = (mydata.relays[relay_data]["timestr"] != "") and (
-                mydata.relays[relay_data]["timestr"] != "Now"
-            )
+            self._attr_is_on = timestr not in {"", "Now"}
+        super()._handle_coordinator_update()
diff --git a/homeassistant/components/hyperion/__init__.py b/homeassistant/components/hyperion/__init__.py
index 6c2842c190e45d..ea038b3b408535 100644
--- a/homeassistant/components/hyperion/__init__.py
+++ b/homeassistant/components/hyperion/__init__.py
@@ -19,7 +19,6 @@
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_INSTANCE_CLIENTS,
@@ -104,12 +103,6 @@ async def async_create_connect_hyperion_client(
     return hyperion_client
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up Hyperion component."""
-    hass.data[DOMAIN] = {}
-    return True
-
-
 @callback
 def listen_for_instance_updates(
     hass: HomeAssistant,
@@ -191,6 +184,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # We need 1 root client (to manage instances being removed/added) and then 1 client
     # per Hyperion server instance which is shared for all entities associated with
     # that instance.
+    hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         CONF_ROOT_CLIENT: hyperion_client,
         CONF_INSTANCE_CLIENTS: {},
diff --git a/homeassistant/components/hyperion/config_flow.py b/homeassistant/components/hyperion/config_flow.py
index 97e97cd835de34..52c4647f11c480 100644
--- a/homeassistant/components/hyperion/config_flow.py
+++ b/homeassistant/components/hyperion/config_flow.py
@@ -447,7 +447,7 @@ async def async_step_init(
     ) -> FlowResult:
         """Manage the options."""
 
-        effects = {source: source for source in const.KEY_COMPONENTID_EXTERNAL_SOURCES}
+        effects = {}
         async with self._create_client() as hyperion_client:
             if not hyperion_client:
                 return self.async_abort(reason="cannot_connect")
diff --git a/homeassistant/components/hyperion/const.py b/homeassistant/components/hyperion/const.py
index e7e4e7f70a48dc..4585b8bedaac5a 100644
--- a/homeassistant/components/hyperion/const.py
+++ b/homeassistant/components/hyperion/const.py
@@ -21,8 +21,6 @@
 HYPERION_RELEASES_URL = "https://github.com/hyperion-project/hyperion.ng/releases"
 HYPERION_VERSION_WARN_CUTOFF = "2.0.0-alpha.9"
 
-NAME_SUFFIX_HYPERION_LIGHT = ""
-NAME_SUFFIX_HYPERION_PRIORITY_LIGHT = "Priority"
 NAME_SUFFIX_HYPERION_COMPONENT_SWITCH = "Component"
 NAME_SUFFIX_HYPERION_CAMERA = ""
 
@@ -32,5 +30,4 @@
 
 TYPE_HYPERION_CAMERA = "hyperion_camera"
 TYPE_HYPERION_LIGHT = "hyperion_light"
-TYPE_HYPERION_PRIORITY_LIGHT = "hyperion_priority_light"
 TYPE_HYPERION_COMPONENT_SWITCH_BASE = "hyperion_component_switch"
diff --git a/homeassistant/components/hyperion/light.py b/homeassistant/components/hyperion/light.py
index ba1dbfbafc2d9f..e14c395315eacd 100644
--- a/homeassistant/components/hyperion/light.py
+++ b/homeassistant/components/hyperion/light.py
@@ -41,24 +41,19 @@
     DOMAIN,
     HYPERION_MANUFACTURER_NAME,
     HYPERION_MODEL_NAME,
-    NAME_SUFFIX_HYPERION_LIGHT,
-    NAME_SUFFIX_HYPERION_PRIORITY_LIGHT,
     SIGNAL_ENTITY_REMOVE,
     TYPE_HYPERION_LIGHT,
-    TYPE_HYPERION_PRIORITY_LIGHT,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-COLOR_BLACK = color_util.COLORS["black"]
-
 CONF_DEFAULT_COLOR = "default_color"
 CONF_HDMI_PRIORITY = "hdmi_priority"
 CONF_EFFECT_LIST = "effect_list"
 
 # As we want to preserve brightness control for effects (e.g. to reduce the
-# brightness for V4L), we need to persist the effect that is in flight, so
-# subsequent calls to turn_on will know the keep the effect enabled.
+# brightness), we need to persist the effect that is in flight, so
+# subsequent calls to turn_on will know to keep the effect enabled.
 # Unfortunately the Home Assistant UI does not easily expose a way to remove a
 # selected effect (there is no 'No Effect' option by default). Instead, we
 # create a new fake effect ("Solid") that is always selected by default for
@@ -75,7 +70,6 @@
 
 ICON_LIGHTBULB = "mdi:lightbulb"
 ICON_EFFECT = "mdi:lava-lamp"
-ICON_EXTERNAL_SOURCE = "mdi:television-ambient-light"
 
 
 async def async_setup_entry(
@@ -102,7 +96,6 @@ def instance_add(instance_num: int, instance_name: str) -> None:
         async_add_entities(
             [
                 HyperionLight(*args),
-                HyperionPriorityLight(*args),
             ]
         )
 
@@ -110,19 +103,18 @@ def instance_add(instance_num: int, instance_name: str) -> None:
     def instance_remove(instance_num: int) -> None:
         """Remove entities for an old Hyperion instance."""
         assert server_id
-        for light_type in LIGHT_TYPES:
-            async_dispatcher_send(
-                hass,
-                SIGNAL_ENTITY_REMOVE.format(
-                    get_hyperion_unique_id(server_id, instance_num, light_type)
-                ),
-            )
+        async_dispatcher_send(
+            hass,
+            SIGNAL_ENTITY_REMOVE.format(
+                get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
+            ),
+        )
 
     listen_for_instance_updates(hass, config_entry, instance_add, instance_remove)
 
 
-class HyperionBaseLight(LightEntity):
-    """A Hyperion light base class."""
+class HyperionLight(LightEntity):
+    """A Hyperion light that acts as a client for the configured priority."""
 
     _attr_color_mode = ColorMode.HS
     _attr_should_poll = False
@@ -151,11 +143,6 @@ def __init__(
         self._effect: str = KEY_EFFECT_SOLID
 
         self._static_effect_list: list[str] = [KEY_EFFECT_SOLID]
-        if self._support_external_effects:
-            self._static_effect_list += [
-                const.KEY_COMPONENTID_TO_NAME[component]
-                for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-            ]
         self._effect_list: list[str] = self._static_effect_list[:]
 
         self._client_callbacks: Mapping[str, Callable[[dict[str, Any]], None]] = {
@@ -168,11 +155,11 @@ def __init__(
 
     def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
         """Compute a unique id for this instance."""
-        raise NotImplementedError
+        return get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
 
     def _compute_name(self, instance_name: str) -> str:
         """Compute the name of the light."""
-        raise NotImplementedError
+        return f"{instance_name}".strip()
 
     @property
     def entity_registry_enabled_default(self) -> bool:
@@ -198,12 +185,6 @@ def hs_color(self) -> tuple[float, float]:
     def icon(self) -> str:
         """Return state specific icon."""
         if self.is_on:
-            if (
-                self.effect in const.KEY_COMPONENTID_FROM_NAME
-                and const.KEY_COMPONENTID_FROM_NAME[self.effect]
-                in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-            ):
-                return ICON_EXTERNAL_SOURCE
             if self.effect != KEY_EFFECT_SOLID:
                 return ICON_EFFECT
         return ICON_LIGHTBULB
@@ -247,6 +228,11 @@ def _get_option(self, key: str) -> Any:
         }
         return self._options.get(key, defaults[key])
 
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on. Light is considered on when there is a source at the configured HA priority."""
+        return self._get_priority_entry_that_dictates_state() is not None
+
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
         # == Get key parameters ==
@@ -279,55 +265,8 @@ async def async_turn_on(self, **kwargs: Any) -> None:
                 ):
                     return
 
-        # == Set an external source
-        if (
-            effect
-            and self._support_external_effects
-            and (
-                effect in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-                or effect in const.KEY_COMPONENTID_FROM_NAME
-            )
-        ):
-            if effect in const.KEY_COMPONENTID_FROM_NAME:
-                component = const.KEY_COMPONENTID_FROM_NAME[effect]
-            else:
-                _LOGGER.warning(
-                    (
-                        "Use of Hyperion effect '%s' is deprecated and will be removed "
-                        "in a future release. Please use '%s' instead"
-                    ),
-                    effect,
-                    const.KEY_COMPONENTID_TO_NAME[effect],
-                )
-                component = effect
-
-            # Clear any color/effect.
-            if not await self._client.async_send_clear(
-                **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-            ):
-                return
-
-            # Turn off all external sources, except the intended.
-            for key in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-                if not await self._client.async_send_set_component(
-                    **{
-                        const.KEY_COMPONENTSTATE: {
-                            const.KEY_COMPONENT: key,
-                            const.KEY_STATE: component == key,
-                        }
-                    }
-                ):
-                    return
-
         # == Set an effect
-        elif effect and effect != KEY_EFFECT_SOLID:
-            # This call should not be necessary, but without it there is no priorities-update issued:
-            # https://github.com/hyperion-project/hyperion.ng/issues/992
-            if not await self._client.async_send_clear(
-                **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-            ):
-                return
-
+        if effect and effect != KEY_EFFECT_SOLID:
             if not await self._client.async_send_set_effect(
                 **{
                     const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
@@ -336,16 +275,23 @@ async def async_turn_on(self, **kwargs: Any) -> None:
                 }
             ):
                 return
+
         # == Set a color
-        else:
-            if not await self._client.async_send_set_color(
-                **{
-                    const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
-                    const.KEY_COLOR: rgb_color,
-                    const.KEY_ORIGIN: DEFAULT_ORIGIN,
-                }
-            ):
-                return
+        elif not await self._client.async_send_set_color(
+            **{
+                const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
+                const.KEY_COLOR: rgb_color,
+                const.KEY_ORIGIN: DEFAULT_ORIGIN,
+            }
+        ):
+            return
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the light i.e. clear the configured priority."""
+        if not await self._client.async_send_clear(
+            **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
+        ):
+            return
 
     def _set_internal_state(
         self,
@@ -384,24 +330,15 @@ def _update_adjustment(self, _: dict[str, Any] | None = None) -> None:
     def _update_priorities(self, _: dict[str, Any] | None = None) -> None:
         """Update Hyperion priorities."""
         priority = self._get_priority_entry_that_dictates_state()
-        if priority and self._allow_priority_update(priority):
-            componentid = priority.get(const.KEY_COMPONENTID)
-            if (
-                self._support_external_effects
-                and componentid in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-                and componentid in const.KEY_COMPONENTID_TO_NAME
-            ):
-                self._set_internal_state(
-                    rgb_color=DEFAULT_COLOR,
-                    effect=const.KEY_COMPONENTID_TO_NAME[componentid],
-                )
-            elif componentid == const.KEY_COMPONENTID_EFFECT:
+        if priority:
+            component_id = priority.get(const.KEY_COMPONENTID)
+            if component_id == const.KEY_COMPONENTID_EFFECT:
                 # Owner is the effect name.
                 # See: https://docs.hyperion-project.org/en/json/ServerInfo.html#priorities
                 self._set_internal_state(
                     rgb_color=DEFAULT_COLOR, effect=priority[const.KEY_OWNER]
                 )
-            elif componentid == const.KEY_COMPONENTID_COLOR:
+            elif component_id == const.KEY_COMPONENTID_COLOR:
                 self._set_internal_state(
                     rgb_color=priority[const.KEY_VALUE][const.KEY_RGB],
                     effect=KEY_EFFECT_SOLID,
@@ -470,172 +407,10 @@ async def async_will_remove_from_hass(self) -> None:
         """Cleanup prior to hass removal."""
         self._client.remove_callbacks(self._client_callbacks)
 
-    @property
-    def _support_external_effects(self) -> bool:
-        """Whether or not to support setting external effects from the light entity."""
-        return True
-
-    def _get_priority_entry_that_dictates_state(self) -> dict[str, Any] | None:
-        """Get the relevant Hyperion priority entry to consider."""
-        # Return the visible priority (whether or not it is the HA priority).
-
-        # Explicit type specifier to ensure this works when the underlying (typed)
-        # library is installed along with the tests. Casts would trigger a
-        # redundant-cast warning in this case.
-        priority: dict[str, Any] | None = self._client.visible_priority
-        return priority
-
-    def _allow_priority_update(self, priority: dict[str, Any] | None = None) -> bool:
-        """Determine whether to allow a priority to update internal state."""
-        return True
-
-
-class HyperionLight(HyperionBaseLight):
-    """A Hyperion light that acts in absolute (vs priority) manner.
-
-    Light state is the absolute Hyperion component state (e.g. LED device on/off) rather
-    than color based at a particular priority, and the 'winning' priority determines
-    shown state rather than exclusively the HA priority.
-    """
-
-    def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
-        """Compute a unique id for this instance."""
-        return get_hyperion_unique_id(server_id, instance_num, TYPE_HYPERION_LIGHT)
-
-    def _compute_name(self, instance_name: str) -> str:
-        """Compute the name of the light."""
-        return f"{instance_name} {NAME_SUFFIX_HYPERION_LIGHT}".strip()
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if light is on."""
-        return (
-            bool(self._client.is_on())
-            and self._get_priority_entry_that_dictates_state() is not None
-        )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        # == Turn device on ==
-        # Turn on both ALL (Hyperion itself) and LEDDEVICE. It would be
-        # preferable to enable LEDDEVICE after the settings (e.g. brightness,
-        # color, effect), but this is not possible due to:
-        # https://github.com/hyperion-project/hyperion.ng/issues/967
-        if not bool(self._client.is_on()):
-            for component in (
-                const.KEY_COMPONENTID_ALL,
-                const.KEY_COMPONENTID_LEDDEVICE,
-            ):
-                if not await self._client.async_send_set_component(
-                    **{
-                        const.KEY_COMPONENTSTATE: {
-                            const.KEY_COMPONENT: component,
-                            const.KEY_STATE: True,
-                        }
-                    }
-                ):
-                    return
-
-        # Turn on the relevant Hyperion priority as usual.
-        await super().async_turn_on(**kwargs)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        if not await self._client.async_send_set_component(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_LEDDEVICE,
-                    const.KEY_STATE: False,
-                }
-            }
-        ):
-            return
-
-
-class HyperionPriorityLight(HyperionBaseLight):
-    """A Hyperion light that only acts on a single Hyperion priority."""
-
-    def _compute_unique_id(self, server_id: str, instance_num: int) -> str:
-        """Compute a unique id for this instance."""
-        return get_hyperion_unique_id(
-            server_id, instance_num, TYPE_HYPERION_PRIORITY_LIGHT
-        )
-
-    def _compute_name(self, instance_name: str) -> str:
-        """Compute the name of the light."""
-        return f"{instance_name} {NAME_SUFFIX_HYPERION_PRIORITY_LIGHT}".strip()
-
-    @property
-    def entity_registry_enabled_default(self) -> bool:
-        """Whether or not the entity is enabled by default."""
-        return False
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if light is on."""
-        priority = self._get_priority_entry_that_dictates_state()
-        return (
-            priority is not None
-            and not HyperionPriorityLight._is_priority_entry_black(priority)
-        )
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        if not await self._client.async_send_clear(
-            **{const.KEY_PRIORITY: self._get_option(CONF_PRIORITY)}
-        ):
-            return
-        await self._client.async_send_set_color(
-            **{
-                const.KEY_PRIORITY: self._get_option(CONF_PRIORITY),
-                const.KEY_COLOR: COLOR_BLACK,
-                const.KEY_ORIGIN: DEFAULT_ORIGIN,
-            }
-        )
-
-    @property
-    def _support_external_effects(self) -> bool:
-        """Whether or not to support setting external effects from the light entity."""
-        return False
-
     def _get_priority_entry_that_dictates_state(self) -> dict[str, Any] | None:
         """Get the relevant Hyperion priority entry to consider."""
-        # Return the active priority (if any) at the configured HA priority.
-        for candidate in self._client.priorities or []:
-            if const.KEY_PRIORITY not in candidate:
-                continue
-            if candidate[const.KEY_PRIORITY] == self._get_option(
-                CONF_PRIORITY
-            ) and candidate.get(const.KEY_ACTIVE, False):
-                # Explicit type specifier to ensure this works when the underlying
-                # (typed) library is installed along with the tests. Casts would trigger
-                # a redundant-cast warning in this case.
-                output: dict[str, Any] = candidate
-                return output
+        # Return whether or not the HA priority is among the active priorities.
+        for priority in self._client.priorities or []:
+            if priority.get(const.KEY_PRIORITY) == self._get_option(CONF_PRIORITY):
+                return priority
         return None
-
-    @classmethod
-    def _is_priority_entry_black(cls, priority: dict[str, Any] | None) -> bool:
-        """Determine if a given priority entry is the color black."""
-        if (
-            priority
-            and priority.get(const.KEY_COMPONENTID) == const.KEY_COMPONENTID_COLOR
-        ):
-            rgb_color = priority.get(const.KEY_VALUE, {}).get(const.KEY_RGB)
-            if rgb_color is not None and tuple(rgb_color) == COLOR_BLACK:
-                return True
-        return False
-
-    def _allow_priority_update(self, priority: dict[str, Any] | None = None) -> bool:
-        """Determine whether to allow a Hyperion priority to update entity attributes."""
-        # Black is treated as 'off' (and Home Assistant does not support selecting black
-        # from the color selector). Do not set our internal attributes if the priority is
-        # 'off' (i.e. if black is active). Do this to ensure it seamlessly turns back on
-        # at the correct prior color on the next 'on' call.
-        return not HyperionPriorityLight._is_priority_entry_black(priority)
-
-
-LIGHT_TYPES = {
-    TYPE_HYPERION_LIGHT: HyperionLight,
-    TYPE_HYPERION_PRIORITY_LIGHT: HyperionPriorityLight,
-}
diff --git a/homeassistant/components/iaqualink/__init__.py b/homeassistant/components/iaqualink/__init__.py
index e0b381d2362dbd..5735e1ab421c35 100644
--- a/homeassistant/components/iaqualink/__init__.py
+++ b/homeassistant/components/iaqualink/__init__.py
@@ -6,7 +6,7 @@
 from datetime import datetime
 from functools import wraps
 import logging
-from typing import Any, Concatenate, ParamSpec, TypeVar
+from typing import Any, Concatenate, ParamSpec, TypeVar, cast
 
 import httpx
 from iaqualink.client import AqualinkClient
@@ -243,6 +243,8 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, self.unique_id)},
             manufacturer=self.dev.manufacturer,
             model=self.dev.model,
-            name=self.name,
+            # Instead of setting the device name to the entity name, iaqualink
+            # should be updated to set has_entity_name = True
+            name=cast(str | None, self.name),
             via_device=(DOMAIN, self.dev.system.serial),
         )
diff --git a/homeassistant/components/ibeacon/device_tracker.py b/homeassistant/components/ibeacon/device_tracker.py
index 4c9337e54ce57b..8e194ac27b110c 100644
--- a/homeassistant/components/ibeacon/device_tracker.py
+++ b/homeassistant/components/ibeacon/device_tracker.py
@@ -48,6 +48,8 @@ def _async_device_new(
 class IBeaconTrackerEntity(IBeaconEntity, BaseTrackerEntity):
     """An iBeacon Tracker entity."""
 
+    _attr_name = None
+
     def __init__(
         self,
         coordinator: IBeaconCoordinator,
diff --git a/homeassistant/components/ibeacon/manifest.json b/homeassistant/components/ibeacon/manifest.json
index a805277cb71fd7..6f00f63b0909af 100644
--- a/homeassistant/components/ibeacon/manifest.json
+++ b/homeassistant/components/ibeacon/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ibeacon",
   "iot_class": "local_push",
   "loggers": ["bleak"],
-  "requirements": ["ibeacon_ble==1.0.1"]
+  "requirements": ["ibeacon-ble==1.0.1"]
 }
diff --git a/homeassistant/components/ibeacon/sensor.py b/homeassistant/components/ibeacon/sensor.py
index c0b9e92decc238..b3895ce23b402c 100644
--- a/homeassistant/components/ibeacon/sensor.py
+++ b/homeassistant/components/ibeacon/sensor.py
@@ -38,7 +38,6 @@ class IBeaconSensorEntityDescription(SensorEntityDescription, IBeaconRequiredKey
 SENSOR_DESCRIPTIONS = (
     IBeaconSensorEntityDescription(
         key="rssi",
-        name="Signal Strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         entity_registry_enabled_default=False,
@@ -47,7 +46,7 @@ class IBeaconSensorEntityDescription(SensorEntityDescription, IBeaconRequiredKey
     ),
     IBeaconSensorEntityDescription(
         key="power",
-        name="Power",
+        translation_key="power",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         entity_registry_enabled_default=False,
@@ -56,7 +55,7 @@ class IBeaconSensorEntityDescription(SensorEntityDescription, IBeaconRequiredKey
     ),
     IBeaconSensorEntityDescription(
         key="estimated_distance",
-        name="Estimated Distance",
+        translation_key="estimated_distance",
         icon="mdi:signal-distance-variant",
         native_unit_of_measurement=UnitOfLength.METERS,
         value_fn=lambda ibeacon_advertisement: ibeacon_advertisement.distance,
@@ -65,7 +64,7 @@ class IBeaconSensorEntityDescription(SensorEntityDescription, IBeaconRequiredKey
     ),
     IBeaconSensorEntityDescription(
         key="vendor",
-        name="Vendor",
+        translation_key="vendor",
         entity_registry_enabled_default=False,
         value_fn=lambda ibeacon_advertisement: ibeacon_advertisement.vendor,
     ),
diff --git a/homeassistant/components/ibeacon/strings.json b/homeassistant/components/ibeacon/strings.json
index b91ba459bd7299..be3f7020cbe918 100644
--- a/homeassistant/components/ibeacon/strings.json
+++ b/homeassistant/components/ibeacon/strings.json
@@ -19,5 +19,18 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "power": {
+        "name": "Power"
+      },
+      "estimated_distance": {
+        "name": "Estimated distance"
+      },
+      "vendor": {
+        "name": "Vendor"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/icloud/config_flow.py b/homeassistant/components/icloud/config_flow.py
index 6cdde2249c8d2f..4be5487f755cb5 100644
--- a/homeassistant/components/icloud/config_flow.py
+++ b/homeassistant/components/icloud/config_flow.py
@@ -263,13 +263,12 @@ async def async_step_verification_code(self, user_input=None, errors=None):
                     self.api.validate_2fa_code, self._verification_code
                 ):
                     raise PyiCloudException("The code you entered is not valid.")
-            else:
-                if not await self.hass.async_add_executor_job(
-                    self.api.validate_verification_code,
-                    self._trusted_device,
-                    self._verification_code,
-                ):
-                    raise PyiCloudException("The code you entered is not valid.")
+            elif not await self.hass.async_add_executor_job(
+                self.api.validate_verification_code,
+                self._trusted_device,
+                self._verification_code,
+            ):
+                raise PyiCloudException("The code you entered is not valid.")
         except PyiCloudException as error:
             # Reset to the initial 2FA state to allow the user to retry
             _LOGGER.error("Failed to verify verification code: %s", error)
diff --git a/homeassistant/components/ign_sismologia/manifest.json b/homeassistant/components/ign_sismologia/manifest.json
index 0fc69a7ba192ef..6eeea6b4a02bcc 100644
--- a/homeassistant/components/ign_sismologia/manifest.json
+++ b/homeassistant/components/ign_sismologia/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["georss_ign_sismologia_client"],
-  "requirements": ["georss_ign_sismologia_client==0.6"]
+  "requirements": ["georss-ign-sismologia-client==0.6"]
 }
diff --git a/homeassistant/components/ihc/light.py b/homeassistant/components/ihc/light.py
index 089317ca7d733e..b469cb54aee162 100644
--- a/homeassistant/components/ihc/light.py
+++ b/homeassistant/components/ihc/light.py
@@ -96,29 +96,26 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the light on."""
         if ATTR_BRIGHTNESS in kwargs:
             brightness = kwargs[ATTR_BRIGHTNESS]
-        else:
-            if (brightness := self._brightness) == 0:
-                brightness = 255
+        elif (brightness := self._brightness) == 0:
+            brightness = 255
 
         if self._dimmable:
             await async_set_int(
                 self.hass, self.ihc_controller, self.ihc_id, int(brightness * 100 / 255)
             )
+        elif self._ihc_on_id:
+            await async_pulse(self.hass, self.ihc_controller, self._ihc_on_id)
         else:
-            if self._ihc_on_id:
-                await async_pulse(self.hass, self.ihc_controller, self._ihc_on_id)
-            else:
-                await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, True)
+            await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
         if self._dimmable:
             await async_set_int(self.hass, self.ihc_controller, self.ihc_id, 0)
+        elif self._ihc_off_id:
+            await async_pulse(self.hass, self.ihc_controller, self._ihc_off_id)
         else:
-            if self._ihc_off_id:
-                await async_pulse(self.hass, self.ihc_controller, self._ihc_off_id)
-            else:
-                await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, False)
+            await async_set_bool(self.hass, self.ihc_controller, self.ihc_id, False)
 
     def on_ihc_change(self, ihc_id, value):
         """Handle IHC notifications."""
diff --git a/homeassistant/components/image/__init__.py b/homeassistant/components/image/__init__.py
new file mode 100644
index 00000000000000..8daea2cdd46051
--- /dev/null
+++ b/homeassistant/components/image/__init__.py
@@ -0,0 +1,275 @@
+"""The image integration."""
+from __future__ import annotations
+
+import asyncio
+import collections
+from contextlib import suppress
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+import logging
+from random import SystemRandom
+from typing import Final, final
+
+from aiohttp import hdrs, web
+import async_timeout
+import httpx
+
+from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.config_validation import (  # noqa: F401
+    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA_BASE,
+)
+from homeassistant.helpers.entity import Entity, EntityDescription
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.typing import UNDEFINED, ConfigType, UndefinedType
+
+from .const import DOMAIN, IMAGE_TIMEOUT  # noqa: F401
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL: Final = timedelta(seconds=30)
+ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
+
+DEFAULT_CONTENT_TYPE: Final = "image/jpeg"
+ENTITY_IMAGE_URL: Final = "/api/image_proxy/{0}?token={1}"
+
+TOKEN_CHANGE_INTERVAL: Final = timedelta(minutes=5)
+_RND: Final = SystemRandom()
+
+GET_IMAGE_TIMEOUT: Final = 10
+
+
+@dataclass
+class ImageEntityDescription(EntityDescription):
+    """A class that describes image entities."""
+
+
+@dataclass
+class Image:
+    """Represent an image."""
+
+    content_type: str
+    content: bytes
+
+
+class ImageContentTypeError(HomeAssistantError):
+    """Error with the content type while loading an image."""
+
+
+def valid_image_content_type(content_type: str | None) -> str:
+    """Validate the assigned content type is one of an image."""
+    if content_type is None or content_type.split("/", 1)[0] != "image":
+        raise ImageContentTypeError
+    return content_type
+
+
+async def _async_get_image(image_entity: ImageEntity, timeout: int) -> Image:
+    """Fetch image from an image entity."""
+    with suppress(asyncio.CancelledError, asyncio.TimeoutError, ImageContentTypeError):
+        async with async_timeout.timeout(timeout):
+            if image_bytes := await image_entity.async_image():
+                content_type = valid_image_content_type(image_entity.content_type)
+                image = Image(content_type, image_bytes)
+                return image
+
+    raise HomeAssistantError("Unable to get image")
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the image component."""
+    component = hass.data[DOMAIN] = EntityComponent[ImageEntity](
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
+    )
+
+    hass.http.register_view(ImageView(component))
+
+    await component.async_setup(config)
+
+    @callback
+    def update_tokens(time: datetime) -> None:
+        """Update tokens of the entities."""
+        for entity in component.entities:
+            entity.async_update_token()
+            entity.async_write_ha_state()
+
+    unsub = async_track_time_interval(
+        hass, update_tokens, TOKEN_CHANGE_INTERVAL, name="Image update tokens"
+    )
+
+    @callback
+    def unsub_track_time_interval(_event: Event) -> None:
+        """Unsubscribe track time interval timer."""
+        unsub()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, unsub_track_time_interval)
+
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up a config entry."""
+    component: EntityComponent[ImageEntity] = hass.data[DOMAIN]
+    return await component.async_setup_entry(entry)
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    component: EntityComponent[ImageEntity] = hass.data[DOMAIN]
+    return await component.async_unload_entry(entry)
+
+
+class ImageEntity(Entity):
+    """The base class for image entities."""
+
+    # Entity Properties
+    _attr_content_type: str = DEFAULT_CONTENT_TYPE
+    _attr_image_last_updated: datetime | None = None
+    _attr_image_url: str | None | UndefinedType = UNDEFINED
+    _attr_should_poll: bool = False  # No need to poll image entities
+    _attr_state: None = None  # State is determined by last_updated
+    _cached_image: Image | None = None
+
+    def __init__(self, hass: HomeAssistant, verify_ssl: bool = False) -> None:
+        """Initialize an image entity."""
+        self._client = get_async_client(hass, verify_ssl=verify_ssl)
+        self.access_tokens: collections.deque = collections.deque([], 2)
+        self.async_update_token()
+
+    @property
+    def content_type(self) -> str:
+        """Image content type."""
+        return self._attr_content_type
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return a link to the image as entity picture."""
+        if self._attr_entity_picture is not None:
+            return self._attr_entity_picture
+        return ENTITY_IMAGE_URL.format(self.entity_id, self.access_tokens[-1])
+
+    @property
+    def image_last_updated(self) -> datetime | None:
+        """The time when the image was last updated."""
+        return self._attr_image_last_updated
+
+    @property
+    def image_url(self) -> str | None | UndefinedType:
+        """Return URL of image."""
+        return self._attr_image_url
+
+    def image(self) -> bytes | None:
+        """Return bytes of image."""
+        raise NotImplementedError()
+
+    async def _async_load_image_from_url(self, url: str) -> Image | None:
+        """Load an image by url."""
+        try:
+            response = await self._client.get(
+                url, timeout=GET_IMAGE_TIMEOUT, follow_redirects=True
+            )
+            response.raise_for_status()
+            content_type = response.headers.get("content-type")
+            return Image(
+                content=response.content,
+                content_type=valid_image_content_type(content_type),
+            )
+        except httpx.TimeoutException:
+            _LOGGER.error("%s: Timeout getting image from %s", self.entity_id, url)
+            return None
+        except (httpx.RequestError, httpx.HTTPStatusError) as err:
+            _LOGGER.error(
+                "%s: Error getting new image from %s: %s",
+                self.entity_id,
+                url,
+                err,
+            )
+            return None
+        except ImageContentTypeError:
+            _LOGGER.error(
+                "%s: Image from %s has invalid content type: %s",
+                self.entity_id,
+                url,
+                content_type,
+            )
+            return None
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+
+        if self._cached_image:
+            return self._cached_image.content
+        if (url := self.image_url) is not UNDEFINED:
+            if not url or (image := await self._async_load_image_from_url(url)) is None:
+                return None
+            self._cached_image = image
+            self._attr_content_type = image.content_type
+            return image.content
+        return await self.hass.async_add_executor_job(self.image)
+
+    @property
+    @final
+    def state(self) -> str | None:
+        """Return the state."""
+        if self.image_last_updated is None:
+            return None
+        return self.image_last_updated.isoformat()
+
+    @final
+    @property
+    def state_attributes(self) -> dict[str, str | None]:
+        """Return the state attributes."""
+        return {"access_token": self.access_tokens[-1]}
+
+    @callback
+    def async_update_token(self) -> None:
+        """Update the used token."""
+        self.access_tokens.append(hex(_RND.getrandbits(256))[2:])
+
+
+class ImageView(HomeAssistantView):
+    """View to serve an image."""
+
+    name = "api:image:image"
+    requires_auth = False
+    url = "/api/image_proxy/{entity_id}"
+
+    def __init__(self, component: EntityComponent[ImageEntity]) -> None:
+        """Initialize an image view."""
+        self.component = component
+
+    async def get(self, request: web.Request, entity_id: str) -> web.StreamResponse:
+        """Start a GET request."""
+        if (image_entity := self.component.get_entity(entity_id)) is None:
+            raise web.HTTPNotFound()
+
+        authenticated = (
+            request[KEY_AUTHENTICATED]
+            or request.query.get("token") in image_entity.access_tokens
+        )
+
+        if not authenticated:
+            # Attempt with invalid bearer token, raise unauthorized
+            # so ban middleware can handle it.
+            if hdrs.AUTHORIZATION in request.headers:
+                raise web.HTTPUnauthorized()
+            # Invalid sigAuth or image entity access token
+            raise web.HTTPForbidden()
+
+        return await self.handle(request, image_entity)
+
+    async def handle(
+        self, request: web.Request, image_entity: ImageEntity
+    ) -> web.StreamResponse:
+        """Serve image."""
+        try:
+            image = await _async_get_image(image_entity, IMAGE_TIMEOUT)
+        except (HomeAssistantError, ValueError) as ex:
+            raise web.HTTPInternalServerError() from ex
+
+        return web.Response(body=image.content, content_type=image.content_type)
diff --git a/homeassistant/components/image/const.py b/homeassistant/components/image/const.py
new file mode 100644
index 00000000000000..d262bb460f701e
--- /dev/null
+++ b/homeassistant/components/image/const.py
@@ -0,0 +1,6 @@
+"""Constants for the image integration."""
+from typing import Final
+
+DOMAIN: Final = "image"
+
+IMAGE_TIMEOUT: Final = 10
diff --git a/homeassistant/components/image/manifest.json b/homeassistant/components/image/manifest.json
new file mode 100644
index 00000000000000..0335710a30bb48
--- /dev/null
+++ b/homeassistant/components/image/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "image",
+  "name": "Image",
+  "codeowners": ["@home-assistant/core"],
+  "dependencies": ["http"],
+  "documentation": "https://www.home-assistant.io/integrations/image",
+  "integration_type": "entity",
+  "quality_scale": "internal"
+}
diff --git a/homeassistant/components/image/recorder.py b/homeassistant/components/image/recorder.py
new file mode 100644
index 00000000000000..5c14122088100c
--- /dev/null
+++ b/homeassistant/components/image/recorder.py
@@ -0,0 +1,10 @@
+"""Integration platform for recorder."""
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant, callback
+
+
+@callback
+def exclude_attributes(hass: HomeAssistant) -> set[str]:
+    """Exclude access_token and entity_picture from being recorded in the database."""
+    return {"access_token", "entity_picture"}
diff --git a/homeassistant/components/image/strings.json b/homeassistant/components/image/strings.json
new file mode 100644
index 00000000000000..ea7ecd1695627b
--- /dev/null
+++ b/homeassistant/components/image/strings.json
@@ -0,0 +1,8 @@
+{
+  "title": "Image",
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::image::title%]"
+    }
+  }
+}
diff --git a/homeassistant/components/image_upload/__init__.py b/homeassistant/components/image_upload/__init__.py
index 17c40cfc8753f4..569df9c65e408c 100644
--- a/homeassistant/components/image_upload/__init__.py
+++ b/homeassistant/components/image_upload/__init__.py
@@ -8,16 +8,16 @@
 import shutil
 from typing import Any
 
-from PIL import Image, ImageOps, UnidentifiedImageError
 from aiohttp import hdrs, web
 from aiohttp.web_request import FileField
+from PIL import Image, ImageOps, UnidentifiedImageError
 import voluptuous as vol
 
 from homeassistant.components.http.static import CACHE_HEADERS
 from homeassistant.components.http.view import HomeAssistantView
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import collection
+from homeassistant.helpers import collection, config_validation as cv
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as dt_util
@@ -38,6 +38,8 @@
     vol.Optional("name"): vol.All(str, vol.Length(min=1)),
 }
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Image integration."""
diff --git a/homeassistant/components/image_upload/manifest.json b/homeassistant/components/image_upload/manifest.json
index 947c3cb67d565f..48c57fb5d036fd 100644
--- a/homeassistant/components/image_upload/manifest.json
+++ b/homeassistant/components/image_upload/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/image_upload",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/imap/__init__.py b/homeassistant/components/imap/__init__.py
index 468181be5f7c24..04069d42d7d2ab 100644
--- a/homeassistant/components/imap/__init__.py
+++ b/homeassistant/components/imap/__init__.py
@@ -45,7 +45,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         coordinator_class = ImapPollingDataUpdateCoordinator
 
     coordinator: ImapPushDataUpdateCoordinator | ImapPollingDataUpdateCoordinator = (
-        coordinator_class(hass, imap_client)
+        coordinator_class(hass, imap_client, entry)
     )
     await coordinator.async_config_entry_first_refresh()
 
diff --git a/homeassistant/components/imap/config_flow.py b/homeassistant/components/imap/config_flow.py
index 8724dbf97c01cc..00be545fb67ddb 100644
--- a/homeassistant/components/imap/config_flow.py
+++ b/homeassistant/components/imap/config_flow.py
@@ -10,19 +10,29 @@
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
-from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_NAME,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import AbortFlow, FlowResult
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
+    BooleanSelector,
     SelectSelector,
     SelectSelectorConfig,
     SelectSelectorMode,
+    TemplateSelector,
+    TemplateSelectorConfig,
 )
 from homeassistant.util.ssl import SSLCipherList
 
 from .const import (
     CONF_CHARSET,
+    CONF_CUSTOM_EVENT_DATA_TEMPLATE,
     CONF_FOLDER,
     CONF_MAX_MESSAGE_SIZE,
     CONF_SEARCH,
@@ -36,6 +46,7 @@
 from .coordinator import connect_to_server
 from .errors import InvalidAuth, InvalidFolder
 
+BOOLEAN_SELECTOR = BooleanSelector()
 CIPHER_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=list(SSLCipherList),
@@ -43,6 +54,7 @@
         translation_key=CONF_SSL_CIPHER_LIST,
     )
 )
+TEMPLATE_SELECTOR = TemplateSelector(TemplateSelectorConfig())
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -59,6 +71,7 @@
     vol.Optional(
         CONF_SSL_CIPHER_LIST, default=SSLCipherList.PYTHON_DEFAULT
     ): CIPHER_SELECTOR,
+    vol.Optional(CONF_VERIFY_SSL, default=True): BOOLEAN_SELECTOR,
 }
 
 OPTIONS_SCHEMA = vol.Schema(
@@ -69,14 +82,17 @@
 )
 
 OPTIONS_SCHEMA_ADVANCED = {
+    vol.Optional(CONF_CUSTOM_EVENT_DATA_TEMPLATE): TEMPLATE_SELECTOR,
     vol.Optional(CONF_MAX_MESSAGE_SIZE, default=DEFAULT_MAX_MESSAGE_SIZE): vol.All(
         cv.positive_int,
         vol.Range(min=DEFAULT_MAX_MESSAGE_SIZE, max=MAX_MESSAGE_SIZE_LIMIT),
-    )
+    ),
 }
 
 
-async def validate_input(user_input: dict[str, Any]) -> dict[str, str]:
+async def validate_input(
+    hass: HomeAssistant, user_input: dict[str, Any]
+) -> dict[str, str]:
     """Validate user input."""
     errors = {}
 
@@ -104,6 +120,7 @@ async def validate_input(user_input: dict[str, Any]) -> dict[str, str]:
                 errors[CONF_CHARSET] = "invalid_charset"
             else:
                 errors[CONF_SEARCH] = "invalid_search"
+
     return errors
 
 
@@ -131,7 +148,7 @@ async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
             }
         )
         title = user_input[CONF_NAME]
-        if await validate_input(data):
+        if await validate_input(self.hass, data):
             raise AbortFlow("cannot_connect")
         return self.async_create_entry(title=title, data=data)
 
@@ -154,12 +171,12 @@ async def async_step_user(
             }
         )
 
-        if not (errors := await validate_input(user_input)):
+        if not (errors := await validate_input(self.hass, user_input)):
             title = user_input[CONF_USERNAME]
 
             return self.async_create_entry(title=title, data=user_input)
 
-        schema = self.add_suggested_values_to_schema(CONFIG_SCHEMA, user_input)
+        schema = self.add_suggested_values_to_schema(schema, user_input)
         return self.async_show_form(step_id="user", data_schema=schema, errors=errors)
 
     async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
@@ -177,7 +194,7 @@ async def async_step_reauth_confirm(
         assert self._reauth_entry
         if user_input is not None:
             user_input = {**self._reauth_entry.data, **user_input}
-            if not (errors := await validate_input(user_input)):
+            if not (errors := await validate_input(self.hass, user_input)):
                 self.hass.config_entries.async_update_entry(
                     self._reauth_entry, data=user_input
                 )
@@ -231,7 +248,7 @@ async def async_step_init(
                 errors = {"base": err.reason}
             else:
                 entry_data.update(user_input)
-                errors = await validate_input(entry_data)
+                errors = await validate_input(self.hass, entry_data)
                 if not errors:
                     self.hass.config_entries.async_update_entry(
                         self.config_entry, data=entry_data
diff --git a/homeassistant/components/imap/const.py b/homeassistant/components/imap/const.py
index b39c88086331a4..2e36dd41e16856 100644
--- a/homeassistant/components/imap/const.py
+++ b/homeassistant/components/imap/const.py
@@ -9,6 +9,7 @@
 CONF_SEARCH: Final = "search"
 CONF_CHARSET: Final = "charset"
 CONF_MAX_MESSAGE_SIZE = "max_message_size"
+CONF_CUSTOM_EVENT_DATA_TEMPLATE: Final = "custom_event_data_template"
 CONF_SSL_CIPHER_LIST: Final = "ssl_cipher_list"
 
 DEFAULT_PORT: Final = 993
diff --git a/homeassistant/components/imap/coordinator.py b/homeassistant/components/imap/coordinator.py
index 512df9adf51c00..bf7f173e647659 100644
--- a/homeassistant/components/imap/coordinator.py
+++ b/homeassistant/components/imap/coordinator.py
@@ -5,6 +5,8 @@
 from collections.abc import Mapping
 from datetime import datetime, timedelta
 import email
+from email.header import decode_header, make_header
+from email.utils import parseaddr, parsedate_to_datetime
 import logging
 from typing import Any
 
@@ -16,16 +18,27 @@
     CONF_PASSWORD,
     CONF_PORT,
     CONF_USERNAME,
+    CONF_VERIFY_SSL,
     CONTENT_TYPE_TEXT_PLAIN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryError
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryError,
+    TemplateError,
+)
 from homeassistant.helpers.json import json_bytes
+from homeassistant.helpers.template import Template
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util.ssl import SSLCipherList, client_context
+from homeassistant.util.ssl import (
+    SSLCipherList,
+    client_context,
+    create_no_verify_ssl_context,
+)
 
 from .const import (
     CONF_CHARSET,
+    CONF_CUSTOM_EVENT_DATA_TEMPLATE,
     CONF_FOLDER,
     CONF_MAX_MESSAGE_SIZE,
     CONF_SEARCH,
@@ -46,9 +59,11 @@
 
 async def connect_to_server(data: Mapping[str, Any]) -> IMAP4_SSL:
     """Connect to imap server and return client."""
-    ssl_context = client_context(
-        ssl_cipher_list=data.get(CONF_SSL_CIPHER_LIST, SSLCipherList.PYTHON_DEFAULT)
-    )
+    ssl_cipher_list: str = data.get(CONF_SSL_CIPHER_LIST, SSLCipherList.PYTHON_DEFAULT)
+    if data.get(CONF_VERIFY_SSL, True):
+        ssl_context = client_context(ssl_cipher_list=ssl_cipher_list)
+    else:
+        ssl_context = create_no_verify_ssl_context()
     client = IMAP4_SSL(data[CONF_SERVER], data[CONF_PORT], ssl_context=ssl_context)
 
     await client.wait_hello_from_server()
@@ -76,9 +91,9 @@ def headers(self) -> dict[str, tuple[str,]]:
         """Get the email headers."""
         header_base: dict[str, tuple[str,]] = {}
         for key, value in self.email_message.items():
-            header: tuple[str,] = (str(value),)
-            if header_base.setdefault(key, header) != header:
-                header_base[key] += header  # type: ignore[assignment]
+            header_instances: tuple[str,] = (str(value),)
+            if header_base.setdefault(key, header_instances) != header_instances:
+                header_base[key] += header_instances  # type: ignore[assignment]
         return header_base
 
     @property
@@ -88,23 +103,26 @@ def date(self) -> datetime | None:
         date_str: str | None
         if (date_str := self.email_message["Date"]) is None:
             return None
-        # In some cases a timezone or comment is added in parenthesis after the date
-        # We want to strip that part to avoid parsing errors
-        return datetime.strptime(
-            date_str.split("(")[0].strip(), "%a, %d %b %Y %H:%M:%S %z"
-        )
+        try:
+            mail_dt_tm = parsedate_to_datetime(date_str)
+        except ValueError:
+            _LOGGER.debug(
+                "Parsed date %s is not compliant with rfc2822#section-3.3", date_str
+            )
+            return None
+        return mail_dt_tm
 
     @property
     def sender(self) -> str:
         """Get the parsed message sender from the email."""
-        return str(email.utils.parseaddr(self.email_message["From"])[1])
+        return str(parseaddr(self.email_message["From"])[1])
 
     @property
     def subject(self) -> str:
         """Decode the message subject."""
-        decoded_header = email.header.decode_header(self.email_message["Subject"])
-        header = email.header.make_header(decoded_header)
-        return str(header)
+        decoded_header = decode_header(self.email_message["Subject"] or "")
+        subject_header = make_header(decoded_header)
+        return str(subject_header)
 
     @property
     def text(self) -> str:
@@ -145,16 +163,22 @@ class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
     """Base class for imap client."""
 
     config_entry: ConfigEntry
+    custom_event_template: Template | None
 
     def __init__(
         self,
         hass: HomeAssistant,
         imap_client: IMAP4_SSL,
+        entry: ConfigEntry,
         update_interval: timedelta | None,
     ) -> None:
         """Initiate imap client."""
         self.imap_client = imap_client
         self._last_message_id: str | None = None
+        self.custom_event_template = None
+        _custom_event_template = entry.data.get(CONF_CUSTOM_EVENT_DATA_TEMPLATE)
+        if _custom_event_template is not None:
+            self.custom_event_template = Template(_custom_event_template, hass=hass)
         super().__init__(
             hass,
             _LOGGER,
@@ -181,15 +205,36 @@ async def _async_process_event(self, last_message_id: str) -> None:
                 "search": self.config_entry.data[CONF_SEARCH],
                 "folder": self.config_entry.data[CONF_FOLDER],
                 "date": message.date,
-                "text": message.text[
-                    : self.config_entry.data.get(
-                        CONF_MAX_MESSAGE_SIZE, DEFAULT_MAX_MESSAGE_SIZE
-                    )
-                ],
+                "text": message.text,
                 "sender": message.sender,
                 "subject": message.subject,
                 "headers": message.headers,
             }
+            if self.custom_event_template is not None:
+                try:
+                    data["custom"] = self.custom_event_template.async_render(
+                        data, parse_result=True
+                    )
+                    _LOGGER.debug(
+                        "imap custom template (%s) for msgid %s rendered to: %s",
+                        self.custom_event_template,
+                        last_message_id,
+                        data["custom"],
+                    )
+                except TemplateError as err:
+                    data["custom"] = None
+                    _LOGGER.error(
+                        "Error rendering imap custom template (%s) for msgid %s "
+                        "failed with message: %s",
+                        self.custom_event_template,
+                        last_message_id,
+                        err,
+                    )
+            data["text"] = message.text[
+                : self.config_entry.data.get(
+                    CONF_MAX_MESSAGE_SIZE, DEFAULT_MAX_MESSAGE_SIZE
+                )
+            ]
             if (size := len(json_bytes(data))) > MAX_EVENT_DATA_BYTES:
                 _LOGGER.warning(
                     "Custom imap_content event skipped, size (%s) exceeds "
@@ -203,7 +248,8 @@ async def _async_process_event(self, last_message_id: str) -> None:
 
             self.hass.bus.fire(EVENT_IMAP, data)
             _LOGGER.debug(
-                "Message processed, sender: %s, subject: %s",
+                "Message with id %s processed, sender: %s, subject: %s",
+                last_message_id,
                 message.sender,
                 message.subject,
             )
@@ -260,9 +306,11 @@ async def shutdown(self, *_: Any) -> None:
 class ImapPollingDataUpdateCoordinator(ImapDataUpdateCoordinator):
     """Class for imap client."""
 
-    def __init__(self, hass: HomeAssistant, imap_client: IMAP4_SSL) -> None:
+    def __init__(
+        self, hass: HomeAssistant, imap_client: IMAP4_SSL, entry: ConfigEntry
+    ) -> None:
         """Initiate imap client."""
-        super().__init__(hass, imap_client, timedelta(seconds=10))
+        super().__init__(hass, imap_client, entry, timedelta(seconds=10))
 
     async def _async_update_data(self) -> int | None:
         """Update the number of unread emails."""
@@ -291,9 +339,11 @@ async def _async_update_data(self) -> int | None:
 class ImapPushDataUpdateCoordinator(ImapDataUpdateCoordinator):
     """Class for imap client."""
 
-    def __init__(self, hass: HomeAssistant, imap_client: IMAP4_SSL) -> None:
+    def __init__(
+        self, hass: HomeAssistant, imap_client: IMAP4_SSL, entry: ConfigEntry
+    ) -> None:
         """Initiate imap client."""
-        super().__init__(hass, imap_client, None)
+        super().__init__(hass, imap_client, entry, None)
         self._push_wait_task: asyncio.Task[None] | None = None
 
     async def _async_update_data(self) -> int | None:
diff --git a/homeassistant/components/imap/manifest.json b/homeassistant/components/imap/manifest.json
index 39dfc6c0d48772..3c35d00f714627 100644
--- a/homeassistant/components/imap/manifest.json
+++ b/homeassistant/components/imap/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "imap",
   "name": "IMAP",
-  "codeowners": ["@engrbm87", "@jbouwh"],
+  "codeowners": ["@jbouwh"],
   "config_flow": true,
   "dependencies": ["repairs"],
   "documentation": "https://www.home-assistant.io/integrations/imap",
diff --git a/homeassistant/components/imap/sensor.py b/homeassistant/components/imap/sensor.py
index 776abc174a2c60..cd6da667ccbe28 100644
--- a/homeassistant/components/imap/sensor.py
+++ b/homeassistant/components/imap/sensor.py
@@ -1,7 +1,11 @@
 """IMAP sensor support."""
 from __future__ import annotations
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_USERNAME
 from homeassistant.core import HomeAssistant
@@ -13,6 +17,12 @@
 from . import ImapPollingDataUpdateCoordinator, ImapPushDataUpdateCoordinator
 from .const import DOMAIN
 
+IMAP_MAIL_COUNT_DESCRIPTION = SensorEntityDescription(
+    key="imap_mail_count",
+    state_class=SensorStateClass.MEASUREMENT,
+    suggested_display_precision=0,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -22,8 +32,7 @@ async def async_setup_entry(
     coordinator: ImapPushDataUpdateCoordinator | ImapPollingDataUpdateCoordinator = (
         hass.data[DOMAIN][entry.entry_id]
     )
-
-    async_add_entities([ImapSensor(coordinator)])
+    async_add_entities([ImapSensor(coordinator, IMAP_MAIL_COUNT_DESCRIPTION)])
 
 
 class ImapSensor(
@@ -34,13 +43,16 @@ class ImapSensor(
 
     _attr_icon = "mdi:email-outline"
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
         coordinator: ImapPushDataUpdateCoordinator | ImapPollingDataUpdateCoordinator,
+        description: SensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(coordinator)
+        self.entity_description = description
         self._attr_unique_id = f"{coordinator.config_entry.entry_id}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
diff --git a/homeassistant/components/imap/strings.json b/homeassistant/components/imap/strings.json
index 6e97fbe69d84a2..6fad88959310a2 100644
--- a/homeassistant/components/imap/strings.json
+++ b/homeassistant/components/imap/strings.json
@@ -10,7 +10,8 @@
           "charset": "Character set",
           "folder": "Folder",
           "search": "IMAP search",
-          "ssl_cipher_list": "SSL cipher list (Advanced)"
+          "ssl_cipher_list": "SSL cipher list (Advanced)",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       },
       "reauth_confirm": {
@@ -40,6 +41,7 @@
         "data": {
           "folder": "[%key:component::imap::config::step::user::data::folder%]",
           "search": "[%key:component::imap::config::step::user::data::search%]",
+          "custom_event_data_template": "Template to create custom event data",
           "max_message_size": "Max message size (2048 < size < 30000)"
         }
       }
diff --git a/homeassistant/components/imap_email_content/__init__.py b/homeassistant/components/imap_email_content/__init__.py
index 1a148f4591bf57..f2041b947df6d6 100644
--- a/homeassistant/components/imap_email_content/__init__.py
+++ b/homeassistant/components/imap_email_content/__init__.py
@@ -2,10 +2,15 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
+from .const import DOMAIN
+
 PLATFORMS = [Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.deprecated(DOMAIN, raise_if_present=False)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up imap_email_content."""
diff --git a/homeassistant/components/incomfort/sensor.py b/homeassistant/components/incomfort/sensor.py
index 0205e690c429f4..9e8cabbe2536a3 100644
--- a/homeassistant/components/incomfort/sensor.py
+++ b/homeassistant/components/incomfort/sensor.py
@@ -28,10 +28,9 @@ class IncomfortSensorEntityDescription(SensorEntityDescription):
     """Describes Incomfort sensor entity."""
 
     extra_key: str | None = None
-    # IncomfortSensor does not support DEVICE_CLASS_NAME
-    # Restrict the type to satisfy the type checker and catch attempts
-    # to use DEVICE_CLASS_NAME in the entity descriptions.
-    name: str | None = None
+    # IncomfortSensor does not support UNDEFINED or None,
+    # restrict the type to str
+    name: str = ""
 
 
 SENSOR_TYPES: tuple[IncomfortSensorEntityDescription, ...] = (
diff --git a/homeassistant/components/influxdb/__init__.py b/homeassistant/components/influxdb/__init__.py
index 8fde1c2d8bed4e..f879ab37e8fcc6 100644
--- a/homeassistant/components/influxdb/__init__.py
+++ b/homeassistant/components/influxdb/__init__.py
@@ -145,12 +145,11 @@ def validate_version_specific_config(conf: dict) -> dict:
                 f" {CONF_API_VERSION} is {DEFAULT_API_VERSION}"
             )
 
-    else:
-        if CONF_TOKEN in conf:
-            raise vol.Invalid(
-                f"{CONF_TOKEN} and {CONF_BUCKET} are only allowed when"
-                f" {CONF_API_VERSION} is {API_VERSION_2}"
-            )
+    elif CONF_TOKEN in conf:
+        raise vol.Invalid(
+            f"{CONF_TOKEN} and {CONF_BUCKET} are only allowed when"
+            f" {CONF_API_VERSION} is {API_VERSION_2}"
+        )
 
     return conf
 
diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py
index 67aaae225a8fe7..b4f643e876f18f 100644
--- a/homeassistant/components/influxdb/sensor.py
+++ b/homeassistant/components/influxdb/sensor.py
@@ -339,7 +339,7 @@ def update(self):
             return
 
         self.query = (
-            f"select {self.group}({self.field}) as {INFLUX_CONF_VALUE} from"
+            f"select {self.group}({self.field}) as {INFLUX_CONF_VALUE} from"  # noqa: S608
             f" {self.measurement} where {where_clause}"
         )
 
diff --git a/homeassistant/components/input_datetime/__init__.py b/homeassistant/components/input_datetime/__init__.py
index c51c0fdd67c4cc..8762769194fa80 100644
--- a/homeassistant/components/input_datetime/__init__.py
+++ b/homeassistant/components/input_datetime/__init__.py
@@ -272,7 +272,7 @@ async def async_added_to_hass(self):
         if self.state is not None:
             return
 
-        default_value = py_datetime.datetime.today().strftime("%Y-%m-%d 00:00:00")
+        default_value = py_datetime.datetime.today().strftime(f"{FMT_DATE} 00:00:00")
 
         # Priority 2: Old state
         if (old_state := await self.async_get_last_state()) is None:
@@ -292,13 +292,12 @@ async def async_added_to_hass(self):
             else:
                 current_datetime = py_datetime.datetime.combine(date, DEFAULT_TIME)
 
+        elif (time := dt_util.parse_time(old_state.state)) is None:
+            current_datetime = dt_util.parse_datetime(default_value)
         else:
-            if (time := dt_util.parse_time(old_state.state)) is None:
-                current_datetime = dt_util.parse_datetime(default_value)
-            else:
-                current_datetime = py_datetime.datetime.combine(
-                    py_datetime.date.today(), time
-                )
+            current_datetime = py_datetime.datetime.combine(
+                py_datetime.date.today(), time
+            )
 
         self._current_datetime = current_datetime.replace(
             tzinfo=dt_util.DEFAULT_TIME_ZONE
diff --git a/homeassistant/components/input_select/__init__.py b/homeassistant/components/input_select/__init__.py
index 186ab84fb81a18..2c5a1c87f29e90 100644
--- a/homeassistant/components/input_select/__init__.py
+++ b/homeassistant/components/input_select/__init__.py
@@ -302,12 +302,9 @@ def extra_state_attributes(self) -> dict[str, bool]:
     async def async_select_option(self, option: str) -> None:
         """Select new option."""
         if option not in self.options:
-            _LOGGER.warning(
-                "Invalid option: %s (possible options: %s)",
-                option,
-                ", ".join(self.options),
+            raise HomeAssistantError(
+                f"Invalid option: {option} (possible options: {', '.join(self.options)})"
             )
-            return
         self._attr_current_option = option
         self.async_write_ha_state()
 
diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index 1667f5fb779a5c..a074ad4600ba61 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -9,13 +9,12 @@
 from homeassistant.const import CONF_PLATFORM, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 
 from . import api
 from .const import (
     CONF_CAT,
-    CONF_DEV_PATH,
     CONF_DIM_STEPS,
     CONF_HOUSECODE,
     CONF_OVERRIDE,
@@ -25,7 +24,6 @@
     DOMAIN,
     INSTEON_PLATFORMS,
 )
-from .schemas import convert_yaml_to_config_flow
 from .utils import (
     add_insteon_events,
     async_register_services,
@@ -36,6 +34,8 @@
 _LOGGER = logging.getLogger(__name__)
 OPTIONS = "options"
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+
 
 async def async_get_device_config(hass, config_entry):
     """Initiate the connection and services."""
@@ -77,26 +77,6 @@ async def close_insteon_connection(*args):
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Insteon platform."""
-    hass.data[DOMAIN] = {}
-    if DOMAIN not in config:
-        return True
-
-    conf = dict(config[DOMAIN])
-    hass.data[DOMAIN][CONF_DEV_PATH] = conf.pop(CONF_DEV_PATH, None)
-
-    if not conf:
-        return True
-
-    data, options = convert_yaml_to_config_flow(conf)
-
-    if options:
-        hass.data[DOMAIN][OPTIONS] = options
-    # Create a config entry with the connection data
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=data
-        )
-    )
     return True
 
 
diff --git a/homeassistant/components/insteon/binary_sensor.py b/homeassistant/components/insteon/binary_sensor.py
index 9d1ec352bedc2d..f895b9c7f6aab6 100644
--- a/homeassistant/components/insteon/binary_sensor.py
+++ b/homeassistant/components/insteon/binary_sensor.py
@@ -25,7 +25,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 SENSOR_TYPES = {
     OPEN_CLOSE_SENSOR: BinarySensorDeviceClass.OPENING,
@@ -62,7 +62,12 @@ def async_add_insteon_binary_sensor_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.BINARY_SENSOR}"
     async_dispatcher_connect(hass, signal, async_add_insteon_binary_sensor_entities)
-    async_add_insteon_binary_sensor_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.BINARY_SENSOR,
+        InsteonBinarySensorEntity,
+        async_add_entities,
+    )
 
 
 class InsteonBinarySensorEntity(InsteonEntity, BinarySensorEntity):
diff --git a/homeassistant/components/insteon/climate.py b/homeassistant/components/insteon/climate.py
index cf5f4ac2c0cba3..48ff898d6aa692 100644
--- a/homeassistant/components/insteon/climate.py
+++ b/homeassistant/components/insteon/climate.py
@@ -23,7 +23,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 FAN_ONLY = "fan_only"
 
@@ -71,7 +71,12 @@ def async_add_insteon_climate_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.CLIMATE}"
     async_dispatcher_connect(hass, signal, async_add_insteon_climate_entities)
-    async_add_insteon_climate_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.CLIMATE,
+        InsteonClimateEntity,
+        async_add_entities,
+    )
 
 
 class InsteonClimateEntity(InsteonEntity, ClimateEntity):
diff --git a/homeassistant/components/insteon/config_flow.py b/homeassistant/components/insteon/config_flow.py
index 15ce7c849e6135..f5bafd935a0f74 100644
--- a/homeassistant/components/insteon/config_flow.py
+++ b/homeassistant/components/insteon/config_flow.py
@@ -163,25 +163,14 @@ async def _async_setup_hub(self, hub_version, user_input):
             step_id=step_id, data_schema=data_schema, errors=errors
         )
 
-    async def async_step_import(self, import_info):
-        """Import a yaml entry as a config entry."""
-        if self._async_current_entries():
-            return self.async_abort(reason="single_instance_allowed")
-        if not await _async_connect(**import_info):
-            return self.async_abort(reason="cannot_connect")
-        return self.async_create_entry(title="", data=import_info)
-
     async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult:
         """Handle USB discovery."""
         if self._async_current_entries():
             return self.async_abort(reason="single_instance_allowed")
 
-        dev_path = await self.hass.async_add_executor_job(
-            usb.get_serial_by_id, discovery_info.device
-        )
-        self._device_path = dev_path
+        self._device_path = discovery_info.device
         self._device_name = usb.human_readable_device_name(
-            dev_path,
+            discovery_info.device,
             discovery_info.serial_number,
             discovery_info.manufacturer,
             discovery_info.description,
diff --git a/homeassistant/components/insteon/cover.py b/homeassistant/components/insteon/cover.py
index 69a66d304ced1b..0756e6035794d9 100644
--- a/homeassistant/components/insteon/cover.py
+++ b/homeassistant/components/insteon/cover.py
@@ -15,7 +15,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 
 async def async_setup_entry(
@@ -34,7 +34,12 @@ def async_add_insteon_cover_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.COVER}"
     async_dispatcher_connect(hass, signal, async_add_insteon_cover_entities)
-    async_add_insteon_cover_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.COVER,
+        InsteonCoverEntity,
+        async_add_entities,
+    )
 
 
 class InsteonCoverEntity(InsteonEntity, CoverEntity):
diff --git a/homeassistant/components/insteon/fan.py b/homeassistant/components/insteon/fan.py
index b0d664a821b811..92f56098a917b0 100644
--- a/homeassistant/components/insteon/fan.py
+++ b/homeassistant/components/insteon/fan.py
@@ -17,7 +17,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 SPEED_RANGE = (1, 255)  # off is not included
 
@@ -38,7 +38,12 @@ def async_add_insteon_fan_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.FAN}"
     async_dispatcher_connect(hass, signal, async_add_insteon_fan_entities)
-    async_add_insteon_fan_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.FAN,
+        InsteonFanEntity,
+        async_add_entities,
+    )
 
 
 class InsteonFanEntity(InsteonEntity, FanEntity):
diff --git a/homeassistant/components/insteon/ipdb.py b/homeassistant/components/insteon/ipdb.py
index ee799e103f923b..de3ba7d55f20fc 100644
--- a/homeassistant/components/insteon/ipdb.py
+++ b/homeassistant/components/insteon/ipdb.py
@@ -1,4 +1,7 @@
 """Utility methods for the Insteon platform."""
+from collections.abc import Iterable
+
+from pyinsteon.device_types.device_base import Device
 from pyinsteon.device_types.ipdb import (
     AccessControl_Morningstar,
     ClimateControl_Thermostat,
@@ -44,7 +47,7 @@
 
 from homeassistant.const import Platform
 
-DEVICE_PLATFORM = {
+DEVICE_PLATFORM: dict[Device, dict[Platform, Iterable[int]]] = {
     AccessControl_Morningstar: {Platform.LOCK: [1]},
     DimmableLightingControl: {Platform.LIGHT: [1]},
     DimmableLightingControl_Dial: {Platform.LIGHT: [1]},
@@ -101,11 +104,11 @@
 }
 
 
-def get_device_platforms(device):
+def get_device_platforms(device) -> dict[Platform, Iterable[int]]:
     """Return the HA platforms for a device type."""
-    return DEVICE_PLATFORM.get(type(device), {}).keys()
+    return DEVICE_PLATFORM.get(type(device), {})
 
 
-def get_platform_groups(device, domain) -> dict:
-    """Return the platforms that a device belongs in."""
-    return DEVICE_PLATFORM.get(type(device), {}).get(domain, {})  # type: ignore[attr-defined]
+def get_device_platform_groups(device: Device, platform: Platform) -> Iterable[int]:
+    """Return the list of device groups for a platform."""
+    return get_device_platforms(device).get(platform, [])
diff --git a/homeassistant/components/insteon/light.py b/homeassistant/components/insteon/light.py
index 44574c696b4e82..1c12bc794f9b48 100644
--- a/homeassistant/components/insteon/light.py
+++ b/homeassistant/components/insteon/light.py
@@ -12,7 +12,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 MAX_BRIGHTNESS = 255
 
@@ -37,7 +37,12 @@ def async_add_insteon_light_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.LIGHT}"
     async_dispatcher_connect(hass, signal, async_add_insteon_light_entities)
-    async_add_insteon_light_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.LIGHT,
+        InsteonDimmerEntity,
+        async_add_entities,
+    )
 
 
 class InsteonDimmerEntity(InsteonEntity, LightEntity):
diff --git a/homeassistant/components/insteon/lock.py b/homeassistant/components/insteon/lock.py
index 75487e7696cd78..27fb0fd42d873e 100644
--- a/homeassistant/components/insteon/lock.py
+++ b/homeassistant/components/insteon/lock.py
@@ -11,7 +11,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 
 async def async_setup_entry(
@@ -30,7 +30,12 @@ def async_add_insteon_lock_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.LOCK}"
     async_dispatcher_connect(hass, signal, async_add_insteon_lock_entities)
-    async_add_insteon_lock_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.LOCK,
+        InsteonLockEntity,
+        async_add_entities,
+    )
 
 
 class InsteonLockEntity(InsteonEntity, LockEntity):
diff --git a/homeassistant/components/insteon/manifest.json b/homeassistant/components/insteon/manifest.json
index cc8495384b1b1c..ad3fb7bfbe81fd 100644
--- a/homeassistant/components/insteon/manifest.json
+++ b/homeassistant/components/insteon/manifest.json
@@ -17,7 +17,7 @@
   "iot_class": "local_push",
   "loggers": ["pyinsteon", "pypubsub"],
   "requirements": [
-    "pyinsteon==1.4.2",
+    "pyinsteon==1.4.3",
     "insteon-frontend-home-assistant==0.3.5"
   ],
   "usb": [
diff --git a/homeassistant/components/insteon/schemas.py b/homeassistant/components/insteon/schemas.py
index 84b586e76494c7..e6b22a8cbb964e 100644
--- a/homeassistant/components/insteon/schemas.py
+++ b/homeassistant/components/insteon/schemas.py
@@ -22,26 +22,13 @@
 
 from .const import (
     CONF_CAT,
-    CONF_DEV_PATH,
     CONF_DIM_STEPS,
-    CONF_FIRMWARE,
     CONF_HOUSECODE,
-    CONF_HUB_PASSWORD,
-    CONF_HUB_USERNAME,
-    CONF_HUB_VERSION,
-    CONF_IP_PORT,
     CONF_OVERRIDE,
-    CONF_PLM_HUB_MSG,
-    CONF_PRODUCT_KEY,
     CONF_SUBCAT,
     CONF_UNITCODE,
     CONF_X10,
-    CONF_X10_ALL_LIGHTS_OFF,
-    CONF_X10_ALL_LIGHTS_ON,
-    CONF_X10_ALL_UNITS_OFF,
-    DOMAIN,
     HOUSECODES,
-    INSTEON_ADDR_REGEX,
     PORT_HUB_V1,
     PORT_HUB_V2,
     SRV_ALL_LINK_GROUP,
@@ -53,88 +40,6 @@
     X10_PLATFORMS,
 )
 
-
-def set_default_port(schema: dict) -> dict:
-    """Set the default port based on the Hub version."""
-    # If the ip_port is found do nothing
-    # If it is not found the set the default
-    if not schema.get(CONF_IP_PORT):
-        hub_version = schema.get(CONF_HUB_VERSION)
-        # Found hub_version but not ip_port
-        schema[CONF_IP_PORT] = PORT_HUB_V1 if hub_version == 1 else PORT_HUB_V2
-    return schema
-
-
-def insteon_address(value: str) -> str:
-    """Validate an Insteon address."""
-    if not INSTEON_ADDR_REGEX.match(value):
-        raise vol.Invalid("Invalid Insteon Address")
-    return str(value).replace(".", "").lower()
-
-
-CONF_DEVICE_OVERRIDE_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Required(CONF_ADDRESS): cv.string,
-            vol.Optional(CONF_CAT): cv.byte,
-            vol.Optional(CONF_SUBCAT): cv.byte,
-            vol.Optional(CONF_FIRMWARE): cv.byte,
-            vol.Optional(CONF_PRODUCT_KEY): cv.byte,
-            vol.Optional(CONF_PLATFORM): cv.string,
-        }
-    ),
-)
-
-
-CONF_X10_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            vol.Required(CONF_HOUSECODE): cv.string,
-            vol.Required(CONF_UNITCODE): vol.Range(min=1, max=16),
-            vol.Required(CONF_PLATFORM): cv.string,
-            vol.Optional(CONF_DIM_STEPS): vol.Range(min=2, max=255),
-        }
-    )
-)
-
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.All(
-            cv.deprecated(CONF_X10_ALL_UNITS_OFF),
-            cv.deprecated(CONF_X10_ALL_LIGHTS_ON),
-            cv.deprecated(CONF_X10_ALL_LIGHTS_OFF),
-            vol.Schema(
-                {
-                    vol.Exclusive(
-                        CONF_PORT, "plm_or_hub", msg=CONF_PLM_HUB_MSG
-                    ): cv.string,
-                    vol.Exclusive(
-                        CONF_HOST, "plm_or_hub", msg=CONF_PLM_HUB_MSG
-                    ): cv.string,
-                    vol.Optional(CONF_IP_PORT): cv.port,
-                    vol.Optional(CONF_HUB_USERNAME): cv.string,
-                    vol.Optional(CONF_HUB_PASSWORD): cv.string,
-                    vol.Optional(CONF_HUB_VERSION, default=2): vol.In([1, 2]),
-                    vol.Optional(CONF_OVERRIDE): vol.All(
-                        cv.ensure_list_csv, [CONF_DEVICE_OVERRIDE_SCHEMA]
-                    ),
-                    vol.Optional(CONF_X10): vol.All(
-                        cv.ensure_list_csv, [CONF_X10_SCHEMA]
-                    ),
-                    vol.Optional(CONF_DEV_PATH): cv.string,
-                },
-                extra=vol.ALLOW_EXTRA,
-                required=True,
-            ),
-            cv.has_at_least_one_key(CONF_PORT, CONF_HOST),
-            set_default_port,
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-
 ADD_ALL_LINK_SCHEMA = vol.Schema(
     {
         vol.Required(SRV_ALL_LINK_GROUP): vol.Range(min=0, max=255),
@@ -170,18 +75,6 @@ def insteon_address(value: str) -> str:
 ADD_DEFAULT_LINKS_SCHEMA = vol.Schema({vol.Required(CONF_ENTITY_ID): cv.entity_id})
 
 
-SCENE_ENTITY_SCHEMA = vol.Schema(
-    [
-        {
-            vol.Required(CONF_ADDRESS): str,
-            vol.Required("data1"): int,
-            vol.Required("data2"): int,
-            vol.Required("data3"): int,
-        }
-    ]
-)
-
-
 def normalize_byte_entry_to_int(entry: int | bytes | str):
     """Format a hex entry value."""
     if isinstance(entry, int):
@@ -338,32 +231,3 @@ def build_remove_x10_schema(data):
         unitcode = device[CONF_UNITCODE]
         selection.append(f"Housecode: {housecode}, Unitcode: {unitcode}")
     return vol.Schema({vol.Required(CONF_DEVICE): vol.In(selection)})
-
-
-def convert_yaml_to_config_flow(yaml_config):
-    """Convert the YAML based configuration to a config flow configuration."""
-    config = {}
-    if yaml_config.get(CONF_HOST):
-        hub_version = yaml_config.get(CONF_HUB_VERSION, 2)
-        default_port = PORT_HUB_V2 if hub_version == 2 else PORT_HUB_V1
-        config[CONF_HOST] = yaml_config.get(CONF_HOST)
-        config[CONF_PORT] = yaml_config.get(CONF_PORT, default_port)
-        config[CONF_HUB_VERSION] = hub_version
-        if hub_version == 2:
-            config[CONF_USERNAME] = yaml_config[CONF_USERNAME]
-            config[CONF_PASSWORD] = yaml_config[CONF_PASSWORD]
-    else:
-        config[CONF_DEVICE] = yaml_config[CONF_PORT]
-
-    options = {}
-    for old_override in yaml_config.get(CONF_OVERRIDE, []):
-        override = {}
-        override[CONF_ADDRESS] = str(Address(old_override[CONF_ADDRESS]))
-        override[CONF_CAT] = normalize_byte_entry_to_int(old_override[CONF_CAT])
-        override[CONF_SUBCAT] = normalize_byte_entry_to_int(old_override[CONF_SUBCAT])
-        options = add_device_override(options, override)
-
-    for x10_device in yaml_config.get(CONF_X10, []):
-        options = add_x10_device(options, x10_device)
-
-    return config, options
diff --git a/homeassistant/components/insteon/switch.py b/homeassistant/components/insteon/switch.py
index 8f7c396f21331e..8acde0429cd4b1 100644
--- a/homeassistant/components/insteon/switch.py
+++ b/homeassistant/components/insteon/switch.py
@@ -10,7 +10,7 @@
 
 from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
-from .utils import async_add_insteon_entities
+from .utils import async_add_insteon_devices, async_add_insteon_entities
 
 
 async def async_setup_entry(
@@ -33,7 +33,12 @@ def async_add_insteon_switch_entities(discovery_info=None):
 
     signal = f"{SIGNAL_ADD_ENTITIES}_{Platform.SWITCH}"
     async_dispatcher_connect(hass, signal, async_add_insteon_switch_entities)
-    async_add_insteon_switch_entities()
+    async_add_insteon_devices(
+        hass,
+        Platform.SWITCH,
+        InsteonSwitchEntity,
+        async_add_entities,
+    )
 
 
 class InsteonSwitchEntity(InsteonEntity, SwitchEntity):
diff --git a/homeassistant/components/insteon/utils.py b/homeassistant/components/insteon/utils.py
index 58b2430092cbe1..d7cbe676eee501 100644
--- a/homeassistant/components/insteon/utils.py
+++ b/homeassistant/components/insteon/utils.py
@@ -1,7 +1,10 @@
 """Utilities used by insteon component."""
+from __future__ import annotations
+
 import asyncio
 from collections.abc import Callable
 import logging
+from typing import TYPE_CHECKING, Any
 
 from pyinsteon import devices
 from pyinsteon.address import Address
@@ -30,6 +33,7 @@
     CONF_ENTITY_ID,
     CONF_PLATFORM,
     ENTITY_MATCH_ALL,
+    Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr
@@ -38,6 +42,7 @@
     async_dispatcher_send,
     dispatcher_send,
 )
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
     CONF_CAT,
@@ -78,7 +83,7 @@
     SRV_X10_ALL_LIGHTS_ON,
     SRV_X10_ALL_UNITS_OFF,
 )
-from .ipdb import get_device_platforms, get_platform_groups
+from .ipdb import get_device_platform_groups, get_device_platforms
 from .schemas import (
     ADD_ALL_LINK_SCHEMA,
     ADD_DEFAULT_LINKS_SCHEMA,
@@ -89,6 +94,9 @@
     X10_HOUSECODE_SCHEMA,
 )
 
+if TYPE_CHECKING:
+    from .insteon_entity import InsteonEntity
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -107,8 +115,8 @@ def add_insteon_events(hass: HomeAssistant, device: Device) -> None:
     """Register Insteon device events."""
 
     @callback
-    def async_fire_group_on_off_event(
-        name: str, address: Address, group: int, button: str
+    def async_fire_insteon_event(
+        name: str, address: Address, group: int, button: str | None = None
     ):
         # Firing an event when a button is pressed.
         if button and button[-2] == "_":
@@ -132,12 +140,15 @@ def async_fire_group_on_off_event(
         _LOGGER.debug("Firing event %s with %s", event, schema)
         hass.bus.async_fire(event, schema)
 
+    if str(device.address).startswith("X10"):
+        return
+
     for name_or_group, event in device.events.items():
         if isinstance(name_or_group, int):
             for _, event in device.events[name_or_group].items():
-                _register_event(event, async_fire_group_on_off_event)
+                _register_event(event, async_fire_insteon_event)
         else:
-            _register_event(event, async_fire_group_on_off_event)
+            _register_event(event, async_fire_insteon_event)
 
 
 def register_new_device_callback(hass):
@@ -158,8 +169,10 @@ async def async_create_new_entities(address):
         await device.async_status()
         platforms = get_device_platforms(device)
         for platform in platforms:
+            groups = get_device_platform_groups(device, platform)
             signal = f"{SIGNAL_ADD_ENTITIES}_{platform}"
-            dispatcher_send(hass, signal, {"address": device.address})
+            dispatcher_send(hass, signal, {"address": device.address, "groups": groups})
+        add_insteon_events(hass, device)
 
     devices.subscribe(async_new_insteon_device, force_strong_ref=True)
 
@@ -383,18 +396,36 @@ def print_aldb_to_log(aldb):
 
 @callback
 def async_add_insteon_entities(
-    hass, platform, entity_type, async_add_entities, discovery_info
-):
-    """Add Insteon devices to a platform."""
-    new_entities = []
-    device_list = [discovery_info.get("address")] if discovery_info else devices
+    hass: HomeAssistant,
+    platform: Platform,
+    entity_type: type[InsteonEntity],
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: dict[str, Any],
+) -> None:
+    """Add an Insteon group to a platform."""
+    address = discovery_info["address"]
+    device = devices[address]
+    new_entities = [
+        entity_type(device=device, group=group) for group in discovery_info["groups"]
+    ]
+    async_add_entities(new_entities)
 
-    for address in device_list:
+
+@callback
+def async_add_insteon_devices(
+    hass: HomeAssistant,
+    platform: Platform,
+    entity_type: type[InsteonEntity],
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Add all entities to a platform."""
+    for address in devices:
         device = devices[address]
-        groups = get_platform_groups(device, platform)
-        for group in groups:
-            new_entities.append(entity_type(device, group))
-    async_add_entities(new_entities)
+        groups = get_device_platform_groups(device, platform)
+        discovery_info = {"address": address, "groups": groups}
+        async_add_insteon_entities(
+            hass, platform, entity_type, async_add_entities, discovery_info
+        )
 
 
 def get_usb_ports() -> dict[str, str]:
diff --git a/homeassistant/components/integration/sensor.py b/homeassistant/components/integration/sensor.py
index 64d83506ad95d3..af4248e5e3ba45 100644
--- a/homeassistant/components/integration/sensor.py
+++ b/homeassistant/components/integration/sensor.py
@@ -1,16 +1,19 @@
 """Numeric integration of data coming from a source sensor over time."""
 from __future__ import annotations
 
-from decimal import Decimal, DecimalException
+from dataclasses import dataclass
+from decimal import Decimal, DecimalException, InvalidOperation
 import logging
-from typing import Final
+from typing import Any, Final
 
+from typing_extensions import Self
 import voluptuous as vol
 
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA,
+    RestoreSensor,
     SensorDeviceClass,
-    SensorEntity,
+    SensorExtraStoredData,
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -25,10 +28,14 @@
     UnitOfTime,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
-from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -79,6 +86,53 @@
 )
 
 
+@dataclass
+class IntegrationSensorExtraStoredData(SensorExtraStoredData):
+    """Object to hold extra stored data."""
+
+    source_entity: str | None
+    last_valid_state: Decimal | None
+
+    def as_dict(self) -> dict[str, Any]:
+        """Return a dict representation of the utility sensor data."""
+        data = super().as_dict()
+        data["source_entity"] = self.source_entity
+        data["last_valid_state"] = (
+            str(self.last_valid_state) if self.last_valid_state else None
+        )
+        return data
+
+    @classmethod
+    def from_dict(cls, restored: dict[str, Any]) -> Self | None:
+        """Initialize a stored sensor state from a dict."""
+        extra = SensorExtraStoredData.from_dict(restored)
+        if extra is None:
+            return None
+
+        source_entity = restored.get(ATTR_SOURCE_ID)
+
+        try:
+            last_valid_state = (
+                Decimal(str(restored.get("last_valid_state")))
+                if restored.get("last_valid_state")
+                else None
+            )
+        except InvalidOperation:
+            # last_period is corrupted
+            _LOGGER.error("Could not use last_valid_state")
+            return None
+
+        if last_valid_state is None:
+            return None
+
+        return cls(
+            extra.native_value,
+            extra.native_unit_of_measurement,
+            source_entity,
+            last_valid_state,
+        )
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -91,6 +145,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE_SENSOR]
     )
 
+    source_entity = er.EntityRegistry.async_get(registry, source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     unit_prefix = config_entry.options[CONF_UNIT_PREFIX]
     if unit_prefix == "none":
         unit_prefix = None
@@ -103,6 +179,7 @@ async def async_setup_entry(
         unique_id=config_entry.entry_id,
         unit_prefix=unit_prefix,
         unit_time=config_entry.options[CONF_UNIT_TIME],
+        device_info=device_info,
     )
 
     async_add_entities([integral])
@@ -128,7 +205,8 @@ async def async_setup_platform(
     async_add_entities([integral])
 
 
-class IntegrationSensor(RestoreEntity, SensorEntity):
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
+class IntegrationSensor(RestoreSensor):
     """Representation of an integration sensor."""
 
     _attr_state_class = SensorStateClass.TOTAL
@@ -144,6 +222,7 @@ def __init__(
         unique_id: str | None,
         unit_prefix: str | None,
         unit_time: UnitOfTime,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the integration sensor."""
         self._attr_unique_id = unique_id
@@ -159,7 +238,9 @@ def __init__(
         self._unit_time = UNIT_TIME[unit_time]
         self._unit_time_str = unit_time
         self._attr_icon = "mdi:chart-histogram"
-        self._attr_extra_state_attributes = {ATTR_SOURCE_ID: source_entity}
+        self._source_entity: str = source_entity
+        self._last_valid_state: Decimal | None = None
+        self._attr_device_info = device_info
 
     def _unit(self, source_unit: str) -> str:
         """Derive unit from the source sensor, SI prefix and time unit."""
@@ -174,10 +255,28 @@ def _unit(self, source_unit: str) -> str:
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
         await super().async_added_to_hass()
-        if (state := await self.async_get_last_state()) is not None:
-            if state.state == STATE_UNAVAILABLE:
-                self._attr_available = False
-            elif state.state != STATE_UNKNOWN:
+
+        if (last_sensor_data := await self.async_get_last_sensor_data()) is not None:
+            self._state = (
+                Decimal(str(last_sensor_data.native_value))
+                if last_sensor_data.native_value
+                else last_sensor_data.last_valid_state
+            )
+            self._attr_native_value = last_sensor_data.native_value
+            self._unit_of_measurement = last_sensor_data.native_unit_of_measurement
+            self._last_valid_state = last_sensor_data.last_valid_state
+
+            _LOGGER.debug(
+                "Restored state %s and last_valid_state %s",
+                self._state,
+                self._last_valid_state,
+            )
+        elif (state := await self.async_get_last_state()) is not None:
+            # legacy to be removed on 2023.10 (we are keeping this to avoid losing data during the transition)
+            if state.state in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
+                if state.state == STATE_UNAVAILABLE:
+                    self._attr_available = False
+            else:
                 try:
                     self._state = Decimal(state.state)
                 except (DecimalException, ValueError) as err:
@@ -294,6 +393,7 @@ def calc_integration(event: Event) -> None:
                     self._state += integral
                 else:
                     self._state = integral
+                self._last_valid_state = self._state
                 self.async_write_ha_state()
 
         self.async_on_remove(
@@ -313,3 +413,33 @@ def native_value(self) -> Decimal | None:
     def native_unit_of_measurement(self) -> str | None:
         """Return the unit the value is expressed in."""
         return self._unit_of_measurement
+
+    @property
+    def extra_state_attributes(self) -> dict[str, str] | None:
+        """Return the state attributes of the sensor."""
+        state_attr = {
+            ATTR_SOURCE_ID: self._source_entity,
+        }
+
+        return state_attr
+
+    @property
+    def extra_restore_state_data(self) -> IntegrationSensorExtraStoredData:
+        """Return sensor specific state data to be restored."""
+        return IntegrationSensorExtraStoredData(
+            self.native_value,
+            self.native_unit_of_measurement,
+            self._source_entity,
+            self._last_valid_state,
+        )
+
+    async def async_get_last_sensor_data(
+        self,
+    ) -> IntegrationSensorExtraStoredData | None:
+        """Restore Utility Meter Sensor Extra Stored Data."""
+        if (restored_last_extra_data := await self.async_get_last_extra_data()) is None:
+            return None
+
+        return IntegrationSensorExtraStoredData.from_dict(
+            restored_last_extra_data.as_dict()
+        )
diff --git a/homeassistant/components/intellifire/climate.py b/homeassistant/components/intellifire/climate.py
index 649234d7568455..5d305db8febcfd 100644
--- a/homeassistant/components/intellifire/climate.py
+++ b/homeassistant/components/intellifire/climate.py
@@ -66,7 +66,7 @@ def __init__(
             self.last_temp = coordinator.data.thermostat_setpoint_c
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return current hvac mode."""
         if self.coordinator.read_api.data.thermostat_on:
             return HVACMode.HEAT
diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index 2f5ea26a8a65a4..b2c77fed3af135 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -29,6 +29,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Intent component."""
@@ -68,18 +70,22 @@ async def async_call_service(self, intent_obj: intent.Intent, state: State) -> N
         if state.domain == COVER_DOMAIN:
             # on = open
             # off = close
-            await hass.services.async_call(
-                COVER_DOMAIN,
-                SERVICE_OPEN_COVER
-                if self.service == SERVICE_TURN_ON
-                else SERVICE_CLOSE_COVER,
-                {ATTR_ENTITY_ID: state.entity_id},
-                context=intent_obj.context,
-                blocking=True,
-                limit=self.service_timeout,
+            await self._run_then_background(
+                hass.async_create_task(
+                    hass.services.async_call(
+                        COVER_DOMAIN,
+                        SERVICE_OPEN_COVER
+                        if self.service == SERVICE_TURN_ON
+                        else SERVICE_CLOSE_COVER,
+                        {ATTR_ENTITY_ID: state.entity_id},
+                        context=intent_obj.context,
+                        blocking=True,
+                    )
+                )
             )
+            return
 
-        elif not hass.services.has_service(state.domain, self.service):
+        if not hass.services.has_service(state.domain, self.service):
             raise intent.IntentHandleError(
                 f"Service {self.service} does not support entity {state.entity_id}"
             )
diff --git a/homeassistant/components/intent_script/__init__.py b/homeassistant/components/intent_script/__init__.py
index 2ec898bfb0eb93..55c4947fe4a04d 100644
--- a/homeassistant/components/intent_script/__init__.py
+++ b/homeassistant/components/intent_script/__init__.py
@@ -5,9 +5,16 @@
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_TYPE
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, intent, script, template
+from homeassistant.const import CONF_TYPE, SERVICE_RELOAD
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import (
+    config_validation as cv,
+    intent,
+    script,
+    service,
+    template,
+)
+from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -55,10 +62,27 @@
 )
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the intent script component."""
-    intents = config[DOMAIN]
+async def async_reload(hass: HomeAssistant, servie_call: ServiceCall) -> None:
+    """Handle start Intent Script service call."""
+    new_config = await async_integration_yaml_config(hass, DOMAIN)
+    existing_intents = hass.data[DOMAIN]
+
+    for intent_type in existing_intents:
+        intent.async_remove(hass, intent_type)
+
+    if not new_config or DOMAIN not in new_config:
+        hass.data[DOMAIN] = {}
+        return
+
+    new_intents = new_config[DOMAIN]
+
+    async_load_intents(hass, new_intents)
+
+
+def async_load_intents(hass: HomeAssistant, intents: dict):
+    """Load YAML intents into the intent system."""
     template.attach(hass, intents)
+    hass.data[DOMAIN] = intents
 
     for intent_type, conf in intents.items():
         if CONF_ACTION in conf:
@@ -67,6 +91,23 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             )
         intent.async_register(hass, ScriptIntentHandler(intent_type, conf))
 
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the intent script component."""
+    intents = config[DOMAIN]
+
+    async_load_intents(hass, intents)
+
+    async def _handle_reload(servie_call: ServiceCall) -> None:
+        return await async_reload(hass, servie_call)
+
+    service.async_register_admin_service(
+        hass,
+        DOMAIN,
+        SERVICE_RELOAD,
+        _handle_reload,
+    )
+
     return True
 
 
diff --git a/homeassistant/components/intent_script/services.yaml b/homeassistant/components/intent_script/services.yaml
new file mode 100644
index 00000000000000..bb981dbc69cb4b
--- /dev/null
+++ b/homeassistant/components/intent_script/services.yaml
@@ -0,0 +1,3 @@
+reload:
+  name: Reload
+  description: Reload the intent_script configuration.
diff --git a/homeassistant/components/ios/sensor.py b/homeassistant/components/ios/sensor.py
index f4dab9e301bad8..f3767be9f3d5ed 100644
--- a/homeassistant/components/ios/sensor.py
+++ b/homeassistant/components/ios/sensor.py
@@ -1,7 +1,11 @@
 """Support for Home Assistant iOS app sensors."""
 from __future__ import annotations
 
-from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
@@ -17,12 +21,12 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="level",
-        name="Battery Level",
         native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.BATTERY,
     ),
     SensorEntityDescription(
         key="state",
-        name="Battery State",
+        translation_key="battery_state",
     ),
 )
 
@@ -59,6 +63,7 @@ class IOSSensor(SensorEntity):
     """Representation of an iOS sensor."""
 
     _attr_should_poll = False
+    _attr_has_entity_name = True
 
     def __init__(
         self, device_name, device, description: SensorEntityDescription
@@ -67,9 +72,6 @@ def __init__(
         self.entity_description = description
         self._device = device
 
-        device_name = device[ios.ATTR_DEVICE][ios.ATTR_DEVICE_NAME]
-        self._attr_name = f"{device_name} {description.key}"
-
         device_id = device[ios.ATTR_DEVICE_ID]
         self._attr_unique_id = f"{description.key}_{device_id}"
 
diff --git a/homeassistant/components/ios/strings.json b/homeassistant/components/ios/strings.json
index 2b486cc0c04834..6c77209e3171b1 100644
--- a/homeassistant/components/ios/strings.json
+++ b/homeassistant/components/ios/strings.json
@@ -8,5 +8,12 @@
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "battery_state": {
+        "name": "Battery state"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/iotawatt/manifest.json b/homeassistant/components/iotawatt/manifest.json
index 1a25a26ee35fa8..5beaa1e318ca6b 100644
--- a/homeassistant/components/iotawatt/manifest.json
+++ b/homeassistant/components/iotawatt/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/iotawatt",
   "iot_class": "local_polling",
   "loggers": ["iotawattpy"],
-  "requirements": ["iotawattpy==0.1.0"]
+  "requirements": ["ha-iotawattpy==0.1.1"]
 }
diff --git a/homeassistant/components/iotawatt/sensor.py b/homeassistant/components/iotawatt/sensor.py
index 849a2055ce32d2..b616c7e4ae9b9c 100644
--- a/homeassistant/components/iotawatt/sensor.py
+++ b/homeassistant/components/iotawatt/sensor.py
@@ -28,7 +28,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN, VOLT_AMPERE_REACTIVE, VOLT_AMPERE_REACTIVE_HOURS
 from .coordinator import IotawattUpdater
@@ -203,7 +203,7 @@ def _handle_coordinator_update(self) -> None:
             return
 
         if (begin := self._sensor_data.getBegin()) and (
-            last_reset := dt.parse_datetime(begin)
+            last_reset := dt_util.parse_datetime(begin)
         ):
             self._attr_last_reset = last_reset
 
diff --git a/homeassistant/components/iperf3/sensor.py b/homeassistant/components/iperf3/sensor.py
index e39d1e1d864c3d..d3db0e76631422 100644
--- a/homeassistant/components/iperf3/sensor.py
+++ b/homeassistant/components/iperf3/sensor.py
@@ -35,6 +35,7 @@ async def async_setup_platform(
     async_add_entities(entities, True)
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Iperf3Sensor(RestoreEntity, SensorEntity):
     """A Iperf3 sensor implementation."""
 
diff --git a/homeassistant/components/ipma/__init__.py b/homeassistant/components/ipma/__init__.py
index 866e79cbe404e2..dd46593998e6bc 100644
--- a/homeassistant/components/ipma/__init__.py
+++ b/homeassistant/components/ipma/__init__.py
@@ -18,7 +18,7 @@
 
 DEFAULT_NAME = "ipma"
 
-PLATFORMS = [Platform.WEATHER]
+PLATFORMS = [Platform.WEATHER, Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/ipma/config_flow.py b/homeassistant/components/ipma/config_flow.py
index 81ab8f98014246..eb361d3f9d5b5d 100644
--- a/homeassistant/components/ipma/config_flow.py
+++ b/homeassistant/components/ipma/config_flow.py
@@ -5,8 +5,7 @@
 from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 
-from .const import DOMAIN, HOME_LOCATION_NAME
-from .weather import FORECAST_MODE
+from .const import DOMAIN, FORECAST_MODE, HOME_LOCATION_NAME
 
 
 class IpmaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
diff --git a/homeassistant/components/ipma/const.py b/homeassistant/components/ipma/const.py
index 515fb501fbd03c..2d715011e4326f 100644
--- a/homeassistant/components/ipma/const.py
+++ b/homeassistant/components/ipma/const.py
@@ -1,5 +1,24 @@
 """Constants for IPMA component."""
-from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
+from datetime import timedelta
+
+from homeassistant.components.weather import (
+    ATTR_CONDITION_CLEAR_NIGHT,
+    ATTR_CONDITION_CLOUDY,
+    ATTR_CONDITION_EXCEPTIONAL,
+    ATTR_CONDITION_FOG,
+    ATTR_CONDITION_HAIL,
+    ATTR_CONDITION_LIGHTNING,
+    ATTR_CONDITION_LIGHTNING_RAINY,
+    ATTR_CONDITION_PARTLYCLOUDY,
+    ATTR_CONDITION_POURING,
+    ATTR_CONDITION_RAINY,
+    ATTR_CONDITION_SNOWY,
+    ATTR_CONDITION_SNOWY_RAINY,
+    ATTR_CONDITION_SUNNY,
+    ATTR_CONDITION_WINDY,
+    ATTR_CONDITION_WINDY_VARIANT,
+    DOMAIN as WEATHER_DOMAIN,
+)
 
 DOMAIN = "ipma"
 
@@ -9,3 +28,27 @@
 DATA_LOCATION = "location"
 
 ENTITY_ID_SENSOR_FORMAT_HOME = f"{WEATHER_DOMAIN}.ipma_{HOME_LOCATION_NAME}"
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
+
+CONDITION_CLASSES = {
+    ATTR_CONDITION_CLOUDY: [4, 5, 24, 25, 27],
+    ATTR_CONDITION_FOG: [16, 17, 26],
+    ATTR_CONDITION_HAIL: [21, 22],
+    ATTR_CONDITION_LIGHTNING: [19],
+    ATTR_CONDITION_LIGHTNING_RAINY: [20, 23],
+    ATTR_CONDITION_PARTLYCLOUDY: [2, 3],
+    ATTR_CONDITION_POURING: [8, 11],
+    ATTR_CONDITION_RAINY: [6, 7, 9, 10, 12, 13, 14, 15],
+    ATTR_CONDITION_SNOWY: [18],
+    ATTR_CONDITION_SNOWY_RAINY: [],
+    ATTR_CONDITION_SUNNY: [1],
+    ATTR_CONDITION_WINDY: [],
+    ATTR_CONDITION_WINDY_VARIANT: [],
+    ATTR_CONDITION_EXCEPTIONAL: [],
+    ATTR_CONDITION_CLEAR_NIGHT: [-1],
+}
+
+FORECAST_MODE = ["hourly", "daily"]
+
+ATTRIBUTION = "Instituto Português do Mar e Atmosfera"
diff --git a/homeassistant/components/ipma/entity.py b/homeassistant/components/ipma/entity.py
new file mode 100644
index 00000000000000..bc8136b620605b
--- /dev/null
+++ b/homeassistant/components/ipma/entity.py
@@ -0,0 +1,26 @@
+"""Base Entity for IPMA."""
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo, Entity
+
+from .const import DOMAIN
+
+
+class IPMADevice(Entity):
+    """Common IPMA Device Information."""
+
+    def __init__(self, location) -> None:
+        """Initialize device information."""
+        self._location = location
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={
+                (
+                    DOMAIN,
+                    f"{self._location.station_latitude}, {self._location.station_longitude}",
+                )
+            },
+            manufacturer=DOMAIN,
+            name=self._location.name,
+        )
diff --git a/homeassistant/components/ipma/sensor.py b/homeassistant/components/ipma/sensor.py
new file mode 100644
index 00000000000000..f02f8b7d9d054f
--- /dev/null
+++ b/homeassistant/components/ipma/sensor.py
@@ -0,0 +1,89 @@
+"""Support for IPMA sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+import logging
+
+import async_timeout
+from pyipma.api import IPMA_API
+from pyipma.location import Location
+
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import Throttle
+
+from .const import DATA_API, DATA_LOCATION, DOMAIN, MIN_TIME_BETWEEN_UPDATES
+from .entity import IPMADevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class IPMARequiredKeysMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[Location, IPMA_API], Coroutine[Location, IPMA_API, int | None]]
+
+
+@dataclass
+class IPMASensorEntityDescription(SensorEntityDescription, IPMARequiredKeysMixin):
+    """Describes IPMA sensor entity."""
+
+
+async def async_retrive_rcm(location: Location, api: IPMA_API) -> int | None:
+    """Retrieve RCM."""
+    fire_risk = await location.fire_risk(api)
+    if fire_risk:
+        return fire_risk.rcm
+    return None
+
+
+SENSOR_TYPES: tuple[IPMASensorEntityDescription, ...] = (
+    IPMASensorEntityDescription(
+        key="rcm",
+        translation_key="fire_risk",
+        value_fn=async_retrive_rcm,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the IPMA sensor platform."""
+    api = hass.data[DOMAIN][entry.entry_id][DATA_API]
+    location = hass.data[DOMAIN][entry.entry_id][DATA_LOCATION]
+
+    entities = [IPMASensor(api, location, description) for description in SENSOR_TYPES]
+
+    async_add_entities(entities, True)
+
+
+class IPMASensor(SensorEntity, IPMADevice):
+    """Representation of an IPMA sensor."""
+
+    entity_description: IPMASensorEntityDescription
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        api: IPMA_API,
+        location: Location,
+        description: IPMASensorEntityDescription,
+    ) -> None:
+        """Initialize the IPMA Sensor."""
+        IPMADevice.__init__(self, location)
+        self.entity_description = description
+        self._api = api
+        self._attr_unique_id = f"{self._location.station_latitude}, {self._location.station_longitude}, {self.entity_description.key}"
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    async def async_update(self) -> None:
+        """Update Fire risk."""
+        async with async_timeout.timeout(10):
+            self._attr_native_value = await self.entity_description.value_fn(
+                self._location, self._api
+            )
diff --git a/homeassistant/components/ipma/strings.json b/homeassistant/components/ipma/strings.json
index 0dd013135dc0f0..b9f50c66f9ee82 100644
--- a/homeassistant/components/ipma/strings.json
+++ b/homeassistant/components/ipma/strings.json
@@ -18,5 +18,12 @@
     "info": {
       "api_endpoint_reachable": "IPMA API endpoint reachable"
     }
+  },
+  "entity": {
+    "sensor": {
+      "fire_risk": {
+        "name": "Fire risk"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ipma/weather.py b/homeassistant/components/ipma/weather.py
index bfd1b820c7a625..811eddf91bf2ca 100644
--- a/homeassistant/components/ipma/weather.py
+++ b/homeassistant/components/ipma/weather.py
@@ -1,7 +1,6 @@
 """Support for IPMA weather service."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
 import async_timeout
@@ -10,21 +9,6 @@
 from pyipma.location import Location
 
 from homeassistant.components.weather import (
-    ATTR_CONDITION_CLEAR_NIGHT,
-    ATTR_CONDITION_CLOUDY,
-    ATTR_CONDITION_EXCEPTIONAL,
-    ATTR_CONDITION_FOG,
-    ATTR_CONDITION_HAIL,
-    ATTR_CONDITION_LIGHTNING,
-    ATTR_CONDITION_LIGHTNING_RAINY,
-    ATTR_CONDITION_PARTLYCLOUDY,
-    ATTR_CONDITION_POURING,
-    ATTR_CONDITION_RAINY,
-    ATTR_CONDITION_SNOWY,
-    ATTR_CONDITION_SNOWY_RAINY,
-    ATTR_CONDITION_SUNNY,
-    ATTR_CONDITION_WINDY,
-    ATTR_CONDITION_WINDY_VARIANT,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
@@ -48,34 +32,18 @@
 from homeassistant.helpers.sun import is_up
 from homeassistant.util import Throttle
 
-from .const import DATA_API, DATA_LOCATION, DOMAIN
+from .const import (
+    ATTRIBUTION,
+    CONDITION_CLASSES,
+    DATA_API,
+    DATA_LOCATION,
+    DOMAIN,
+    MIN_TIME_BETWEEN_UPDATES,
+)
+from .entity import IPMADevice
 
 _LOGGER = logging.getLogger(__name__)
 
-ATTRIBUTION = "Instituto Português do Mar e Atmosfera"
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
-
-CONDITION_CLASSES = {
-    ATTR_CONDITION_CLOUDY: [4, 5, 24, 25, 27],
-    ATTR_CONDITION_FOG: [16, 17, 26],
-    ATTR_CONDITION_HAIL: [21, 22],
-    ATTR_CONDITION_LIGHTNING: [19],
-    ATTR_CONDITION_LIGHTNING_RAINY: [20, 23],
-    ATTR_CONDITION_PARTLYCLOUDY: [2, 3],
-    ATTR_CONDITION_POURING: [8, 11],
-    ATTR_CONDITION_RAINY: [6, 7, 9, 10, 12, 13, 14, 15],
-    ATTR_CONDITION_SNOWY: [18],
-    ATTR_CONDITION_SNOWY_RAINY: [],
-    ATTR_CONDITION_SUNNY: [1],
-    ATTR_CONDITION_WINDY: [],
-    ATTR_CONDITION_WINDY_VARIANT: [],
-    ATTR_CONDITION_EXCEPTIONAL: [],
-    ATTR_CONDITION_CLEAR_NIGHT: [-1],
-}
-
-FORECAST_MODE = ["hourly", "daily"]
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -110,7 +78,7 @@ def _async_migrator(entity_entry: er.RegistryEntry):
     async_add_entities([IPMAWeather(location, api, config_entry.data)], True)
 
 
-class IPMAWeather(WeatherEntity):
+class IPMAWeather(WeatherEntity, IPMADevice):
     """Representation of a weather condition."""
 
     _attr_native_pressure_unit = UnitOfPressure.HPA
@@ -121,13 +89,14 @@ class IPMAWeather(WeatherEntity):
 
     def __init__(self, location: Location, api: IPMA_API, config) -> None:
         """Initialise the platform with a data instance and station name."""
+        IPMADevice.__init__(self, location)
         self._api = api
-        self._location_name = config.get(CONF_NAME, location.name)
+        self._attr_name = config.get(CONF_NAME, location.name)
         self._mode = config.get(CONF_MODE)
         self._period = 1 if config.get(CONF_MODE) == "hourly" else 24
-        self._location = location
         self._observation = None
         self._forecast: list[Forecast] = []
+        self._attr_unique_id = f"{self._location.station_latitude}, {self._location.station_longitude}, {self._mode}"
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def async_update(self) -> None:
@@ -153,19 +122,6 @@ async def async_update(self) -> None:
                 self._observation,
             )
 
-    @property
-    def unique_id(self) -> str:
-        """Return a unique id."""
-        return (
-            f"{self._location.station_latitude}, {self._location.station_longitude},"
-            f" {self._mode}"
-        )
-
-    @property
-    def name(self):
-        """Return the name of the station."""
-        return self._location_name
-
     def _condition_conversion(self, identifier, forecast_dt):
         """Convert from IPMA weather_type id to HA."""
         if identifier == 1 and not is_up(self.hass, forecast_dt):
diff --git a/homeassistant/components/ipp/__init__.py b/homeassistant/components/ipp/__init__.py
index 42dc2b8d93b9c9..9df377b939a488 100644
--- a/homeassistant/components/ipp/__init__.py
+++ b/homeassistant/components/ipp/__init__.py
@@ -19,21 +19,18 @@
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up IPP from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    if not (coordinator := hass.data[DOMAIN].get(entry.entry_id)):
-        # Create IPP instance for this entry
-        coordinator = IPPDataUpdateCoordinator(
-            hass,
-            host=entry.data[CONF_HOST],
-            port=entry.data[CONF_PORT],
-            base_path=entry.data[CONF_BASE_PATH],
-            tls=entry.data[CONF_SSL],
-            verify_ssl=entry.data[CONF_VERIFY_SSL],
-        )
-        hass.data[DOMAIN][entry.entry_id] = coordinator
-
+    coordinator = IPPDataUpdateCoordinator(
+        hass,
+        host=entry.data[CONF_HOST],
+        port=entry.data[CONF_PORT],
+        base_path=entry.data[CONF_BASE_PATH],
+        tls=entry.data[CONF_SSL],
+        verify_ssl=entry.data[CONF_VERIFY_SSL],
+    )
     await coordinator.async_config_entry_first_refresh()
 
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -41,7 +38,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         hass.data[DOMAIN].pop(entry.entry_id)
     return unload_ok
diff --git a/homeassistant/components/ipp/manifest.json b/homeassistant/components/ipp/manifest.json
index 59f8c32c210744..59b8b4b070e1e3 100644
--- a/homeassistant/components/ipp/manifest.json
+++ b/homeassistant/components/ipp/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_polling",
   "loggers": ["deepmerge", "pyipp"],
   "quality_scale": "platinum",
-  "requirements": ["pyipp==0.12.1"],
+  "requirements": ["pyipp==0.14.0"],
   "zeroconf": ["_ipps._tcp.local.", "_ipp._tcp.local."]
 }
diff --git a/homeassistant/components/islamic_prayer_times/manifest.json b/homeassistant/components/islamic_prayer_times/manifest.json
index 7e68ba9b24d2b8..c87cb2d28ac047 100644
--- a/homeassistant/components/islamic_prayer_times/manifest.json
+++ b/homeassistant/components/islamic_prayer_times/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/islamic_prayer_times",
   "iot_class": "cloud_polling",
   "loggers": ["prayer_times_calculator"],
-  "requirements": ["prayer_times_calculator==0.0.6"]
+  "requirements": ["prayer-times-calculator==0.0.6"]
 }
diff --git a/homeassistant/components/iss/config_flow.py b/homeassistant/components/iss/config_flow.py
index ebfd445f62c8bc..2beffc7c8944f3 100644
--- a/homeassistant/components/iss/config_flow.py
+++ b/homeassistant/components/iss/config_flow.py
@@ -3,7 +3,7 @@
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_NAME, CONF_SHOW_ON_MAP
+from homeassistant.const import CONF_SHOW_ON_MAP
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 
@@ -33,7 +33,7 @@ async def async_step_user(self, user_input=None) -> FlowResult:
 
         if user_input is not None:
             return self.async_create_entry(
-                title=user_input.get(CONF_NAME, DEFAULT_NAME),
+                title=DEFAULT_NAME,
                 data={},
                 options={CONF_SHOW_ON_MAP: user_input.get(CONF_SHOW_ON_MAP, False)},
             )
diff --git a/homeassistant/components/isy994/const.py b/homeassistant/components/isy994/const.py
index 686ffdb72f3112..70f0f49d7a1cf6 100644
--- a/homeassistant/components/isy994/const.py
+++ b/homeassistant/components/isy994/const.py
@@ -15,15 +15,18 @@
     HVACMode,
 )
 from homeassistant.const import (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
     CURRENCY_CENT,
     CURRENCY_DOLLAR,
     DEGREE,
     LIGHT_LUX,
     PERCENTAGE,
+    POWER_VOLT_AMPERE_REACTIVE,
     REVOLUTIONS_PER_MINUTE,
     SERVICE_LOCK,
     SERVICE_UNLOCK,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_LOCKED,
@@ -36,6 +39,7 @@
     STATE_UNLOCKED,
     UV_INDEX,
     Platform,
+    UnitOfApparentPower,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -399,7 +403,7 @@
     "92": f"{DEGREE} South",
     UOM_8_BIT_RANGE: "",  # Range 0-255, no unit.
     UOM_DOUBLE_TEMP: UOM_DOUBLE_TEMP,
-    "102": "kWs",
+    "102": "kWs",  # Kilowatt Seconds
     "103": CURRENCY_DOLLAR,
     "104": CURRENCY_CENT,
     "105": UnitOfLength.INCHES,
@@ -417,6 +421,29 @@
     "118": UnitOfPressure.HPA,
     "119": UnitOfEnergy.WATT_HOUR,
     "120": UnitOfVolumetricFlux.INCHES_PER_DAY,
+    "122": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,  # Microgram per cubic meter
+    "123": f"bq/{UnitOfVolume.CUBIC_METERS}",  # Becquerel per cubic meter
+    "124": f"pCi/{UnitOfVolume.LITERS}",  # Picocuries per liter
+    "125": "pH",
+    "126": "bpm",  # Beats per Minute
+    "127": UnitOfPressure.MMHG,
+    "128": "J",
+    "129": "BMI",  # Body Mass Index
+    "130": f"{UnitOfVolume.LITERS}/{UnitOfTime.HOURS}",
+    "131": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    "132": "bpm",  # Breaths per minute
+    "133": UnitOfFrequency.KILOHERTZ,
+    "134": f"{UnitOfLength.METERS}/{UnitOfTime.SECONDS}²",
+    "135": UnitOfApparentPower.VOLT_AMPERE,  # Volt-Amp
+    "136": POWER_VOLT_AMPERE_REACTIVE,  # VAR = Volt-Amp Reactive
+    "137": "",  # NTP DateTime - Number of seconds since 1900
+    "138": UnitOfPressure.PSI,
+    "139": DEGREE,  # Degree 0-360
+    "140": f"{UnitOfMass.MILLIGRAMS}/{UnitOfVolume.LITERS}",
+    "141": "N",  # Netwon
+    "142": f"{UnitOfVolume.GALLONS}/{UnitOfTime.SECONDS}",
+    "143": "gpm",  # Gallon per Minute
+    "144": "gph",  # Gallon per Hour
 }
 
 UOM_TO_STATES = {
diff --git a/homeassistant/components/isy994/select.py b/homeassistant/components/isy994/select.py
index d2b10ef7419106..60e2111848d2cd 100644
--- a/homeassistant/components/isy994/select.py
+++ b/homeassistant/components/isy994/select.py
@@ -76,10 +76,9 @@ async def async_setup_entry(
             options = RAMP_RATE_OPTIONS
         elif control == CMD_BACKLIGHT:
             options = BACKLIGHT_INDEX
-        else:
-            if uom := node.aux_properties[control].uom == UOM_INDEX:
-                if options_dict := UOM_TO_STATES.get(uom):
-                    options = list(options_dict.values())
+        elif uom := node.aux_properties[control].uom == UOM_INDEX:
+            if options_dict := UOM_TO_STATES.get(uom):
+                options = list(options_dict.values())
 
         description = SelectEntityDescription(
             key=f"{node.address}_{control}",
diff --git a/homeassistant/components/isy994/switch.py b/homeassistant/components/isy994/switch.py
index a150c0526783f6..62ae375736d018 100644
--- a/homeassistant/components/isy994/switch.py
+++ b/homeassistant/components/isy994/switch.py
@@ -1,6 +1,7 @@
 """Support for ISY switches."""
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any
 
 from pyisy.constants import (
@@ -22,7 +23,7 @@
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
@@ -30,6 +31,15 @@
 from .models import IsyData
 
 
+@dataclass
+class ISYSwitchEntityDescription(SwitchEntityDescription):
+    """Describes IST switch."""
+
+    # ISYEnableSwitchEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
@@ -53,7 +63,7 @@ async def async_setup_entry(
     for node, control in isy_data.aux_properties[Platform.SWITCH]:
         # Currently only used for enable switches, will need to be updated for
         # NS support by making sure control == TAG_ENABLED
-        description = SwitchEntityDescription(
+        description = ISYSwitchEntityDescription(
             key=control,
             device_class=SwitchDeviceClass.SWITCH,
             name=control.title(),
@@ -135,7 +145,7 @@ def __init__(
         node: Node,
         control: str,
         unique_id: str,
-        description: EntityDescription,
+        description: ISYSwitchEntityDescription,
         device_info: DeviceInfo | None,
     ) -> None:
         """Initialize the ISY Aux Control Number entity."""
diff --git a/homeassistant/components/jellyfin/media_player.py b/homeassistant/components/jellyfin/media_player.py
index 2025e1a2a6cd52..bcd8e97582324b 100644
--- a/homeassistant/components/jellyfin/media_player.py
+++ b/homeassistant/components/jellyfin/media_player.py
@@ -90,6 +90,7 @@ def __init__(
                 sw_version=self.app_version,
                 via_device=(DOMAIN, coordinator.server_id),
             )
+            self._attr_name = None
         else:
             self._attr_device_info = None
             self._attr_has_entity_name = False
diff --git a/homeassistant/components/jellyfin/media_source.py b/homeassistant/components/jellyfin/media_source.py
index b2e7e1468fd0f0..318798fdc5f2d3 100644
--- a/homeassistant/components/jellyfin/media_source.py
+++ b/homeassistant/components/jellyfin/media_source.py
@@ -21,7 +21,6 @@
 from .const import (
     COLLECTION_TYPE_MOVIES,
     COLLECTION_TYPE_MUSIC,
-    COLLECTION_TYPE_TVSHOWS,
     DOMAIN,
     ITEM_KEY_COLLECTION_TYPE,
     ITEM_KEY_ID,
@@ -155,10 +154,7 @@ async def _build_library(
             return await self._build_music_library(library, include_children)
         if collection_type == COLLECTION_TYPE_MOVIES:
             return await self._build_movie_library(library, include_children)
-        if collection_type == COLLECTION_TYPE_TVSHOWS:
-            return await self._build_tv_library(library, include_children)
-
-        raise BrowseError(f"Unsupported collection type {collection_type}")
+        return await self._build_tv_library(library, include_children)
 
     async def _build_music_library(
         self, library: dict[str, Any], include_children: bool
@@ -189,7 +185,7 @@ async def _build_music_library(
     async def _build_artists(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all artists in the music library."""
         artists = await self._get_children(library_id, ITEM_TYPE_ARTIST)
-        artists = sorted(artists, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        artists = sorted(artists, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_artist(artist, False) for artist in artists]
 
     async def _build_artist(
@@ -220,7 +216,7 @@ async def _build_artist(
     async def _build_albums(self, parent_id: str) -> list[BrowseMediaSource]:
         """Return all albums of a single artist as browsable media sources."""
         albums = await self._get_children(parent_id, ITEM_TYPE_ALBUM)
-        albums = sorted(albums, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        albums = sorted(albums, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_album(album, False) for album in albums]
 
     async def _build_album(
@@ -310,7 +306,7 @@ async def _build_movie_library(
     async def _build_movies(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all movies in the movie library."""
         movies = await self._get_children(library_id, ITEM_TYPE_MOVIE)
-        movies = sorted(movies, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        movies = sorted(movies, key=lambda k: k[ITEM_KEY_NAME])
         return [
             self._build_movie(movie)
             for movie in movies
@@ -363,7 +359,7 @@ async def _build_tv_library(
     async def _build_tvshow(self, library_id: str) -> list[BrowseMediaSource]:
         """Return all series in the tv library."""
         series = await self._get_children(library_id, ITEM_TYPE_SERIES)
-        series = sorted(series, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        series = sorted(series, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_series(serie, False) for serie in series]
 
     async def _build_series(
@@ -394,7 +390,7 @@ async def _build_series(
     async def _build_seasons(self, series_id: str) -> list[BrowseMediaSource]:
         """Return all seasons in the series."""
         seasons = await self._get_children(series_id, ITEM_TYPE_SEASON)
-        seasons = sorted(seasons, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        seasons = sorted(seasons, key=lambda k: k[ITEM_KEY_NAME])
         return [await self._build_season(season, False) for season in seasons]
 
     async def _build_season(
@@ -425,7 +421,7 @@ async def _build_season(
     async def _build_episodes(self, season_id: str) -> list[BrowseMediaSource]:
         """Return all episode in the season."""
         episodes = await self._get_children(season_id, ITEM_TYPE_EPISODE)
-        episodes = sorted(episodes, key=lambda k: k[ITEM_KEY_NAME])  # type: ignore[no-any-return]
+        episodes = sorted(episodes, key=lambda k: k[ITEM_KEY_NAME])
         return [
             self._build_episode(episode)
             for episode in episodes
diff --git a/homeassistant/components/jellyfin/sensor.py b/homeassistant/components/jellyfin/sensor.py
index 1957adfc6eb12d..cd0e9ab21a23b0 100644
--- a/homeassistant/components/jellyfin/sensor.py
+++ b/homeassistant/components/jellyfin/sensor.py
@@ -42,6 +42,7 @@ def _count_now_playing(data: JellyfinDataT) -> int:
 SENSOR_TYPES: dict[str, JellyfinSensorEntityDescription] = {
     "sessions": JellyfinSensorEntityDescription(
         key="watching",
+        name=None,
         icon="mdi:television-play",
         native_unit_of_measurement="Watching",
         value_fn=_count_now_playing,
diff --git a/homeassistant/components/jvc_projector/remote.py b/homeassistant/components/jvc_projector/remote.py
index e33eef74c4872e..45f797a5aaa7e1 100644
--- a/homeassistant/components/jvc_projector/remote.py
+++ b/homeassistant/components/jvc_projector/remote.py
@@ -52,6 +52,8 @@ async def async_setup_entry(
 class JvcProjectorRemote(JvcProjectorEntity, RemoteEntity):
     """Representation of a JVC Projector device."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
diff --git a/homeassistant/components/kaleidescape/entity.py b/homeassistant/components/kaleidescape/entity.py
index 9a5e62bca94cba..87a9fa4da0eecf 100644
--- a/homeassistant/components/kaleidescape/entity.py
+++ b/homeassistant/components/kaleidescape/entity.py
@@ -19,16 +19,19 @@
 class KaleidescapeEntity(Entity):
     """Defines a base Kaleidescape entity."""
 
+    _attr_has_entity_name = True
+    _attr_should_poll = False
+
     def __init__(self, device: KaleidescapeDevice) -> None:
         """Initialize entity."""
         self._device = device
 
-        self._attr_should_poll = False
         self._attr_unique_id = device.serial_number
-        self._attr_name = f"{KALEIDESCAPE_NAME} {device.system.friendly_name}"
         self._attr_device_info = DeviceInfo(
             identifiers={(KALEIDESCAPE_DOMAIN, self._device.serial_number)},
-            name=self.name,
+            # Instead of setting the device name to the entity name, kaleidescape
+            # should be updated to set has_entity_name = True
+            name=f"{KALEIDESCAPE_NAME} {device.system.friendly_name}",
             model=self._device.system.type,
             manufacturer=KALEIDESCAPE_NAME,
             sw_version=f"{self._device.system.kos_version}",
diff --git a/homeassistant/components/kaleidescape/media_player.py b/homeassistant/components/kaleidescape/media_player.py
index cbae7f0df76591..7751f6b6a29762 100644
--- a/homeassistant/components/kaleidescape/media_player.py
+++ b/homeassistant/components/kaleidescape/media_player.py
@@ -56,6 +56,7 @@ class KaleidescapeMediaPlayer(KaleidescapeEntity, MediaPlayerEntity):
         | MediaPlayerEntityFeature.NEXT_TRACK
         | MediaPlayerEntityFeature.PREVIOUS_TRACK
     )
+    _attr_name = None
 
     async def async_turn_on(self) -> None:
         """Send leave standby command."""
diff --git a/homeassistant/components/kaleidescape/remote.py b/homeassistant/components/kaleidescape/remote.py
index 61080052ee58d5..2d35ad2787fda7 100644
--- a/homeassistant/components/kaleidescape/remote.py
+++ b/homeassistant/components/kaleidescape/remote.py
@@ -47,6 +47,8 @@ async def async_setup_entry(
 class KaleidescapeRemote(KaleidescapeEntity, RemoteEntity):
     """Representation of a Kaleidescape device."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return true if device is on."""
diff --git a/homeassistant/components/kaleidescape/sensor.py b/homeassistant/components/kaleidescape/sensor.py
index 23d40684c13cc4..183036f3973dfc 100644
--- a/homeassistant/components/kaleidescape/sensor.py
+++ b/homeassistant/components/kaleidescape/sensor.py
@@ -39,67 +39,67 @@ class KaleidescapeSensorEntityDescription(
 SENSOR_TYPES: tuple[KaleidescapeSensorEntityDescription, ...] = (
     KaleidescapeSensorEntityDescription(
         key="media_location",
-        name="Media Location",
+        translation_key="media_location",
         icon="mdi:monitor",
         value_fn=lambda device: device.automation.movie_location,
     ),
     KaleidescapeSensorEntityDescription(
         key="play_status",
-        name="Play Status",
+        translation_key="play_status",
         icon="mdi:monitor",
         value_fn=lambda device: device.movie.play_status,
     ),
     KaleidescapeSensorEntityDescription(
         key="play_speed",
-        name="Play Speed",
+        translation_key="play_speed",
         icon="mdi:monitor",
         value_fn=lambda device: device.movie.play_speed,
     ),
     KaleidescapeSensorEntityDescription(
         key="video_mode",
-        name="Video Mode",
+        translation_key="video_mode",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.video_mode,
     ),
     KaleidescapeSensorEntityDescription(
         key="video_color_eotf",
-        name="Video Color EOTF",
+        translation_key="video_color_eotf",
         icon="mdi:monitor-eye",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.video_color_eotf,
     ),
     KaleidescapeSensorEntityDescription(
         key="video_color_space",
-        name="Video Color Space",
+        translation_key="video_color_space",
         icon="mdi:monitor-eye",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.video_color_space,
     ),
     KaleidescapeSensorEntityDescription(
         key="video_color_depth",
-        name="Video Color Depth",
+        translation_key="video_color_depth",
         icon="mdi:monitor-eye",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.video_color_depth,
     ),
     KaleidescapeSensorEntityDescription(
         key="video_color_sampling",
-        name="Video Color Sampling",
+        translation_key="video_color_sampling",
         icon="mdi:monitor-eye",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.video_color_sampling,
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_ratio",
-        name="Screen Mask Ratio",
+        translation_key="screen_mask_ratio",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.screen_mask_ratio,
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_top_trim_rel",
-        name="Screen Mask Top Trim Rel",
+        translation_key="screen_mask_top_trim_rel",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
@@ -107,7 +107,7 @@ class KaleidescapeSensorEntityDescription(
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_bottom_trim_rel",
-        name="Screen Mask Bottom Trim Rel",
+        translation_key="screen_mask_bottom_trim_rel",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
@@ -115,14 +115,14 @@ class KaleidescapeSensorEntityDescription(
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_conservative_ratio",
-        name="Screen Mask Conservative Ratio",
+        translation_key="screen_mask_conservative_ratio",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.screen_mask_conservative_ratio,
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_top_mask_abs",
-        name="Screen Mask Top Mask Abs",
+        translation_key="screen_mask_top_mask_abs",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
@@ -130,7 +130,7 @@ class KaleidescapeSensorEntityDescription(
     ),
     KaleidescapeSensorEntityDescription(
         key="screen_mask_bottom_mask_abs",
-        name="Screen Mask Bottom Mask Abs",
+        translation_key="screen_mask_bottom_mask_abs",
         icon="mdi:monitor-screenshot",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=PERCENTAGE,
@@ -138,14 +138,14 @@ class KaleidescapeSensorEntityDescription(
     ),
     KaleidescapeSensorEntityDescription(
         key="cinemascape_mask",
-        name="Cinemascape Mask",
+        translation_key="cinemascape_mask",
         icon="mdi:monitor-star",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.cinemascape_mask,
     ),
     KaleidescapeSensorEntityDescription(
         key="cinemascape_mode",
-        name="Cinemascape Mode",
+        translation_key="cinemascape_mode",
         icon="mdi:monitor-star",
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.automation.cinemascape_mode,
@@ -177,7 +177,6 @@ def __init__(
         super().__init__(device)
         self.entity_description = entity_description
         self._attr_unique_id = f"{self._attr_unique_id}-{entity_description.key}"
-        self._attr_name = f"{self._attr_name} {entity_description.name}"
 
     @property
     def native_value(self) -> StateType:
diff --git a/homeassistant/components/kaleidescape/strings.json b/homeassistant/components/kaleidescape/strings.json
index 92b9c931acddc6..30c22a8ca0ee11 100644
--- a/homeassistant/components/kaleidescape/strings.json
+++ b/homeassistant/components/kaleidescape/strings.json
@@ -21,5 +21,57 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unsupported": "Unsupported device"
     }
+  },
+  "entity": {
+    "sensor": {
+      "media_location": {
+        "name": "Media location"
+      },
+      "play_status": {
+        "name": "Play status"
+      },
+      "play_speed": {
+        "name": "Play speed"
+      },
+      "video_mode": {
+        "name": "Video mode"
+      },
+      "video_color_eotf": {
+        "name": "Video color EOTF"
+      },
+      "video_color_space": {
+        "name": "Video color space"
+      },
+      "video_color_depth": {
+        "name": "Video color depth"
+      },
+      "video_color_sampling": {
+        "name": "Video color sampling"
+      },
+      "screen_mask_ratio": {
+        "name": "Screen mask ratio"
+      },
+      "screen_mask_top_trim_rel": {
+        "name": "Screen mask top trim relative"
+      },
+      "screen_mask_bottom_trim_rel": {
+        "name": "Screen mask bottom trim relative"
+      },
+      "screen_mask_conservative_ratio": {
+        "name": "Screen mask conservative ratio"
+      },
+      "screen_mask_top_mask_abs": {
+        "name": "Screen mask top mask absolute"
+      },
+      "screen_mask_bottom_mask_abs": {
+        "name": "Screen mask bottom mask absolute"
+      },
+      "cinemascape_mask": {
+        "name": "Cinemascape mask"
+      },
+      "cinemascape_mode": {
+        "name": "Cinemascape mode"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/keenetic_ndms2/manifest.json b/homeassistant/components/keenetic_ndms2/manifest.json
index 41a1d0f2a2fb30..0751b40acd2361 100644
--- a/homeassistant/components/keenetic_ndms2/manifest.json
+++ b/homeassistant/components/keenetic_ndms2/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/keenetic_ndms2",
   "iot_class": "local_polling",
   "loggers": ["ndms2_client"],
-  "requirements": ["ndms2_client==0.1.2"],
+  "requirements": ["ndms2-client==0.1.2"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:InternetGatewayDevice:1",
diff --git a/homeassistant/components/keyboard/__init__.py b/homeassistant/components/keyboard/__init__.py
index cdd80119bc5d0b..f4e7f9e042480b 100644
--- a/homeassistant/components/keyboard/__init__.py
+++ b/homeassistant/components/keyboard/__init__.py
@@ -11,12 +11,15 @@
     SERVICE_VOLUME_UP,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "keyboard"
 
 TAP_KEY_SCHEMA = vol.Schema({})
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Listen for keyboard events."""
diff --git a/homeassistant/components/keyboard_remote/__init__.py b/homeassistant/components/keyboard_remote/__init__.py
index f0f1497f940e13..df3b6f0e427938 100644
--- a/homeassistant/components/keyboard_remote/__init__.py
+++ b/homeassistant/components/keyboard_remote/__init__.py
@@ -1,11 +1,14 @@
 """Receive signals from a keyboard and use it as a remote control."""
 # pylint: disable=import-error
+from __future__ import annotations
+
 import asyncio
 from contextlib import suppress
 import logging
 import os
+from typing import Any
 
-import aionotify
+from asyncinotify import Inotify, Mask
 from evdev import InputDevice, categorize, ecodes, list_devices
 import voluptuous as vol
 
@@ -64,9 +67,9 @@
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the keyboard_remote."""
-    config = config[DOMAIN]
+    domain_config: list[dict[str, Any]] = config[DOMAIN]
 
-    remote = KeyboardRemote(hass, config)
+    remote = KeyboardRemote(hass, domain_config)
     remote.setup()
 
     return True
@@ -75,12 +78,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class KeyboardRemote:
     """Manage device connection/disconnection using inotify to asynchronously monitor."""
 
-    def __init__(self, hass, config):
+    def __init__(self, hass: HomeAssistant, config: list[dict[str, Any]]) -> None:
         """Create handlers and setup dictionaries to keep track of them."""
         self.hass = hass
         self.handlers_by_name = {}
         self.handlers_by_descriptor = {}
-        self.active_handlers_by_descriptor = {}
+        self.active_handlers_by_descriptor: dict[str, asyncio.Future] = {}
+        self.inotify = None
         self.watcher = None
         self.monitor_task = None
 
@@ -110,16 +114,12 @@ async def async_start_monitoring(self, event):
         connected, and start monitoring for device connection/disconnection.
         """
 
-        # start watching
-        self.watcher = aionotify.Watcher()
-        self.watcher.watch(
-            alias="devinput",
-            path=DEVINPUT,
-            flags=aionotify.Flags.CREATE
-            | aionotify.Flags.ATTRIB
-            | aionotify.Flags.DELETE,
+        _LOGGER.debug("Start monitoring")
+
+        self.inotify = Inotify()
+        self.watcher = self.inotify.add_watch(
+            DEVINPUT, Mask.CREATE | Mask.ATTRIB | Mask.DELETE
         )
-        await self.watcher.setup(self.hass.loop)
 
         # add initial devices (do this AFTER starting watcher in order to
         # avoid race conditions leading to missing device connections)
@@ -134,7 +134,9 @@ async def async_start_monitoring(self, event):
                 continue
 
             self.active_handlers_by_descriptor[descriptor] = handler
-            initial_start_monitoring.add(handler.async_start_monitoring(dev))
+            initial_start_monitoring.add(
+                asyncio.create_task(handler.async_device_start_monitoring(dev))
+            )
 
         if initial_start_monitoring:
             await asyncio.wait(initial_start_monitoring)
@@ -146,6 +148,10 @@ async def async_stop_monitoring(self, event):
 
         _LOGGER.debug("Cleanup on shutdown")
 
+        if self.inotify and self.watcher:
+            self.inotify.rm_watch(self.watcher)
+            self.watcher = None
+
         if self.monitor_task is not None:
             if not self.monitor_task.done():
                 self.monitor_task.cancel()
@@ -153,11 +159,16 @@ async def async_stop_monitoring(self, event):
 
         handler_stop_monitoring = set()
         for handler in self.active_handlers_by_descriptor.values():
-            handler_stop_monitoring.add(handler.async_stop_monitoring())
-
+            handler_stop_monitoring.add(
+                asyncio.create_task(handler.async_device_stop_monitoring())
+            )
         if handler_stop_monitoring:
             await asyncio.wait(handler_stop_monitoring)
 
+        if self.inotify:
+            self.inotify.close()
+            self.inotify = None
+
     def get_device_handler(self, descriptor):
         """Find the correct device handler given a descriptor (path)."""
 
@@ -187,52 +198,63 @@ def get_device_handler(self, descriptor):
     async def async_monitor_devices(self):
         """Monitor asynchronously for device connection/disconnection or permissions changes."""
 
+        _LOGGER.debug("Start monitoring loop")
+
         try:
-            while True:
-                event = await self.watcher.get_event()
+            async for event in self.inotify:
                 descriptor = f"{DEVINPUT}/{event.name}"
+                _LOGGER.debug(
+                    "got event for %s: %s",
+                    descriptor,
+                    event.mask,
+                )
 
                 descriptor_active = descriptor in self.active_handlers_by_descriptor
 
-                if (event.flags & aionotify.Flags.DELETE) and descriptor_active:
+                if (event.mask & Mask.DELETE) and descriptor_active:
+                    _LOGGER.debug("removing: %s", descriptor)
                     handler = self.active_handlers_by_descriptor[descriptor]
                     del self.active_handlers_by_descriptor[descriptor]
-                    await handler.async_stop_monitoring()
+                    await handler.async_device_stop_monitoring()
                 elif (
-                    (event.flags & aionotify.Flags.CREATE)
-                    or (event.flags & aionotify.Flags.ATTRIB)
+                    (event.mask & Mask.CREATE) or (event.mask & Mask.ATTRIB)
                 ) and not descriptor_active:
+                    _LOGGER.debug("checking new: %s", descriptor)
                     dev, handler = await self.hass.async_add_executor_job(
                         self.get_device_handler, descriptor
                     )
                     if handler is None:
                         continue
+                    _LOGGER.debug("adding: %s", descriptor)
                     self.active_handlers_by_descriptor[descriptor] = handler
-                    await handler.async_start_monitoring(dev)
+                    await handler.async_device_start_monitoring(dev)
         except asyncio.CancelledError:
+            _LOGGER.debug("Monitoring canceled")
             return
 
     class DeviceHandler:
         """Manage input events using evdev with asyncio."""
 
-        def __init__(self, hass, dev_block):
+        def __init__(self, hass: HomeAssistant, dev_block: dict[str, Any]) -> None:
             """Fill configuration data."""
 
             self.hass = hass
 
-            key_types = dev_block.get(TYPE)
+            key_types = dev_block[TYPE]
 
             self.key_values = set()
             for key_type in key_types:
                 self.key_values.add(KEY_VALUE[key_type])
 
-            self.emulate_key_hold = dev_block.get(EMULATE_KEY_HOLD)
-            self.emulate_key_hold_delay = dev_block.get(EMULATE_KEY_HOLD_DELAY)
-            self.emulate_key_hold_repeat = dev_block.get(EMULATE_KEY_HOLD_REPEAT)
+            self.emulate_key_hold = dev_block[EMULATE_KEY_HOLD]
+            self.emulate_key_hold_delay = dev_block[EMULATE_KEY_HOLD_DELAY]
+            self.emulate_key_hold_repeat = dev_block[EMULATE_KEY_HOLD_REPEAT]
             self.monitor_task = None
             self.dev = None
+            self.config_descriptor = dev_block.get(DEVICE_DESCRIPTOR)
+            self.descriptor = None
 
-        async def async_keyrepeat(self, path, name, code, delay, repeat):
+        async def async_device_keyrepeat(self, code, delay, repeat):
             """Emulate keyboard delay/repeat behaviour by sending key events on a timer."""
 
             await asyncio.sleep(delay)
@@ -242,26 +264,36 @@ async def async_keyrepeat(self, path, name, code, delay, repeat):
                     {
                         KEY_CODE: code,
                         TYPE: "key_hold",
-                        DEVICE_DESCRIPTOR: path,
-                        DEVICE_NAME: name,
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: self.dev.name,
                     },
                 )
                 await asyncio.sleep(repeat)
 
-        async def async_start_monitoring(self, dev):
+        async def async_device_start_monitoring(self, dev):
             """Start event monitoring task and issue event."""
+            _LOGGER.debug("Keyboard async_device_start_monitoring, %s", dev.name)
             if self.monitor_task is None:
                 self.dev = dev
+                # set the descriptor to the one provided to the config if any, falling back to the device path if not set
+                if self.config_descriptor:
+                    self.descriptor = self.config_descriptor
+                else:
+                    self.descriptor = self.dev.path
+
                 self.monitor_task = self.hass.async_create_task(
-                    self.async_monitor_input(dev)
+                    self.async_device_monitor_input()
                 )
                 self.hass.bus.async_fire(
                     KEYBOARD_REMOTE_CONNECTED,
-                    {DEVICE_DESCRIPTOR: dev.path, DEVICE_NAME: dev.name},
+                    {
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: dev.name,
+                    },
                 )
                 _LOGGER.debug("Keyboard (re-)connected, %s", dev.name)
 
-        async def async_stop_monitoring(self):
+        async def async_device_stop_monitoring(self):
             """Stop event monitoring task and issue event."""
             if self.monitor_task is not None:
                 with suppress(OSError):
@@ -277,12 +309,16 @@ async def async_stop_monitoring(self):
                 self.monitor_task = None
                 self.hass.bus.async_fire(
                     KEYBOARD_REMOTE_DISCONNECTED,
-                    {DEVICE_DESCRIPTOR: self.dev.path, DEVICE_NAME: self.dev.name},
+                    {
+                        DEVICE_DESCRIPTOR: self.descriptor,
+                        DEVICE_NAME: self.dev.name,
+                    },
                 )
                 _LOGGER.debug("Keyboard disconnected, %s", self.dev.name)
                 self.dev = None
+                self.descriptor = self.config_descriptor
 
-        async def async_monitor_input(self, dev):
+        async def async_device_monitor_input(self):
             """Event monitoring loop.
 
             Monitor one device for new events using evdev with asyncio,
@@ -293,18 +329,22 @@ async def async_monitor_input(self, dev):
 
             try:
                 _LOGGER.debug("Start device monitoring")
-                await self.hass.async_add_executor_job(dev.grab)
-                async for event in dev.async_read_loop():
+                await self.hass.async_add_executor_job(self.dev.grab)
+                async for event in self.dev.async_read_loop():
+                    # pylint: disable=no-member
                     if event.type is ecodes.EV_KEY:
                         if event.value in self.key_values:
-                            _LOGGER.debug(categorize(event))
+                            _LOGGER.debug(
+                                "device: %s: %s", self.dev.name, categorize(event)
+                            )
+
                             self.hass.bus.async_fire(
                                 KEYBOARD_REMOTE_COMMAND_RECEIVED,
                                 {
                                     KEY_CODE: event.code,
                                     TYPE: KEY_VALUE_NAME[event.value],
-                                    DEVICE_DESCRIPTOR: dev.path,
-                                    DEVICE_NAME: dev.name,
+                                    DEVICE_DESCRIPTOR: self.descriptor,
+                                    DEVICE_NAME: self.dev.name,
                                 },
                             )
 
@@ -313,9 +353,7 @@ async def async_monitor_input(self, dev):
                             and self.emulate_key_hold
                         ):
                             repeat_tasks[event.code] = self.hass.async_create_task(
-                                self.async_keyrepeat(
-                                    dev.path,
-                                    dev.name,
+                                self.async_device_keyrepeat(
                                     event.code,
                                     self.emulate_key_hold_delay,
                                     self.emulate_key_hold_repeat,
diff --git a/homeassistant/components/keyboard_remote/manifest.json b/homeassistant/components/keyboard_remote/manifest.json
index d319ba93ce2648..bb84b32defc81f 100644
--- a/homeassistant/components/keyboard_remote/manifest.json
+++ b/homeassistant/components/keyboard_remote/manifest.json
@@ -3,7 +3,8 @@
   "name": "Keyboard Remote",
   "codeowners": ["@bendavid", "@lanrat"],
   "documentation": "https://www.home-assistant.io/integrations/keyboard_remote",
+  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["aionotify", "evdev"],
-  "requirements": ["evdev==1.4.0", "aionotify==0.2.0"]
+  "requirements": ["evdev==1.6.1", "asyncinotify==4.0.2"]
 }
diff --git a/homeassistant/components/kitchen_sink/__init__.py b/homeassistant/components/kitchen_sink/__init__.py
index 3b7b96e90b6fa4..7857e6b31495d4 100644
--- a/homeassistant/components/kitchen_sink/__init__.py
+++ b/homeassistant/components/kitchen_sink/__init__.py
@@ -18,6 +18,7 @@
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import Platform, UnitOfEnergy, UnitOfTemperature, UnitOfVolume
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as dt_util
@@ -25,7 +26,9 @@
 DOMAIN = "kitchen_sink"
 
 
-COMPONENTS_WITH_DEMO_PLATFORM = [Platform.SENSOR, Platform.LOCK]
+COMPONENTS_WITH_DEMO_PLATFORM = [Platform.SENSOR, Platform.LOCK, Platform.IMAGE]
+
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
diff --git a/homeassistant/components/kitchen_sink/image.py b/homeassistant/components/kitchen_sink/image.py
new file mode 100644
index 00000000000000..4fe20f08de9dad
--- /dev/null
+++ b/homeassistant/components/kitchen_sink/image.py
@@ -0,0 +1,68 @@
+"""Demo image platform."""
+from __future__ import annotations
+
+from pathlib import Path
+
+from homeassistant.components.image import ImageEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up image entities."""
+    async_add_entities(
+        [
+            DemoImage(
+                hass,
+                "kitchen_sink_image_001",
+                "QR Code",
+                "image/png",
+                "qr_code.png",
+            ),
+        ]
+    )
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Everything but the Kitchen Sink config entry."""
+    await async_setup_platform(hass, {}, async_add_entities)
+
+
+class DemoImage(ImageEntity):
+    """Representation of an image entity."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        unique_id: str,
+        name: str,
+        content_type: str,
+        image: str,
+    ) -> None:
+        """Initialize the image entity."""
+        super().__init__(hass)
+        self._attr_content_type = content_type
+        self._attr_name = name
+        self._attr_unique_id = unique_id
+        self._image_filename = image
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        image_path = Path(__file__).parent / self._image_filename
+        return await self.hass.async_add_executor_job(image_path.read_bytes)
diff --git a/homeassistant/components/kitchen_sink/lock.py b/homeassistant/components/kitchen_sink/lock.py
index 343190acb63132..b25941cf1a3e14 100644
--- a/homeassistant/components/kitchen_sink/lock.py
+++ b/homeassistant/components/kitchen_sink/lock.py
@@ -5,7 +5,7 @@
 
 from homeassistant.components.lock import LockEntity, LockEntityFeature
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED, STATE_UNLOCKING
+from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -17,7 +17,7 @@ async def async_setup_platform(
     async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Demo sensors."""
+    """Set up the Demo locks."""
     async_add_entities(
         [
             DemoLock(
@@ -70,6 +70,8 @@ def __init__(
         self._attr_unique_id = unique_id
         self._attr_supported_features = features
         self._state = state
+        self._attr_is_locking = False
+        self._attr_is_unlocking = False
 
     @property
     def is_locked(self) -> bool:
@@ -78,12 +80,18 @@ def is_locked(self) -> bool:
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the device."""
+        self._attr_is_locking = True
+        self.async_write_ha_state()
+        self._attr_is_locking = False
         self._state = STATE_LOCKED
         self.async_write_ha_state()
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the device."""
-        self._state = STATE_UNLOCKING
+        self._attr_is_unlocking = True
+        self.async_write_ha_state()
+        self._attr_is_unlocking = False
+        self._state = STATE_UNLOCKED
         self.async_write_ha_state()
 
     async def async_open(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/kitchen_sink/qr_code.png b/homeassistant/components/kitchen_sink/qr_code.png
new file mode 100644
index 00000000000000..d8350728b633a9
Binary files /dev/null and b/homeassistant/components/kitchen_sink/qr_code.png differ
diff --git a/homeassistant/components/kitchen_sink/sensor.py b/homeassistant/components/kitchen_sink/sensor.py
index 6692f53810be43..6912c9404823a7 100644
--- a/homeassistant/components/kitchen_sink/sensor.py
+++ b/homeassistant/components/kitchen_sink/sensor.py
@@ -7,7 +7,7 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_BATTERY_LEVEL, UnitOfPower
+from homeassistant.const import UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -31,7 +31,6 @@ async def async_setup_entry(
                 None,
                 SensorStateClass.MEASUREMENT,
                 UnitOfPower.WATT,  # Not a volume unit
-                None,
             ),
             DemoSensor(
                 "statistics_issue_2",
@@ -40,7 +39,6 @@ async def async_setup_entry(
                 None,
                 SensorStateClass.MEASUREMENT,
                 "dogs",  # Can't be converted to cats
-                None,
             ),
             DemoSensor(
                 "statistics_issue_3",
@@ -49,7 +47,6 @@ async def async_setup_entry(
                 None,
                 None,  # Wrong state class
                 UnitOfPower.WATT,
-                None,
             ),
         ]
     )
@@ -68,9 +65,6 @@ def __init__(
         device_class: SensorDeviceClass | None,
         state_class: SensorStateClass | None,
         unit_of_measurement: str | None,
-        battery: StateType,
-        options: list[str] | None = None,
-        translation_key: str | None = None,
     ) -> None:
         """Initialize the sensor."""
         self._attr_device_class = device_class
@@ -79,13 +73,8 @@ def __init__(
         self._attr_native_value = state
         self._attr_state_class = state_class
         self._attr_unique_id = unique_id
-        self._attr_options = options
-        self._attr_translation_key = translation_key
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
             name=name,
         )
-
-        if battery:
-            self._attr_extra_state_attributes = {ATTR_BATTERY_LEVEL: battery}
diff --git a/homeassistant/components/kitchen_sink/strings.json b/homeassistant/components/kitchen_sink/strings.json
new file mode 100644
index 00000000000000..ce907a3368da12
--- /dev/null
+++ b/homeassistant/components/kitchen_sink/strings.json
@@ -0,0 +1,43 @@
+{
+  "issues": {
+    "bad_psu": {
+      "title": "The power supply is not stable",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "The power supply needs to be replaced",
+            "description": "Press SUBMIT to confirm the power supply has been replaced"
+          }
+        }
+      }
+    },
+    "out_of_blinker_fluid": {
+      "title": "The blinker fluid is empty and needs to be refilled",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "Blinker fluid needs to be refilled",
+            "description": "Press SUBMIT when blinker fluid has been refilled"
+          }
+        }
+      }
+    },
+    "cold_tea": {
+      "title": "The tea is cold",
+      "fix_flow": {
+        "step": {},
+        "abort": {
+          "not_tea_time": "Can not re-heat the tea at this time"
+        }
+      }
+    },
+    "transmogrifier_deprecated": {
+      "title": "The transmogrifier component is deprecated",
+      "description": "The transmogrifier component is now deprecated due to the lack of local control available in the new API"
+    },
+    "unfixable_problem": {
+      "title": "This is not a fixable problem",
+      "description": "This issue is never going to give up."
+    }
+  }
+}
diff --git a/homeassistant/components/knx/__init__.py b/homeassistant/components/knx/__init__.py
index 8a8e87b893fb6d..e8c237114b51ab 100644
--- a/homeassistant/components/knx/__init__.py
+++ b/homeassistant/components/knx/__init__.py
@@ -30,6 +30,7 @@
     CONF_PORT,
     CONF_TYPE,
     EVENT_HOMEASSISTANT_STOP,
+    SERVICE_RELOAD,
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall
@@ -90,6 +91,7 @@
     SensorSchema,
     SwitchSchema,
     TextSchema,
+    TimeSchema,
     WeatherSchema,
     ga_validator,
     sensor_type_validator,
@@ -143,6 +145,7 @@
                     **SensorSchema.platform_node(),
                     **SwitchSchema.platform_node(),
                     **TextSchema.platform_node(),
+                    **TimeSchema.platform_node(),
                     **WeatherSchema.platform_node(),
                 }
             ),
@@ -310,6 +313,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         schema=SERVICE_KNX_EXPOSURE_REGISTER_SCHEMA,
     )
 
+    async def _reload_integration(call: ServiceCall) -> None:
+        """Reload the integration."""
+        await hass.config_entries.async_reload(entry.entry_id)
+        hass.bus.async_fire(f"event_{DOMAIN}_reloaded", context=call.context)
+
+    async_register_admin_service(hass, DOMAIN, SERVICE_RELOAD, _reload_integration)
+
     await register_panel(hass)
 
     return True
@@ -683,6 +693,7 @@ async def service_send_to_knx_bus(self, call: ServiceCall) -> None:
                 payload=GroupValueResponse(payload)
                 if attr_response
                 else GroupValueWrite(payload),
+                source_address=self.xknx.current_address,
             )
             await self.xknx.telegrams.put(telegram)
 
@@ -692,5 +703,6 @@ async def service_read_to_knx_bus(self, call: ServiceCall) -> None:
             telegram = Telegram(
                 destination_address=parse_device_group_address(address),
                 payload=GroupValueRead(),
+                source_address=self.xknx.current_address,
             )
             await self.xknx.telegrams.put(telegram)
diff --git a/homeassistant/components/knx/const.py b/homeassistant/components/knx/const.py
index 5546a2d6fd9c18..a9f5341fbfdb76 100644
--- a/homeassistant/components/knx/const.py
+++ b/homeassistant/components/knx/const.py
@@ -114,24 +114,11 @@ class KNXConfigEntryData(TypedDict, total=False):
     telegram_log_size: int  # not required
 
 
-class KNXBusMonitorMessage(TypedDict):
-    """KNX bus monitor message."""
-
-    destination_address: str
-    destination_text: str | None
-    payload: str
-    type: str
-    value: str | None
-    source_address: str
-    source_text: str | None
-    direction: str
-    timestamp: str
-
-
 class ColorTempModes(Enum):
     """Color temperature modes for config validation."""
 
     ABSOLUTE = "DPT-7.600"
+    ABSOLUTE_FLOAT = "DPT-9"
     RELATIVE = "DPT-5.001"
 
 
@@ -149,6 +136,7 @@ class ColorTempModes(Enum):
     Platform.SENSOR,
     Platform.SWITCH,
     Platform.TEXT,
+    Platform.TIME,
     Platform.WEATHER,
 ]
 
diff --git a/homeassistant/components/knx/device_trigger.py b/homeassistant/components/knx/device_trigger.py
index 8a074b43b7ddd9..1abafb221db759 100644
--- a/homeassistant/components/knx/device_trigger.py
+++ b/homeassistant/components/knx/device_trigger.py
@@ -84,6 +84,7 @@ async def async_attach_trigger(
     trigger_info: TriggerInfo,
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
+    trigger_data = trigger_info["trigger_data"]
     dst_addresses: list[str] = config.get(EXTRA_FIELD_DESTINATION, [])
     job = HassJob(action, f"KNX device trigger {trigger_info}")
     knx: KNXModule = hass.data[DOMAIN]
@@ -95,7 +96,7 @@ def async_call_trigger_action(telegram: TelegramDict) -> None:
             return
         hass.async_run_hass_job(
             job,
-            {"trigger": telegram},
+            {"trigger": {**trigger_data, **telegram}},
         )
 
     return knx.telegrams.async_listen_telegram(
diff --git a/homeassistant/components/knx/knx_entity.py b/homeassistant/components/knx/knx_entity.py
index fff7f9b9f4f68c..9545510e635de0 100644
--- a/homeassistant/components/knx/knx_entity.py
+++ b/homeassistant/components/knx/knx_entity.py
@@ -42,8 +42,5 @@ async def after_update_callback(self, device: XknxDevice) -> None:
     async def async_added_to_hass(self) -> None:
         """Store register state change callback."""
         self._device.register_device_updated_cb(self.after_update_callback)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Disconnect device object when removed."""
-        # will also remove all callbacks
-        self._device.shutdown()
+        # will remove all callbacks and xknx tasks
+        self.async_on_remove(self._device.shutdown)
diff --git a/homeassistant/components/knx/light.py b/homeassistant/components/knx/light.py
index f5ef8f61b84538..07747f094c31b5 100644
--- a/homeassistant/components/knx/light.py
+++ b/homeassistant/components/knx/light.py
@@ -4,7 +4,11 @@
 from typing import Any, cast
 
 from xknx import XKNX
-from xknx.devices.light import Light as XknxLight, XYYColor
+from xknx.devices.light import (
+    ColorTemperatureType,
+    Light as XknxLight,
+    XYYColor,
+)
 
 from homeassistant import config_entries
 from homeassistant.components.light import (
@@ -56,16 +60,20 @@ def individual_color_addresses(color: str, feature: str) -> Any | None:
     group_address_tunable_white_state = None
     group_address_color_temp = None
     group_address_color_temp_state = None
-    if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE:
-        group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
-        group_address_color_temp_state = config.get(
-            LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
-        )
-    elif config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
+    color_temperature_type = ColorTemperatureType.UINT_2_BYTE
+    if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.RELATIVE:
         group_address_tunable_white = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
         group_address_tunable_white_state = config.get(
             LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
         )
+    else:
+        # absolute uint or float
+        group_address_color_temp = config.get(LightSchema.CONF_COLOR_TEMP_ADDRESS)
+        group_address_color_temp_state = config.get(
+            LightSchema.CONF_COLOR_TEMP_STATE_ADDRESS
+        )
+        if config[LightSchema.CONF_COLOR_TEMP_MODE] == ColorTempModes.ABSOLUTE_FLOAT:
+            color_temperature_type = ColorTemperatureType.FLOAT_2_BYTE
 
     return XknxLight(
         xknx,
@@ -140,6 +148,7 @@ def individual_color_addresses(color: str, feature: str) -> Any | None:
         group_address_brightness_white_state=individual_color_addresses(
             LightSchema.CONF_WHITE, LightSchema.CONF_BRIGHTNESS_STATE_ADDRESS
         ),
+        color_temperature_type=color_temperature_type,
         min_kelvin=config[LightSchema.CONF_MIN_KELVIN],
         max_kelvin=config[LightSchema.CONF_MAX_KELVIN],
     )
@@ -239,7 +248,7 @@ def color_temp_kelvin(self) -> int | None:
         """Return the color temperature in Kelvin."""
         if self._device.supports_color_temperature:
             if kelvin := self._device.current_color_temperature:
-                return kelvin
+                return int(kelvin)
         if self._device.supports_tunable_white:
             relative_ct = self._device.current_tunable_white
             if relative_ct is not None:
diff --git a/homeassistant/components/knx/manifest.json b/homeassistant/components/knx/manifest.json
index b850954e8a8dc4..30e239a65a9778 100644
--- a/homeassistant/components/knx/manifest.json
+++ b/homeassistant/components/knx/manifest.json
@@ -11,8 +11,8 @@
   "loggers": ["xknx", "xknxproject"],
   "quality_scale": "platinum",
   "requirements": [
-    "xknx==2.9.0",
-    "xknxproject==3.1.0",
-    "knx_frontend==2023.5.16.204359"
+    "xknx==2.11.1",
+    "xknxproject==3.2.0",
+    "knx-frontend==2023.6.23.191712"
   ]
 }
diff --git a/homeassistant/components/knx/schema.py b/homeassistant/components/knx/schema.py
index 0f627b724cb580..86bf790a0775cc 100644
--- a/homeassistant/components/knx/schema.py
+++ b/homeassistant/components/knx/schema.py
@@ -936,6 +936,25 @@ class TextSchema(KNXPlatformSchema):
     )
 
 
+class TimeSchema(KNXPlatformSchema):
+    """Voluptuous schema for KNX time."""
+
+    PLATFORM = Platform.TIME
+
+    DEFAULT_NAME = "KNX Time"
+
+    ENTITY_SCHEMA = vol.Schema(
+        {
+            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+            vol.Optional(CONF_RESPOND_TO_READ, default=False): cv.boolean,
+            vol.Optional(CONF_SYNC_STATE, default=True): sync_state_validator,
+            vol.Required(KNX_ADDRESS): ga_list_validator,
+            vol.Optional(CONF_STATE_ADDRESS): ga_list_validator,
+            vol.Optional(CONF_ENTITY_CATEGORY): ENTITY_CATEGORIES_SCHEMA,
+        }
+    )
+
+
 class WeatherSchema(KNXPlatformSchema):
     """Voluptuous schema for KNX weather station."""
 
diff --git a/homeassistant/components/knx/sensor.py b/homeassistant/components/knx/sensor.py
index ea5ba2f63a60ab..dbfe8e9bd5e1ff 100644
--- a/homeassistant/components/knx/sensor.py
+++ b/homeassistant/components/knx/sensor.py
@@ -4,6 +4,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
+from functools import partial
 from typing import Any
 
 from xknx import XKNX
@@ -71,7 +72,7 @@ class KNXSystemEntityDescription(SensorEntityDescription):
         device_class=SensorDeviceClass.ENUM,
         options=[opt.value for opt in XknxConnectionType],
         should_poll=False,
-        value_fn=lambda knx: knx.xknx.connection_manager.connection_type.value,  # type: ignore[no-any-return]
+        value_fn=lambda knx: knx.xknx.connection_manager.connection_type.value,
     ),
     KNXSystemEntityDescription(
         key="telegrams_incoming",
@@ -221,9 +222,9 @@ async def async_added_to_hass(self) -> None:
         self.knx.xknx.connection_manager.register_connection_state_changed_cb(
             self.after_update_callback
         )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Disconnect device object when removed."""
-        self.knx.xknx.connection_manager.unregister_connection_state_changed_cb(
-            self.after_update_callback
+        self.async_on_remove(
+            partial(
+                self.knx.xknx.connection_manager.unregister_connection_state_changed_cb,
+                self.after_update_callback,
+            )
         )
diff --git a/homeassistant/components/knx/services.yaml b/homeassistant/components/knx/services.yaml
index d95a15738722f2..0ad497a30a261c 100644
--- a/homeassistant/components/knx/services.yaml
+++ b/homeassistant/components/knx/services.yaml
@@ -106,3 +106,6 @@ exposure_register:
       default: false
       selector:
         boolean:
+reload:
+  name: Reload
+  description: Reload the KNX integration.
diff --git a/homeassistant/components/knx/telegrams.py b/homeassistant/components/knx/telegrams.py
index 5b429b0bdc18a6..09307794066744 100644
--- a/homeassistant/components/knx/telegrams.py
+++ b/homeassistant/components/knx/telegrams.py
@@ -20,9 +20,13 @@
 class TelegramDict(TypedDict):
     """Represent a Telegram as a dict."""
 
+    # this has to be in sync with the frontend implementation
     destination: str
     destination_name: str
     direction: str
+    dpt_main: int | None
+    dpt_sub: int | None
+    dpt_name: str | None
     payload: int | tuple[int, ...] | None
     source: str
     source_name: str
@@ -57,7 +61,7 @@ def __init__(
     async def _xknx_telegram_cb(self, telegram: Telegram) -> None:
         """Handle incoming and outgoing telegrams from xknx."""
         telegram_dict = self.telegram_to_dict(telegram)
-        self.recent_telegrams.appendleft(telegram_dict)
+        self.recent_telegrams.append(telegram_dict)
         for job in self._jobs:
             self.hass.async_run_hass_job(job, telegram_dict)
 
@@ -80,6 +84,9 @@ def remove_listener() -> None:
     def telegram_to_dict(self, telegram: Telegram) -> TelegramDict:
         """Convert a Telegram to a dict."""
         dst_name = ""
+        dpt_main = None
+        dpt_sub = None
+        dpt_name = None
         payload_data: int | tuple[int, ...] | None = None
         src_name = ""
         transcoder = None
@@ -104,6 +111,9 @@ def telegram_to_dict(self, telegram: Telegram) -> TelegramDict:
             if transcoder is not None:
                 try:
                     value = transcoder.from_knx(telegram.payload.value)
+                    dpt_main = transcoder.dpt_main_number
+                    dpt_sub = transcoder.dpt_sub_number
+                    dpt_name = transcoder.value_type
                     unit = transcoder.unit
                 except XKNXException:
                     value = "Error decoding value"
@@ -112,6 +122,9 @@ def telegram_to_dict(self, telegram: Telegram) -> TelegramDict:
             destination=f"{telegram.destination_address}",
             destination_name=dst_name,
             direction=telegram.direction.value,
+            dpt_main=dpt_main,
+            dpt_sub=dpt_sub,
+            dpt_name=dpt_name,
             payload=payload_data,
             source=f"{telegram.source_address}",
             source_name=src_name,
diff --git a/homeassistant/components/knx/time.py b/homeassistant/components/knx/time.py
new file mode 100644
index 00000000000000..af8ee48b806f5d
--- /dev/null
+++ b/homeassistant/components/knx/time.py
@@ -0,0 +1,104 @@
+"""Support for KNX/IP time."""
+from __future__ import annotations
+
+from datetime import time as dt_time
+import time as time_time
+from typing import Final
+
+from xknx import XKNX
+from xknx.devices import DateTime as XknxDateTime
+
+from homeassistant import config_entries
+from homeassistant.components.time import TimeEntity
+from homeassistant.const import (
+    CONF_ENTITY_CATEGORY,
+    CONF_NAME,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import ConfigType
+
+from .const import (
+    CONF_RESPOND_TO_READ,
+    CONF_STATE_ADDRESS,
+    CONF_SYNC_STATE,
+    DATA_KNX_CONFIG,
+    DOMAIN,
+    KNX_ADDRESS,
+)
+from .knx_entity import KnxEntity
+
+_TIME_TRANSLATION_FORMAT: Final = "%H:%M:%S"
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: config_entries.ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up entities for KNX platform."""
+    xknx: XKNX = hass.data[DOMAIN].xknx
+    config: list[ConfigType] = hass.data[DATA_KNX_CONFIG][Platform.TIME]
+
+    async_add_entities(KNXTime(xknx, entity_config) for entity_config in config)
+
+
+def _create_xknx_device(xknx: XKNX, config: ConfigType) -> XknxDateTime:
+    """Return a XKNX DateTime object to be used within XKNX."""
+    return XknxDateTime(
+        xknx,
+        name=config[CONF_NAME],
+        broadcast_type="TIME",
+        localtime=False,
+        group_address=config[KNX_ADDRESS],
+        group_address_state=config.get(CONF_STATE_ADDRESS),
+        respond_to_read=config[CONF_RESPOND_TO_READ],
+        sync_state=config[CONF_SYNC_STATE],
+    )
+
+
+class KNXTime(KnxEntity, TimeEntity, RestoreEntity):
+    """Representation of a KNX time."""
+
+    _device: XknxDateTime
+
+    def __init__(self, xknx: XKNX, config: ConfigType) -> None:
+        """Initialize a KNX time."""
+        super().__init__(_create_xknx_device(xknx, config))
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_unique_id = str(self._device.remote_value.group_address)
+
+    async def async_added_to_hass(self) -> None:
+        """Restore last state."""
+        await super().async_added_to_hass()
+        if (
+            not self._device.remote_value.readable
+            and (last_state := await self.async_get_last_state()) is not None
+            and last_state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE)
+        ):
+            self._device.remote_value.value = time_time.strptime(
+                last_state.state, _TIME_TRANSLATION_FORMAT
+            )
+
+    @property
+    def native_value(self) -> dt_time | None:
+        """Return the latest value."""
+        if (time_struct := self._device.remote_value.value) is None:
+            return None
+        return dt_time(
+            hour=time_struct.tm_hour,
+            minute=time_struct.tm_min,
+            second=min(time_struct.tm_sec, 59),  # account for leap seconds
+        )
+
+    async def async_set_value(self, value: dt_time) -> None:
+        """Change the value."""
+        time_struct = time_time.strptime(
+            value.strftime(_TIME_TRANSLATION_FORMAT),
+            _TIME_TRANSLATION_FORMAT,
+        )
+        await self._device.set(time_struct)
diff --git a/homeassistant/components/knx/websocket.py b/homeassistant/components/knx/websocket.py
index d63ba89fbcc714..ad29fd19928fdb 100644
--- a/homeassistant/components/knx/websocket.py
+++ b/homeassistant/components/knx/websocket.py
@@ -3,15 +3,14 @@
 
 from typing import TYPE_CHECKING, Final
 
-from knx_frontend import get_build_id, locate_dir
+import knx_frontend as knx_panel
 import voluptuous as vol
-from xknx.telegram import TelegramDirection
 from xknxproject.exceptions import XknxProjectException
 
 from homeassistant.components import panel_custom, websocket_api
 from homeassistant.core import HomeAssistant, callback
 
-from .const import DOMAIN, KNXBusMonitorMessage
+from .const import DOMAIN
 from .telegrams import TelegramDict
 
 if TYPE_CHECKING:
@@ -30,23 +29,24 @@ async def register_panel(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, ws_subscribe_telegram)
 
     if DOMAIN not in hass.data.get("frontend_panels", {}):
-        path = locate_dir()
-        build_id = get_build_id()
         hass.http.register_static_path(
-            URL_BASE, path, cache_headers=(build_id != "dev")
+            URL_BASE,
+            path=knx_panel.locate_dir(),
+            cache_headers=knx_panel.is_prod_build,
         )
         await panel_custom.async_register_panel(
             hass=hass,
             frontend_url_path=DOMAIN,
-            webcomponent_name="knx-frontend",
+            webcomponent_name=knx_panel.webcomponent_name,
             sidebar_title=DOMAIN.upper(),
             sidebar_icon="mdi:bus-electric",
-            module_url=f"{URL_BASE}/entrypoint-{build_id}.js",
+            module_url=f"{URL_BASE}/{knx_panel.entrypoint_js}",
             embed_iframe=True,
             require_admin=True,
         )
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "knx/info",
@@ -129,6 +129,7 @@ async def ws_project_file_remove(
     connection.send_result(msg["id"])
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "knx/group_monitor_info",
@@ -142,10 +143,7 @@ def ws_group_monitor_info(
 ) -> None:
     """Handle get info command of group monitor."""
     knx: KNXModule = hass.data[DOMAIN]
-    recent_telegrams = [
-        _telegram_dict_to_group_monitor(telegram)
-        for telegram in knx.telegrams.recent_telegrams
-    ]
+    recent_telegrams = [*knx.telegrams.recent_telegrams]
     connection.send_result(
         msg["id"],
         {
@@ -155,6 +153,7 @@ def ws_group_monitor_info(
     )
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "knx/subscribe_telegrams",
@@ -174,7 +173,7 @@ def forward_telegram(telegram: TelegramDict) -> None:
         """Forward telegram to websocket subscription."""
         connection.send_event(
             msg["id"],
-            _telegram_dict_to_group_monitor(telegram),
+            telegram,
         )
 
     connection.subscriptions[msg["id"]] = knx.telegrams.async_listen_telegram(
@@ -182,38 +181,3 @@ def forward_telegram(telegram: TelegramDict) -> None:
         name="KNX GroupMonitor subscription",
     )
     connection.send_result(msg["id"])
-
-
-def _telegram_dict_to_group_monitor(telegram: TelegramDict) -> KNXBusMonitorMessage:
-    """Convert a TelegramDict to a KNXBusMonitorMessage object."""
-    direction = (
-        "group_monitor_incoming"
-        if telegram["direction"] == TelegramDirection.INCOMING.value
-        else "group_monitor_outgoing"
-    )
-
-    _payload = telegram["payload"]
-    if isinstance(_payload, tuple):
-        payload = f"0x{bytes(_payload).hex()}"
-    elif isinstance(_payload, int):
-        payload = f"{_payload:d}"
-    else:
-        payload = ""
-
-    timestamp = telegram["timestamp"].strftime("%H:%M:%S.%f")[:-3]
-
-    if (value := telegram["value"]) is not None:
-        unit = telegram["unit"]
-        value = f"{value}{' ' + unit if unit else ''}"
-
-    return KNXBusMonitorMessage(
-        destination_address=telegram["destination"],
-        destination_text=telegram["destination_name"],
-        direction=direction,
-        payload=payload,
-        source_address=telegram["source"],
-        source_text=telegram["source_name"],
-        timestamp=timestamp,
-        type=telegram["telegramtype"],
-        value=value,
-    )
diff --git a/homeassistant/components/kodi/device_trigger.py b/homeassistant/components/kodi/device_trigger.py
index c15c415bd9c343..3f931d1e2641f9 100644
--- a/homeassistant/components/kodi/device_trigger.py
+++ b/homeassistant/components/kodi/device_trigger.py
@@ -23,7 +23,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
     }
 )
@@ -44,7 +44,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_on",
                 }
             )
@@ -53,7 +53,7 @@ async def async_get_triggers(
                     CONF_PLATFORM: "device",
                     CONF_DEVICE_ID: device_id,
                     CONF_DOMAIN: DOMAIN,
-                    CONF_ENTITY_ID: entry.entity_id,
+                    CONF_ENTITY_ID: entry.id,
                     CONF_TYPE: "turn_off",
                 }
             )
@@ -69,15 +69,24 @@ def _attach_trigger(
     event_type,
     trigger_info: TriggerInfo,
 ):
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
     trigger_data = trigger_info["trigger_data"]
     job = HassJob(action)
 
     @callback
     def _handle_event(event: Event):
-        if event.data[ATTR_ENTITY_ID] == config[CONF_ENTITY_ID]:
+        if event.data[ATTR_ENTITY_ID] == entity_id:
             hass.async_run_hass_job(
                 job,
-                {"trigger": {**trigger_data, **config, "description": event_type}},
+                {
+                    "trigger": {
+                        **trigger_data,
+                        **config,
+                        "description": event_type,
+                        "entity_id": entity_id,
+                    }
+                },
                 event.context,
             )
 
diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py
index 3272491a06d3e3..af4e5700805124 100644
--- a/homeassistant/components/kodi/media_player.py
+++ b/homeassistant/components/kodi/media_player.py
@@ -26,6 +26,7 @@
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     ATTR_ENTITY_ID,
+    CONF_DEVICE_ID,
     CONF_HOST,
     CONF_NAME,
     CONF_PASSWORD,
@@ -33,6 +34,7 @@
     CONF_PROXY_SSL,
     CONF_SSL,
     CONF_TIMEOUT,
+    CONF_TYPE,
     CONF_USERNAME,
     EVENT_HOMEASSISTANT_STARTED,
 )
@@ -257,6 +259,8 @@ async def wrapper(obj: _KodiEntityT, *args: _P.args, **kwargs: _P.kwargs) -> Non
 class KodiEntity(MediaPlayerEntity):
     """Representation of a XBMC/Kodi device."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.BROWSE_MEDIA
         | MediaPlayerEntityFeature.NEXT_TRACK
@@ -279,6 +283,7 @@ def __init__(self, connection, kodi, name, uid):
         self._connection = connection
         self._kodi = kodi
         self._unique_id = uid
+        self._device_id = None
         self._players = None
         self._properties = {}
         self._item = {}
@@ -287,7 +292,11 @@ def __init__(self, connection, kodi, name, uid):
         self._media_position = None
         self._connect_error = False
 
-        self._attr_name = name
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, uid)},
+            manufacturer="Kodi",
+            name=name,
+        )
 
     def _reset_state(self, players=None):
         self._players = players
@@ -336,6 +345,20 @@ def async_on_volume_changed(self, sender, data):
         self._app_properties["muted"] = data["muted"]
         self.async_write_ha_state()
 
+    @callback
+    def async_on_key_press(self, sender, data):
+        """Handle a incoming key press notification."""
+        self.hass.bus.async_fire(
+            f"{DOMAIN}_keypress",
+            {
+                CONF_TYPE: "keypress",
+                CONF_DEVICE_ID: self._device_id,
+                ATTR_ENTITY_ID: self.entity_id,
+                "sender": sender,
+                "data": data,
+            },
+        )
+
     async def async_on_quit(self, sender, data):
         """Reset the player state on quit action."""
         await self._clear_connection()
@@ -351,15 +374,6 @@ def unique_id(self):
         """Return the unique id of the device."""
         return self._unique_id
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info for this device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
-            manufacturer="Kodi",
-            name=self.name,
-        )
-
     @property
     def state(self) -> MediaPlayerState:
         """Return the state of the device."""
@@ -410,6 +424,7 @@ async def _on_ws_connected(self):
         dev_reg = dr.async_get(self.hass)
         device = dev_reg.async_get_device({(DOMAIN, self.unique_id)})
         dev_reg.async_update_device(device.id, sw_version=sw_version)
+        self._device_id = device.id
 
         self.async_schedule_update_ha_state(True)
 
@@ -457,6 +472,7 @@ def _register_ws_callbacks(self):
         self._connection.server.Application.OnVolumeChanged = (
             self.async_on_volume_changed
         )
+        self._connection.server.Other.OnKeyPress = self.async_on_key_press
         self._connection.server.System.OnQuit = self.async_on_quit
         self._connection.server.System.OnRestart = self.async_on_quit
         self._connection.server.System.OnSleep = self.async_on_quit
diff --git a/homeassistant/components/lacrosse/sensor.py b/homeassistant/components/lacrosse/sensor.py
index fb2c60b32c98ce..7355a60f5f0fed 100644
--- a/homeassistant/components/lacrosse/sensor.py
+++ b/homeassistant/components/lacrosse/sensor.py
@@ -93,7 +93,7 @@ def setup_platform(
         _LOGGER.warning("Unable to open serial port: %s", exc)
         return
 
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, lambda event: lacrosse.close())  # type: ignore[no-any-return]
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, lambda event: lacrosse.close())
 
     if CONF_JEELINK_LED in config:
         lacrosse.led_mode_state(config.get(CONF_JEELINK_LED))
diff --git a/homeassistant/components/lacrosse_view/__init__.py b/homeassistant/components/lacrosse_view/__init__.py
index 46239485eb314c..86793a94a4bdd4 100644
--- a/homeassistant/components/lacrosse_view/__init__.py
+++ b/homeassistant/components/lacrosse_view/__init__.py
@@ -1,6 +1,8 @@
 """The LaCrosse View integration."""
 from __future__ import annotations
 
+import logging
+
 from lacrosse_view import LaCrosse, LoginError
 
 from homeassistant.config_entries import ConfigEntry
@@ -13,6 +15,7 @@
 from .coordinator import LaCrosseUpdateCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
+_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -22,17 +25,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         await api.login(entry.data["username"], entry.data["password"])
+        _LOGGER.debug("Log in successful")
     except LoginError as error:
         raise ConfigEntryAuthFailed from error
 
     coordinator = LaCrosseUpdateCoordinator(hass, api, entry)
 
+    _LOGGER.debug("First refresh")
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
         "coordinator": coordinator,
     }
 
+    _LOGGER.debug("Setting up platforms")
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
diff --git a/homeassistant/components/lacrosse_view/config_flow.py b/homeassistant/components/lacrosse_view/config_flow.py
index 2b694860bc81b4..67d294de179177 100644
--- a/homeassistant/components/lacrosse_view/config_flow.py
+++ b/homeassistant/components/lacrosse_view/config_flow.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from lacrosse_view import LaCrosse, Location, LoginError
@@ -13,7 +14,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN, LOGGER
+from .const import DOMAIN
 
 STEP_USER_DATA_SCHEMA = vol.Schema(
     {
@@ -21,6 +22,7 @@
         vol.Required("password"): str,
     }
 )
+_LOGGER = logging.getLogger(__name__)
 
 
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> list[Location]:
@@ -29,14 +31,16 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> list[Loca
     api = LaCrosse(async_get_clientsession(hass))
 
     try:
-        await api.login(data["username"], data["password"])
+        if await api.login(data["username"], data["password"]):
+            _LOGGER.debug("Successfully logged in")
 
         locations = await api.get_locations()
+        _LOGGER.debug(locations)
     except LoginError as error:
         raise InvalidAuth from error
 
     if not locations:
-        raise NoLocations("No locations found for account {}".format(data["username"]))
+        raise NoLocations(f'No locations found for account {data["username"]}')
 
     return locations
 
@@ -57,6 +61,7 @@ async def async_step_user(
     ) -> FlowResult:
         """Handle the initial step."""
         if user_input is None:
+            _LOGGER.debug("Showing initial form")
             return self.async_show_form(
                 step_id="user", data_schema=STEP_USER_DATA_SCHEMA
             )
@@ -66,11 +71,12 @@ async def async_step_user(
         try:
             info = await validate_input(self.hass, user_input)
         except InvalidAuth:
+            _LOGGER.exception("Could not login")
             errors["base"] = "invalid_auth"
         except NoLocations:
             errors["base"] = "no_locations"
         except Exception:  # pylint: disable=broad-except
-            LOGGER.exception("Unexpected exception")
+            _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
         else:
             self.data = user_input
@@ -83,8 +89,11 @@ async def async_step_user(
                 )
                 await self.hass.config_entries.async_reload(self._reauth_entry.entry_id)
                 return self.async_abort(reason="reauth_successful")
+
+            _LOGGER.debug("Moving on to location step")
             return await self.async_step_location()
 
+        _LOGGER.debug("Showing errors")
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
@@ -95,6 +104,7 @@ async def async_step_location(
         """Handle the location step."""
 
         if not user_input:
+            _LOGGER.debug("Showing initial location selection")
             return self.async_show_form(
                 step_id="location",
                 data_schema=vol.Schema(
@@ -113,7 +123,6 @@ async def async_step_location(
         )
 
         await self.async_set_unique_id(location_id)
-
         self._abort_if_unique_id_configured()
 
         return self.async_create_entry(
diff --git a/homeassistant/components/lacrosse_view/const.py b/homeassistant/components/lacrosse_view/const.py
index cae11315bc7abe..900463cff6e3a6 100644
--- a/homeassistant/components/lacrosse_view/const.py
+++ b/homeassistant/components/lacrosse_view/const.py
@@ -1,6 +1,4 @@
 """Constants for the LaCrosse View integration."""
-import logging
 
 DOMAIN = "lacrosse_view"
-LOGGER = logging.getLogger(__package__)
 SCAN_INTERVAL = 30
diff --git a/homeassistant/components/lacrosse_view/coordinator.py b/homeassistant/components/lacrosse_view/coordinator.py
index 8dcbd8a2e5eab5..b45fe3ae1b4ed0 100644
--- a/homeassistant/components/lacrosse_view/coordinator.py
+++ b/homeassistant/components/lacrosse_view/coordinator.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
+import logging
 from time import time
 
 from lacrosse_view import HTTPError, LaCrosse, Location, LoginError, Sensor
@@ -11,7 +12,9 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from .const import LOGGER, SCAN_INTERVAL
+from .const import SCAN_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)
 
 
 class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
@@ -39,7 +42,7 @@ def __init__(
         self.id = entry.data["id"]
         super().__init__(
             hass,
-            LOGGER,
+            _LOGGER,
             name="LaCrosse View",
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
@@ -49,6 +52,7 @@ async def _async_update_data(self) -> list[Sensor]:
         now = int(time())
 
         if self.last_update < now - 59 * 60:  # Get new token once in a hour
+            _LOGGER.debug("Refreshing token")
             self.last_update = now
             try:
                 await self.api.login(self.username, self.password)
@@ -66,6 +70,8 @@ async def _async_update_data(self) -> list[Sensor]:
         except HTTPError as error:
             raise ConfigEntryNotReady from error
 
+        _LOGGER.debug("Got data: %s", sensors)
+
         # Verify that we have permission to read the sensors
         for sensor in sensors:
             if not sensor.permissions.get("read", False):
diff --git a/homeassistant/components/lacrosse_view/sensor.py b/homeassistant/components/lacrosse_view/sensor.py
index 1c2daa2ba4ab52..547772cad09ff1 100644
--- a/homeassistant/components/lacrosse_view/sensor.py
+++ b/homeassistant/components/lacrosse_view/sensor.py
@@ -3,6 +3,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+import logging
 
 from lacrosse_view import Sensor
 
@@ -22,13 +23,16 @@
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
 )
 
-from .const import DOMAIN, LOGGER
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
 
 
 @dataclass
@@ -63,7 +67,6 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     "Temperature": LaCrosseSensorEntityDescription(
         key="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Temperature",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
@@ -71,22 +74,20 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     "Humidity": LaCrosseSensorEntityDescription(
         key="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        name="Humidity",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=PERCENTAGE,
     ),
     "HeatIndex": LaCrosseSensorEntityDescription(
         key="HeatIndex",
+        translation_key="heat_index",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Heat index",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
     ),
     "WindSpeed": LaCrosseSensorEntityDescription(
         key="WindSpeed",
-        name="Wind speed",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
@@ -94,7 +95,6 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     ),
     "Rain": LaCrosseSensorEntityDescription(
         key="Rain",
-        name="Rain",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         native_unit_of_measurement=UnitOfPrecipitationDepth.INCHES,
@@ -102,23 +102,23 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     ),
     "WindHeading": LaCrosseSensorEntityDescription(
         key="WindHeading",
-        name="Wind heading",
+        translation_key="wind_heading",
         value_fn=get_value,
         native_unit_of_measurement=DEGREE,
     ),
     "WetDry": LaCrosseSensorEntityDescription(
         key="WetDry",
-        name="Wet/Dry",
+        translation_key="wet_dry",
         value_fn=get_value,
     ),
     "Flex": LaCrosseSensorEntityDescription(
         key="Flex",
-        name="Flex",
+        translation_key="flex",
         value_fn=get_value,
     ),
     "BarometricPressure": LaCrosseSensorEntityDescription(
         key="BarometricPressure",
-        name="Barometric pressure",
+        translation_key="barometric_pressure",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
@@ -126,7 +126,7 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     ),
     "FeelsLike": LaCrosseSensorEntityDescription(
         key="FeelsLike",
-        name="Feels like",
+        translation_key="feels_like",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -134,7 +134,7 @@ def get_value(sensor: Sensor, field: str) -> float | int | str | None:
     ),
     "WindChill": LaCrosseSensorEntityDescription(
         key="WindChill",
-        name="Wind chill",
+        translation_key="wind_chill",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=get_value,
         device_class=SensorDeviceClass.TEMPERATURE,
@@ -169,7 +169,7 @@ async def async_setup_entry(
                     f"title=LaCrosse%20View%20Unsupported%20sensor%20field:%20{field}"
                 )
 
-                LOGGER.warning(message)
+                _LOGGER.warning(message)
                 continue
             sensor_list.append(
                 LaCrosseViewSensor(
@@ -189,7 +189,7 @@ class LaCrosseViewSensor(
     """LaCrosse View sensor."""
 
     entity_description: LaCrosseSensorEntityDescription
-    _attr_has_entity_name: bool = True
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -203,13 +203,13 @@ def __init__(
 
         self.entity_description = description
         self._attr_unique_id = f"{sensor.sensor_id}-{description.key}"
-        self._attr_device_info = {
-            "identifiers": {(DOMAIN, sensor.sensor_id)},
-            "name": sensor.name,
-            "manufacturer": "LaCrosse Technology",
-            "model": sensor.model,
-            "via_device": (DOMAIN, sensor.location.id),
-        }
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, sensor.sensor_id)},
+            name=sensor.name,
+            manufacturer="LaCrosse Technology",
+            model=sensor.model,
+            via_device=(DOMAIN, sensor.location.id),
+        )
         self.index = index
 
     @property
diff --git a/homeassistant/components/lacrosse_view/strings.json b/homeassistant/components/lacrosse_view/strings.json
index 160517793d8f9c..8dc27ba259e622 100644
--- a/homeassistant/components/lacrosse_view/strings.json
+++ b/homeassistant/components/lacrosse_view/strings.json
@@ -17,5 +17,30 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "heat_index": {
+        "name": "Heat index"
+      },
+      "wind_heading": {
+        "name": "Wind heading"
+      },
+      "wet_dry": {
+        "name": "Wet/Dry"
+      },
+      "flex": {
+        "name": "Flex"
+      },
+      "barometric_pressure": {
+        "name": "Barometric pressure"
+      },
+      "feels_like": {
+        "name": "Feels like"
+      },
+      "wind_chill": {
+        "name": "Wind chill"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/lametric/config_flow.py b/homeassistant/components/lametric/config_flow.py
index 8e9da5851cf50a..1dad190d70675d 100644
--- a/homeassistant/components/lametric/config_flow.py
+++ b/homeassistant/components/lametric/config_flow.py
@@ -248,6 +248,10 @@ async def _async_step_create_entry(self, host: str, api_key: str) -> FlowResult:
                 updates={CONF_HOST: lametric.host, CONF_API_KEY: lametric.api_key}
             )
 
+        notify_sound: Sound | None = None
+        if device.model != "sa5":
+            notify_sound = Sound(sound=NotificationSound.WIN)
+
         await lametric.notify(
             notification=Notification(
                 priority=NotificationPriority.CRITICAL,
@@ -255,7 +259,7 @@ async def _async_step_create_entry(self, host: str, api_key: str) -> FlowResult:
                 model=Model(
                     cycles=2,
                     frames=[Simple(text="Connected to Home Assistant!", icon=7956)],
-                    sound=Sound(sound=NotificationSound.WIN),
+                    sound=notify_sound,
                 ),
             )
         )
diff --git a/homeassistant/components/lametric/sensor.py b/homeassistant/components/lametric/sensor.py
index 0c26d2c7dd5892..6cddf81b2bf3f6 100644
--- a/homeassistant/components/lametric/sensor.py
+++ b/homeassistant/components/lametric/sensor.py
@@ -39,7 +39,6 @@ class LaMetricSensorEntityDescription(
     LaMetricSensorEntityDescription(
         key="rssi",
         translation_key="rssi",
-        name="Wi-Fi signal",
         icon="mdi:wifi",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
diff --git a/homeassistant/components/lastfm/__init__.py b/homeassistant/components/lastfm/__init__.py
index 2012834293175f..fc26dd85ea3229 100644
--- a/homeassistant/components/lastfm/__init__.py
+++ b/homeassistant/components/lastfm/__init__.py
@@ -1 +1,27 @@
 """The lastfm component."""
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+from .const import PLATFORMS
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up lastfm from a config entry."""
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload lastfm config entry."""
+
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
diff --git a/homeassistant/components/lastfm/config_flow.py b/homeassistant/components/lastfm/config_flow.py
new file mode 100644
index 00000000000000..54406a6e03bc01
--- /dev/null
+++ b/homeassistant/components/lastfm/config_flow.py
@@ -0,0 +1,229 @@
+"""Config flow for LastFm."""
+from __future__ import annotations
+
+from typing import Any
+
+from pylast import LastFMNetwork, PyLastError, User, WSError
+import voluptuous as vol
+
+from homeassistant.config_entries import (
+    ConfigEntry,
+    ConfigFlow,
+    OptionsFlowWithConfigEntry,
+)
+from homeassistant.const import CONF_API_KEY
+from homeassistant.core import callback
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+)
+from homeassistant.helpers.typing import ConfigType
+
+from .const import CONF_MAIN_USER, CONF_USERS, DOMAIN
+
+PLACEHOLDERS = {"api_account_url": "https://www.last.fm/api/account/create"}
+
+CONFIG_SCHEMA: vol.Schema = vol.Schema(
+    {
+        vol.Required(CONF_API_KEY): str,
+        vol.Required(CONF_MAIN_USER): str,
+    }
+)
+
+
+def get_lastfm_user(api_key: str, username: str) -> tuple[User, dict[str, str]]:
+    """Get and validate lastFM User."""
+    user = LastFMNetwork(api_key=api_key).get_user(username)
+    errors = {}
+    try:
+        user.get_playcount()
+    except WSError as error:
+        if error.details == "User not found":
+            errors["base"] = "invalid_account"
+        elif (
+            error.details
+            == "Invalid API key - You must be granted a valid key by last.fm"
+        ):
+            errors["base"] = "invalid_auth"
+        else:
+            errors["base"] = "unknown"
+    except Exception:  # pylint:disable=broad-except
+        errors["base"] = "unknown"
+    return user, errors
+
+
+def validate_lastfm_users(
+    api_key: str, usernames: list[str]
+) -> tuple[list[str], dict[str, str]]:
+    """Validate list of users. Return tuple of valid users and errors."""
+    valid_users = []
+    errors = {}
+    for username in usernames:
+        _, lastfm_errors = get_lastfm_user(api_key, username)
+        if lastfm_errors:
+            errors = lastfm_errors
+        else:
+            valid_users.append(username)
+    return valid_users, errors
+
+
+class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN):
+    """Config flow handler for LastFm."""
+
+    data: dict[str, Any] = {}
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: ConfigEntry,
+    ) -> LastFmOptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return LastFmOptionsFlowHandler(config_entry)
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Initialize user input."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            self.data = user_input.copy()
+            _, errors = get_lastfm_user(
+                self.data[CONF_API_KEY], self.data[CONF_MAIN_USER]
+            )
+            if not errors:
+                return await self.async_step_friends()
+        return self.async_show_form(
+            step_id="user",
+            errors=errors,
+            description_placeholders=PLACEHOLDERS,
+            data_schema=self.add_suggested_values_to_schema(CONFIG_SCHEMA, user_input),
+        )
+
+    async def async_step_friends(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Form to select other users and friends."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            users, errors = validate_lastfm_users(
+                self.data[CONF_API_KEY], user_input[CONF_USERS]
+            )
+            user_input[CONF_USERS] = users
+            if not errors:
+                return self.async_create_entry(
+                    title="LastFM",
+                    data={},
+                    options={
+                        CONF_API_KEY: self.data[CONF_API_KEY],
+                        CONF_MAIN_USER: self.data[CONF_MAIN_USER],
+                        CONF_USERS: [
+                            self.data[CONF_MAIN_USER],
+                            *user_input[CONF_USERS],
+                        ],
+                    },
+                )
+        try:
+            main_user, _ = get_lastfm_user(
+                self.data[CONF_API_KEY], self.data[CONF_MAIN_USER]
+            )
+            friends_response = await self.hass.async_add_executor_job(
+                main_user.get_friends
+            )
+            friends = [
+                SelectOptionDict(value=friend.name, label=friend.get_name(True))
+                for friend in friends_response
+            ]
+        except PyLastError:
+            friends = []
+        return self.async_show_form(
+            step_id="friends",
+            errors=errors,
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(
+                    {
+                        vol.Required(CONF_USERS): SelectSelector(
+                            SelectSelectorConfig(
+                                options=friends, custom_value=True, multiple=True
+                            )
+                        ),
+                    }
+                ),
+                user_input or {CONF_USERS: []},
+            ),
+        )
+
+    async def async_step_import(self, import_config: ConfigType) -> FlowResult:
+        """Import config from yaml."""
+        for entry in self._async_current_entries():
+            if entry.options[CONF_API_KEY] == import_config[CONF_API_KEY]:
+                return self.async_abort(reason="already_configured")
+        users, _ = validate_lastfm_users(
+            import_config[CONF_API_KEY], import_config[CONF_USERS]
+        )
+        return self.async_create_entry(
+            title="LastFM",
+            data={},
+            options={
+                CONF_API_KEY: import_config[CONF_API_KEY],
+                CONF_MAIN_USER: None,
+                CONF_USERS: users,
+            },
+        )
+
+
+class LastFmOptionsFlowHandler(OptionsFlowWithConfigEntry):
+    """LastFm Options flow handler."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Initialize form."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            users, errors = validate_lastfm_users(
+                self.options[CONF_API_KEY], user_input[CONF_USERS]
+            )
+            user_input[CONF_USERS] = users
+            if not errors:
+                return self.async_create_entry(
+                    title="LastFM",
+                    data={
+                        **self.options,
+                        CONF_USERS: user_input[CONF_USERS],
+                    },
+                )
+        if self.options[CONF_MAIN_USER]:
+            try:
+                main_user, _ = get_lastfm_user(
+                    self.options[CONF_API_KEY],
+                    self.options[CONF_MAIN_USER],
+                )
+                friends_response = await self.hass.async_add_executor_job(
+                    main_user.get_friends
+                )
+                friends = [
+                    SelectOptionDict(value=friend.name, label=friend.get_name(True))
+                    for friend in friends_response
+                ]
+            except PyLastError:
+                friends = []
+        else:
+            friends = []
+        return self.async_show_form(
+            step_id="init",
+            errors=errors,
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(
+                    {
+                        vol.Required(CONF_USERS): SelectSelector(
+                            SelectSelectorConfig(
+                                options=friends, custom_value=True, multiple=True
+                            )
+                        ),
+                    }
+                ),
+                user_input or self.options,
+            ),
+        )
diff --git a/homeassistant/components/lastfm/const.py b/homeassistant/components/lastfm/const.py
index 2a7f40b99e3a33..f895876c3c392d 100644
--- a/homeassistant/components/lastfm/const.py
+++ b/homeassistant/components/lastfm/const.py
@@ -2,10 +2,14 @@
 import logging
 from typing import Final
 
+from homeassistant.const import Platform
+
 LOGGER = logging.getLogger(__package__)
 DOMAIN: Final = "lastfm"
+PLATFORMS = [Platform.SENSOR]
 DEFAULT_NAME = "LastFM"
 
+CONF_MAIN_USER = "main_user"
 CONF_USERS = "users"
 
 ATTR_LAST_PLAYED = "last_played"
diff --git a/homeassistant/components/lastfm/manifest.json b/homeassistant/components/lastfm/manifest.json
index 392da95a2ac881..4315f4c538998e 100644
--- a/homeassistant/components/lastfm/manifest.json
+++ b/homeassistant/components/lastfm/manifest.json
@@ -1,7 +1,8 @@
 {
   "domain": "lastfm",
   "name": "Last.fm",
-  "codeowners": [],
+  "codeowners": ["@joostlek"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/lastfm",
   "iot_class": "cloud_polling",
   "loggers": ["pylast"],
diff --git a/homeassistant/components/lastfm/sensor.py b/homeassistant/components/lastfm/sensor.py
index 20c51f8a8c6a3b..b4776b19c50db9 100644
--- a/homeassistant/components/lastfm/sensor.py
+++ b/homeassistant/components/lastfm/sensor.py
@@ -3,14 +3,18 @@
 
 import hashlib
 
-from pylast import LastFMNetwork, Track, User, WSError
+from pylast import LastFMNetwork, PyLastError, Track, User
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
@@ -18,6 +22,8 @@
     ATTR_PLAY_COUNT,
     ATTR_TOP_PLAYED,
     CONF_USERS,
+    DEFAULT_NAME,
+    DOMAIN,
     LOGGER,
     STATE_NOT_SCROBBLING,
 )
@@ -35,23 +41,46 @@ def format_track(track: Track) -> str:
     return f"{track.artist} - {track.title}"
 
 
-def setup_platform(
+async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Last.fm sensor platform."""
-    lastfm_api = LastFMNetwork(api_key=config[CONF_API_KEY])
-    entities = []
-    for username in config[CONF_USERS]:
-        try:
-            user = lastfm_api.get_user(username)
-            entities.append(LastFmSensor(user, lastfm_api))
-        except WSError as exc:
-            LOGGER.error("Failed to load LastFM user `%s`: %r", username, exc)
-            return
-    add_entities(entities, True)
+    """Set up the Last.fm sensor platform from yaml."""
+
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Initialize the entries."""
+
+    lastfm_api = LastFMNetwork(api_key=entry.options[CONF_API_KEY])
+    async_add_entities(
+        (
+            LastFmSensor(lastfm_api.get_user(user), entry.entry_id)
+            for user in entry.options[CONF_USERS]
+        ),
+        True,
+    )
 
 
 class LastFmSensor(SensorEntity):
@@ -60,28 +89,45 @@ class LastFmSensor(SensorEntity):
     _attr_attribution = "Data provided by Last.fm"
     _attr_icon = "mdi:radio-fm"
 
-    def __init__(self, user: User, lastfm_api: LastFMNetwork) -> None:
+    def __init__(self, user: User, entry_id: str) -> None:
         """Initialize the sensor."""
+        self._user = user
         self._attr_unique_id = hashlib.sha256(user.name.encode("utf-8")).hexdigest()
         self._attr_name = user.name
-        self._user = user
+        self._attr_device_info = DeviceInfo(
+            configuration_url="https://www.last.fm",
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, f"{entry_id}_{self._attr_unique_id}")},
+            manufacturer=DEFAULT_NAME,
+            name=f"{DEFAULT_NAME} {user.name}",
+        )
 
     def update(self) -> None:
         """Update device state."""
-        self._attr_entity_picture = self._user.get_image()
-        if now_playing := self._user.get_now_playing():
+        self._attr_native_value = STATE_NOT_SCROBBLING
+        try:
+            play_count = self._user.get_playcount()
+            self._attr_entity_picture = self._user.get_image()
+            now_playing = self._user.get_now_playing()
+            top_tracks = self._user.get_top_tracks(limit=1)
+            last_tracks = self._user.get_recent_tracks(limit=1)
+        except PyLastError as exc:
+            self._attr_available = False
+            LOGGER.error("Failed to load LastFM user `%s`: %r", self._user.name, exc)
+            return
+        self._attr_available = True
+        if now_playing:
             self._attr_native_value = format_track(now_playing)
-        else:
-            self._attr_native_value = STATE_NOT_SCROBBLING
-        top_played = None
-        if top_tracks := self._user.get_top_tracks(limit=1):
-            top_played = format_track(top_tracks[0].item)
-        last_played = None
-        if last_tracks := self._user.get_recent_tracks(limit=1):
-            last_played = format_track(last_tracks[0].track)
-        play_count = self._user.get_playcount()
         self._attr_extra_state_attributes = {
-            ATTR_LAST_PLAYED: last_played,
             ATTR_PLAY_COUNT: play_count,
-            ATTR_TOP_PLAYED: top_played,
+            ATTR_LAST_PLAYED: None,
+            ATTR_TOP_PLAYED: None,
         }
+        if len(last_tracks) > 0:
+            self._attr_extra_state_attributes[ATTR_LAST_PLAYED] = format_track(
+                last_tracks[0].track
+            )
+        if len(top_tracks) > 0:
+            self._attr_extra_state_attributes[ATTR_TOP_PLAYED] = format_track(
+                top_tracks[0].item
+            )
diff --git a/homeassistant/components/lastfm/strings.json b/homeassistant/components/lastfm/strings.json
new file mode 100644
index 00000000000000..f9156bed658c46
--- /dev/null
+++ b/homeassistant/components/lastfm/strings.json
@@ -0,0 +1,45 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "description": "Request an API account at {api_account_url}.",
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "main_user": "Last.fm username"
+        }
+      },
+      "friends": {
+        "description": "Fill in other users you want to add.",
+        "data": {
+          "users": "Last.fm usernames"
+        }
+      }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_account": "Invalid username",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "description": "Fill in other users you want to add.",
+        "data": {
+          "users": "Last.fm usernames"
+        }
+      }
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_account": "Invalid username",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
+  "issues": {
+    "deprecated_yaml": {
+      "title": "The LastFM YAML configuration is being removed",
+      "description": "Configuring LastFM using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the LastFM YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+    }
+  }
+}
diff --git a/homeassistant/components/laundrify/manifest.json b/homeassistant/components/laundrify/manifest.json
index b9469f79e65d43..8dca67058b746c 100644
--- a/homeassistant/components/laundrify/manifest.json
+++ b/homeassistant/components/laundrify/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/laundrify",
   "iot_class": "cloud_polling",
-  "requirements": ["laundrify_aio==1.1.2"]
+  "requirements": ["laundrify-aio==1.1.2"]
 }
diff --git a/homeassistant/components/lcn/strings.json b/homeassistant/components/lcn/strings.json
index c0e46250c1efcc..bee6c0f0e298b5 100644
--- a/homeassistant/components/lcn/strings.json
+++ b/homeassistant/components/lcn/strings.json
@@ -1,11 +1,11 @@
 {
   "device_automation": {
     "trigger_type": {
-      "transmitter": "transmitter code received",
-      "transponder": "transponder code received",
-      "fingerprint": "fingerprint code received",
-      "codelock": "code lock code received",
-      "send_keys": "send keys received"
+      "transmitter": "Transmitter code received",
+      "transponder": "Transponder code received",
+      "fingerprint": "Fingerprint code received",
+      "codelock": "Code lock code received",
+      "send_keys": "Send keys received"
     }
   }
 }
diff --git a/homeassistant/components/ld2410_ble/__init__.py b/homeassistant/components/ld2410_ble/__init__.py
index 204a5367e0b90d..e127a4a98361e5 100644
--- a/homeassistant/components/ld2410_ble/__init__.py
+++ b/homeassistant/components/ld2410_ble/__init__.py
@@ -2,7 +2,7 @@
 
 import logging
 
-from bleak_retry_connector import BleakError, get_device
+from bleak_retry_connector import BleakError, close_stale_connections, get_device
 from ld2410_ble import LD2410BLE
 
 from homeassistant.components import bluetooth
@@ -31,6 +31,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady(
             f"Could not find LD2410B device with address {address}"
         )
+
+    await close_stale_connections(ble_device)
+
     ld2410_ble = LD2410BLE(ble_device)
 
     coordinator = LD2410BLECoordinator(hass, ld2410_ble)
diff --git a/homeassistant/components/ld2410_ble/coordinator.py b/homeassistant/components/ld2410_ble/coordinator.py
index 6ab255530940b1..2f0fd079773342 100644
--- a/homeassistant/components/ld2410_ble/coordinator.py
+++ b/homeassistant/components/ld2410_ble/coordinator.py
@@ -1,16 +1,22 @@
 """Data coordinator for receiving LD2410B updates."""
 
+from datetime import datetime
 import logging
+import time
 
 from ld2410_ble import LD2410BLE, LD2410BLEState
 
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
+from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+NEVER_TIME = -86400.0
+DEBOUNCE_SECONDS = 1.0
+
 
 class LD2410BLECoordinator(DataUpdateCoordinator[None]):
     """Data coordinator for receiving LD2410B updates."""
@@ -26,15 +32,43 @@ def __init__(self, hass: HomeAssistant, ld2410_ble: LD2410BLE) -> None:
         ld2410_ble.register_callback(self._async_handle_update)
         ld2410_ble.register_disconnected_callback(self._async_handle_disconnect)
         self.connected = False
+        self._last_update_time = NEVER_TIME
+        self._debounce_cancel: CALLBACK_TYPE | None = None
+        self._debounced_update_job = HassJob(
+            self._async_handle_debounced_update,
+            f"LD2410 {ld2410_ble.address} BLE debounced update",
+        )
+
+    @callback
+    def _async_handle_debounced_update(self, _now: datetime) -> None:
+        """Handle debounced update."""
+        self._debounce_cancel = None
+        self._last_update_time = time.monotonic()
+        self.async_set_updated_data(None)
 
     @callback
     def _async_handle_update(self, state: LD2410BLEState) -> None:
         """Just trigger the callbacks."""
         self.connected = True
-        self.async_set_updated_data(None)
+        previous_last_updated_time = self._last_update_time
+        self._last_update_time = time.monotonic()
+        if self._last_update_time - previous_last_updated_time >= DEBOUNCE_SECONDS:
+            self.async_set_updated_data(None)
+            return
+        if self._debounce_cancel is None:
+            self._debounce_cancel = async_call_later(
+                self.hass, DEBOUNCE_SECONDS, self._debounced_update_job
+            )
 
     @callback
     def _async_handle_disconnect(self) -> None:
         """Trigger the callbacks for disconnected."""
         self.connected = False
         self.async_update_listeners()
+
+    async def async_shutdown(self) -> None:
+        """Shutdown the coordinator."""
+        if self._debounce_cancel is not None:
+            self._debounce_cancel()
+            self._debounce_cancel = None
+        await super().async_shutdown()
diff --git a/homeassistant/components/ld2410_ble/manifest.json b/homeassistant/components/ld2410_ble/manifest.json
index 4716519ac18ceb..6eaf2885d89306 100644
--- a/homeassistant/components/ld2410_ble/manifest.json
+++ b/homeassistant/components/ld2410_ble/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ld2410_ble/",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["bluetooth-data-tools==0.4.0", "ld2410-ble==0.1.1"]
+  "requirements": ["bluetooth-data-tools==1.3.0", "ld2410-ble==0.1.1"]
 }
diff --git a/homeassistant/components/led_ble/manifest.json b/homeassistant/components/led_ble/manifest.json
index a19680ffa5c6c1..cdc270f2e99371 100644
--- a/homeassistant/components/led_ble/manifest.json
+++ b/homeassistant/components/led_ble/manifest.json
@@ -32,5 +32,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/led_ble/",
   "iot_class": "local_polling",
-  "requirements": ["bluetooth-data-tools==0.4.0", "led-ble==1.0.0"]
+  "requirements": ["bluetooth-data-tools==1.3.0", "led-ble==1.0.0"]
 }
diff --git a/homeassistant/components/lg_netcast/media_player.py b/homeassistant/components/lg_netcast/media_player.py
index 2074966e1e7be8..2b59e628705bb9 100644
--- a/homeassistant/components/lg_netcast/media_player.py
+++ b/homeassistant/components/lg_netcast/media_player.py
@@ -40,6 +40,7 @@
     | MediaPlayerEntityFeature.SELECT_SOURCE
     | MediaPlayerEntityFeature.PLAY
     | MediaPlayerEntityFeature.PLAY_MEDIA
+    | MediaPlayerEntityFeature.STOP
 )
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
@@ -74,6 +75,7 @@ def setup_platform(
 class LgTVDevice(MediaPlayerEntity):
     """Representation of a LG TV."""
 
+    _attr_assumed_state = True
     _attr_device_class = MediaPlayerDeviceClass.TV
     _attr_media_content_type = MediaType.CHANNEL
 
@@ -83,8 +85,6 @@ def __init__(self, client, name, on_action_script):
         self._name = name
         self._muted = False
         self._on_action_script = on_action_script
-        # Assume that the TV is in Play mode
-        self._playing = True
         self._volume = 0
         self._channel_id = None
         self._channel_name = ""
@@ -106,7 +106,7 @@ def update(self) -> None:
 
         try:
             with self._client as client:
-                self._attr_state = MediaPlayerState.PLAYING
+                self._attr_state = MediaPlayerState.ON
 
                 self.__update_volume()
 
@@ -233,25 +233,18 @@ def select_source(self, source: str) -> None:
         """Select input source."""
         self._client.change_channel(self._sources[source])
 
-    def media_play_pause(self) -> None:
-        """Simulate play pause media player."""
-        if self._playing:
-            self.media_pause()
-        else:
-            self.media_play()
-
     def media_play(self) -> None:
         """Send play command."""
-        self._playing = True
-        self._attr_state = MediaPlayerState.PLAYING
         self.send_command(LG_COMMAND.PLAY)
 
     def media_pause(self) -> None:
         """Send media pause command to media player."""
-        self._playing = False
-        self._attr_state = MediaPlayerState.PAUSED
         self.send_command(LG_COMMAND.PAUSE)
 
+    def media_stop(self) -> None:
+        """Send media stop command to media player."""
+        self.send_command(LG_COMMAND.STOP)
+
     def media_next_track(self) -> None:
         """Send next track command."""
         self.send_command(LG_COMMAND.FAST_FORWARD)
diff --git a/homeassistant/components/lidarr/sensor.py b/homeassistant/components/lidarr/sensor.py
index 96ab2e5f7a2801..1a2930c8051709 100644
--- a/homeassistant/components/lidarr/sensor.py
+++ b/homeassistant/components/lidarr/sensor.py
@@ -70,7 +70,7 @@ class LidarrSensorEntityDescription(
 SENSOR_TYPES: dict[str, LidarrSensorEntityDescription[Any]] = {
     "disk_space": LidarrSensorEntityDescription(
         key="disk_space",
-        name="Disk space",
+        translation_key="disk_space",
         native_unit_of_measurement=UnitOfInformation.GIGABYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:harddisk",
@@ -80,7 +80,7 @@ class LidarrSensorEntityDescription(
     ),
     "queue": LidarrSensorEntityDescription[LidarrQueue](
         key="queue",
-        name="Queue",
+        translation_key="queue",
         native_unit_of_measurement="Albums",
         icon="mdi:download",
         value_fn=lambda data, _: data.totalRecords,
@@ -89,7 +89,7 @@ class LidarrSensorEntityDescription(
     ),
     "wanted": LidarrSensorEntityDescription[LidarrQueue](
         key="wanted",
-        name="Wanted",
+        translation_key="wanted",
         native_unit_of_measurement="Albums",
         icon="mdi:music",
         value_fn=lambda data, _: data.totalRecords,
diff --git a/homeassistant/components/lidarr/strings.json b/homeassistant/components/lidarr/strings.json
index ffa91c23f2a92c..bbe4b19db25d3a 100644
--- a/homeassistant/components/lidarr/strings.json
+++ b/homeassistant/components/lidarr/strings.json
@@ -28,5 +28,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "disk_space": {
+        "name": "Disk space"
+      },
+      "queue": {
+        "name": "Queue"
+      },
+      "wanted": {
+        "name": "Wanted"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/lifx/binary_sensor.py b/homeassistant/components/lifx/binary_sensor.py
index 110661b1c5ca63..5719c881d1faa8 100644
--- a/homeassistant/components/lifx/binary_sensor.py
+++ b/homeassistant/components/lifx/binary_sensor.py
@@ -18,7 +18,7 @@
 
 HEV_CYCLE_STATE_SENSOR = BinarySensorEntityDescription(
     key=HEV_CYCLE_STATE,
-    name="Clean Cycle",
+    translation_key="clean_cycle",
     entity_category=EntityCategory.DIAGNOSTIC,
     device_class=BinarySensorDeviceClass.RUNNING,
 )
@@ -39,8 +39,6 @@ async def async_setup_entry(
 class LIFXHevCycleBinarySensorEntity(LIFXEntity, BinarySensorEntity):
     """LIFX HEV cycle state binary sensor."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         coordinator: LIFXUpdateCoordinator,
diff --git a/homeassistant/components/lifx/button.py b/homeassistant/components/lifx/button.py
index b5f5373b3e838f..86e3bc569b148a 100644
--- a/homeassistant/components/lifx/button.py
+++ b/homeassistant/components/lifx/button.py
@@ -17,14 +17,13 @@
 
 RESTART_BUTTON_DESCRIPTION = ButtonEntityDescription(
     key=RESTART,
-    name="Restart",
     device_class=ButtonDeviceClass.RESTART,
     entity_category=EntityCategory.CONFIG,
 )
 
 IDENTIFY_BUTTON_DESCRIPTION = ButtonEntityDescription(
     key=IDENTIFY,
-    name="Identify",
+    device_class=ButtonDeviceClass.IDENTIFY,
     entity_category=EntityCategory.CONFIG,
 )
 
@@ -45,8 +44,7 @@ async def async_setup_entry(
 class LIFXButton(LIFXEntity, ButtonEntity):
     """Base LIFX button."""
 
-    _attr_has_entity_name: bool = True
-    _attr_should_poll: bool = False
+    _attr_should_poll = False
 
     def __init__(self, coordinator: LIFXUpdateCoordinator) -> None:
         """Initialise a LIFX button."""
diff --git a/homeassistant/components/lifx/entity.py b/homeassistant/components/lifx/entity.py
index a86bda53cfdc86..5f08b6e7884478 100644
--- a/homeassistant/components/lifx/entity.py
+++ b/homeassistant/components/lifx/entity.py
@@ -14,6 +14,8 @@
 class LIFXEntity(CoordinatorEntity[LIFXUpdateCoordinator]):
     """Representation of a LIFX entity with a coordinator."""
 
+    _attr_has_entity_name = True
+
     def __init__(self, coordinator: LIFXUpdateCoordinator) -> None:
         """Initialise the light."""
         super().__init__(coordinator)
diff --git a/homeassistant/components/lifx/light.py b/homeassistant/components/lifx/light.py
index cb901dcbe477f9..0e56155832ffeb 100644
--- a/homeassistant/components/lifx/light.py
+++ b/homeassistant/components/lifx/light.py
@@ -112,6 +112,7 @@ class LIFXLight(LIFXEntity, LightEntity):
     """Representation of a LIFX light."""
 
     _attr_supported_features = LightEntityFeature.TRANSITION | LightEntityFeature.EFFECT
+    _attr_name = None
 
     def __init__(
         self,
@@ -131,7 +132,6 @@ def __init__(
         self.postponed_update: CALLBACK_TYPE | None = None
         self.entry = entry
         self._attr_unique_id = self.coordinator.serial_number
-        self._attr_name = self.bulb.label
         self._attr_min_color_temp_kelvin = bulb_features["min_kelvin"]
         self._attr_max_color_temp_kelvin = bulb_features["max_kelvin"]
         if bulb_features["min_kelvin"] != bulb_features["max_kelvin"]:
diff --git a/homeassistant/components/lifx/manifest.json b/homeassistant/components/lifx/manifest.json
index e867bb65eb03d2..d6b253bd4784a5 100644
--- a/homeassistant/components/lifx/manifest.json
+++ b/homeassistant/components/lifx/manifest.json
@@ -42,7 +42,7 @@
   "quality_scale": "platinum",
   "requirements": [
     "aiolifx==0.8.10",
-    "aiolifx_effects==0.3.2",
-    "aiolifx_themes==0.4.5"
+    "aiolifx-effects==0.3.2",
+    "aiolifx-themes==0.4.5"
   ]
 }
diff --git a/homeassistant/components/lifx/select.py b/homeassistant/components/lifx/select.py
index 9ad457e0270551..183e31dec1fde2 100644
--- a/homeassistant/components/lifx/select.py
+++ b/homeassistant/components/lifx/select.py
@@ -23,14 +23,14 @@
 
 INFRARED_BRIGHTNESS_ENTITY = SelectEntityDescription(
     key=INFRARED_BRIGHTNESS,
-    name="Infrared brightness",
+    translation_key="infrared_brightness",
     entity_category=EntityCategory.CONFIG,
     options=list(INFRARED_BRIGHTNESS_VALUES_MAP.values()),
 )
 
 THEME_ENTITY = SelectEntityDescription(
     key=ATTR_THEME,
-    name="Theme",
+    translation_key="theme",
     entity_category=EntityCategory.CONFIG,
     options=THEME_NAMES,
 )
@@ -58,8 +58,6 @@ async def async_setup_entry(
 class LIFXInfraredBrightnessSelectEntity(LIFXEntity, SelectEntity):
     """LIFX Nightvision infrared brightness configuration entity."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         coordinator: LIFXUpdateCoordinator,
@@ -90,8 +88,6 @@ async def async_select_option(self, option: str) -> None:
 class LIFXThemeSelectEntity(LIFXEntity, SelectEntity):
     """Theme entity for LIFX multizone devices."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         coordinator: LIFXUpdateCoordinator,
diff --git a/homeassistant/components/lifx/sensor.py b/homeassistant/components/lifx/sensor.py
index 654b528575601c..e10f9579bc31fd 100644
--- a/homeassistant/components/lifx/sensor.py
+++ b/homeassistant/components/lifx/sensor.py
@@ -22,7 +22,7 @@
 
 RSSI_SENSOR = SensorEntityDescription(
     key=ATTR_RSSI,
-    name="RSSI",
+    translation_key="rssi",
     device_class=SensorDeviceClass.SIGNAL_STRENGTH,
     entity_category=EntityCategory.DIAGNOSTIC,
     state_class=SensorStateClass.MEASUREMENT,
@@ -41,8 +41,6 @@ async def async_setup_entry(
 class LIFXRssiSensor(LIFXEntity, SensorEntity):
     """LIFX RSSI sensor."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         coordinator: LIFXUpdateCoordinator,
diff --git a/homeassistant/components/lifx/strings.json b/homeassistant/components/lifx/strings.json
index 93d3bd62abea74..69055d6bbc67cb 100644
--- a/homeassistant/components/lifx/strings.json
+++ b/homeassistant/components/lifx/strings.json
@@ -25,5 +25,25 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "clean_cycle": {
+        "name": "Clean cycle"
+      }
+    },
+    "select": {
+      "infrared_brightness": {
+        "name": "Infrared brightness"
+      },
+      "theme": {
+        "name": "Theme"
+      }
+    },
+    "sensor": {
+      "rssi": {
+        "name": "RSSI"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/light/device_action.py b/homeassistant/components/light/device_action.py
index 2b4c32cb3b1912..2b49c963438048 100644
--- a/homeassistant/components/light/device_action.py
+++ b/homeassistant/components/light/device_action.py
@@ -3,7 +3,11 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -37,9 +41,9 @@
 TYPE_BRIGHTNESS_DECREASE = "brightness_decrease"
 TYPE_FLASH = "flash"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
-        vol.Required(ATTR_ENTITY_ID): cv.entity_id,
+        vol.Required(ATTR_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_DOMAIN): DOMAIN,
         vol.Required(CONF_TYPE): vol.In(
             toggle_entity.DEVICE_ACTION_TYPES
@@ -51,6 +55,13 @@
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_call_action_from_config(
     hass: HomeAssistant,
     config: ConfigType,
@@ -102,7 +113,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         if brightness_supported(supported_color_modes):
@@ -127,13 +138,11 @@ async def async_get_action_capabilities(
         return {}
 
     try:
-        supported_color_modes = get_supported_color_modes(hass, config[ATTR_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        supported_color_modes = get_supported_color_modes(hass, entry.entity_id)
+        supported_features = get_supported_features(hass, entry.entity_id)
     except HomeAssistantError:
         supported_color_modes = None
-
-    try:
-        supported_features = get_supported_features(hass, config[ATTR_ENTITY_ID])
-    except HomeAssistantError:
         supported_features = 0
 
     extra_fields = {}
diff --git a/homeassistant/components/lightwave/__init__.py b/homeassistant/components/lightwave/__init__.py
index e774a27999deee..9feefd6e24ddc6 100644
--- a/homeassistant/components/lightwave/__init__.py
+++ b/homeassistant/components/lightwave/__init__.py
@@ -1,4 +1,6 @@
 """Support for device connected via Lightwave WiFi-link hub."""
+import logging
+
 from lightwave.lightwave import LWLink
 import voluptuous as vol
 
@@ -20,12 +22,13 @@
 CONF_TRV = "trv"
 CONF_TRVS = "trvs"
 DEFAULT_PROXY_PORT = 7878
-DEFAULT_PROXY_IP = "127.0.0.1"
 DOMAIN = "lightwave"
 LIGHTWAVE_LINK = f"{DOMAIN}_link"
 LIGHTWAVE_TRV_PROXY = f"{DOMAIN}_proxy"
 LIGHTWAVE_TRV_PROXY_PORT = f"{DOMAIN}_proxy_port"
 
+_LOGGER = logging.getLogger(__name__)
+
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -44,9 +47,7 @@
                         vol.Optional(
                             CONF_PROXY_PORT, default=DEFAULT_PROXY_PORT
                         ): cv.port,
-                        vol.Optional(
-                            CONF_PROXY_IP, default=DEFAULT_PROXY_IP
-                        ): cv.string,
+                        vol.Optional(CONF_PROXY_IP): cv.string,
                         vol.Required(CONF_TRVS, default={}): {
                             cv.string: vol.Schema(
                                 {
@@ -84,9 +85,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     if trv := config[DOMAIN][CONF_TRV]:
         trvs = trv[CONF_TRVS]
-        proxy_ip = trv[CONF_PROXY_IP]
+        proxy_ip = trv.get(CONF_PROXY_IP)
         proxy_port = trv[CONF_PROXY_PORT]
-        lwlink.set_trv_proxy(proxy_ip, proxy_port)
+        if proxy_ip is None:
+            await lwlink.LW_listen()
+        else:
+            lwlink.set_trv_proxy(proxy_ip, proxy_port)
+            _LOGGER.warning(
+                "Proxy no longer required, remove `proxy_ip` from config to use builtin listener"
+            )
 
         for platform in PLATFORMS:
             hass.async_create_task(
diff --git a/homeassistant/components/lightwave/manifest.json b/homeassistant/components/lightwave/manifest.json
index 86c6a9263f3d4b..d242195a71c0c0 100644
--- a/homeassistant/components/lightwave/manifest.json
+++ b/homeassistant/components/lightwave/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/lightwave",
   "iot_class": "assumed_state",
   "loggers": ["lightwave"],
-  "requirements": ["lightwave==0.20"]
+  "requirements": ["lightwave==0.24"]
 }
diff --git a/homeassistant/components/lirc/__init__.py b/homeassistant/components/lirc/__init__.py
index cf76213a88e2ba..181783b6bbdce6 100644
--- a/homeassistant/components/lirc/__init__.py
+++ b/homeassistant/components/lirc/__init__.py
@@ -8,6 +8,7 @@
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -20,6 +21,8 @@
 
 ICON = "mdi:remote"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the LIRC capability."""
diff --git a/homeassistant/components/litterrobot/__init__.py b/homeassistant/components/litterrobot/__init__.py
index 45483f99e5b0e0..c7eda2f118b983 100644
--- a/homeassistant/components/litterrobot/__init__.py
+++ b/homeassistant/components/litterrobot/__init__.py
@@ -18,7 +18,7 @@
         Platform.SWITCH,
     ),
     LitterRobot: (Platform.VACUUM,),
-    LitterRobot3: (Platform.BUTTON,),
+    LitterRobot3: (Platform.BUTTON, Platform.TIME),
     LitterRobot4: (Platform.UPDATE,),
     FeederRobot: (Platform.BUTTON,),
 }
diff --git a/homeassistant/components/litterrobot/binary_sensor.py b/homeassistant/components/litterrobot/binary_sensor.py
index 107935be7b8063..5308a3b4f832a2 100644
--- a/homeassistant/components/litterrobot/binary_sensor.py
+++ b/homeassistant/components/litterrobot/binary_sensor.py
@@ -51,7 +51,7 @@ def is_on(self) -> bool:
     LitterRobot: (
         RobotBinarySensorEntityDescription[LitterRobot](
             key="sleeping",
-            name="Sleeping",
+            translation_key="sleeping",
             icon="mdi:sleep",
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
@@ -59,7 +59,7 @@ def is_on(self) -> bool:
         ),
         RobotBinarySensorEntityDescription[LitterRobot](
             key="sleep_mode",
-            name="Sleep mode",
+            translation_key="sleep_mode",
             icon="mdi:sleep",
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
@@ -69,7 +69,7 @@ def is_on(self) -> bool:
     Robot: (
         RobotBinarySensorEntityDescription[Robot](
             key="power_status",
-            name="Power status",
+            translation_key="power_status",
             device_class=BinarySensorDeviceClass.PLUG,
             entity_category=EntityCategory.DIAGNOSTIC,
             entity_registry_enabled_default=False,
diff --git a/homeassistant/components/litterrobot/button.py b/homeassistant/components/litterrobot/button.py
index 1d208ca48e12a8..06c4fe75888e0e 100644
--- a/homeassistant/components/litterrobot/button.py
+++ b/homeassistant/components/litterrobot/button.py
@@ -60,14 +60,14 @@ class RobotButtonEntityDescription(ButtonEntityDescription, RequiredKeysMixin[_R
 
 LITTER_ROBOT_BUTTON = RobotButtonEntityDescription[LitterRobot3](
     key="reset_waste_drawer",
-    name="Reset waste drawer",
+    translation_key="reset_waste_drawer",
     icon="mdi:delete-variant",
     entity_category=EntityCategory.CONFIG,
     press_fn=lambda robot: robot.reset_waste_drawer(),
 )
 FEEDER_ROBOT_BUTTON = RobotButtonEntityDescription[FeederRobot](
     key="give_snack",
-    name="Give snack",
+    translation_key="give_snack",
     icon="mdi:candy-outline",
     press_fn=lambda robot: robot.give_snack(),
 )
diff --git a/homeassistant/components/litterrobot/manifest.json b/homeassistant/components/litterrobot/manifest.json
index d3dcf77f3243eb..2a4a3447eb663c 100644
--- a/homeassistant/components/litterrobot/manifest.json
+++ b/homeassistant/components/litterrobot/manifest.json
@@ -12,5 +12,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["pylitterbot"],
-  "requirements": ["pylitterbot==2023.4.0"]
+  "requirements": ["pylitterbot==2023.4.2"]
 }
diff --git a/homeassistant/components/litterrobot/select.py b/homeassistant/components/litterrobot/select.py
index feac85ecac484a..6fabd6ea526468 100644
--- a/homeassistant/components/litterrobot/select.py
+++ b/homeassistant/components/litterrobot/select.py
@@ -50,7 +50,7 @@ class RobotSelectEntityDescription(
 ROBOT_SELECT_MAP: dict[type[Robot], RobotSelectEntityDescription] = {
     LitterRobot: RobotSelectEntityDescription[LitterRobot, int](
         key="cycle_delay",
-        name="Clean cycle wait time minutes",
+        translation_key="cycle_delay",
         icon="mdi:timer-outline",
         unit_of_measurement=UnitOfTime.MINUTES,
         current_fn=lambda robot: robot.clean_cycle_wait_time_minutes,
@@ -59,7 +59,6 @@ class RobotSelectEntityDescription(
     ),
     LitterRobot4: RobotSelectEntityDescription[LitterRobot4, str](
         key="panel_brightness",
-        name="Panel brightness",
         translation_key="brightness_level",
         current_fn=lambda robot: bri.name.lower()
         if (bri := robot.panel_brightness) is not None
@@ -72,7 +71,7 @@ class RobotSelectEntityDescription(
     ),
     FeederRobot: RobotSelectEntityDescription[FeederRobot, float](
         key="meal_insert_size",
-        name="Meal insert size",
+        translation_key="meal_insert_size",
         icon="mdi:scale",
         unit_of_measurement="cups",
         current_fn=lambda robot: robot.meal_insert_size,
diff --git a/homeassistant/components/litterrobot/sensor.py b/homeassistant/components/litterrobot/sensor.py
index e7aed366fa3e93..ba601a0ba54daa 100644
--- a/homeassistant/components/litterrobot/sensor.py
+++ b/homeassistant/components/litterrobot/sensor.py
@@ -69,32 +69,31 @@ def icon(self) -> str | None:
     LitterRobot: [
         RobotSensorEntityDescription[LitterRobot](
             key="waste_drawer_level",
-            name="Waste drawer",
+            translation_key="waste_drawer",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="sleep_mode_start_time",
-            name="Sleep mode start time",
+            translation_key="sleep_mode_start_time",
             device_class=SensorDeviceClass.TIMESTAMP,
             should_report=lambda robot: robot.sleep_mode_enabled,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="sleep_mode_end_time",
-            name="Sleep mode end time",
+            translation_key="sleep_mode_end_time",
             device_class=SensorDeviceClass.TIMESTAMP,
             should_report=lambda robot: robot.sleep_mode_enabled,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="last_seen",
-            name="Last seen",
+            translation_key="last_seen",
             device_class=SensorDeviceClass.TIMESTAMP,
             entity_category=EntityCategory.DIAGNOSTIC,
         ),
         RobotSensorEntityDescription[LitterRobot](
             key="status_code",
-            name="Status code",
             translation_key="status_code",
             entity_category=EntityCategory.DIAGNOSTIC,
             device_class=SensorDeviceClass.ENUM,
@@ -130,14 +129,14 @@ def icon(self) -> str | None:
     LitterRobot4: [
         RobotSensorEntityDescription[LitterRobot4](
             key="litter_level",
-            name="Litter level",
+            translation_key="litter_level",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
         ),
         RobotSensorEntityDescription[LitterRobot4](
             key="pet_weight",
-            name="Pet weight",
+            translation_key="pet_weight",
             native_unit_of_measurement=UnitOfMass.POUNDS,
             device_class=SensorDeviceClass.WEIGHT,
             state_class=SensorStateClass.MEASUREMENT,
@@ -146,7 +145,7 @@ def icon(self) -> str | None:
     FeederRobot: [
         RobotSensorEntityDescription[FeederRobot](
             key="food_level",
-            name="Food level",
+            translation_key="food_level",
             native_unit_of_measurement=PERCENTAGE,
             icon_fn=lambda state: icon_for_gauge_level(state, 10),
             state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/litterrobot/strings.json b/homeassistant/components/litterrobot/strings.json
index b4aa8f0016d68e..00a8a6122db998 100644
--- a/homeassistant/components/litterrobot/strings.json
+++ b/homeassistant/components/litterrobot/strings.json
@@ -32,8 +32,46 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "sleeping": {
+        "name": "Sleeping"
+      },
+      "sleep_mode": {
+        "name": "Sleep mode"
+      },
+      "power_status": {
+        "name": "Power status"
+      }
+    },
+    "button": {
+      "reset_waste_drawer": {
+        "name": "Reset waste drawer"
+      },
+      "give_snack": {
+        "name": "Give snack"
+      }
+    },
     "sensor": {
+      "food_level": {
+        "name": "Food level"
+      },
+      "last_seen": {
+        "name": "Last seen"
+      },
+      "litter_level": {
+        "name": "Litter level"
+      },
+      "pet_weight": {
+        "name": "Pet weight"
+      },
+      "sleep_mode_end_time": {
+        "name": "Sleep mode end time"
+      },
+      "sleep_mode_start_time": {
+        "name": "Sleep mode start time"
+      },
       "status_code": {
+        "name": "Status code",
         "state": {
           "br": "Bonnet Removed",
           "ccc": "Clean Cycle Complete",
@@ -61,16 +99,49 @@
           "sdf": "Drawer Full At Startup",
           "spf": "Pinch Detect At Startup"
         }
+      },
+      "waste_drawer": {
+        "name": "Waste drawer"
       }
     },
     "select": {
+      "cycle_delay": {
+        "name": "Clean cycle wait time minutes"
+      },
+      "meal_insert_size": {
+        "name": "Meal insert size"
+      },
       "brightness_level": {
+        "name": "Panel brightness",
         "state": {
           "low": "Low",
           "medium": "Medium",
           "high": "High"
         }
       }
+    },
+    "switch": {
+      "night_light_mode": {
+        "name": "Night light mode"
+      },
+      "panel_lockout": {
+        "name": "Panel lockout"
+      }
+    },
+    "time": {
+      "sleep_mode_start_time": {
+        "name": "Sleep mode start time"
+      }
+    },
+    "vacuum": {
+      "litter_box": {
+        "name": "Litter box"
+      }
+    },
+    "update": {
+      "firmware": {
+        "name": "Firmware"
+      }
     }
   }
 }
diff --git a/homeassistant/components/litterrobot/switch.py b/homeassistant/components/litterrobot/switch.py
index eb2297e506e17f..6b4e5b56b48ee3 100644
--- a/homeassistant/components/litterrobot/switch.py
+++ b/homeassistant/components/litterrobot/switch.py
@@ -36,13 +36,13 @@ class RobotSwitchEntityDescription(SwitchEntityDescription, RequiredKeysMixin[_R
 ROBOT_SWITCHES = [
     RobotSwitchEntityDescription[LitterRobot | FeederRobot](
         key="night_light_mode_enabled",
-        name="Night light mode",
+        translation_key="night_light_mode",
         icons=("mdi:lightbulb-on", "mdi:lightbulb-off"),
         set_fn=lambda robot, value: robot.set_night_light(value),
     ),
     RobotSwitchEntityDescription[LitterRobot | FeederRobot](
         key="panel_lock_enabled",
-        name="Panel lockout",
+        translation_key="panel_lockout",
         icons=("mdi:lock", "mdi:lock-open"),
         set_fn=lambda robot, value: robot.set_panel_lockout(value),
     ),
diff --git a/homeassistant/components/litterrobot/time.py b/homeassistant/components/litterrobot/time.py
new file mode 100644
index 00000000000000..f352b7cee70ccc
--- /dev/null
+++ b/homeassistant/components/litterrobot/time.py
@@ -0,0 +1,82 @@
+"""Support for Litter-Robot time."""
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from datetime import datetime, time
+from typing import Any, Generic
+
+from pylitterbot import LitterRobot3
+
+from homeassistant.components.time import TimeEntity, TimeEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+import homeassistant.util.dt as dt_util
+
+from .const import DOMAIN
+from .entity import LitterRobotEntity, _RobotT
+from .hub import LitterRobotHub
+
+
+@dataclass
+class RequiredKeysMixin(Generic[_RobotT]):
+    """A class that describes robot time entity required keys."""
+
+    value_fn: Callable[[_RobotT], time | None]
+    set_fn: Callable[[_RobotT, time], Coroutine[Any, Any, bool]]
+
+
+@dataclass
+class RobotTimeEntityDescription(TimeEntityDescription, RequiredKeysMixin[_RobotT]):
+    """A class that describes robot time entities."""
+
+
+def _as_local_time(start: datetime | None) -> time | None:
+    """Return a datetime as local time."""
+    return dt_util.as_local(start).time() if start else None
+
+
+LITTER_ROBOT_3_SLEEP_START = RobotTimeEntityDescription[LitterRobot3](
+    key="sleep_mode_start_time",
+    translation_key="sleep_mode_start_time",
+    entity_category=EntityCategory.CONFIG,
+    value_fn=lambda robot: _as_local_time(robot.sleep_mode_start_time),
+    set_fn=lambda robot, value: robot.set_sleep_mode(
+        robot.sleep_mode_enabled, value.replace(tzinfo=dt_util.DEFAULT_TIME_ZONE)
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Litter-Robot cleaner using config entry."""
+    hub: LitterRobotHub = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities(
+        [
+            LitterRobotTimeEntity(
+                robot=robot, hub=hub, description=LITTER_ROBOT_3_SLEEP_START
+            )
+            for robot in hub.litter_robots()
+            if isinstance(robot, LitterRobot3)
+        ]
+    )
+
+
+class LitterRobotTimeEntity(LitterRobotEntity[_RobotT], TimeEntity):
+    """Litter-Robot time entity."""
+
+    entity_description: RobotTimeEntityDescription[_RobotT]
+
+    @property
+    def native_value(self) -> time | None:
+        """Return the value reported by the time."""
+        return self.entity_description.value_fn(self.robot)
+
+    async def async_set_value(self, value: time) -> None:
+        """Update the current value."""
+        await self.entity_description.set_fn(self.robot, value)
diff --git a/homeassistant/components/litterrobot/update.py b/homeassistant/components/litterrobot/update.py
index 33ca6cd0376666..9b8391c5bae53d 100644
--- a/homeassistant/components/litterrobot/update.py
+++ b/homeassistant/components/litterrobot/update.py
@@ -24,7 +24,7 @@
 
 FIRMWARE_UPDATE_ENTITY = UpdateEntityDescription(
     key="firmware",
-    name="Firmware",
+    translation_key="firmware",
     device_class=UpdateDeviceClass.FIRMWARE,
 )
 
diff --git a/homeassistant/components/litterrobot/vacuum.py b/homeassistant/components/litterrobot/vacuum.py
index b56724f15c855e..d1352c1e45f75d 100644
--- a/homeassistant/components/litterrobot/vacuum.py
+++ b/homeassistant/components/litterrobot/vacuum.py
@@ -42,7 +42,9 @@
     LitterBoxStatus.OFF: STATE_OFF,
 }
 
-LITTER_BOX_ENTITY = StateVacuumEntityDescription("litter_box", name="Litter box")
+LITTER_BOX_ENTITY = StateVacuumEntityDescription(
+    "litter_box", translation_key="litter_box"
+)
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/local_calendar/__init__.py b/homeassistant/components/local_calendar/__init__.py
index 33ad67cc81a6ef..7c1d2f09b04b80 100644
--- a/homeassistant/components/local_calendar/__init__.py
+++ b/homeassistant/components/local_calendar/__init__.py
@@ -39,3 +39,14 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle removal of an entry."""
+    key = slugify(entry.data[CONF_CALENDAR_NAME])
+    path = Path(hass.config.path(STORAGE_PATH.format(key=key)))
+
+    def unlink(path: Path) -> None:
+        path.unlink(missing_ok=True)
+
+    await hass.async_add_executor_job(unlink, path)
diff --git a/homeassistant/components/local_calendar/manifest.json b/homeassistant/components/local_calendar/manifest.json
index 049f9de03ea305..b56acffe4e2507 100644
--- a/homeassistant/components/local_calendar/manifest.json
+++ b/homeassistant/components/local_calendar/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/local_calendar",
   "iot_class": "local_polling",
   "loggers": ["ical"],
-  "requirements": ["ical==4.5.1"]
+  "requirements": ["ical==4.5.4"]
 }
diff --git a/homeassistant/components/local_calendar/strings.json b/homeassistant/components/local_calendar/strings.json
index f49c92e5438e0b..c6eb36ee88f0eb 100644
--- a/homeassistant/components/local_calendar/strings.json
+++ b/homeassistant/components/local_calendar/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Local Calendar",
   "config": {
     "step": {
       "user": {
diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py
index 5a796b976ff58c..cca322f3baa0f4 100644
--- a/homeassistant/components/locative/__init__.py
+++ b/homeassistant/components/locative/__init__.py
@@ -21,7 +21,6 @@
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -61,12 +60,6 @@ def _validate_test_mode(obj: dict) -> dict:
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the Locative component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook from Locative."""
     try:
@@ -117,6 +110,8 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    if DOMAIN not in hass.data:
+        hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
     webhook.async_register(
         hass, DOMAIN, "Locative", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/lock/device_action.py b/homeassistant/components/lock/device_action.py
index 01e7b21d4b6e9b..fba95a932de511 100644
--- a/homeassistant/components/lock/device_action.py
+++ b/homeassistant/components/lock/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -23,14 +24,21 @@
 
 ACTION_TYPES = {"lock", "unlock", "open"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -49,7 +57,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "lock"})
diff --git a/homeassistant/components/lock/device_condition.py b/homeassistant/components/lock/device_condition.py
index c439fe99d14865..5ba93554aec5bf 100644
--- a/homeassistant/components/lock/device_condition.py
+++ b/homeassistant/components/lock/device_condition.py
@@ -39,7 +39,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -62,7 +62,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -86,8 +86,11 @@ def async_condition_from_config(
     else:
         state = STATE_UNLOCKED
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/lock/device_trigger.py b/homeassistant/components/lock/device_trigger.py
index ec996d4f0b29f2..c6b86eaca4afc7 100644
--- a/homeassistant/components/lock/device_trigger.py
+++ b/homeassistant/components/lock/device_trigger.py
@@ -29,7 +29,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -54,7 +54,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/logbook/__init__.py b/homeassistant/components/logbook/__init__.py
index ee2ae3da4d95de..0c614972e1e39c 100644
--- a/homeassistant/components/logbook/__init__.py
+++ b/homeassistant/components/logbook/__init__.py
@@ -127,7 +127,7 @@ def log_message(service: ServiceCall) -> None:
     possible_merged_entities_filter = convert_include_exclude_filter(merged_filter)
     if not possible_merged_entities_filter.empty_filter:
         filters = sqlalchemy_filter_from_include_exclude_conf(merged_filter)
-        entities_filter = possible_merged_entities_filter
+        entities_filter = possible_merged_entities_filter.get_filter()
     else:
         filters = None
         entities_filter = None
diff --git a/homeassistant/components/logbook/helpers.py b/homeassistant/components/logbook/helpers.py
index c8f55331de1332..3a1ec971b54e26 100644
--- a/homeassistant/components/logbook/helpers.py
+++ b/homeassistant/components/logbook/helpers.py
@@ -23,7 +23,6 @@
     split_entity_id,
 )
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.entityfilter import EntityFilter
 from homeassistant.helpers.event import async_track_state_change_event
 
 from .const import ALWAYS_CONTINUOUS_DOMAINS, AUTOMATION_EVENTS, BUILT_IN_EVENTS, DOMAIN
@@ -104,7 +103,7 @@ def extract_attr(source: dict[str, Any], attr: str) -> list[str]:
 @callback
 def event_forwarder_filtered(
     target: Callable[[Event], None],
-    entities_filter: EntityFilter | None,
+    entities_filter: Callable[[str], bool] | None,
     entity_ids: list[str] | None,
     device_ids: list[str] | None,
 ) -> Callable[[Event], None]:
@@ -159,7 +158,7 @@ def async_subscribe_events(
     subscriptions: list[CALLBACK_TYPE],
     target: Callable[[Event], None],
     event_types: tuple[str, ...],
-    entities_filter: EntityFilter | None,
+    entities_filter: Callable[[str], bool] | None,
     entity_ids: list[str] | None,
     device_ids: list[str] | None,
 ) -> None:
diff --git a/homeassistant/components/logbook/models.py b/homeassistant/components/logbook/models.py
index 86dcfdf82c5140..e351ee6bb6133f 100644
--- a/homeassistant/components/logbook/models.py
+++ b/homeassistant/components/logbook/models.py
@@ -16,7 +16,6 @@
 )
 from homeassistant.const import ATTR_ICON, EVENT_STATE_CHANGED
 from homeassistant.core import Context, Event, State, callback
-from homeassistant.helpers.entityfilter import EntityFilter
 import homeassistant.util.dt as dt_util
 from homeassistant.util.json import json_loads
 from homeassistant.util.ulid import ulid_to_bytes
@@ -30,7 +29,7 @@ class LogbookConfig:
         str, tuple[str, Callable[[LazyEventPartialState], dict[str, Any]]]
     ]
     sqlalchemy_filter: Filters | None = None
-    entity_filter: EntityFilter | None = None
+    entity_filter: Callable[[str], bool] | None = None
 
 
 class LazyEventPartialState:
diff --git a/homeassistant/components/logbook/rest_api.py b/homeassistant/components/logbook/rest_api.py
index a1a7db3ed2c0bb..57d0a6695c7d4b 100644
--- a/homeassistant/components/logbook/rest_api.py
+++ b/homeassistant/components/logbook/rest_api.py
@@ -1,6 +1,7 @@
 """Event parser and human readable log generator."""
 from __future__ import annotations
 
+from collections.abc import Callable
 from datetime import timedelta
 from http import HTTPStatus
 from typing import Any, cast
@@ -14,7 +15,6 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import InvalidEntityFormatError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entityfilter import EntityFilter
 from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as dt_util
 
@@ -27,7 +27,7 @@ def async_setup(
     hass: HomeAssistant,
     conf: ConfigType,
     filters: Filters | None,
-    entities_filter: EntityFilter | None,
+    entities_filter: Callable[[str], bool] | None,
 ) -> None:
     """Set up the logbook rest API."""
     hass.http.register_view(LogbookView(conf, filters, entities_filter))
@@ -44,7 +44,7 @@ def __init__(
         self,
         config: dict[str, Any],
         filters: Filters | None,
-        entities_filter: EntityFilter | None,
+        entities_filter: Callable[[str], bool] | None,
     ) -> None:
         """Initialize the logbook view."""
         self.config = config
diff --git a/homeassistant/components/logbook/websocket_api.py b/homeassistant/components/logbook/websocket_api.py
index c4e6b9814f4904..4afa40cb14f1a0 100644
--- a/homeassistant/components/logbook/websocket_api.py
+++ b/homeassistant/components/logbook/websocket_api.py
@@ -15,7 +15,6 @@
 from homeassistant.components.websocket_api import messages
 from homeassistant.components.websocket_api.connection import ActiveConnection
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
-from homeassistant.helpers.entityfilter import EntityFilter
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.json import JSON_DUMP
 import homeassistant.util.dt as dt_util
@@ -357,7 +356,7 @@ def _queue_or_cancel(event: Event) -> None:
             )
             _unsub()
 
-    entities_filter: EntityFilter | None = None
+    entities_filter: Callable[[str], bool] | None = None
     if not event_processor.limited_select:
         logbook_config: LogbookConfig = hass.data[DOMAIN]
         entities_filter = logbook_config.entity_filter
diff --git a/homeassistant/components/logger/__init__.py b/homeassistant/components/logger/__init__.py
index fe29447aeba44c..cd2761510d3eef 100644
--- a/homeassistant/components/logger/__init__.py
+++ b/homeassistant/components/logger/__init__.py
@@ -13,8 +13,8 @@
 from . import websocket_api
 from .const import (
     ATTR_LEVEL,
-    DEFAULT_LOGSEVERITY,
     DOMAIN,
+    EVENT_LOGGING_CHANGED,  # noqa: F401
     LOGGER_DEFAULT,
     LOGGER_FILTERS,
     LOGGER_LOGS,
@@ -22,7 +22,6 @@
     SERVICE_SET_DEFAULT_LEVEL,
     SERVICE_SET_LEVEL,
 )
-from .const import EVENT_LOGGING_CHANGED  # noqa: F401
 from .helpers import (
     LoggerDomainConfig,
     LoggerSettings,
@@ -39,9 +38,7 @@
     {
         DOMAIN: vol.Schema(
             {
-                vol.Optional(
-                    LOGGER_DEFAULT, default=DEFAULT_LOGSEVERITY
-                ): _VALID_LOG_LEVEL,
+                vol.Optional(LOGGER_DEFAULT): _VALID_LOG_LEVEL,
                 vol.Optional(LOGGER_LOGS): vol.Schema({cv.string: _VALID_LOG_LEVEL}),
                 vol.Optional(LOGGER_FILTERS): vol.Schema({cv.string: [cv.is_regex]}),
             }
diff --git a/homeassistant/components/logger/helpers.py b/homeassistant/components/logger/helpers.py
index 0f1751c1b2ec65..dcd4348a561848 100644
--- a/homeassistant/components/logger/helpers.py
+++ b/homeassistant/components/logger/helpers.py
@@ -119,7 +119,7 @@ def __init__(self, hass: HomeAssistant, yaml_config: ConfigType) -> None:
 
         self._yaml_config = yaml_config
         self._default_level = logging.INFO
-        if DOMAIN in yaml_config:
+        if DOMAIN in yaml_config and LOGGER_DEFAULT in yaml_config[DOMAIN]:
             self._default_level = yaml_config[DOMAIN][LOGGER_DEFAULT]
         self._store: Store[dict[str, dict[str, dict[str, Any]]]] = Store(
             hass, STORAGE_VERSION, STORAGE_KEY
diff --git a/homeassistant/components/logi_circle/manifest.json b/homeassistant/components/logi_circle/manifest.json
index 2f08fe6f135546..f4f65b2250571c 100644
--- a/homeassistant/components/logi_circle/manifest.json
+++ b/homeassistant/components/logi_circle/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/logi_circle",
   "iot_class": "cloud_polling",
   "loggers": ["logi_circle"],
-  "requirements": ["logi_circle==0.2.3"]
+  "requirements": ["logi-circle==0.2.3"]
 }
diff --git a/homeassistant/components/loqed/__init__.py b/homeassistant/components/loqed/__init__.py
new file mode 100644
index 00000000000000..e6c69e0751e629
--- /dev/null
+++ b/homeassistant/components/loqed/__init__.py
@@ -0,0 +1,55 @@
+"""The loqed integration."""
+from __future__ import annotations
+
+import logging
+import re
+
+from loqedAPI import loqed
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+from .coordinator import LoqedDataCoordinator
+
+PLATFORMS: list[str] = [Platform.LOCK, Platform.SENSOR]
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up loqed from a config entry."""
+    websession = async_get_clientsession(hass)
+    host = entry.data["bridge_ip"]
+    apiclient = loqed.APIClient(websession, f"http://{host}")
+    api = loqed.LoqedAPI(apiclient)
+
+    lock = await api.async_get_lock(
+        entry.data["lock_key_key"],
+        entry.data["bridge_key"],
+        int(entry.data["lock_key_local_id"]),
+        re.sub(r"LOQED-([a-f0-9]+)\.local", r"\1", entry.data["bridge_mdns_hostname"]),
+    )
+    coordinator = LoqedDataCoordinator(hass, api, lock, entry)
+    await coordinator.ensure_webhooks()
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
+    await coordinator.async_config_entry_first_refresh()
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    coordinator: LoqedDataCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    await coordinator.remove_webhooks()
+
+    return unload_ok
diff --git a/homeassistant/components/loqed/config_flow.py b/homeassistant/components/loqed/config_flow.py
new file mode 100644
index 00000000000000..5eecc0b3f59a89
--- /dev/null
+++ b/homeassistant/components/loqed/config_flow.py
@@ -0,0 +1,169 @@
+"""Config flow for loqed integration."""
+from __future__ import annotations
+
+import logging
+import re
+from typing import Any
+
+import aiohttp
+from loqedAPI import cloud_loqed, loqed
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components import webhook
+from homeassistant.components.zeroconf import ZeroconfServiceInfo
+from homeassistant.const import CONF_API_TOKEN, CONF_HOST, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Loqed."""
+
+    VERSION = 1
+    DOMAIN = DOMAIN
+    _host: str | None = None
+
+    async def validate_input(
+        self, hass: HomeAssistant, data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Validate the user input allows us to connect."""
+
+        # 1. Checking loqed-connection
+        try:
+            session = async_get_clientsession(hass)
+            cloud_api_client = cloud_loqed.CloudAPIClient(
+                session,
+                data[CONF_API_TOKEN],
+            )
+            cloud_client = cloud_loqed.LoqedCloudAPI(cloud_api_client)
+            lock_data = await cloud_client.async_get_locks()
+        except aiohttp.ClientError as err:
+            _LOGGER.error("HTTP Connection error to loqed API")
+            raise CannotConnect from err
+
+        try:
+            selected_lock = next(
+                lock
+                for lock in lock_data["data"]
+                if lock["bridge_ip"] == self._host or lock["name"] == data.get("name")
+            )
+
+            apiclient = loqed.APIClient(session, f"http://{selected_lock['bridge_ip']}")
+            api = loqed.LoqedAPI(apiclient)
+            lock = await api.async_get_lock(
+                selected_lock["backend_key"],
+                selected_lock["bridge_key"],
+                selected_lock["local_id"],
+                selected_lock["bridge_ip"],
+            )
+
+            # checking getWebooks to check the bridgeKey
+            await lock.getWebhooks()
+            return {
+                "lock_key_key": selected_lock["key_secret"],
+                "bridge_key": selected_lock["bridge_key"],
+                "lock_key_local_id": selected_lock["local_id"],
+                "bridge_mdns_hostname": selected_lock["bridge_hostname"],
+                "bridge_ip": selected_lock["bridge_ip"],
+                "name": selected_lock["name"],
+                "id": selected_lock["id"],
+            }
+        except StopIteration:
+            raise InvalidAuth from StopIteration
+        except aiohttp.ClientError:
+            _LOGGER.error("HTTP Connection error to loqed lock")
+            raise CannotConnect from aiohttp.ClientError
+
+    async def async_step_zeroconf(
+        self, discovery_info: ZeroconfServiceInfo
+    ) -> FlowResult:
+        """Handle zeroconf discovery."""
+        host = discovery_info.host
+        self._host = host
+
+        session = async_get_clientsession(self.hass)
+        apiclient = loqed.APIClient(session, f"http://{host}")
+        api = loqed.LoqedAPI(apiclient)
+        lock_data = await api.async_get_lock_details()
+
+        # Check if already exists
+        await self.async_set_unique_id(lock_data["bridge_mac_wifi"])
+        self._abort_if_unique_id_configured({CONF_HOST: host})
+
+        return await self.async_step_user()
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Show userform to user."""
+        user_data_schema = (
+            vol.Schema(
+                {
+                    vol.Required(CONF_API_TOKEN): str,
+                }
+            )
+            if self._host
+            else vol.Schema(
+                {
+                    vol.Required(CONF_NAME): str,
+                    vol.Required(CONF_API_TOKEN): str,
+                }
+            )
+        )
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=user_data_schema,
+                description_placeholders={
+                    "config_url": "https://integrations.production.loqed.com/personal-access-tokens",
+                },
+            )
+
+        errors = {}
+
+        try:
+            info = await self.validate_input(self.hass, user_input)
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        else:
+            await self.async_set_unique_id(
+                re.sub(
+                    r"LOQED-([a-f0-9]+)\.local", r"\1", info["bridge_mdns_hostname"]
+                ),
+                raise_on_progress=False,
+            )
+            self._abort_if_unique_id_configured()
+
+            return self.async_create_entry(
+                title="LOQED Touch Smart Lock",
+                data=(
+                    user_input | {CONF_WEBHOOK_ID: webhook.async_generate_id()} | info
+                ),
+            )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=user_data_schema,
+            errors=errors,
+            description_placeholders={
+                "config_url": "https://integrations.production.loqed.com/personal-access-tokens",
+            },
+        )
+
+
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class InvalidAuth(HomeAssistantError):
+    """Error to indicate there is invalid auth."""
diff --git a/homeassistant/components/loqed/const.py b/homeassistant/components/loqed/const.py
new file mode 100644
index 00000000000000..6b1c0311a2d049
--- /dev/null
+++ b/homeassistant/components/loqed/const.py
@@ -0,0 +1,4 @@
+"""Constants for the loqed integration."""
+
+
+DOMAIN = "loqed"
diff --git a/homeassistant/components/loqed/coordinator.py b/homeassistant/components/loqed/coordinator.py
new file mode 100644
index 00000000000000..507debc02ab9ba
--- /dev/null
+++ b/homeassistant/components/loqed/coordinator.py
@@ -0,0 +1,151 @@
+"""Provides the coordinator for a LOQED lock."""
+import logging
+from typing import TypedDict
+
+from aiohttp.web import Request
+import async_timeout
+from loqedAPI import loqed
+
+from homeassistant.components import webhook
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class BatteryMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    mac_wifi: str
+    mac_ble: str
+    battery_type: str
+    battery_percentage: int
+
+
+class StateReachedMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    requested_state: str
+    requested_state_numeric: int
+    event_type: str
+    key_local_id: int
+    mac_wifi: str
+    mac_ble: str
+
+
+class TransitionMessage(TypedDict):
+    """Properties in a battery update message."""
+
+    go_to_state: str
+    go_to_state_numeric: int
+    event_type: str
+    key_local_id: int
+    mac_wifi: str
+    mac_ble: str
+
+
+class StatusMessage(TypedDict):
+    """Properties returned by the status endpoint of the bridhge."""
+
+    battery_percentage: int
+    battery_type: str
+    battery_type_numeric: int
+    battery_voltage: float
+    bolt_state: str
+    bolt_state_numeric: int
+    bridge_mac_wifi: str
+    bridge_mac_ble: str
+    lock_online: int
+    webhooks_number: int
+    ip_address: str
+    up_timestamp: int
+    wifi_strength: int
+    ble_strength: int
+
+
+class LoqedDataCoordinator(DataUpdateCoordinator[StatusMessage]):
+    """Data update coordinator for the loqed platform."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        api: loqed.LoqedAPI,
+        lock: loqed.Lock,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize the Loqed Data Update coordinator."""
+        super().__init__(hass, _LOGGER, name="Loqed sensors")
+        self._api = api
+        self._entry = entry
+        self.lock = lock
+        self.device_name = self._entry.data[CONF_NAME]
+
+    async def _async_update_data(self) -> StatusMessage:
+        """Fetch data from API endpoint."""
+        async with async_timeout.timeout(10):
+            return await self._api.async_get_lock_details()
+
+    async def _handle_webhook(
+        self, hass: HomeAssistant, webhook_id: str, request: Request
+    ) -> None:
+        """Handle incoming Loqed messages."""
+        _LOGGER.debug("Callback received: %s", request.headers)
+        received_ts = request.headers["TIMESTAMP"]
+        received_hash = request.headers["HASH"]
+        body = await request.text()
+
+        _LOGGER.debug("Callback body: %s", body)
+
+        event_data = await self.lock.receiveWebhook(body, received_hash, received_ts)
+        if "error" in event_data:
+            _LOGGER.warning("Incorrect callback received:: %s", event_data)
+            return
+
+        self.async_update_listeners()
+
+    async def ensure_webhooks(self) -> None:
+        """Register webhook on LOQED bridge."""
+        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+
+        webhook.async_register(
+            self.hass, DOMAIN, "Loqed", webhook_id, self._handle_webhook
+        )
+        webhook_url = webhook.async_generate_url(self.hass, webhook_id)
+        _LOGGER.debug("Webhook URL: %s", webhook_url)
+
+        webhooks = await self.lock.getWebhooks()
+
+        webhook_index = next(
+            (x["id"] for x in webhooks if x["url"] == webhook_url), None
+        )
+
+        if not webhook_index:
+            await self.lock.registerWebhook(webhook_url)
+            webhooks = await self.lock.getWebhooks()
+            webhook_index = next(x["id"] for x in webhooks if x["url"] == webhook_url)
+
+            _LOGGER.info("Webhook got index %s", webhook_index)
+
+    async def remove_webhooks(self) -> None:
+        """Remove webhook from LOQED bridge."""
+        webhook_id = self._entry.data[CONF_WEBHOOK_ID]
+        webhook_url = webhook.async_generate_url(self.hass, webhook_id)
+
+        webhook.async_unregister(
+            self.hass,
+            webhook_id,
+        )
+        _LOGGER.info("Webhook URL: %s", webhook_url)
+
+        webhooks = await self.lock.getWebhooks()
+
+        webhook_index = next(
+            (x["id"] for x in webhooks if x["url"] == webhook_url), None
+        )
+
+        if webhook_index:
+            await self.lock.deleteWebhook(webhook_index)
diff --git a/homeassistant/components/loqed/entity.py b/homeassistant/components/loqed/entity.py
new file mode 100644
index 00000000000000..978fe844d619cb
--- /dev/null
+++ b/homeassistant/components/loqed/entity.py
@@ -0,0 +1,29 @@
+"""Base entity for the LOQED integration."""
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import LoqedDataCoordinator
+
+
+class LoqedEntity(CoordinatorEntity[LoqedDataCoordinator]):
+    """Defines a LOQED entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: LoqedDataCoordinator) -> None:
+        """Initialize the LOQED entity."""
+        super().__init__(coordinator=coordinator)
+
+        lock_id = coordinator.lock.id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, lock_id)},
+            manufacturer="LOQED",
+            name=coordinator.device_name,
+            model="Touch Smart Lock",
+            connections={(CONNECTION_NETWORK_MAC, lock_id)},
+        )
diff --git a/homeassistant/components/loqed/lock.py b/homeassistant/components/loqed/lock.py
new file mode 100644
index 00000000000000..d34df19e2d11c3
--- /dev/null
+++ b/homeassistant/components/loqed/lock.py
@@ -0,0 +1,85 @@
+"""LOQED lock integration for Home Assistant."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from homeassistant.components.lock import LockEntity, LockEntityFeature
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import LoqedDataCoordinator
+from .const import DOMAIN
+from .entity import LoqedEntity
+
+WEBHOOK_API_ENDPOINT = "/api/loqed/webhook"
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Loqed lock platform."""
+    coordinator = hass.data[DOMAIN][entry.entry_id]
+
+    async_add_entities([LoqedLock(coordinator)])
+
+
+class LoqedLock(LoqedEntity, LockEntity):
+    """Representation of a loqed lock."""
+
+    _attr_supported_features = LockEntityFeature.OPEN
+
+    def __init__(self, coordinator: LoqedDataCoordinator) -> None:
+        """Initialize the lock."""
+        super().__init__(coordinator)
+        self._lock = coordinator.lock
+        self._attr_unique_id = self._lock.id
+        self._attr_name = None
+
+    @property
+    def changed_by(self) -> str:
+        """Return internal ID of last used key."""
+        return f"KeyID {self._lock.last_key_id}"
+
+    @property
+    def is_locking(self) -> bool | None:
+        """Return true if lock is locking."""
+        return self._lock.bolt_state == "locking"
+
+    @property
+    def is_unlocking(self) -> bool | None:
+        """Return true if lock is unlocking."""
+        return self._lock.bolt_state == "unlocking"
+
+    @property
+    def is_jammed(self) -> bool | None:
+        """Return true if lock is jammed."""
+        return self._lock.bolt_state == "motor_stall"
+
+    @property
+    def is_locked(self) -> bool | None:
+        """Return true if lock is locked."""
+        return self._lock.bolt_state in ["night_lock_remote", "night_lock"]
+
+    async def async_lock(self, **kwargs: Any) -> None:
+        """Lock the lock."""
+        await self._lock.lock()
+
+    async def async_unlock(self, **kwargs: Any) -> None:
+        """Unlock the lock."""
+        await self._lock.unlock()
+
+    async def async_open(self, **kwargs: Any) -> None:
+        """Open the door latch."""
+        await self._lock.open()
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        _LOGGER.debug(self.coordinator.data)
+        if "bolt_state" in self.coordinator.data:
+            self._lock.updateState(self.coordinator.data["bolt_state"]).close()
+            self.async_write_ha_state()
diff --git a/homeassistant/components/loqed/manifest.json b/homeassistant/components/loqed/manifest.json
new file mode 100644
index 00000000000000..1000d8f804d643
--- /dev/null
+++ b/homeassistant/components/loqed/manifest.json
@@ -0,0 +1,16 @@
+{
+  "domain": "loqed",
+  "name": "LOQED Touch Smart Lock",
+  "codeowners": ["@mikewoudenberg"],
+  "config_flow": true,
+  "dependencies": ["webhook"],
+  "documentation": "https://www.home-assistant.io/integrations/loqed",
+  "iot_class": "local_push",
+  "requirements": ["loqedAPI==2.1.7"],
+  "zeroconf": [
+    {
+      "type": "_http._tcp.local.",
+      "name": "loqed*"
+    }
+  ]
+}
diff --git a/homeassistant/components/loqed/sensor.py b/homeassistant/components/loqed/sensor.py
new file mode 100644
index 00000000000000..ee4fa7ecd74b00
--- /dev/null
+++ b/homeassistant/components/loqed/sensor.py
@@ -0,0 +1,71 @@
+"""Creates LOQED sensors."""
+from typing import Final
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    EntityCategory,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import LoqedDataCoordinator, StatusMessage
+from .entity import LoqedEntity
+
+SENSORS: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        key="ble_strength",
+        translation_key="ble_strength",
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+    ),
+    SensorEntityDescription(
+        key="battery_percentage",
+        device_class=SensorDeviceClass.BATTERY,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Loqed lock platform."""
+    coordinator = hass.data[DOMAIN][entry.entry_id]
+
+    async_add_entities(LoqedSensor(coordinator, sensor) for sensor in SENSORS)
+
+
+class LoqedSensor(LoqedEntity, SensorEntity):
+    """Representation of Sensor state."""
+
+    def __init__(
+        self, coordinator: LoqedDataCoordinator, description: SensorEntityDescription
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{self.coordinator.lock.id}_{description.key}"
+
+    @property
+    def data(self) -> StatusMessage:
+        """Return data object from DataUpdateCoordinator."""
+        return self.coordinator.lock
+
+    @property
+    def native_value(self) -> int:
+        """Return state of sensor."""
+        return getattr(self.data, self.entity_description.key)
diff --git a/homeassistant/components/loqed/strings.json b/homeassistant/components/loqed/strings.json
new file mode 100644
index 00000000000000..3d31194f5a6ed4
--- /dev/null
+++ b/homeassistant/components/loqed/strings.json
@@ -0,0 +1,28 @@
+{
+  "config": {
+    "flow_title": "LOQED Touch Smartlock setup",
+    "step": {
+      "user": {
+        "description": "Login at {config_url} and: \n* Create an API-key by clicking 'Create' \n* Copy the created access token.",
+        "data": {
+          "name": "Name of your lock in the LOQED app.",
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "entity": {
+    "sensor": {
+      "ble_strength": {
+        "name": "Bluetooth signal"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/luftdaten/sensor.py b/homeassistant/components/luftdaten/sensor.py
index 262a6701f56bbd..cca467ce756d2e 100644
--- a/homeassistant/components/luftdaten/sensor.py
+++ b/homeassistant/components/luftdaten/sensor.py
@@ -32,21 +32,18 @@
 SENSORS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="humidity",
-        translation_key="humidity",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="pressure",
-        translation_key="pressure",
         native_unit_of_measurement=UnitOfPressure.PA,
         device_class=SensorDeviceClass.PRESSURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -60,14 +57,12 @@
     ),
     SensorEntityDescription(
         key="P1",
-        translation_key="pm10",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="P2",
-        translation_key="pm25",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/luftdaten/strings.json b/homeassistant/components/luftdaten/strings.json
index d54bc6d0bdc9db..e990142923f73b 100644
--- a/homeassistant/components/luftdaten/strings.json
+++ b/homeassistant/components/luftdaten/strings.json
@@ -16,22 +16,7 @@
   },
   "entity": {
     "sensor": {
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "pressure": {
-        "name": "[%key:component::sensor::entity_component::pressure::name%]"
-      },
-      "pressure_at_sealevel": { "name": "Pressure at sealevel" },
-      "pm10": {
-        "name": "[%key:component::sensor::entity_component::pm10::name%]"
-      },
-      "pm25": {
-        "name": "[%key:component::sensor::entity_component::pm25::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      }
+      "pressure_at_sealevel": { "name": "Pressure at sealevel" }
     }
   }
 }
diff --git a/homeassistant/components/lutron/__init__.py b/homeassistant/components/lutron/__init__.py
index d8ccce8a6bc662..c15f0ea075e933 100644
--- a/homeassistant/components/lutron/__init__.py
+++ b/homeassistant/components/lutron/__init__.py
@@ -37,6 +37,7 @@
 # Attribute on events that indicates what action was taken with the button.
 ATTR_ACTION = "action"
 ATTR_FULL_ID = "full_id"
+ATTR_UUID = "uuid"
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -170,6 +171,7 @@ def __init__(self, hass, area_name, keypad, button):
         self._button = button
         self._event = "lutron_event"
         self._full_id = slugify(f"{area_name} {name}")
+        self._uuid = button.uuid
 
         button.subscribe(self.button_callback, None)
 
@@ -188,5 +190,10 @@ def button_callback(self, button, context, event, params):
             action = "single"
 
         if action:
-            data = {ATTR_ID: self._id, ATTR_ACTION: action, ATTR_FULL_ID: self._full_id}
+            data = {
+                ATTR_ID: self._id,
+                ATTR_ACTION: action,
+                ATTR_FULL_ID: self._full_id,
+                ATTR_UUID: self._uuid,
+            }
             self._hass.bus.fire(self._event, data)
diff --git a/homeassistant/components/lyric/__init__.py b/homeassistant/components/lyric/__init__.py
index f34366f24d0e46..c2423a7c47fa42 100644
--- a/homeassistant/components/lyric/__init__.py
+++ b/homeassistant/components/lyric/__init__.py
@@ -23,8 +23,6 @@
     device_registry as dr,
 )
 from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -38,29 +36,13 @@
 )
 from .const import DOMAIN
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Honeywell Lyric integration."""
-    if DOMAIN in config:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.8.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Honeywell Lyric from a config entry."""
     implementation = (
diff --git a/homeassistant/components/mailbox/__init__.py b/homeassistant/components/mailbox/__init__.py
index 29f023d0de229a..75cea546b71ecf 100644
--- a/homeassistant/components/mailbox/__init__.py
+++ b/homeassistant/components/mailbox/__init__.py
@@ -16,7 +16,11 @@
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_per_platform, discovery
+from homeassistant.helpers import (
+    config_per_platform,
+    config_validation as cv,
+    discovery,
+)
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -32,6 +36,8 @@
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Track states and offer events for mailboxes."""
diff --git a/homeassistant/components/map/__init__.py b/homeassistant/components/map/__init__.py
index 0ea1fbf2af931a..a3ba65be7db13d 100644
--- a/homeassistant/components/map/__init__.py
+++ b/homeassistant/components/map/__init__.py
@@ -1,10 +1,13 @@
 """Support for showing device locations."""
 from homeassistant.components import frontend
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "map"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Register the built-in map panel."""
diff --git a/homeassistant/components/marytts/tts.py b/homeassistant/components/marytts/tts.py
index 5904e271a6a96b..56f31d81d9713d 100644
--- a/homeassistant/components/marytts/tts.py
+++ b/homeassistant/components/marytts/tts.py
@@ -80,7 +80,7 @@ def supported_options(self):
         """Return a list of supported options."""
         return SUPPORT_OPTIONS
 
-    def get_tts_audio(self, message, language, options=None):
+    def get_tts_audio(self, message, language, options):
         """Load TTS from MaryTTS."""
         effects = options[CONF_EFFECT]
 
diff --git a/homeassistant/components/matter/__init__.py b/homeassistant/components/matter/__init__.py
index 4c47cd4d235477..59c5ec9efc8418 100644
--- a/homeassistant/components/matter/__init__.py
+++ b/homeassistant/components/matter/__init__.py
@@ -2,11 +2,12 @@
 from __future__ import annotations
 
 import asyncio
+from contextlib import suppress
 
 import async_timeout
 from matter_server.client import MatterClient
 from matter_server.client.exceptions import CannotConnect, InvalidServerVersion
-from matter_server.common.errors import MatterError, NodeCommissionFailed
+from matter_server.common.errors import MatterError, NodeCommissionFailed, NodeNotExists
 import voluptuous as vol
 
 from homeassistant.components.hassio import AddonError, AddonManager, AddonState
@@ -207,7 +208,9 @@ async def async_remove_config_entry_device(
                 )
 
     matter = get_matter(hass)
-    await matter.matter_client.remove_node(node.node_id)
+    with suppress(NodeNotExists):
+        # ignore if the server has already removed the node.
+        await matter.matter_client.remove_node(node.node_id)
 
     return True
 
diff --git a/homeassistant/components/matter/adapter.py b/homeassistant/components/matter/adapter.py
index fbc027091b4d16..8e76706b7fdb8b 100644
--- a/homeassistant/components/matter/adapter.py
+++ b/homeassistant/components/matter/adapter.py
@@ -3,6 +3,7 @@
 
 from typing import TYPE_CHECKING, cast
 
+from matter_server.client.models.device_types import BridgedDevice
 from matter_server.common.models import EventType, ServerInfoMessage
 
 from homeassistant.config_entries import ConfigEntry
@@ -20,6 +21,14 @@
     from matter_server.client.models.node import MatterEndpoint, MatterNode
 
 
+def get_clean_name(name: str | None) -> str | None:
+    """Strip spaces and null char from the name."""
+    if name is None:
+        return name
+    name = name.replace("\x00", "")
+    return name.strip() or None
+
+
 class MatterAdapter:
     """Connect Matter into Home Assistant."""
 
@@ -43,15 +52,68 @@ def register_platform_handler(
 
     async def setup_nodes(self) -> None:
         """Set up all existing nodes and subscribe to new nodes."""
-        for node in await self.matter_client.get_nodes():
+        for node in self.matter_client.get_nodes():
             self._setup_node(node)
 
         def node_added_callback(event: EventType, node: MatterNode) -> None:
             """Handle node added event."""
             self._setup_node(node)
 
+        def endpoint_added_callback(event: EventType, data: dict[str, int]) -> None:
+            """Handle endpoint added event."""
+            node = self.matter_client.get_node(data["node_id"])
+            self._setup_endpoint(node.endpoints[data["endpoint_id"]])
+
+        def endpoint_removed_callback(event: EventType, data: dict[str, int]) -> None:
+            """Handle endpoint removed event."""
+            server_info = cast(ServerInfoMessage, self.matter_client.server_info)
+            try:
+                node = self.matter_client.get_node(data["node_id"])
+            except KeyError:
+                return  # race condition
+            device_registry = dr.async_get(self.hass)
+            endpoint = node.endpoints.get(data["endpoint_id"])
+            if not endpoint:
+                return  # race condition
+            node_device_id = get_device_id(
+                server_info,
+                node.endpoints[data["endpoint_id"]],
+            )
+            identifier = (DOMAIN, f"{ID_TYPE_DEVICE_ID}_{node_device_id}")
+            if device := device_registry.async_get_device({identifier}):
+                device_registry.async_remove_device(device.id)
+
+        def node_removed_callback(event: EventType, node_id: int) -> None:
+            """Handle node removed event."""
+            try:
+                node = self.matter_client.get_node(node_id)
+            except KeyError:
+                return  # race condition
+            for endpoint_id in node.endpoints:
+                endpoint_removed_callback(
+                    EventType.ENDPOINT_REMOVED,
+                    {"node_id": node_id, "endpoint_id": endpoint_id},
+                )
+
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                endpoint_added_callback, EventType.ENDPOINT_ADDED
+            )
+        )
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                endpoint_removed_callback, EventType.ENDPOINT_REMOVED
+            )
+        )
         self.config_entry.async_on_unload(
-            self.matter_client.subscribe(node_added_callback, EventType.NODE_ADDED)
+            self.matter_client.subscribe_events(
+                node_removed_callback, EventType.NODE_REMOVED
+            )
+        )
+        self.config_entry.async_on_unload(
+            self.matter_client.subscribe_events(
+                node_added_callback, EventType.NODE_ADDED
+            )
         )
 
     def _setup_node(self, node: MatterNode) -> None:
@@ -70,11 +132,27 @@ def _create_device_registry(
         server_info = cast(ServerInfoMessage, self.matter_client.server_info)
 
         basic_info = endpoint.device_info
-        name = basic_info.nodeLabel or basic_info.productLabel or basic_info.productName
+        # use (first) DeviceType of the endpoint as fallback product name
+        device_type = next(
+            (
+                x
+                for x in endpoint.device_types
+                if x.device_type != BridgedDevice.device_type
+            ),
+            None,
+        )
+        name = (
+            get_clean_name(basic_info.nodeLabel)
+            or get_clean_name(basic_info.productLabel)
+            or get_clean_name(basic_info.productName)
+            or device_type.__name__
+            if device_type
+            else None
+        )
 
         # handle bridged devices
         bridge_device_id = None
-        if endpoint.is_bridged_device:
+        if endpoint.is_bridged_device and endpoint.node.endpoints[0] != endpoint:
             bridge_device_id = get_device_id(
                 server_info,
                 endpoint.node.endpoints[0],
@@ -91,14 +169,19 @@ def _create_device_registry(
             # prefix identifier with 'serial_' to be able to filter it
             identifiers.add((DOMAIN, f"{ID_TYPE_SERIAL}_{basic_info.serialNumber}"))
 
+        model = (
+            get_clean_name(basic_info.productName) or device_type.__name__
+            if device_type
+            else None
+        )
         dr.async_get(self.hass).async_get_or_create(
             name=name,
             config_entry_id=self.config_entry.entry_id,
             identifiers=identifiers,
             hw_version=basic_info.hardwareVersionString,
             sw_version=basic_info.softwareVersionString,
-            manufacturer=basic_info.vendorName,
-            model=basic_info.productName,
+            manufacturer=basic_info.vendorName or endpoint.node.device_info.vendorName,
+            model=model,
             via_device=(DOMAIN, bridge_device_id) if bridge_device_id else None,
         )
 
diff --git a/homeassistant/components/matter/binary_sensor.py b/homeassistant/components/matter/binary_sensor.py
index a82614cbcc6997..aabfc12eefbf6a 100644
--- a/homeassistant/components/matter/binary_sensor.py
+++ b/homeassistant/components/matter/binary_sensor.py
@@ -13,7 +13,7 @@
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -65,7 +65,6 @@ def _update_from_device(self) -> None:
         entity_description=MatterBinarySensorEntityDescription(
             key="HueMotionSensor",
             device_class=BinarySensorDeviceClass.MOTION,
-            name="Motion",
             measurement_to_ha=lambda x: (x & 1 == 1) if x is not None else None,
         ),
         entity_class=MatterBinarySensor,
@@ -78,7 +77,6 @@ def _update_from_device(self) -> None:
         entity_description=MatterBinarySensorEntityDescription(
             key="ContactSensor",
             device_class=BinarySensorDeviceClass.DOOR,
-            name="Contact",
             # value is inverted on matter to what we expect
             measurement_to_ha=lambda x: not x,
         ),
@@ -90,7 +88,6 @@ def _update_from_device(self) -> None:
         entity_description=MatterBinarySensorEntityDescription(
             key="OccupancySensor",
             device_class=BinarySensorDeviceClass.OCCUPANCY,
-            name="Occupancy",
             # The first bit = if occupied
             measurement_to_ha=lambda x: (x & 1 == 1) if x is not None else None,
         ),
@@ -102,9 +99,9 @@ def _update_from_device(self) -> None:
         entity_description=MatterBinarySensorEntityDescription(
             key="BatteryChargeLevel",
             device_class=BinarySensorDeviceClass.BATTERY,
-            name="Battery Status",
+            entity_category=EntityCategory.DIAGNOSTIC,
             measurement_to_ha=lambda x: x
-            != clusters.PowerSource.Enums.BatChargeLevel.kOk,
+            != clusters.PowerSource.Enums.BatChargeLevelEnum.kOk,
         ),
         entity_class=MatterBinarySensor,
         required_attributes=(clusters.PowerSource.Attributes.BatChargeLevel,),
diff --git a/homeassistant/components/matter/climate.py b/homeassistant/components/matter/climate.py
new file mode 100644
index 00000000000000..6da88533edc065
--- /dev/null
+++ b/homeassistant/components/matter/climate.py
@@ -0,0 +1,313 @@
+"""Matter climate platform."""
+from __future__ import annotations
+
+from enum import IntEnum
+from typing import TYPE_CHECKING, Any
+
+from chip.clusters import Objects as clusters
+from matter_server.client.models import device_types
+from matter_server.common.helpers.util import create_attribute_path_from_attribute
+
+from homeassistant.components.climate import (
+    ATTR_HVAC_MODE,
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    DEFAULT_MAX_TEMP,
+    DEFAULT_MIN_TEMP,
+    ClimateEntity,
+    ClimateEntityDescription,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .entity import MatterEntity
+from .helpers import get_matter
+from .models import MatterDiscoverySchema
+
+if TYPE_CHECKING:
+    from matter_server.client import MatterClient
+    from matter_server.client.models.node import MatterEndpoint
+
+    from .discovery import MatterEntityInfo
+
+TEMPERATURE_SCALING_FACTOR = 100
+HVAC_SYSTEM_MODE_MAP = {
+    HVACMode.OFF: 0,
+    HVACMode.HEAT_COOL: 1,
+    HVACMode.COOL: 3,
+    HVACMode.HEAT: 4,
+}
+SystemModeEnum = clusters.Thermostat.Enums.ThermostatSystemMode
+ControlSequenceEnum = clusters.Thermostat.Enums.ThermostatControlSequence
+ThermostatFeature = clusters.Thermostat.Bitmaps.ThermostatFeature
+
+
+class ThermostatRunningState(IntEnum):
+    """Thermostat Running State, Matter spec Thermostat 7.33."""
+
+    Heat = 1  # 1 << 0 = 1
+    Cool = 2  # 1 << 1 = 2
+    Fan = 4  # 1 << 2 = 4
+    HeatStage2 = 8  # 1 << 3 = 8
+    CoolStage2 = 16  # 1 << 4 = 16
+    FanStage2 = 32  # 1 << 5 = 32
+    FanStage3 = 64  # 1 << 6 = 64
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Matter climate platform from Config Entry."""
+    matter = get_matter(hass)
+    matter.register_platform_handler(Platform.CLIMATE, async_add_entities)
+
+
+class MatterClimate(MatterEntity, ClimateEntity):
+    """Representation of a Matter climate entity."""
+
+    _attr_temperature_unit: str = UnitOfTemperature.CELSIUS
+    _attr_supported_features: ClimateEntityFeature = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+    )
+    _attr_hvac_mode: HVACMode = HVACMode.OFF
+
+    def __init__(
+        self,
+        matter_client: MatterClient,
+        endpoint: MatterEndpoint,
+        entity_info: MatterEntityInfo,
+    ) -> None:
+        """Initialize the Matter climate entity."""
+        super().__init__(matter_client, endpoint, entity_info)
+
+        # set hvac_modes based on feature map
+        self._attr_hvac_modes: list[HVACMode] = [HVACMode.OFF]
+        feature_map = int(
+            self.get_matter_attribute_value(clusters.Thermostat.Attributes.FeatureMap)
+        )
+        if feature_map & ThermostatFeature.kHeating:
+            self._attr_hvac_modes.append(HVACMode.HEAT)
+        if feature_map & ThermostatFeature.kCooling:
+            self._attr_hvac_modes.append(HVACMode.COOL)
+        if feature_map & ThermostatFeature.kAutoMode:
+            self._attr_hvac_modes.append(HVACMode.HEAT_COOL)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        target_hvac_mode: HVACMode | None = kwargs.get(ATTR_HVAC_MODE)
+        if target_hvac_mode is not None:
+            await self.async_set_hvac_mode(target_hvac_mode)
+
+        current_mode = target_hvac_mode or self.hvac_mode
+        command = None
+        if current_mode in (HVACMode.HEAT, HVACMode.COOL):
+            # when current mode is either heat or cool, the temperature arg must be provided.
+            temperature: float | None = kwargs.get(ATTR_TEMPERATURE)
+            if temperature is None:
+                raise ValueError("Temperature must be provided")
+            if self.target_temperature is None:
+                raise ValueError("Current target_temperature should not be None")
+            command = self._create_optional_setpoint_command(
+                clusters.Thermostat.Enums.SetpointAdjustMode.kCool
+                if current_mode == HVACMode.COOL
+                else clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+                temperature,
+                self.target_temperature,
+            )
+        elif current_mode == HVACMode.HEAT_COOL:
+            temperature_low: float | None = kwargs.get(ATTR_TARGET_TEMP_LOW)
+            temperature_high: float | None = kwargs.get(ATTR_TARGET_TEMP_HIGH)
+            if temperature_low is None or temperature_high is None:
+                raise ValueError(
+                    "temperature_low and temperature_high must be provided"
+                )
+            if (
+                self.target_temperature_low is None
+                or self.target_temperature_high is None
+            ):
+                raise ValueError(
+                    "current target_temperature_low and target_temperature_high should not be None"
+                )
+            # due to ha send both high and low temperature, we need to check which one is changed
+            command = self._create_optional_setpoint_command(
+                clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+                temperature_low,
+                self.target_temperature_low,
+            )
+            if command is None:
+                command = self._create_optional_setpoint_command(
+                    clusters.Thermostat.Enums.SetpointAdjustMode.kCool,
+                    temperature_high,
+                    self.target_temperature_high,
+                )
+        if command:
+            await self.matter_client.send_device_command(
+                node_id=self._endpoint.node.node_id,
+                endpoint_id=self._endpoint.endpoint_id,
+                command=command,
+            )
+
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set new target hvac mode."""
+        system_mode_path = create_attribute_path_from_attribute(
+            endpoint_id=self._endpoint.endpoint_id,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        )
+        system_mode_value = HVAC_SYSTEM_MODE_MAP.get(hvac_mode)
+        if system_mode_value is None:
+            raise ValueError(f"Unsupported hvac mode {hvac_mode} in Matter")
+        await self.matter_client.write_attribute(
+            node_id=self._endpoint.node.node_id,
+            attribute_path=system_mode_path,
+            value=system_mode_value,
+        )
+        # we need to optimistically update the attribute's value here
+        # to prevent a race condition when adjusting the mode and temperature
+        # in the same call
+        self._endpoint.set_attribute_value(system_mode_path, system_mode_value)
+        self._update_from_device()
+
+    @callback
+    def _update_from_device(self) -> None:
+        """Update from device."""
+        self._attr_current_temperature = self._get_temperature_in_degrees(
+            clusters.Thermostat.Attributes.LocalTemperature
+        )
+        # update hvac_mode from SystemMode
+        system_mode_value = int(
+            self.get_matter_attribute_value(clusters.Thermostat.Attributes.SystemMode)
+        )
+        match system_mode_value:
+            case SystemModeEnum.kAuto:
+                self._attr_hvac_mode = HVACMode.HEAT_COOL
+            case SystemModeEnum.kDry:
+                self._attr_hvac_mode = HVACMode.DRY
+            case SystemModeEnum.kFanOnly:
+                self._attr_hvac_mode = HVACMode.FAN_ONLY
+            case SystemModeEnum.kCool | SystemModeEnum.kPrecooling:
+                self._attr_hvac_mode = HVACMode.COOL
+            case SystemModeEnum.kHeat | SystemModeEnum.kEmergencyHeat:
+                self._attr_hvac_mode = HVACMode.HEAT
+            case _:
+                self._attr_hvac_mode = HVACMode.OFF
+        # running state is an optional attribute
+        # which we map to hvac_action if it exists (its value is not None)
+        self._attr_hvac_action = None
+        if running_state_value := self.get_matter_attribute_value(
+            clusters.Thermostat.Attributes.ThermostatRunningState
+        ):
+            match running_state_value:
+                case ThermostatRunningState.Heat | ThermostatRunningState.HeatStage2:
+                    self._attr_hvac_action = HVACAction.HEATING
+                case ThermostatRunningState.Cool | ThermostatRunningState.CoolStage2:
+                    self._attr_hvac_action = HVACAction.COOLING
+                case (
+                    ThermostatRunningState.Fan
+                    | ThermostatRunningState.FanStage2
+                    | ThermostatRunningState.FanStage3
+                ):
+                    self._attr_hvac_action = HVACAction.FAN
+                case _:
+                    self._attr_hvac_action = HVACAction.OFF
+        # update target_temperature
+        if self._attr_hvac_mode == HVACMode.HEAT_COOL:
+            self._attr_target_temperature = None
+        elif self._attr_hvac_mode == HVACMode.COOL:
+            self._attr_target_temperature = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedCoolingSetpoint
+            )
+        else:
+            self._attr_target_temperature = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedHeatingSetpoint
+            )
+        # update target temperature high/low
+        if self._attr_hvac_mode == HVACMode.HEAT_COOL:
+            self._attr_target_temperature_high = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedCoolingSetpoint
+            )
+            self._attr_target_temperature_low = self._get_temperature_in_degrees(
+                clusters.Thermostat.Attributes.OccupiedHeatingSetpoint
+            )
+        else:
+            self._attr_target_temperature_high = None
+            self._attr_target_temperature_low = None
+        # update min_temp
+        if self._attr_hvac_mode == HVACMode.COOL:
+            attribute = clusters.Thermostat.Attributes.AbsMinCoolSetpointLimit
+        else:
+            attribute = clusters.Thermostat.Attributes.AbsMinHeatSetpointLimit
+        if (value := self._get_temperature_in_degrees(attribute)) is not None:
+            self._attr_min_temp = value
+        else:
+            self._attr_min_temp = DEFAULT_MIN_TEMP
+        # update max_temp
+        if self._attr_hvac_mode in (HVACMode.COOL, HVACMode.HEAT_COOL):
+            attribute = clusters.Thermostat.Attributes.AbsMaxHeatSetpointLimit
+        else:
+            attribute = clusters.Thermostat.Attributes.AbsMaxCoolSetpointLimit
+        if (value := self._get_temperature_in_degrees(attribute)) is not None:
+            self._attr_max_temp = value
+        else:
+            self._attr_max_temp = DEFAULT_MAX_TEMP
+
+    def _get_temperature_in_degrees(
+        self, attribute: type[clusters.ClusterAttributeDescriptor]
+    ) -> float | None:
+        """Return the scaled temperature value for the given attribute."""
+        if value := self.get_matter_attribute_value(attribute):
+            return float(value) / TEMPERATURE_SCALING_FACTOR
+        return None
+
+    @staticmethod
+    def _create_optional_setpoint_command(
+        mode: clusters.Thermostat.Enums.SetpointAdjustMode,
+        target_temp: float,
+        current_target_temp: float,
+    ) -> clusters.Thermostat.Commands.SetpointRaiseLower | None:
+        """Create a setpoint command if the target temperature is different from the current one."""
+
+        temp_diff = int((target_temp - current_target_temp) * 10)
+
+        if temp_diff == 0:
+            return None
+
+        return clusters.Thermostat.Commands.SetpointRaiseLower(
+            mode,
+            temp_diff,
+        )
+
+
+# Discovery schema(s) to map Matter Attributes to HA entities
+DISCOVERY_SCHEMAS = [
+    MatterDiscoverySchema(
+        platform=Platform.CLIMATE,
+        entity_description=ClimateEntityDescription(
+            key="MatterThermostat",
+            name=None,
+        ),
+        entity_class=MatterClimate,
+        required_attributes=(clusters.Thermostat.Attributes.LocalTemperature,),
+        optional_attributes=(
+            clusters.Thermostat.Attributes.FeatureMap,
+            clusters.Thermostat.Attributes.ControlSequenceOfOperation,
+            clusters.Thermostat.Attributes.Occupancy,
+            clusters.Thermostat.Attributes.OccupiedCoolingSetpoint,
+            clusters.Thermostat.Attributes.OccupiedHeatingSetpoint,
+            clusters.Thermostat.Attributes.SystemMode,
+            clusters.Thermostat.Attributes.ThermostatRunningMode,
+            clusters.Thermostat.Attributes.ThermostatRunningState,
+            clusters.Thermostat.Attributes.TemperatureSetpointHold,
+            clusters.Thermostat.Attributes.UnoccupiedCoolingSetpoint,
+            clusters.Thermostat.Attributes.UnoccupiedHeatingSetpoint,
+        ),
+        device_type=(device_types.Thermostat,),
+    ),
+]
diff --git a/homeassistant/components/matter/cover.py b/homeassistant/components/matter/cover.py
index 4e227d83b44e82..590f325cf22960 100644
--- a/homeassistant/components/matter/cover.py
+++ b/homeassistant/components/matter/cover.py
@@ -2,12 +2,14 @@
 from __future__ import annotations
 
 from enum import IntEnum
+from math import floor
 from typing import Any
 
 from chip.clusters import Objects as clusters
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
+    ATTR_TILT_POSITION,
     CoverDeviceClass,
     CoverEntity,
     CoverEntityDescription,
@@ -56,17 +58,20 @@ class MatterCover(MatterEntity, CoverEntity):
     """Representation of a Matter Cover."""
 
     entity_description: CoverEntityDescription
-    _attr_supported_features = (
-        CoverEntityFeature.OPEN
-        | CoverEntityFeature.CLOSE
-        | CoverEntityFeature.STOP
-        | CoverEntityFeature.SET_POSITION
-    )
 
     @property
-    def is_closed(self) -> bool:
-        """Return true if cover is closed, else False."""
-        return self.current_cover_position == 0
+    def is_closed(self) -> bool | None:
+        """Return true if cover is closed, if there is no position report, return None."""
+        if not self._entity_info.endpoint.has_attribute(
+            None, clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths
+        ):
+            return None
+
+        return (
+            self.current_cover_position == 0
+            if self.current_cover_position is not None
+            else None
+        )
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover movement."""
@@ -88,6 +93,14 @@ async def async_set_cover_position(self, **kwargs: Any) -> None:
             clusters.WindowCovering.Commands.GoToLiftPercentage((100 - position) * 100)
         )
 
+    async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
+        """Set the cover tilt to a specific position."""
+        position = kwargs[ATTR_TILT_POSITION]
+        await self.send_device_command(
+            # value needs to be inverted and is sent in 100ths
+            clusters.WindowCovering.Commands.GoToTiltPercentage((100 - position) * 100)
+        )
+
     async def send_device_command(self, command: Any) -> None:
         """Send device command."""
         await self.matter_client.send_device_command(
@@ -123,18 +136,45 @@ def _update_from_device(self) -> None:
                 self._attr_is_opening = False
                 self._attr_is_closing = False
 
-        # current position is inverted in matter (100 is closed, 0 is open)
-        current_cover_position = self.get_matter_attribute_value(
-            clusters.WindowCovering.Attributes.CurrentPositionLiftPercentage
-        )
-        self._attr_current_cover_position = 100 - current_cover_position
+        if self._entity_info.endpoint.has_attribute(
+            None, clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths
+        ):
+            # current position is inverted in matter (100 is closed, 0 is open)
+            current_cover_position = self.get_matter_attribute_value(
+                clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths
+            )
+            self._attr_current_cover_position = (
+                100 - floor(current_cover_position / 100)
+                if current_cover_position is not None
+                else None
+            )
 
-        LOGGER.debug(
-            "Current position for %s - raw: %s - corrected: %s",
-            self.entity_id,
-            current_cover_position,
-            self.current_cover_position,
-        )
+            LOGGER.debug(
+                "Current position for %s - raw: %s - corrected: %s",
+                self.entity_id,
+                current_cover_position,
+                self.current_cover_position,
+            )
+
+        if self._entity_info.endpoint.has_attribute(
+            None, clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths
+        ):
+            # current tilt position is inverted in matter (100 is closed, 0 is open)
+            current_cover_tilt_position = self.get_matter_attribute_value(
+                clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths
+            )
+            self._attr_current_cover_tilt_position = (
+                100 - floor(current_cover_tilt_position / 100)
+                if current_cover_tilt_position is not None
+                else None
+            )
+
+            LOGGER.debug(
+                "Current tilt position for %s - raw: %s - corrected: %s",
+                self.entity_id,
+                current_cover_tilt_position,
+                self.current_cover_tilt_position,
+            )
 
         # map matter type to HA deviceclass
         device_type: clusters.WindowCovering.Enums.Type = (
@@ -142,16 +182,75 @@ def _update_from_device(self) -> None:
         )
         self._attr_device_class = TYPE_MAP.get(device_type, CoverDeviceClass.AWNING)
 
+        supported_features = (
+            CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
+        )
+        commands = self.get_matter_attribute_value(
+            clusters.WindowCovering.Attributes.AcceptedCommandList
+        )
+        if clusters.WindowCovering.Commands.GoToLiftPercentage.command_id in commands:
+            supported_features |= CoverEntityFeature.SET_POSITION
+        if clusters.WindowCovering.Commands.GoToTiltPercentage.command_id in commands:
+            supported_features |= CoverEntityFeature.SET_TILT_POSITION
+        self._attr_supported_features = supported_features
+
 
 # Discovery schema(s) to map Matter Attributes to HA entities
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.COVER,
-        entity_description=CoverEntityDescription(key="MatterCover"),
+        entity_description=CoverEntityDescription(key="MatterCover", name=None),
+        entity_class=MatterCover,
+        required_attributes=(
+            clusters.WindowCovering.Attributes.OperationalStatus,
+            clusters.WindowCovering.Attributes.Type,
+        ),
+        absent_attributes=(
+            clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths,
+            clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths,
+        ),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.COVER,
+        entity_description=CoverEntityDescription(
+            key="MatterCoverPositionAwareLift", name=None
+        ),
+        entity_class=MatterCover,
+        required_attributes=(
+            clusters.WindowCovering.Attributes.OperationalStatus,
+            clusters.WindowCovering.Attributes.Type,
+            clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths,
+        ),
+        absent_attributes=(
+            clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths,
+        ),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.COVER,
+        entity_description=CoverEntityDescription(
+            key="MatterCoverPositionAwareTilt", name=None
+        ),
+        entity_class=MatterCover,
+        required_attributes=(
+            clusters.WindowCovering.Attributes.OperationalStatus,
+            clusters.WindowCovering.Attributes.Type,
+            clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths,
+        ),
+        absent_attributes=(
+            clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths,
+        ),
+    ),
+    MatterDiscoverySchema(
+        platform=Platform.COVER,
+        entity_description=CoverEntityDescription(
+            key="MatterCoverPositionAwareLiftAndTilt", name=None
+        ),
         entity_class=MatterCover,
         required_attributes=(
-            clusters.WindowCovering.Attributes.CurrentPositionLiftPercentage,
             clusters.WindowCovering.Attributes.OperationalStatus,
+            clusters.WindowCovering.Attributes.Type,
+            clusters.WindowCovering.Attributes.CurrentPositionLiftPercent100ths,
+            clusters.WindowCovering.Attributes.CurrentPositionTiltPercent100ths,
         ),
-    )
+    ),
 ]
diff --git a/homeassistant/components/matter/discovery.py b/homeassistant/components/matter/discovery.py
index 28f5b6b7f90168..0b4bacf00ca343 100644
--- a/homeassistant/components/matter/discovery.py
+++ b/homeassistant/components/matter/discovery.py
@@ -10,6 +10,7 @@
 from homeassistant.core import callback
 
 from .binary_sensor import DISCOVERY_SCHEMAS as BINARY_SENSOR_SCHEMAS
+from .climate import DISCOVERY_SCHEMAS as CLIMATE_SENSOR_SCHEMAS
 from .cover import DISCOVERY_SCHEMAS as COVER_SCHEMAS
 from .light import DISCOVERY_SCHEMAS as LIGHT_SCHEMAS
 from .lock import DISCOVERY_SCHEMAS as LOCK_SCHEMAS
@@ -19,6 +20,7 @@
 
 DISCOVERY_SCHEMAS: dict[Platform, list[MatterDiscoverySchema]] = {
     Platform.BINARY_SENSOR: BINARY_SENSOR_SCHEMAS,
+    Platform.CLIMATE: CLIMATE_SENSOR_SCHEMAS,
     Platform.COVER: COVER_SCHEMAS,
     Platform.LIGHT: LIGHT_SCHEMAS,
     Platform.LOCK: LOCK_SCHEMAS,
diff --git a/homeassistant/components/matter/entity.py b/homeassistant/components/matter/entity.py
index bf0a74ef84574c..0457cfaa8107b4 100644
--- a/homeassistant/components/matter/entity.py
+++ b/homeassistant/components/matter/entity.py
@@ -75,20 +75,25 @@ async def async_added_to_hass(self) -> None:
         await super().async_added_to_hass()
 
         # Subscribe to attribute updates.
+        sub_paths: list[str] = []
         for attr_cls in self._entity_info.attributes_to_watch:
             attr_path = self.get_matter_attribute_path(attr_cls)
             self._attributes_map[attr_cls] = attr_path
+            sub_paths.append(attr_path)
             self._unsubscribes.append(
-                self.matter_client.subscribe(
+                self.matter_client.subscribe_events(
                     callback=self._on_matter_event,
                     event_filter=EventType.ATTRIBUTE_UPDATED,
                     node_filter=self._endpoint.node.node_id,
                     attr_path_filter=attr_path,
                 )
             )
+        await self.matter_client.subscribe_attribute(
+            self._endpoint.node.node_id, sub_paths
+        )
         # subscribe to node (availability changes)
         self._unsubscribes.append(
-            self.matter_client.subscribe(
+            self.matter_client.subscribe_events(
                 callback=self._on_matter_event,
                 event_filter=EventType.NODE_UPDATED,
                 node_filter=self._endpoint.node.node_id,
diff --git a/homeassistant/components/matter/helpers.py b/homeassistant/components/matter/helpers.py
index 4b6099502562e1..0274c80edf8ef1 100644
--- a/homeassistant/components/matter/helpers.py
+++ b/homeassistant/components/matter/helpers.py
@@ -95,7 +95,7 @@ async def get_node_from_device_entry(
     node = next(
         (
             node
-            for node in await matter_client.get_nodes()
+            for node in matter_client.get_nodes()
             for endpoint in node.endpoints.values()
             if get_device_id(server_info, endpoint) == device_id
         ),
diff --git a/homeassistant/components/matter/light.py b/homeassistant/components/matter/light.py
index 10a52eb88055c8..02919baa8f1a4b 100644
--- a/homeassistant/components/matter/light.py
+++ b/homeassistant/components/matter/light.py
@@ -1,7 +1,6 @@
 """Matter light."""
 from __future__ import annotations
 
-from enum import IntFlag
 from typing import Any
 
 from chip.clusters import Objects as clusters
@@ -112,7 +111,7 @@ async def _set_color_temp(self, color_temp: int) -> None:
 
         await self.send_device_command(
             clusters.ColorControl.Commands.MoveToColorTemperature(
-                colorTemperature=color_temp,
+                colorTemperatureMireds=color_temp,
                 # It's required in TLV. We don't implement transition time yet.
                 transitionTime=0,
             )
@@ -129,7 +128,7 @@ async def _set_brightness(self, brightness: int) -> None:
             renormalize(
                 brightness,
                 (0, 255),
-                (level_control.minLevel, level_control.maxLevel),
+                (level_control.minLevel or 1, level_control.maxLevel or 254),
             )
         )
 
@@ -221,7 +220,7 @@ def _get_brightness(self) -> int:
         return round(
             renormalize(
                 level_control.currentLevel,
-                (level_control.minLevel, level_control.maxLevel),
+                (level_control.minLevel or 1, level_control.maxLevel or 254),
                 (0, 255),
             )
         )
@@ -300,6 +299,8 @@ def _update_from_device(self) -> None:
             # colormode(s)
             if self._entity_info.endpoint.has_attribute(
                 None, clusters.ColorControl.Attributes.ColorMode
+            ) and self._entity_info.endpoint.has_attribute(
+                None, clusters.ColorControl.Attributes.ColorCapabilities
             ):
                 capabilities = self.get_matter_attribute_value(
                     clusters.ColorControl.Attributes.ColorCapabilities
@@ -307,13 +308,22 @@ def _update_from_device(self) -> None:
 
                 assert capabilities is not None
 
-                if capabilities & ColorCapabilities.kHueSaturationSupported:
+                if (
+                    capabilities
+                    & clusters.ColorControl.Bitmaps.ColorCapabilities.kHueSaturationSupported
+                ):
                     supported_color_modes.add(ColorMode.HS)
 
-                if capabilities & ColorCapabilities.kXYAttributesSupported:
+                if (
+                    capabilities
+                    & clusters.ColorControl.Bitmaps.ColorCapabilities.kXYAttributesSupported
+                ):
                     supported_color_modes.add(ColorMode.XY)
 
-                if capabilities & ColorCapabilities.kColorTemperatureSupported:
+                if (
+                    capabilities
+                    & clusters.ColorControl.Bitmaps.ColorCapabilities.kColorTemperatureSupported
+                ):
                     supported_color_modes.add(ColorMode.COLOR_TEMP)
 
             self._attr_supported_color_modes = supported_color_modes
@@ -344,23 +354,11 @@ def _update_from_device(self) -> None:
             self._attr_brightness = self._get_brightness()
 
 
-# This enum should be removed once the ColorControlCapabilities enum is added to the CHIP (Matter) library
-# clusters.ColorControl.Bitmap.ColorCapabilities
-class ColorCapabilities(IntFlag):
-    """Color control capabilities bitmap."""
-
-    kHueSaturationSupported = 0x1
-    kEnhancedHueSupported = 0x2
-    kColorLoopSupported = 0x4
-    kXYAttributesSupported = 0x8
-    kColorTemperatureSupported = 0x10
-
-
 # Discovery schema(s) to map Matter Attributes to HA entities
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LIGHT,
-        entity_description=LightEntityDescription(key="MatterLight"),
+        entity_description=LightEntityDescription(key="MatterLight", name=None),
         entity_class=MatterLight,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
         optional_attributes=(
@@ -372,10 +370,97 @@ class ColorCapabilities(IntFlag):
             clusters.ColorControl.Attributes.CurrentY,
             clusters.ColorControl.Attributes.ColorTemperatureMireds,
         ),
-        # restrict device type to prevent discovery by the wrong platform
+        device_type=(
+            device_types.ColorTemperatureLight,
+            device_types.DimmableLight,
+            device_types.ExtendedColorLight,
+            device_types.OnOffLight,
+        ),
+    ),
+    # Additional schema to match (HS Color) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterHSColorLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+        ),
+    ),
+    # Additional schema to match (XY Color) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterXYColorLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+        ),
+    ),
+    # Additional schema to match (color temperature) lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterColorTemperatureLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+        ),
+        optional_attributes=(clusters.ColorControl.Attributes.ColorMode,),
+    ),
+    # Additional schema to match generic dimmable lights with incorrect/missing device type
+    MatterDiscoverySchema(
+        platform=Platform.LIGHT,
+        entity_description=LightEntityDescription(
+            key="MatterDimmableLightFallback", name=None
+        ),
+        entity_class=MatterLight,
+        required_attributes=(
+            clusters.OnOff.Attributes.OnOff,
+            clusters.LevelControl.Attributes.CurrentLevel,
+        ),
+        optional_attributes=(
+            clusters.ColorControl.Attributes.ColorMode,
+            clusters.ColorControl.Attributes.CurrentHue,
+            clusters.ColorControl.Attributes.CurrentSaturation,
+            clusters.ColorControl.Attributes.CurrentX,
+            clusters.ColorControl.Attributes.CurrentY,
+            clusters.ColorControl.Attributes.ColorTemperatureMireds,
+        ),
+        # important: make sure to rule out all device types that are also based on the
+        # onoff and levelcontrol clusters !
         not_device_type=(
+            device_types.Fan,
+            device_types.GenericSwitch,
             device_types.OnOffPlugInUnit,
-            device_types.DoorLock,
+            device_types.HeatingCoolingUnit,
+            device_types.Pump,
+            device_types.CastingVideoClient,
+            device_types.VideoRemoteControl,
+            device_types.Speaker,
         ),
     ),
 ]
diff --git a/homeassistant/components/matter/lock.py b/homeassistant/components/matter/lock.py
index f90d8eb485d0d3..a5f625f9e73ddd 100644
--- a/homeassistant/components/matter/lock.py
+++ b/homeassistant/components/matter/lock.py
@@ -8,7 +8,7 @@
 
 from homeassistant.components.lock import LockEntity, LockEntityDescription
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import ATTR_CODE, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -33,6 +33,26 @@ class MatterLock(MatterEntity, LockEntity):
 
     features: int | None = None
 
+    @property
+    def code_format(self) -> str | None:
+        """Regex for code format or None if no code is required."""
+        if self.get_matter_attribute_value(
+            clusters.DoorLock.Attributes.RequirePINforRemoteOperation
+        ):
+            min_pincode_length = int(
+                self.get_matter_attribute_value(
+                    clusters.DoorLock.Attributes.MinPINCodeLength
+                )
+            )
+            max_pincode_length = int(
+                self.get_matter_attribute_value(
+                    clusters.DoorLock.Attributes.MaxPINCodeLength
+                )
+            )
+            return f"^\\d{{{min_pincode_length},{max_pincode_length}}}$"
+
+        return None
+
     @property
     def supports_door_position_sensor(self) -> bool:
         """Return True if the lock supports door position sensor."""
@@ -56,11 +76,25 @@ async def send_device_command(
 
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock with pin if needed."""
-        await self.send_device_command(command=clusters.DoorLock.Commands.LockDoor())
+        code: str = kwargs.get(
+            ATTR_CODE,
+            self._lock_option_default_code,
+        )
+        code_bytes = code.encode() if code else None
+        await self.send_device_command(
+            command=clusters.DoorLock.Commands.LockDoor(code_bytes)
+        )
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock with pin if needed."""
-        await self.send_device_command(command=clusters.DoorLock.Commands.UnlockDoor())
+        code: str = kwargs.get(
+            ATTR_CODE,
+            self._lock_option_default_code,
+        )
+        code_bytes = code.encode() if code else None
+        await self.send_device_command(
+            command=clusters.DoorLock.Commands.UnlockDoor(code_bytes)
+        )
 
     @callback
     def _update_from_device(self) -> None:
@@ -106,7 +140,7 @@ def _update_from_device(self) -> None:
             LOGGER.debug("Door state: %s for %s", door_state, self.entity_id)
 
             self._attr_is_jammed = (
-                door_state is clusters.DoorLock.Enums.DlDoorState.kDoorJammed
+                door_state is clusters.DoorLock.Enums.DoorStateEnum.kDoorJammed
             )
 
 
@@ -116,24 +150,24 @@ class DoorLockFeature(IntFlag):
     Should be replaced by the library provided one once that is released.
     """
 
-    kPinCredential = 0x1
-    kRfidCredential = 0x2
-    kFingerCredentials = 0x4
-    kLogging = 0x8
-    kWeekDayAccessSchedules = 0x10
-    kDoorPositionSensor = 0x20
-    kFaceCredentials = 0x40
-    kCredentialsOverTheAirAccess = 0x80
-    kUser = 0x100
-    kNotification = 0x200
-    kYearDayAccessSchedules = 0x400
-    kHolidaySchedules = 0x800
+    kPinCredential = 0x1  # noqa: N815
+    kRfidCredential = 0x2  # noqa: N815
+    kFingerCredentials = 0x4  # noqa: N815
+    kLogging = 0x8  # noqa: N815
+    kWeekDayAccessSchedules = 0x10  # noqa: N815
+    kDoorPositionSensor = 0x20  # noqa: N815
+    kFaceCredentials = 0x40  # noqa: N815
+    kCredentialsOverTheAirAccess = 0x80  # noqa: N815
+    kUser = 0x100  # noqa: N815
+    kNotification = 0x200  # noqa: N815
+    kYearDayAccessSchedules = 0x400  # noqa: N815
+    kHolidaySchedules = 0x800  # noqa: N815
 
 
 DISCOVERY_SCHEMAS = [
     MatterDiscoverySchema(
         platform=Platform.LOCK,
-        entity_description=LockEntityDescription(key="MatterLock"),
+        entity_description=LockEntityDescription(key="MatterLock", name=None),
         entity_class=MatterLock,
         required_attributes=(clusters.DoorLock.Attributes.LockState,),
         optional_attributes=(clusters.DoorLock.Attributes.DoorState,),
diff --git a/homeassistant/components/matter/manifest.json b/homeassistant/components/matter/manifest.json
index 190bf33dcf71ea..85434407a10ffb 100644
--- a/homeassistant/components/matter/manifest.json
+++ b/homeassistant/components/matter/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/matter",
   "iot_class": "local_push",
-  "requirements": ["python-matter-server==3.2.0"]
+  "requirements": ["python-matter-server==3.6.3"]
 }
diff --git a/homeassistant/components/matter/sensor.py b/homeassistant/components/matter/sensor.py
index 84e68695d639e0..5021ed7fa0d016 100644
--- a/homeassistant/components/matter/sensor.py
+++ b/homeassistant/components/matter/sensor.py
@@ -16,6 +16,7 @@
 from homeassistant.const import (
     LIGHT_LUX,
     PERCENTAGE,
+    EntityCategory,
     Platform,
     UnitOfPressure,
     UnitOfTemperature,
@@ -68,7 +69,6 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="TemperatureSensor",
-            name="Temperature",
             native_unit_of_measurement=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             measurement_to_ha=lambda x: x / 100,
@@ -80,7 +80,6 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="PressureSensor",
-            name="Pressure",
             native_unit_of_measurement=UnitOfPressure.KPA,
             device_class=SensorDeviceClass.PRESSURE,
             measurement_to_ha=lambda x: x / 10,
@@ -92,9 +91,8 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="FlowSensor",
-            name="Flow",
             native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
-            device_class=SensorDeviceClass.WATER,  # what is the device class here ?
+            translation_key="flow",
             measurement_to_ha=lambda x: x / 10,
         ),
         entity_class=MatterSensor,
@@ -104,7 +102,6 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="HumiditySensor",
-            name="Humidity",
             native_unit_of_measurement=PERCENTAGE,
             device_class=SensorDeviceClass.HUMIDITY,
             measurement_to_ha=lambda x: x / 100,
@@ -118,7 +115,6 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="LightSensor",
-            name="Illuminance",
             native_unit_of_measurement=LIGHT_LUX,
             device_class=SensorDeviceClass.ILLUMINANCE,
             measurement_to_ha=lambda x: round(pow(10, ((x - 1) / 10000)), 1),
@@ -130,9 +126,9 @@ def _update_from_device(self) -> None:
         platform=Platform.SENSOR,
         entity_description=MatterSensorEntityDescription(
             key="PowerSource",
-            name="Battery",
             native_unit_of_measurement=PERCENTAGE,
             device_class=SensorDeviceClass.BATTERY,
+            entity_category=EntityCategory.DIAGNOSTIC,
             # value has double precision
             measurement_to_ha=lambda x: int(x / 2),
         ),
diff --git a/homeassistant/components/matter/strings.json b/homeassistant/components/matter/strings.json
index 594998c236f2df..dc5eb30df51a33 100644
--- a/homeassistant/components/matter/strings.json
+++ b/homeassistant/components/matter/strings.json
@@ -43,5 +43,12 @@
       "install_addon": "Please wait while the Matter Server add-on installation finishes. This can take several minutes.",
       "start_addon": "Please wait while the Matter Server add-on starts. This add-on is what powers Matter in Home Assistant. This may take some seconds."
     }
+  },
+  "entity": {
+    "sensor": {
+      "flow": {
+        "name": "Flow"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/matter/switch.py b/homeassistant/components/matter/switch.py
index 809d0ad73861c3..e1fb4464b83122 100644
--- a/homeassistant/components/matter/switch.py
+++ b/homeassistant/components/matter/switch.py
@@ -63,15 +63,21 @@ def _update_from_device(self) -> None:
     MatterDiscoverySchema(
         platform=Platform.SWITCH,
         entity_description=SwitchEntityDescription(
-            key="MatterPlug", device_class=SwitchDeviceClass.OUTLET
+            key="MatterPlug", device_class=SwitchDeviceClass.OUTLET, name=None
         ),
         entity_class=MatterSwitch,
         required_attributes=(clusters.OnOff.Attributes.OnOff,),
         # restrict device type to prevent discovery by the wrong platform
         not_device_type=(
-            device_types.OnOffLight,
+            device_types.ColorTemperatureLight,
             device_types.DimmableLight,
+            device_types.ExtendedColorLight,
+            device_types.OnOffLight,
             device_types.DoorLock,
+            device_types.ColorDimmerSwitch,
+            device_types.DimmerSwitch,
+            device_types.OnOffLightSwitch,
+            device_types.Thermostat,
         ),
     ),
 ]
diff --git a/homeassistant/components/mazda/button.py b/homeassistant/components/mazda/button.py
index 99a1a4ac2ff889..1b1e51db0358f6 100644
--- a/homeassistant/components/mazda/button.py
+++ b/homeassistant/components/mazda/button.py
@@ -78,21 +78,25 @@ class MazdaButtonEntityDescription(ButtonEntityDescription):
         key="start_engine",
         name="Start engine",
         icon="mdi:engine",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="stop_engine",
         name="Stop engine",
         icon="mdi:engine-off",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="turn_on_hazard_lights",
         name="Turn on hazard lights",
         icon="mdi:hazard-lights",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="turn_off_hazard_lights",
         name="Turn off hazard lights",
         icon="mdi:hazard-lights",
+        is_supported=lambda data: not data["isElectric"],
     ),
     MazdaButtonEntityDescription(
         key="refresh_vehicle_status",
diff --git a/homeassistant/components/mazda/manifest.json b/homeassistant/components/mazda/manifest.json
index 2c2aafa960e932..01f77cb2d38a4f 100644
--- a/homeassistant/components/mazda/manifest.json
+++ b/homeassistant/components/mazda/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pymazda"],
   "quality_scale": "platinum",
-  "requirements": ["pymazda==0.3.8"]
+  "requirements": ["pymazda==0.3.9"]
 }
diff --git a/homeassistant/components/meater/sensor.py b/homeassistant/components/meater/sensor.py
index 0a1240c74716ee..cf71455a81bb47 100644
--- a/homeassistant/components/meater/sensor.py
+++ b/homeassistant/components/meater/sensor.py
@@ -16,6 +16,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -63,8 +64,8 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Ambient temperature
     MeaterSensorEntityDescription(
         key="ambient",
+        translation_key="ambient",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Ambient",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         available=lambda probe: probe is not None,
@@ -73,8 +74,8 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Internal temperature (probe tip)
     MeaterSensorEntityDescription(
         key="internal",
+        translation_key="internal",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Internal",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         available=lambda probe: probe is not None,
@@ -83,7 +84,7 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Name of selected meat in user language or user given custom name
     MeaterSensorEntityDescription(
         key="cook_name",
-        name="Cooking",
+        translation_key="cook_name",
         available=lambda probe: probe is not None and probe.cook is not None,
         value=lambda probe: probe.cook.name if probe.cook else None,
     ),
@@ -91,15 +92,15 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Slightly Underdone, Finished, Slightly Overdone, OVERCOOK!. Not translated.
     MeaterSensorEntityDescription(
         key="cook_state",
-        name="Cook state",
+        translation_key="cook_state",
         available=lambda probe: probe is not None and probe.cook is not None,
         value=lambda probe: probe.cook.state if probe.cook else None,
     ),
     # Target temperature
     MeaterSensorEntityDescription(
         key="cook_target_temp",
+        translation_key="cook_target_temp",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Target",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         available=lambda probe: probe is not None and probe.cook is not None,
@@ -110,8 +111,8 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Peak temperature
     MeaterSensorEntityDescription(
         key="cook_peak_temp",
+        translation_key="cook_peak_temp",
         device_class=SensorDeviceClass.TEMPERATURE,
-        name="Peak",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         available=lambda probe: probe is not None and probe.cook is not None,
@@ -123,8 +124,8 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # Exposed as a TIMESTAMP sensor where the timestamp is current time + remaining time.
     MeaterSensorEntityDescription(
         key="cook_time_remaining",
+        translation_key="cook_time_remaining",
         device_class=SensorDeviceClass.TIMESTAMP,
-        name="Remaining time",
         available=lambda probe: probe is not None and probe.cook is not None,
         value=_remaining_time_to_timestamp,
     ),
@@ -132,8 +133,8 @@ def _remaining_time_to_timestamp(probe: MeaterProbe) -> datetime | None:
     # where the timestamp is current time - elapsed time.
     MeaterSensorEntityDescription(
         key="cook_time_elapsed",
+        translation_key="cook_time_elapsed",
         device_class=SensorDeviceClass.TIMESTAMP,
-        name="Elapsed time",
         available=lambda probe: probe is not None and probe.cook is not None,
         value=_elapsed_time_to_timestamp,
     ),
@@ -191,16 +192,15 @@ def __init__(
     ) -> None:
         """Initialise the sensor."""
         super().__init__(coordinator)
-        self._attr_name = f"Meater Probe {description.name}"
-        self._attr_device_info = {
-            "identifiers": {
+        self._attr_device_info = DeviceInfo(
+            identifiers={
                 # Serial numbers are unique identifiers within a specific domain
                 (DOMAIN, device_id)
             },
-            "manufacturer": "Apption Labs",
-            "model": "Meater Probe",
-            "name": f"Meater Probe {device_id}",
-        }
+            manufacturer="Apption Labs",
+            model="Meater Probe",
+            name=f"Meater Probe {device_id}",
+        )
         self._attr_unique_id = f"{device_id}-{description.key}"
 
         self.device_id = device_id
diff --git a/homeassistant/components/meater/strings.json b/homeassistant/components/meater/strings.json
index 7f4a97a5b19c5a..279841bb14777c 100644
--- a/homeassistant/components/meater/strings.json
+++ b/homeassistant/components/meater/strings.json
@@ -26,5 +26,33 @@
       "unknown_auth_error": "[%key:common::config_flow::error::unknown%]",
       "service_unavailable_error": "The API is currently unavailable, please try again later."
     }
+  },
+  "entity": {
+    "sensor": {
+      "ambient": {
+        "name": "Ambient temperature"
+      },
+      "internal": {
+        "name": "Internal temperature"
+      },
+      "cook_name": {
+        "name": "Cooking"
+      },
+      "cook_state": {
+        "name": "Cook state"
+      },
+      "cook_target_temp": {
+        "name": "Target temperature"
+      },
+      "cook_peak_temp": {
+        "name": "Peak temperature"
+      },
+      "cook_time_remaining": {
+        "name": "Time remaining"
+      },
+      "cook_time_elapsed": {
+        "name": "Time elapsed"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/media_extractor/__init__.py b/homeassistant/components/media_extractor/__init__.py
index a0c542d72a556b..a35650f00929e5 100644
--- a/homeassistant/components/media_extractor/__init__.py
+++ b/homeassistant/components/media_extractor/__init__.py
@@ -2,8 +2,8 @@
 import logging
 
 import voluptuous as vol
-from youtube_dl import YoutubeDL
-from youtube_dl.utils import DownloadError, ExtractorError
+from yt_dlp import YoutubeDL
+from yt_dlp.utils import DownloadError, ExtractorError
 
 from homeassistant.components.media_player import (
     ATTR_MEDIA_CONTENT_ID,
@@ -127,7 +127,7 @@ def stream_selector(query):
                 _LOGGER.error("Could not extract stream for the query: %s", query)
                 raise MEQueryException() from err
 
-            return requested_stream["url"]
+            return requested_stream["webpage_url"]
 
         return stream_selector
 
@@ -147,7 +147,7 @@ def call_media_player_service(self, stream_selector, entity_id):
         if entity_id:
             data[ATTR_ENTITY_ID] = entity_id
 
-        self.hass.async_create_task(
+        self.hass.create_task(
             self.hass.services.async_call(MEDIA_PLAYER_DOMAIN, SERVICE_PLAY_MEDIA, data)
         )
 
diff --git a/homeassistant/components/media_extractor/manifest.json b/homeassistant/components/media_extractor/manifest.json
index c358b29062a808..ccab196032f45d 100644
--- a/homeassistant/components/media_extractor/manifest.json
+++ b/homeassistant/components/media_extractor/manifest.json
@@ -5,7 +5,7 @@
   "dependencies": ["media_player"],
   "documentation": "https://www.home-assistant.io/integrations/media_extractor",
   "iot_class": "calculated",
-  "loggers": ["youtube_dl"],
+  "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["youtube_dl==2021.12.17"]
+  "requirements": ["yt-dlp==2023.3.4"]
 }
diff --git a/homeassistant/components/media_player/browse_media.py b/homeassistant/components/media_player/browse_media.py
index 2b046868f164b8..1e9be742c5316c 100644
--- a/homeassistant/components/media_player/browse_media.py
+++ b/homeassistant/components/media_player/browse_media.py
@@ -42,9 +42,8 @@ def async_process_play_media_url(
     if parsed.is_absolute():
         if not is_hass_url(hass, media_content_id):
             return media_content_id
-    else:
-        if media_content_id[0] != "/":
-            return media_content_id
+    elif media_content_id[0] != "/":
+        return media_content_id
 
     if parsed.query:
         logging.getLogger(__name__).debug(
diff --git a/homeassistant/components/media_player/device_condition.py b/homeassistant/components/media_player/device_condition.py
index 9e3981ed9833a9..5efee0c0b49464 100644
--- a/homeassistant/components/media_player/device_condition.py
+++ b/homeassistant/components/media_player/device_condition.py
@@ -39,7 +39,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -62,7 +62,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -88,8 +88,11 @@ def async_condition_from_config(
     else:  # is_playing
         state = STATE_PLAYING
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[ATTR_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        return condition.state(hass, config[ATTR_ENTITY_ID], state)
+        return condition.state(hass, entity_id, state)
 
     return test_is_state
diff --git a/homeassistant/components/media_player/device_trigger.py b/homeassistant/components/media_player/device_trigger.py
index 58fc0aca84fab9..e626059841c66f 100644
--- a/homeassistant/components/media_player/device_trigger.py
+++ b/homeassistant/components/media_player/device_trigger.py
@@ -33,7 +33,7 @@
 
 MEDIA_PLAYER_TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -66,7 +66,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/media_player/strings.json b/homeassistant/components/media_player/strings.json
index cee0ee200fe9e9..2c63a543119669 100644
--- a/homeassistant/components/media_player/strings.json
+++ b/homeassistant/components/media_player/strings.json
@@ -122,7 +122,7 @@
           "name": "Repeat",
           "state": {
             "all": "All",
-            "off": "Off",
+            "off": "[%key:common::state::off%]",
             "one": "One"
           }
         },
diff --git a/homeassistant/components/media_source/__init__.py b/homeassistant/components/media_source/__init__.py
index 21c32c9137fee4..62cf78156130ae 100644
--- a/homeassistant/components/media_source/__init__.py
+++ b/homeassistant/components/media_source/__init__.py
@@ -18,6 +18,7 @@
 )
 from homeassistant.components.websocket_api import ActiveConnection
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.frame import report
 from homeassistant.helpers.integration_platform import (
     async_process_integration_platforms,
@@ -53,6 +54,9 @@
 ]
 
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
 def is_media_source_id(media_content_id: str) -> bool:
     """Test if identifier is a media source."""
     return URI_SCHEME_REGEX.match(media_content_id) is not None
@@ -189,7 +193,7 @@ async def websocket_resolve_media(
 ) -> None:
     """Resolve media."""
     try:
-        media = await async_resolve_media(hass, msg["media_content_id"])
+        media = await async_resolve_media(hass, msg["media_content_id"], None)
     except Unresolvable as err:
         connection.send_error(msg["id"], "resolve_media_failed", str(err))
         return
diff --git a/homeassistant/components/media_source/local_source.py b/homeassistant/components/media_source/local_source.py
index c29794ae8d7b97..89437a6b2e0513 100644
--- a/homeassistant/components/media_source/local_source.py
+++ b/homeassistant/components/media_source/local_source.py
@@ -38,7 +38,7 @@ def async_setup(hass: HomeAssistant) -> None:
 class LocalSource(MediaSource):
     """Provide local directories as media sources."""
 
-    name: str = "Local Media"
+    name: str = "My media"
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize local source."""
diff --git a/homeassistant/components/melnor/__init__.py b/homeassistant/components/melnor/__init__.py
index 3cd9fee4fe7aaa..9a15e81dc22c0d 100644
--- a/homeassistant/components/melnor/__init__.py
+++ b/homeassistant/components/melnor/__init__.py
@@ -18,6 +18,7 @@
     Platform.NUMBER,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.TIME,
 ]
 
 
diff --git a/homeassistant/components/melnor/manifest.json b/homeassistant/components/melnor/manifest.json
index 4a95900aeb396f..45dce207f7e213 100644
--- a/homeassistant/components/melnor/manifest.json
+++ b/homeassistant/components/melnor/manifest.json
@@ -12,5 +12,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/melnor",
   "iot_class": "local_polling",
-  "requirements": ["melnor-bluetooth==0.0.20"]
+  "requirements": ["melnor-bluetooth==0.0.25"]
 }
diff --git a/homeassistant/components/melnor/number.py b/homeassistant/components/melnor/number.py
index c750e07f7e844b..e0f9c7d3bf67a8 100644
--- a/homeassistant/components/melnor/number.py
+++ b/homeassistant/components/melnor/number.py
@@ -8,9 +8,13 @@
 
 from melnor_bluetooth.device import Valve
 
-from homeassistant.components.number import NumberEntity, NumberEntityDescription
+from homeassistant.components.number import (
+    NumberEntity,
+    NumberEntityDescription,
+    NumberMode,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import EntityCategory
+from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -44,10 +48,33 @@ class MelnorZoneNumberEntityDescription(
         native_min_value=1,
         icon="mdi:timer-cog-outline",
         key="manual_minutes",
-        name="Manual Minutes",
+        translation_key="manual_minutes",
+        native_unit_of_measurement=UnitOfTime.MINUTES,
         set_num_fn=lambda valve, value: valve.set_manual_watering_minutes(value),
         state_fn=lambda valve: valve.manual_watering_minutes,
-    )
+    ),
+    MelnorZoneNumberEntityDescription(
+        entity_category=EntityCategory.CONFIG,
+        native_max_value=168,
+        native_min_value=1,
+        icon="mdi:calendar-refresh-outline",
+        key="frequency_interval_hours",
+        translation_key="frequency_interval_hours",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        set_num_fn=lambda valve, value: valve.set_frequency_interval_hours(value),
+        state_fn=lambda valve: valve.frequency.interval_hours,
+    ),
+    MelnorZoneNumberEntityDescription(
+        entity_category=EntityCategory.CONFIG,
+        native_max_value=360,
+        native_min_value=1,
+        icon="mdi:timer-outline",
+        key="frequency_duration_minutes",
+        translation_key="frequency_duration_minutes",
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+        set_num_fn=lambda valve, value: valve.set_frequency_duration_minutes(value),
+        state_fn=lambda valve: valve.frequency.duration_minutes,
+    ),
 ]
 
 
@@ -75,6 +102,7 @@ class MelnorZoneNumber(MelnorZoneEntity, NumberEntity):
     """A number implementation for a melnor device."""
 
     entity_description: MelnorZoneNumberEntityDescription
+    _attr_mode = NumberMode.BOX
 
     def __init__(
         self,
@@ -88,7 +116,7 @@ def __init__(
     @property
     def native_value(self) -> float | None:
         """Return the current value."""
-        return self._valve.manual_watering_minutes
+        return self.entity_description.state_fn(self._valve)
 
     async def async_set_native_value(self, value: float) -> None:
         """Update the current value."""
diff --git a/homeassistant/components/melnor/sensor.py b/homeassistant/components/melnor/sensor.py
index 1061d084ad1bd0..edb906cc80f41e 100644
--- a/homeassistant/components/melnor/sensor.py
+++ b/homeassistant/components/melnor/sensor.py
@@ -45,6 +45,15 @@ def watering_seconds_left(valve: Valve) -> datetime | None:
     return dt_util.utc_from_timestamp(valve.watering_end_time)
 
 
+def next_cycle(valve: Valve) -> datetime | None:
+    """Return the value of the next_cycle date, only if the cycle is enabled."""
+
+    if valve.schedule_enabled is True:
+        return valve.next_cycle
+
+    return None
+
+
 @dataclass
 class MelnorSensorEntityDescriptionMixin:
     """Mixin for required keys."""
@@ -78,7 +87,6 @@ class MelnorSensorEntityDescription(
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         key="battery",
-        name="Battery",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         state_fn=lambda device: device.battery_level,
@@ -88,7 +96,7 @@ class MelnorSensorEntityDescription(
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         key="rssi",
-        name="RSSI",
+        translation_key="rssi",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         state_class=SensorStateClass.MEASUREMENT,
         state_fn=lambda device: device.rssi,
@@ -99,9 +107,15 @@ class MelnorSensorEntityDescription(
     MelnorZoneSensorEntityDescription(
         device_class=SensorDeviceClass.TIMESTAMP,
         key="manual_cycle_end",
-        name="Manual Cycle End",
+        translation_key="manual_cycle_end",
         state_fn=watering_seconds_left,
     ),
+    MelnorZoneSensorEntityDescription(
+        device_class=SensorDeviceClass.TIMESTAMP,
+        key="next_cycle",
+        translation_key="next_cycle",
+        state_fn=next_cycle,
+    ),
 ]
 
 
diff --git a/homeassistant/components/melnor/strings.json b/homeassistant/components/melnor/strings.json
index 2fefa32b6bc1f2..51ca18b0b3d1c0 100644
--- a/homeassistant/components/melnor/strings.json
+++ b/homeassistant/components/melnor/strings.json
@@ -10,5 +10,39 @@
         "title": "Discovered Melnor Bluetooth valve"
       }
     }
+  },
+  "entity": {
+    "number": {
+      "manual_minutes": {
+        "name": "Manual duration"
+      },
+      "frequency_interval_hours": {
+        "name": "Schedule interval"
+      },
+      "frequency_duration_minutes": {
+        "name": "Schedule duration"
+      }
+    },
+    "sensor": {
+      "rssi": {
+        "name": "RSSI"
+      },
+      "manual_cycle_end": {
+        "name": "Manual cycle end"
+      },
+      "next_cycle": {
+        "name": "Next cycle"
+      }
+    },
+    "switch": {
+      "frequency": {
+        "name": "Schedule"
+      }
+    },
+    "time": {
+      "frequency_start_time": {
+        "name": "Schedule start time"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/melnor/switch.py b/homeassistant/components/melnor/switch.py
index eca6f1a98cfbba..03bd28faa9d98e 100644
--- a/homeassistant/components/melnor/switch.py
+++ b/homeassistant/components/melnor/switch.py
@@ -45,9 +45,18 @@ class MelnorSwitchEntityDescription(
         device_class=SwitchDeviceClass.SWITCH,
         icon="mdi:sprinkler",
         key="manual",
+        name=None,
         on_off_fn=lambda valve, bool: valve.set_is_watering(bool),
         state_fn=lambda valve: valve.is_watering,
-    )
+    ),
+    MelnorSwitchEntityDescription(
+        device_class=SwitchDeviceClass.SWITCH,
+        icon="mdi:calendar-sync-outline",
+        key="frequency",
+        translation_key="frequency",
+        on_off_fn=lambda valve, bool: valve.set_frequency_enabled(bool),
+        state_fn=lambda valve: valve.schedule_enabled,
+    ),
 ]
 
 
diff --git a/homeassistant/components/melnor/time.py b/homeassistant/components/melnor/time.py
new file mode 100644
index 00000000000000..943a7996aeb250
--- /dev/null
+++ b/homeassistant/components/melnor/time.py
@@ -0,0 +1,91 @@
+"""Number support for Melnor Bluetooth water timer."""
+
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+from datetime import time
+from typing import Any
+
+from melnor_bluetooth.device import Valve
+
+from homeassistant.components.time import TimeEntity, TimeEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .models import (
+    MelnorDataUpdateCoordinator,
+    MelnorZoneEntity,
+    get_entities_for_valves,
+)
+
+
+@dataclass
+class MelnorZoneTimeEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    set_time_fn: Callable[[Valve, time], Coroutine[Any, Any, None]]
+    state_fn: Callable[[Valve], Any]
+
+
+@dataclass
+class MelnorZoneTimeEntityDescription(
+    TimeEntityDescription, MelnorZoneTimeEntityDescriptionMixin
+):
+    """Describes Melnor number entity."""
+
+
+ZONE_ENTITY_DESCRIPTIONS: list[MelnorZoneTimeEntityDescription] = [
+    MelnorZoneTimeEntityDescription(
+        entity_category=EntityCategory.CONFIG,
+        key="frequency_start_time",
+        translation_key="frequency_start_time",
+        set_time_fn=lambda valve, value: valve.set_frequency_start_time(value),
+        state_fn=lambda valve: valve.frequency.start_time,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the number platform."""
+
+    coordinator: MelnorDataUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities(
+        get_entities_for_valves(
+            coordinator,
+            ZONE_ENTITY_DESCRIPTIONS,
+            lambda valve, description: MelnorZoneTime(coordinator, description, valve),
+        )
+    )
+
+
+class MelnorZoneTime(MelnorZoneEntity, TimeEntity):
+    """A time implementation for a melnor device."""
+
+    entity_description: MelnorZoneTimeEntityDescription
+
+    def __init__(
+        self,
+        coordinator: MelnorDataUpdateCoordinator,
+        entity_description: MelnorZoneTimeEntityDescription,
+        valve: Valve,
+    ) -> None:
+        """Initialize a number for a melnor device."""
+        super().__init__(coordinator, entity_description, valve)
+
+    @property
+    def native_value(self) -> time | None:
+        """Return the current value."""
+        return self.entity_description.state_fn(self._valve)
+
+    async def async_set_value(self, value: time) -> None:
+        """Update the current value."""
+        await self.entity_description.set_time_fn(self._valve, value)
diff --git a/homeassistant/components/met/__init__.py b/homeassistant/components/met/__init__.py
index c676f15336eca2..32b095230d90f2 100644
--- a/homeassistant/components/met/__init__.py
+++ b/homeassistant/components/met/__init__.py
@@ -179,6 +179,6 @@ async def fetch_data(self) -> Self:
             raise CannotConnect()
         self.current_weather_data = self._weather_data.get_current_weather()
         time_zone = dt_util.DEFAULT_TIME_ZONE
-        self.daily_forecast = self._weather_data.get_forecast(time_zone, False)
+        self.daily_forecast = self._weather_data.get_forecast(time_zone, False, 0)
         self.hourly_forecast = self._weather_data.get_forecast(time_zone, True)
         return self
diff --git a/homeassistant/components/met/const.py b/homeassistant/components/met/const.py
index 5b2a756847e805..dcc493570ba2ec 100644
--- a/homeassistant/components/met/const.py
+++ b/homeassistant/components/met/const.py
@@ -10,19 +10,24 @@
     ATTR_CONDITION_SNOWY,
     ATTR_CONDITION_SNOWY_RAINY,
     ATTR_CONDITION_SUNNY,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_WEATHER_CLOUD_COVERAGE,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     DOMAIN as WEATHER_DOMAIN,
 )
@@ -180,6 +185,9 @@
     ATTR_FORECAST_TIME: "datetime",
     ATTR_FORECAST_WIND_BEARING: "wind_bearing",
     ATTR_FORECAST_NATIVE_WIND_SPEED: "wind_speed",
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: "wind_gust",
+    ATTR_FORECAST_CLOUD_COVERAGE: "cloudiness",
+    ATTR_FORECAST_HUMIDITY: "humidity",
 }
 
 ATTR_MAP = {
@@ -189,4 +197,6 @@
     ATTR_WEATHER_VISIBILITY: "visibility",
     ATTR_WEATHER_WIND_BEARING: "wind_bearing",
     ATTR_WEATHER_WIND_SPEED: "wind_speed",
+    ATTR_WEATHER_WIND_GUST_SPEED: "wind_gust",
+    ATTR_WEATHER_CLOUD_COVERAGE: "cloudiness",
 }
diff --git a/homeassistant/components/met/manifest.json b/homeassistant/components/met/manifest.json
index 5e00e13b808e1e..5c476b10665202 100644
--- a/homeassistant/components/met/manifest.json
+++ b/homeassistant/components/met/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/met",
   "iot_class": "cloud_polling",
   "loggers": ["metno"],
-  "requirements": ["pyMetno==0.9.0"]
+  "requirements": ["PyMetno==0.10.0"]
 }
diff --git a/homeassistant/components/met/weather.py b/homeassistant/components/met/weather.py
index a6dcb23cc475c6..20822dc99732ae 100644
--- a/homeassistant/components/met/weather.py
+++ b/homeassistant/components/met/weather.py
@@ -7,10 +7,12 @@
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_TIME,
+    ATTR_WEATHER_CLOUD_COVERAGE,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     Forecast,
     WeatherEntity,
@@ -174,6 +176,20 @@ def wind_bearing(self) -> float | str | None:
             ATTR_MAP[ATTR_WEATHER_WIND_BEARING]
         )
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed in native units."""
+        return self.coordinator.data.current_weather_data.get(
+            ATTR_MAP[ATTR_WEATHER_WIND_GUST_SPEED]
+        )
+
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage."""
+        return self.coordinator.data.current_weather_data.get(
+            ATTR_MAP[ATTR_WEATHER_CLOUD_COVERAGE]
+        )
+
     @property
     def forecast(self) -> list[Forecast] | None:
         """Return the forecast array."""
@@ -202,7 +218,7 @@ def forecast(self) -> list[Forecast] | None:
     def device_info(self) -> DeviceInfo:
         """Device info."""
         return DeviceInfo(
-            default_name="Forecast",
+            name="Forecast",
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN,)},  # type: ignore[arg-type]
             manufacturer="Met.no",
diff --git a/homeassistant/components/met_eireann/manifest.json b/homeassistant/components/met_eireann/manifest.json
index 1e05787158adc9..72afc6977dd978 100644
--- a/homeassistant/components/met_eireann/manifest.json
+++ b/homeassistant/components/met_eireann/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/met_eireann",
   "iot_class": "cloud_polling",
   "loggers": ["meteireann"],
-  "requirements": ["pyMetEireann==2021.8.0"]
+  "requirements": ["PyMetEireann==2021.8.0"]
 }
diff --git a/homeassistant/components/met_eireann/weather.py b/homeassistant/components/met_eireann/weather.py
index cce35731c728d1..bf0d7214c6efc1 100644
--- a/homeassistant/components/met_eireann/weather.py
+++ b/homeassistant/components/met_eireann/weather.py
@@ -159,7 +159,7 @@ def forecast(self):
     def device_info(self):
         """Device info."""
         return DeviceInfo(
-            default_name="Forecast",
+            name="Forecast",
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN,)},
             manufacturer="Met Éireann",
diff --git a/homeassistant/components/meteo_france/__init__.py b/homeassistant/components/meteo_france/__init__.py
index 3b82399f217477..ccd237628507cd 100644
--- a/homeassistant/components/meteo_france/__init__.py
+++ b/homeassistant/components/meteo_france/__init__.py
@@ -133,10 +133,8 @@ async def _async_update_data_alert():
 
             await coordinator_alert.async_refresh()
 
-            if not coordinator_alert.last_update_success:
-                raise ConfigEntryNotReady
-
-            hass.data[DOMAIN][department] = True
+            if coordinator_alert.last_update_success:
+                hass.data[DOMAIN][department] = True
         else:
             _LOGGER.warning(
                 (
@@ -158,11 +156,12 @@ async def _async_update_data_alert():
     undo_listener = entry.add_update_listener(_async_update_listener)
 
     hass.data[DOMAIN][entry.entry_id] = {
+        UNDO_UPDATE_LISTENER: undo_listener,
         COORDINATOR_FORECAST: coordinator_forecast,
         COORDINATOR_RAIN: coordinator_rain,
-        COORDINATOR_ALERT: coordinator_alert,
-        UNDO_UPDATE_LISTENER: undo_listener,
     }
+    if coordinator_alert and coordinator_alert.last_update_success:
+        hass.data[DOMAIN][entry.entry_id][COORDINATOR_ALERT] = coordinator_alert
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py
index c87aea052604d6..8c27f2970a3f27 100644
--- a/homeassistant/components/meteo_france/sensor.py
+++ b/homeassistant/components/meteo_france/sensor.py
@@ -247,11 +247,7 @@ def __init__(
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
-        assert (
-            self.platform
-            and self.platform.config_entry
-            and self.platform.config_entry.unique_id
-        )
+        assert self.platform.config_entry and self.platform.config_entry.unique_id
         return DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.platform.config_entry.unique_id)},
@@ -275,11 +271,10 @@ def native_value(self):
                 value = data[0][path[1]]
 
         # General case
+        elif len(path) == 3:
+            value = data[path[1]][path[2]]
         else:
-            if len(path) == 3:
-                value = data[path[1]][path[2]]
-            else:
-                value = data[path[1]]
+            value = data[path[1]]
 
         if self.entity_description.key in ("wind_speed", "wind_gust"):
             # convert API wind speed from m/s to km/h
diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py
index e1a530eef97d00..7709ba0a63880d 100644
--- a/homeassistant/components/meteo_france/weather.py
+++ b/homeassistant/components/meteo_france/weather.py
@@ -109,11 +109,7 @@ def name(self):
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
-        assert (
-            self.platform
-            and self.platform.config_entry
-            and self.platform.config_entry.unique_id
-        )
+        assert self.platform.config_entry and self.platform.config_entry.unique_id
         return DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.platform.config_entry.unique_id)},
diff --git a/homeassistant/components/microsoft/tts.py b/homeassistant/components/microsoft/tts.py
index 7deb8f27c68df0..9bcd7f533f8f9d 100644
--- a/homeassistant/components/microsoft/tts.py
+++ b/homeassistant/components/microsoft/tts.py
@@ -1,12 +1,13 @@
 """Support for the Microsoft Cognitive Services text-to-speech service."""
-from http.client import HTTPException
 import logging
 
 from pycsspeechtts import pycsspeechtts
+from requests.exceptions import HTTPError
 import voluptuous as vol
 
 from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider
 from homeassistant.const import CONF_API_KEY, CONF_REGION, CONF_TYPE, PERCENTAGE
+from homeassistant.generated.microsoft_tts import SUPPORTED_LANGUAGES
 import homeassistant.helpers.config_validation as cv
 
 CONF_GENDER = "gender"
@@ -17,80 +18,6 @@
 CONF_CONTOUR = "contour"
 _LOGGER = logging.getLogger(__name__)
 
-SUPPORTED_LANGUAGES = [
-    "ar-eg",
-    "ar-sa",
-    "bg-bg",
-    "ca-es",
-    "cs-cz",
-    "cy-gb",
-    "da-dk",
-    "de-at",
-    "de-ch",
-    "de-de",
-    "el-gr",
-    "en-au",
-    "en-ca",
-    "en-gb",
-    "en-hk",
-    "en-ie",
-    "en-in",
-    "en-nz",
-    "en-ph",
-    "en-sg",
-    "en-us",
-    "en-za",
-    "es-ar",
-    "es-co",
-    "es-es",
-    "es-mx",
-    "es-us",
-    "et-ee",
-    "fi-fi",
-    "fr-be",
-    "fr-ca",
-    "fr-ch",
-    "fr-fr",
-    "ga-ie",
-    "gu-in",
-    "he-il",
-    "hi-in",
-    "hr-hr",
-    "hu-hu",
-    "id-id",
-    "is-is",
-    "it-it",
-    "ja-jp",
-    "ko-kr",
-    "lt-lt",
-    "lv-lv",
-    "mr-in",
-    "ms-my",
-    "mt-mt",
-    "nb-no",
-    "nl-be",
-    "nl-nl",
-    "pl-pl",
-    "pt-br",
-    "pt-pt",
-    "ro-ro",
-    "ru-ru",
-    "sk-sk",
-    "sl-si",
-    "sv-se",
-    "sw-ke",
-    "ta-in",
-    "te-in",
-    "th-th",
-    "tr-tr",
-    "uk-ua",
-    "ur-pk",
-    "vi-vn",
-    "zh-cn",
-    "zh-hk",
-    "zh-tw",
-]
-
 GENDERS = ["Female", "Male"]
 
 DEFAULT_LANG = "en-us"
@@ -176,7 +103,7 @@ def default_options(self):
         """Return a dict include default options."""
         return {CONF_GENDER: self._gender, CONF_TYPE: self._type}
 
-    def get_tts_audio(self, message, language, options=None):
+    def get_tts_audio(self, message, language, options):
         """Load TTS from Microsoft."""
         if language is None:
             language = self._lang
@@ -194,7 +121,7 @@ def get_tts_audio(self, message, language, options=None):
                 contour=self._contour,
                 text=message,
             )
-        except HTTPException as ex:
+        except HTTPError as ex:
             _LOGGER.error("Error occurred for Microsoft TTS: %s", ex)
             return (None, None)
         return ("mp3", data)
diff --git a/homeassistant/components/microsoft_face/__init__.py b/homeassistant/components/microsoft_face/__init__.py
index 82a9accac59444..f57a9146858559 100644
--- a/homeassistant/components/microsoft_face/__init__.py
+++ b/homeassistant/components/microsoft_face/__init__.py
@@ -17,6 +17,7 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import slugify
 
@@ -73,12 +74,16 @@
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up Microsoft Face."""
+    component = EntityComponent[MicrosoftFaceGroupEntity](
+        logging.getLogger(__name__), DOMAIN, hass
+    )
     entities: dict[str, MicrosoftFaceGroupEntity] = {}
     face = MicrosoftFace(
         hass,
         config[DOMAIN].get(CONF_AZURE_REGION),
         config[DOMAIN].get(CONF_API_KEY),
         config[DOMAIN].get(CONF_TIMEOUT),
+        component,
         entities,
     )
 
@@ -99,9 +104,12 @@ async def async_create_group(service: ServiceCall) -> None:
         try:
             await face.call_api("put", f"persongroups/{g_id}", {"name": name})
             face.store[g_id] = {}
+            old_entity = entities.pop(g_id, None)
+            if old_entity:
+                await component.async_remove_entity(old_entity.entity_id)
 
             entities[g_id] = MicrosoftFaceGroupEntity(hass, face, g_id, name)
-            entities[g_id].async_write_ha_state()
+            await component.async_add_entities([entities[g_id]])
         except HomeAssistantError as err:
             _LOGGER.error("Can't create group '%s' with error: %s", g_id, err)
 
@@ -118,7 +126,7 @@ async def async_delete_group(service: ServiceCall) -> None:
             face.store.pop(g_id)
 
             entity = entities.pop(g_id)
-            hass.states.async_remove(entity.entity_id, service.context)
+            await component.async_remove_entity(entity.entity_id)
         except HomeAssistantError as err:
             _LOGGER.error("Can't delete group '%s' with error: %s", g_id, err)
 
@@ -244,7 +252,7 @@ def extra_state_attributes(self):
 class MicrosoftFace:
     """Microsoft Face api for Home Assistant."""
 
-    def __init__(self, hass, server_loc, api_key, timeout, entities):
+    def __init__(self, hass, server_loc, api_key, timeout, component, entities):
         """Initialize Microsoft Face api."""
         self.hass = hass
         self.websession = async_get_clientsession(hass)
@@ -252,6 +260,7 @@ def __init__(self, hass, server_loc, api_key, timeout, entities):
         self._api_key = api_key
         self._server_url = f"https://{server_loc}.{FACE_API_URL}"
         self._store = {}
+        self._component: EntityComponent[MicrosoftFaceGroupEntity] = component
         self._entities = entities
 
     @property
@@ -263,25 +272,30 @@ async def update_store(self):
         """Load all group/person data into local store."""
         groups = await self.call_api("get", "persongroups")
 
-        tasks = []
+        remove_tasks = []
+        new_entities = []
         for group in groups:
             g_id = group["personGroupId"]
             self._store[g_id] = {}
+            old_entity = self._entities.pop(g_id, None)
+            if old_entity:
+                remove_tasks.append(
+                    self._component.async_remove_entity(old_entity.entity_id)
+                )
+
             self._entities[g_id] = MicrosoftFaceGroupEntity(
                 self.hass, self, g_id, group["name"]
             )
+            new_entities.append(self._entities[g_id])
 
             persons = await self.call_api("get", f"persongroups/{g_id}/persons")
 
             for person in persons:
                 self._store[g_id][person["name"]] = person["personId"]
 
-            tasks.append(
-                asyncio.create_task(self._entities[g_id].async_update_ha_state())
-            )
-
-        if tasks:
-            await asyncio.wait(tasks)
+        if remove_tasks:
+            await asyncio.gather(remove_tasks)
+        await self._component.async_add_entities(new_entities)
 
     async def call_api(self, method, function, data=None, binary=False, params=None):
         """Make an api call."""
diff --git a/homeassistant/components/mill/climate.py b/homeassistant/components/mill/climate.py
index 42b759b3cdf3aa..f1487ed59f1cdb 100644
--- a/homeassistant/components/mill/climate.py
+++ b/homeassistant/components/mill/climate.py
@@ -91,8 +91,10 @@ class MillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
     """Representation of a Mill Thermostat device."""
 
     _attr_fan_modes = [FAN_ON, FAN_OFF]
+    _attr_has_entity_name = True
     _attr_max_temp = MAX_TEMP
     _attr_min_temp = MIN_TEMP
+    _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     def __init__(
@@ -106,12 +108,11 @@ def __init__(
 
         self._id = heater.device_id
         self._attr_unique_id = heater.device_id
-        self._attr_name = heater.name
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, heater.device_id)},
             manufacturer=MANUFACTURER,
             model=f"Generation {heater.generation}",
-            name=self.name,
+            name=heater.name,
         )
         if heater.is_gen1:
             self._attr_hvac_modes = [HVACMode.HEAT]
@@ -202,10 +203,12 @@ def _update_attr(self, heater):
 class LocalMillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntity):
     """Representation of a Mill Thermostat device."""
 
+    _attr_has_entity_name = True
     _attr_hvac_mode = HVACMode.HEAT
     _attr_hvac_modes = [HVACMode.HEAT]
     _attr_max_temp = MAX_TEMP
     _attr_min_temp = MIN_TEMP
+    _attr_name = None
     _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
     _attr_target_temperature_step = PRECISION_HALVES
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
@@ -213,7 +216,6 @@ class LocalMillHeater(CoordinatorEntity[MillDataUpdateCoordinator], ClimateEntit
     def __init__(self, coordinator: MillDataUpdateCoordinator) -> None:
         """Initialize the thermostat."""
         super().__init__(coordinator)
-        self._attr_name = coordinator.mill_data_connection.name
         if mac := coordinator.mill_data_connection.mac_address:
             self._attr_unique_id = mac
             self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/minecraft_server/__init__.py b/homeassistant/components/minecraft_server/__init__.py
index dad8ebe7f11502..801b27ee9716f2 100644
--- a/homeassistant/components/minecraft_server/__init__.py
+++ b/homeassistant/components/minecraft_server/__init__.py
@@ -237,7 +237,6 @@ def __init__(
     ) -> None:
         """Initialize base entity."""
         self._server = server
-        self._attr_name = type_name
         self._attr_icon = icon
         self._attr_unique_id = f"{self._server.unique_id}-{type_name}"
         self._attr_device_info = DeviceInfo(
diff --git a/homeassistant/components/minecraft_server/binary_sensor.py b/homeassistant/components/minecraft_server/binary_sensor.py
index 0bf4cdab859057..ecf7d747770345 100644
--- a/homeassistant/components/minecraft_server/binary_sensor.py
+++ b/homeassistant/components/minecraft_server/binary_sensor.py
@@ -29,6 +29,8 @@ async def async_setup_entry(
 class MinecraftServerStatusBinarySensor(MinecraftServerEntity, BinarySensorEntity):
     """Representation of a Minecraft Server status binary sensor."""
 
+    _attr_translation_key = "status"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize status binary sensor."""
         super().__init__(
diff --git a/homeassistant/components/minecraft_server/sensor.py b/homeassistant/components/minecraft_server/sensor.py
index 2499dd8b75b523..5d056d98dd117a 100644
--- a/homeassistant/components/minecraft_server/sensor.py
+++ b/homeassistant/components/minecraft_server/sensor.py
@@ -74,6 +74,8 @@ def available(self) -> bool:
 class MinecraftServerVersionSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server version sensor."""
 
+    _attr_translation_key = "version"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize version sensor."""
         super().__init__(server=server, type_name=NAME_VERSION, icon=ICON_VERSION)
@@ -86,6 +88,8 @@ async def async_update(self) -> None:
 class MinecraftServerProtocolVersionSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server protocol version sensor."""
 
+    _attr_translation_key = "protocol_version"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize protocol version sensor."""
         super().__init__(
@@ -102,6 +106,8 @@ async def async_update(self) -> None:
 class MinecraftServerLatencyTimeSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server latency time sensor."""
 
+    _attr_translation_key = "latency"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize latency time sensor."""
         super().__init__(
@@ -119,6 +125,8 @@ async def async_update(self) -> None:
 class MinecraftServerPlayersOnlineSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server online players sensor."""
 
+    _attr_translation_key = "players_online"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize online players sensor."""
         super().__init__(
@@ -144,6 +152,8 @@ async def async_update(self) -> None:
 class MinecraftServerPlayersMaxSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server maximum number of players sensor."""
 
+    _attr_translation_key = "players_max"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize maximum number of players sensor."""
         super().__init__(
@@ -161,6 +171,8 @@ async def async_update(self) -> None:
 class MinecraftServerMOTDSensor(MinecraftServerSensorEntity):
     """Representation of a Minecraft Server MOTD sensor."""
 
+    _attr_translation_key = "motd"
+
     def __init__(self, server: MinecraftServer) -> None:
         """Initialize MOTD sensor."""
         super().__init__(
diff --git a/homeassistant/components/minecraft_server/strings.json b/homeassistant/components/minecraft_server/strings.json
index 9e546a3cdfa171..b4d68bc611744d 100644
--- a/homeassistant/components/minecraft_server/strings.json
+++ b/homeassistant/components/minecraft_server/strings.json
@@ -18,5 +18,32 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "status": {
+        "name": "Status"
+      }
+    },
+    "sensor": {
+      "version": {
+        "name": "Version"
+      },
+      "protocol_version": {
+        "name": "Protocol version"
+      },
+      "latency": {
+        "name": "Latency"
+      },
+      "players_online": {
+        "name": "Players online"
+      },
+      "players_max": {
+        "name": "Players max"
+      },
+      "motd": {
+        "name": "World message"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/mjpeg/__init__.py b/homeassistant/components/mjpeg/__init__.py
index 605c8b6c9d51e9..a5bfc49edf6592 100644
--- a/homeassistant/components/mjpeg/__init__.py
+++ b/homeassistant/components/mjpeg/__init__.py
@@ -2,10 +2,11 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .camera import MjpegCamera
-from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, PLATFORMS
+from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, DOMAIN, PLATFORMS
 from .util import filter_urllib3_logging
 
 __all__ = [
@@ -15,8 +16,10 @@
     "filter_urllib3_logging",
 ]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the MJPEG IP Camera integration."""
     filter_urllib3_logging()
     return True
diff --git a/homeassistant/components/mjpeg/camera.py b/homeassistant/components/mjpeg/camera.py
index 27f5c7a1411ecc..c2ab3b5768cfc7 100644
--- a/homeassistant/components/mjpeg/camera.py
+++ b/homeassistant/components/mjpeg/camera.py
@@ -2,14 +2,13 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Iterable
-from contextlib import closing
+from collections.abc import AsyncIterator
+from contextlib import suppress
 
 import aiohttp
 from aiohttp import web
 import async_timeout
-import requests
-from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+import httpx
 from yarl import URL
 
 from homeassistant.components.camera import Camera
@@ -29,9 +28,13 @@
 )
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, DOMAIN, LOGGER
 
+TIMEOUT = 10
+BUFFER_SIZE = 102400
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -59,11 +62,11 @@ async def async_setup_entry(
     )
 
 
-def extract_image_from_mjpeg(stream: Iterable[bytes]) -> bytes | None:
+async def async_extract_image_from_mjpeg(stream: AsyncIterator[bytes]) -> bytes | None:
     """Take in a MJPEG stream object, return the jpg from it."""
     data = b""
 
-    for chunk in stream:
+    async for chunk in stream:
         data += chunk
         jpg_end = data.find(b"\xff\xd9")
 
@@ -137,12 +140,11 @@ async def async_camera_image(
             self._authentication == HTTP_DIGEST_AUTHENTICATION
             or self._still_image_url is None
         ):
-            image = await self.hass.async_add_executor_job(self.camera_image)
-            return image
+            return await self._async_digest_camera_image()
 
         websession = async_get_clientsession(self.hass, verify_ssl=self._verify_ssl)
         try:
-            async with async_timeout.timeout(10):
+            async with async_timeout.timeout(TIMEOUT):
                 response = await websession.get(self._still_image_url, auth=self._auth)
 
                 image = await response.read()
@@ -156,37 +158,65 @@ async def async_camera_image(
 
         return None
 
-    def camera_image(
-        self, width: int | None = None, height: int | None = None
-    ) -> bytes | None:
-        """Return a still image response from the camera."""
-        if self._username and self._password:
-            if self._authentication == HTTP_DIGEST_AUTHENTICATION:
-                auth: HTTPDigestAuth | HTTPBasicAuth = HTTPDigestAuth(
-                    self._username, self._password
+    def _get_digest_auth(self) -> httpx.DigestAuth:
+        """Return a DigestAuth object."""
+        username = "" if self._username is None else self._username
+        return httpx.DigestAuth(username, self._password)
+
+    async def _async_digest_camera_image(self) -> bytes | None:
+        """Return a still image response from the camera using digest authentication."""
+        client = get_async_client(self.hass, verify_ssl=self._verify_ssl)
+        auth = self._get_digest_auth()
+        try:
+            if self._still_image_url:
+                # Fallback to MJPEG stream if still image URL is not available
+                with suppress(asyncio.TimeoutError, httpx.HTTPError):
+                    return (
+                        await client.get(
+                            self._still_image_url, auth=auth, timeout=TIMEOUT
+                        )
+                    ).content
+
+            async with client.stream(
+                "get", self._mjpeg_url, auth=auth, timeout=TIMEOUT
+            ) as stream:
+                return await async_extract_image_from_mjpeg(
+                    stream.aiter_bytes(BUFFER_SIZE)
                 )
-            else:
-                auth = HTTPBasicAuth(self._username, self._password)
-            req = requests.get(
-                self._mjpeg_url,
-                auth=auth,
-                stream=True,
-                timeout=10,
-                verify=self._verify_ssl,
-            )
-        else:
-            req = requests.get(self._mjpeg_url, stream=True, timeout=10)
 
-        with closing(req) as response:
-            return extract_image_from_mjpeg(response.iter_content(102400))
+        except asyncio.TimeoutError:
+            LOGGER.error("Timeout getting camera image from %s", self.name)
+
+        except httpx.HTTPError as err:
+            LOGGER.error("Error getting new camera image from %s: %s", self.name, err)
+
+        return None
+
+    async def _handle_async_mjpeg_digest_stream(
+        self, request: web.Request
+    ) -> web.StreamResponse | None:
+        """Generate an HTTP MJPEG stream from the camera using digest authentication."""
+        async with get_async_client(self.hass, verify_ssl=self._verify_ssl).stream(
+            "get", self._mjpeg_url, auth=self._get_digest_auth(), timeout=TIMEOUT
+        ) as stream:
+            response = web.StreamResponse(headers=stream.headers)
+            await response.prepare(request)
+            # Stream until we are done or client disconnects
+            with suppress(asyncio.TimeoutError, httpx.HTTPError):
+                async for chunk in stream.aiter_bytes(BUFFER_SIZE):
+                    if not self.hass.is_running:
+                        break
+                    async with async_timeout.timeout(TIMEOUT):
+                        await response.write(chunk)
+        return response
 
     async def handle_async_mjpeg_stream(
         self, request: web.Request
     ) -> web.StreamResponse | None:
         """Generate an HTTP MJPEG stream from the camera."""
-        # aiohttp don't support DigestAuth -> Fallback
+        # aiohttp don't support DigestAuth so we use httpx
         if self._authentication == HTTP_DIGEST_AUTHENTICATION:
-            return await super().handle_async_mjpeg_stream(request)
+            return await self._handle_async_mjpeg_digest_stream(request)
 
         # connect to stream
         websession = async_get_clientsession(self.hass, verify_ssl=self._verify_ssl)
diff --git a/homeassistant/components/mobile_app/__init__.py b/homeassistant/components/mobile_app/__init__.py
index 70c23da66e23fc..3d33af38761797 100644
--- a/homeassistant/components/mobile_app/__init__.py
+++ b/homeassistant/components/mobile_app/__init__.py
@@ -10,7 +10,11 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_DEVICE_ID, CONF_WEBHOOK_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, discovery
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    discovery,
+)
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 
@@ -36,6 +40,8 @@
 
 PLATFORMS = [Platform.SENSOR, Platform.BINARY_SENSOR, Platform.DEVICE_TRACKER]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the mobile app component."""
diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py
index f78e3ef9d318d3..43f43585775c55 100644
--- a/homeassistant/components/modbus/binary_sensor.py
+++ b/homeassistant/components/modbus/binary_sensor.py
@@ -14,7 +14,6 @@
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -74,11 +73,6 @@ async def async_setup_slaves(
         # this ensures that idx = bit position of value in result
         # polling is done with the base class
         name = self._attr_name if self._attr_name else "modbus_sensor"
-
-        # DataUpdateCoordinator does not support DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME in _attr_name.
-        assert name is not DEVICE_CLASS_NAME
         self._coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
@@ -121,7 +115,10 @@ async def async_update(self, now: datetime | None = None) -> None:
                 self._result = result.bits
             else:
                 self._result = result.registers
-            self._attr_is_on = bool(self._result[0] & 1)
+            if len(self._result) >= 1:
+                self._attr_is_on = bool(self._result[0] & 1)
+            else:
+                self._attr_available = False
 
         self.async_write_ha_state()
         if self._coordinator:
diff --git a/homeassistant/components/modbus/manifest.json b/homeassistant/components/modbus/manifest.json
index bb64a264248a21..c2e6b9ef467b7f 100644
--- a/homeassistant/components/modbus/manifest.json
+++ b/homeassistant/components/modbus/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pymodbus"],
   "quality_scale": "gold",
-  "requirements": ["pymodbus==3.1.3"]
+  "requirements": ["pymodbus==3.3.1"]
 }
diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py
index 7c1c3b0a7913dd..ca8246577fd4e3 100644
--- a/homeassistant/components/modbus/sensor.py
+++ b/homeassistant/components/modbus/sensor.py
@@ -17,7 +17,6 @@
     CONF_UNIT_OF_MEASUREMENT,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import (
@@ -80,11 +79,6 @@ async def async_setup_slaves(
         # this ensures that idx = bit position of value in result
         # polling is done with the base class
         name = self._attr_name if self._attr_name else "modbus_sensor"
-
-        # DataUpdateCoordinator does not support DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME in _attr_name.
-        assert name is not DEVICE_CLASS_NAME
         self._coordinator = DataUpdateCoordinator(
             hass,
             _LOGGER,
diff --git a/homeassistant/components/modem_callerid/config_flow.py b/homeassistant/components/modem_callerid/config_flow.py
index 537fe81da11339..fac20073fe939a 100644
--- a/homeassistant/components/modem_callerid/config_flow.py
+++ b/homeassistant/components/modem_callerid/config_flow.py
@@ -32,9 +32,7 @@ def __init__(self) -> None:
 
     async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult:
         """Handle USB Discovery."""
-        device = discovery_info.device
-
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
         unique_id = f"{discovery_info.vid}:{discovery_info.pid}_{discovery_info.serial_number}_{discovery_info.manufacturer}_{discovery_info.description}"
         if (
             await self.validate_device_errors(dev_path=dev_path, unique_id=unique_id)
diff --git a/homeassistant/components/modem_callerid/manifest.json b/homeassistant/components/modem_callerid/manifest.json
index 1ff348fb3b7b5d..34e5be431556e9 100644
--- a/homeassistant/components/modem_callerid/manifest.json
+++ b/homeassistant/components/modem_callerid/manifest.json
@@ -8,7 +8,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["phone_modem"],
-  "requirements": ["phone_modem==0.1.1"],
+  "requirements": ["phone-modem==0.1.1"],
   "usb": [
     {
       "vid": "0572",
diff --git a/homeassistant/components/moehlenhoff_alpha2/button.py b/homeassistant/components/moehlenhoff_alpha2/button.py
index 44dbd08ffcdf5f..c637909417c922 100644
--- a/homeassistant/components/moehlenhoff_alpha2/button.py
+++ b/homeassistant/components/moehlenhoff_alpha2/button.py
@@ -6,7 +6,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import Alpha2BaseCoordinator
 from .const import DOMAIN
@@ -38,4 +38,4 @@ def __init__(self, coordinator: Alpha2BaseCoordinator, entry_id: str) -> None:
 
     async def async_press(self) -> None:
         """Synchronize current local time from HA instance to base station."""
-        await self.coordinator.base.set_datetime(dt.now())
+        await self.coordinator.base.set_datetime(dt_util.now())
diff --git a/homeassistant/components/moon/sensor.py b/homeassistant/components/moon/sensor.py
index f8e1cd24abeacc..10251fc679d3d9 100644
--- a/homeassistant/components/moon/sensor.py
+++ b/homeassistant/components/moon/sensor.py
@@ -50,14 +50,14 @@ class MoonSensorEntity(SensorEntity):
     _attr_name = "Phase"
     _attr_device_class = SensorDeviceClass.ENUM
     _attr_options = [
+        STATE_NEW_MOON,
+        STATE_WAXING_CRESCENT,
         STATE_FIRST_QUARTER,
+        STATE_WAXING_GIBBOUS,
         STATE_FULL_MOON,
+        STATE_WANING_GIBBOUS,
         STATE_LAST_QUARTER,
-        STATE_NEW_MOON,
         STATE_WANING_CRESCENT,
-        STATE_WANING_GIBBOUS,
-        STATE_WAXING_CRESCENT,
-        STATE_WAXING_GIBBOUS,
     ]
     _attr_translation_key = "phase"
 
diff --git a/homeassistant/components/mopeka/manifest.json b/homeassistant/components/mopeka/manifest.json
index 711041921536fc..d6b5618bf97eb7 100644
--- a/homeassistant/components/mopeka/manifest.json
+++ b/homeassistant/components/mopeka/manifest.json
@@ -21,5 +21,5 @@
   "documentation": "https://www.home-assistant.io/integrations/mopeka",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["mopeka_iot_ble==0.4.1"]
+  "requirements": ["mopeka-iot-ble==0.4.1"]
 }
diff --git a/homeassistant/components/motion_blinds/const.py b/homeassistant/components/motion_blinds/const.py
index 332a30a5e5fa63..d241f03a02e913 100644
--- a/homeassistant/components/motion_blinds/const.py
+++ b/homeassistant/components/motion_blinds/const.py
@@ -28,4 +28,6 @@
 
 UPDATE_INTERVAL = 600
 UPDATE_INTERVAL_FAST = 60
+UPDATE_DELAY_STOP = 3
 UPDATE_INTERVAL_MOVING = 5
+UPDATE_INTERVAL_MOVING_WIFI = 45
diff --git a/homeassistant/components/motion_blinds/cover.py b/homeassistant/components/motion_blinds/cover.py
index aaf74a96de00d4..17918133614139 100644
--- a/homeassistant/components/motion_blinds/cover.py
+++ b/homeassistant/components/motion_blinds/cover.py
@@ -15,7 +15,7 @@
     CoverEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
@@ -36,7 +36,9 @@
     KEY_VERSION,
     MANUFACTURER,
     SERVICE_SET_ABSOLUTE_POSITION,
+    UPDATE_DELAY_STOP,
     UPDATE_INTERVAL_MOVING,
+    UPDATE_INTERVAL_MOVING_WIFI,
 )
 from .gateway import device_name
 
@@ -191,13 +193,15 @@ def __init__(self, coordinator, blind, device_class, sw_version):
 
         self._blind = blind
         self._api_lock = coordinator.api_lock
-        self._requesting_position = False
+        self._requesting_position: CALLBACK_TYPE | None = None
         self._previous_positions = []
 
         if blind.device_type in DEVICE_TYPES_WIFI:
+            self._update_interval_moving = UPDATE_INTERVAL_MOVING_WIFI
             via_device = ()
             connections = {(dr.CONNECTION_NETWORK_MAC, blind.mac)}
         else:
+            self._update_interval_moving = UPDATE_INTERVAL_MOVING
             via_device = (DOMAIN, blind._gateway.mac)
             connections = {}
             sw_version = None
@@ -271,23 +275,29 @@ async def async_scheduled_update_request(self, *_):
             self.current_cover_position == prev_position
             for prev_position in self._previous_positions
         ):
-            # keep updating the position @UPDATE_INTERVAL_MOVING until the position does not change.
-            async_call_later(
-                self.hass, UPDATE_INTERVAL_MOVING, self.async_scheduled_update_request
+            # keep updating the position @self._update_interval_moving until the position does not change.
+            self._requesting_position = async_call_later(
+                self.hass,
+                self._update_interval_moving,
+                self.async_scheduled_update_request,
             )
         else:
             self._previous_positions = []
-            self._requesting_position = False
+            self._requesting_position = None
+
+    async def async_request_position_till_stop(self, delay=None):
+        """Request the position of the blind every self._update_interval_moving seconds until it stops moving."""
+        if delay is None:
+            delay = self._update_interval_moving
 
-    async def async_request_position_till_stop(self):
-        """Request the position of the blind every UPDATE_INTERVAL_MOVING seconds until it stops moving."""
         self._previous_positions = []
-        if self._requesting_position or self.current_cover_position is None:
+        if self.current_cover_position is None:
             return
+        if self._requesting_position is not None:
+            self._requesting_position()
 
-        self._requesting_position = True
-        async_call_later(
-            self.hass, UPDATE_INTERVAL_MOVING, self.async_scheduled_update_request
+        self._requesting_position = async_call_later(
+            self.hass, delay, self.async_scheduled_update_request
         )
 
     async def async_open_cover(self, **kwargs: Any) -> None:
@@ -334,6 +344,8 @@ async def async_stop_cover(self, **kwargs: Any) -> None:
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop)
 
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
+
 
 class MotionTiltDevice(MotionPositionDevice):
     """Representation of a Motion Blind Device."""
@@ -378,6 +390,8 @@ async def async_stop_cover_tilt(self, **kwargs: Any) -> None:
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop)
 
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
+
 
 class MotionTiltOnlyDevice(MotionTiltDevice):
     """Representation of a Motion Blind Device."""
@@ -507,3 +521,5 @@ async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop the cover."""
         async with self._api_lock:
             await self.hass.async_add_executor_job(self._blind.Stop, self._motor_key)
+
+        await self.async_request_position_till_stop(delay=UPDATE_DELAY_STOP)
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index d3806044fcc521..3fb6c8d2c48547 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -29,10 +29,7 @@
 from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import async_get_platforms
-from homeassistant.helpers.reload import (
-    async_integration_yaml_config,
-    async_reload_integration_platforms,
-)
+from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
 
@@ -374,7 +371,6 @@ async def async_forward_entry_setup_and_setup_discovery(
         conf: ConfigType,
     ) -> None:
         """Forward the config entry setup to the platforms and set up discovery."""
-        reload_manual_setup: bool = False
         # Local import to avoid circular dependencies
         # pylint: disable-next=import-outside-toplevel
         from . import device_automation, tag
@@ -399,35 +395,12 @@ async def async_forward_entry_setup_and_setup_discovery(
             )
         # Setup reload service after all platforms have loaded
         await async_setup_reload_service()
-        # When the entry is reloaded, also reload manual set up items to enable MQTT
-        if mqtt_data.reload_entry:
-            mqtt_data.reload_entry = False
-            reload_manual_setup = True
-
-        # When the entry was disabled before, reload manual set up items to enable
-        # MQTT again
-        if mqtt_data.reload_needed:
-            mqtt_data.reload_needed = False
-            reload_manual_setup = True
-
-        if reload_manual_setup:
-            await async_reload_manual_mqtt_items(hass)
 
     await async_forward_entry_setup_and_setup_discovery(entry, conf)
 
     return True
 
 
-async def async_reload_manual_mqtt_items(hass: HomeAssistant) -> None:
-    """Reload manual configured MQTT items."""
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_RELOAD,
-        {},
-        blocking=True,
-    )
-
-
 @websocket_api.websocket_command(
     {vol.Required("type"): "mqtt/device/debug_info", vol.Required("device_id"): str}
 )
@@ -570,17 +543,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Cleanup listeners
     mqtt_client.cleanup()
 
-    # Trigger reload manual MQTT items at entry setup
-    if (mqtt_entry_status := mqtt_config_entry_enabled(hass)) is False:
-        # The entry is disabled reload legacy manual items when
-        # the entry is enabled again
-        mqtt_data.reload_needed = True
-    elif mqtt_entry_status is True:
-        # The entry is reloaded:
-        # Trigger re-fetching the yaml config at entry setup
-        mqtt_data.reload_entry = True
-    # Reload the legacy yaml platform to make entities unavailable
-    await async_reload_integration_platforms(hass, DOMAIN, RELOADABLE_PLATFORMS)
     # Cleanup entity registry hooks
     registry_hooks = mqtt_data.discovery_registry_hooks
     while registry_hooks:
diff --git a/homeassistant/components/mqtt/abbreviations.py b/homeassistant/components/mqtt/abbreviations.py
index de593385c1f8e1..a5360090bb9e9d 100644
--- a/homeassistant/components/mqtt/abbreviations.py
+++ b/homeassistant/components/mqtt/abbreviations.py
@@ -12,9 +12,6 @@
     "avty_mode": "availability_mode",
     "avty_t": "availability_topic",
     "avty_tpl": "availability_template",
-    "away_mode_cmd_t": "away_mode_command_topic",
-    "away_mode_stat_tpl": "away_mode_state_template",
-    "away_mode_stat_t": "away_mode_state_topic",
     "b_tpl": "blue_template",
     "bri_cmd_tpl": "brightness_command_template",
     "bri_cmd_t": "brightness_command_topic",
@@ -44,6 +41,7 @@
     "cod_dis_req": "code_disarm_required",
     "cod_form": "code_format",
     "cod_trig_req": "code_trigger_required",
+    "cont_type": "content_type",
     "curr_hum_t": "current_humidity_topic",
     "curr_hum_tpl": "current_humidity_template",
     "curr_temp_t": "current_temperature_topic",
@@ -80,16 +78,13 @@
     "fan_mode_stat_t": "fan_mode_state_topic",
     "frc_upd": "force_update",
     "g_tpl": "green_template",
-    "hold_cmd_tpl": "hold_command_template",
-    "hold_cmd_t": "hold_command_topic",
-    "hold_stat_tpl": "hold_state_template",
-    "hold_stat_t": "hold_state_topic",
     "hs_cmd_t": "hs_command_topic",
     "hs_cmd_tpl": "hs_command_template",
     "hs_stat_t": "hs_state_topic",
     "hs_val_tpl": "hs_value_template",
     "ic": "icon",
     "img_e": "image_encoding",
+    "img_t": "image_topic",
     "init": "initial",
     "hum_cmd_t": "target_humidity_command_topic",
     "hum_cmd_tpl": "target_humidity_command_template",
@@ -166,6 +161,7 @@
     "pos_clsd": "position_closed",
     "pos_open": "position_open",
     "pow_cmd_t": "power_command_topic",
+    "pow_cmd_tpl": "power_command_template",
     "pow_stat_t": "power_state_topic",
     "pow_stat_tpl": "power_state_template",
     "pr_mode_cmd_t": "preset_mode_command_topic",
@@ -243,7 +239,6 @@
     "tilt_clsd_val": "tilt_closed_value",
     "tilt_cmd_t": "tilt_command_topic",
     "tilt_cmd_tpl": "tilt_command_template",
-    "tilt_inv_stat": "tilt_invert_state",
     "tilt_max": "tilt_max",
     "tilt_min": "tilt_min",
     "tilt_opnd_val": "tilt_opened_value",
@@ -254,13 +249,11 @@
     "t": "topic",
     "uniq_id": "unique_id",
     "unit_of_meas": "unit_of_measurement",
+    "url_t": "url_topic",
+    "url_tpl": "url_template",
     "val_tpl": "value_template",
     "whit_cmd_t": "white_command_topic",
     "whit_scl": "white_scale",
-    "whit_val_cmd_t": "white_value_command_topic",
-    "whit_val_scl": "white_value_scale",
-    "whit_val_stat_t": "white_value_state_topic",
-    "whit_val_tpl": "white_value_template",
     "xy_cmd_t": "xy_command_topic",
     "xy_cmd_tpl": "xy_command_template",
     "xy_stat_t": "xy_state_topic",
diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py
index b685daaf6f1825..dbed1c8aa9e8bd 100644
--- a/homeassistant/components/mqtt/alarm_control_panel.py
+++ b/homeassistant/components/mqtt/alarm_control_panel.py
@@ -41,12 +41,7 @@
     CONF_STATE_TOPIC,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
 from .util import get_mqtt_data, valid_publish_topic, valid_subscribe_topic
 
@@ -112,13 +107,6 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT alarm control panels under the alarm_control_panel platform key
-# was deprecated in HA Core 2022.6;
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(alarm.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/binary_sensor.py b/homeassistant/components/mqtt/binary_sensor.py
index d09e31f65f9ac6..50af9ef8a555e5 100644
--- a/homeassistant/components/mqtt/binary_sensor.py
+++ b/homeassistant/components/mqtt/binary_sensor.py
@@ -43,7 +43,6 @@
     MqttAvailability,
     MqttEntity,
     async_setup_entry_helper,
-    warn_for_legacy_schema,
 )
 from .models import MqttValueTemplate, ReceiveMessage
 from .util import get_mqtt_data
@@ -69,13 +68,6 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Binary sensors under the binary_sensor platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(binary_sensor.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/button.py b/homeassistant/components/mqtt/button.py
index f81f78a487a0e2..46ecc16d385513 100644
--- a/homeassistant/components/mqtt/button.py
+++ b/homeassistant/components/mqtt/button.py
@@ -22,12 +22,7 @@
     CONF_QOS,
     CONF_RETAIN,
 )
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import MqttCommandTemplate
 from .util import valid_publish_topic
 
@@ -46,14 +41,6 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Buttons under the button platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(button.DOMAIN),
-)
-
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/camera.py b/homeassistant/components/mqtt/camera.py
index b3a78f4d2ffe8c..75ab25efcfa28f 100644
--- a/homeassistant/components/mqtt/camera.py
+++ b/homeassistant/components/mqtt/camera.py
@@ -20,12 +20,7 @@
 from .config import MQTT_BASE_SCHEMA
 from .const import CONF_QOS, CONF_TOPIC
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import ReceiveMessage
 from .util import valid_subscribe_topic
 
@@ -56,12 +51,6 @@
     PLATFORM_SCHEMA_BASE.schema,
 )
 
-# Configuring MQTT Camera under the camera platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(camera.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py
index 140d9fb128bc57..40ec754aa44076 100644
--- a/homeassistant/components/mqtt/climate.py
+++ b/homeassistant/components/mqtt/climate.py
@@ -1,6 +1,7 @@
 """Support for MQTT climate devices."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 from collections.abc import Callable
 import functools
 import logging
@@ -14,9 +15,7 @@
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
     DEFAULT_MAX_HUMIDITY,
-    DEFAULT_MAX_TEMP,
     DEFAULT_MIN_HUMIDITY,
-    DEFAULT_MIN_TEMP,
     FAN_AUTO,
     FAN_HIGH,
     FAN_LOW,
@@ -41,29 +40,45 @@
     PRECISION_HALVES,
     PRECISION_TENTHS,
     PRECISION_WHOLE,
+    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util.unit_conversion import TemperatureConverter
 
 from . import subscription
 from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
 from .const import (
+    CONF_ACTION_TEMPLATE,
+    CONF_ACTION_TOPIC,
+    CONF_CURRENT_HUMIDITY_TEMPLATE,
+    CONF_CURRENT_HUMIDITY_TOPIC,
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_CURRENT_TEMP_TOPIC,
     CONF_ENCODING,
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_LIST,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_MODE_STATE_TOPIC,
+    CONF_PRECISION,
     CONF_QOS,
     CONF_RETAIN,
+    CONF_TEMP_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_INITIAL,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    CONF_TEMP_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TOPIC,
     DEFAULT_OPTIMISTIC,
     PAYLOAD_NONE,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -77,33 +92,15 @@
 
 DEFAULT_NAME = "MQTT HVAC"
 
-CONF_ACTION_TEMPLATE = "action_template"
-CONF_ACTION_TOPIC = "action_topic"
 CONF_AUX_COMMAND_TOPIC = "aux_command_topic"
 CONF_AUX_STATE_TEMPLATE = "aux_state_template"
 CONF_AUX_STATE_TOPIC = "aux_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_AWAY_MODE_COMMAND_TOPIC = "away_mode_command_topic"
-CONF_AWAY_MODE_STATE_TEMPLATE = "away_mode_state_template"
-CONF_AWAY_MODE_STATE_TOPIC = "away_mode_state_topic"
-
-CONF_CURRENT_HUMIDITY_TEMPLATE = "current_humidity_template"
-CONF_CURRENT_HUMIDITY_TOPIC = "current_humidity_topic"
-CONF_CURRENT_TEMP_TEMPLATE = "current_temperature_template"
-CONF_CURRENT_TEMP_TOPIC = "current_temperature_topic"
+
 CONF_FAN_MODE_COMMAND_TEMPLATE = "fan_mode_command_template"
 CONF_FAN_MODE_COMMAND_TOPIC = "fan_mode_command_topic"
 CONF_FAN_MODE_LIST = "fan_modes"
 CONF_FAN_MODE_STATE_TEMPLATE = "fan_mode_state_template"
 CONF_FAN_MODE_STATE_TOPIC = "fan_mode_state_topic"
-# AWAY and HOLD mode topics and templates are no longer supported,
-# support was removed with release 2022.9
-CONF_HOLD_COMMAND_TEMPLATE = "hold_command_template"
-CONF_HOLD_COMMAND_TOPIC = "hold_command_topic"
-CONF_HOLD_STATE_TEMPLATE = "hold_state_template"
-CONF_HOLD_STATE_TOPIC = "hold_state_topic"
-CONF_HOLD_LIST = "hold_modes"
 
 CONF_HUMIDITY_COMMAND_TEMPLATE = "target_humidity_command_template"
 CONF_HUMIDITY_COMMAND_TOPIC = "target_humidity_command_topic"
@@ -111,34 +108,26 @@
 CONF_HUMIDITY_STATE_TOPIC = "target_humidity_state_topic"
 CONF_HUMIDITY_MAX = "max_humidity"
 CONF_HUMIDITY_MIN = "min_humidity"
-CONF_MODE_COMMAND_TEMPLATE = "mode_command_template"
-CONF_MODE_COMMAND_TOPIC = "mode_command_topic"
-CONF_MODE_LIST = "modes"
-CONF_MODE_STATE_TEMPLATE = "mode_state_template"
-CONF_MODE_STATE_TOPIC = "mode_state_topic"
 
-# CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
+# CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
 # are deprecated, support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
 # was already removed or never added support was deprecated with release 2023.2
 # and will be removed with release 2023.8
-CONF_POWER_COMMAND_TOPIC = "power_command_topic"
 CONF_POWER_STATE_TEMPLATE = "power_state_template"
 CONF_POWER_STATE_TOPIC = "power_state_topic"
-CONF_PRECISION = "precision"
+
+CONF_POWER_COMMAND_TOPIC = "power_command_topic"
+CONF_POWER_COMMAND_TEMPLATE = "power_command_template"
 CONF_PRESET_MODE_STATE_TOPIC = "preset_mode_state_topic"
 CONF_PRESET_MODE_COMMAND_TOPIC = "preset_mode_command_topic"
 CONF_PRESET_MODE_VALUE_TEMPLATE = "preset_mode_value_template"
 CONF_PRESET_MODE_COMMAND_TEMPLATE = "preset_mode_command_template"
 CONF_PRESET_MODES_LIST = "preset_modes"
-# Support CONF_SEND_IF_OFF is removed with release 2022.9
-CONF_SEND_IF_OFF = "send_if_off"
 CONF_SWING_MODE_COMMAND_TEMPLATE = "swing_mode_command_template"
 CONF_SWING_MODE_COMMAND_TOPIC = "swing_mode_command_topic"
 CONF_SWING_MODE_LIST = "swing_modes"
 CONF_SWING_MODE_STATE_TEMPLATE = "swing_mode_state_template"
 CONF_SWING_MODE_STATE_TOPIC = "swing_mode_state_topic"
-CONF_TEMP_COMMAND_TEMPLATE = "temperature_command_template"
-CONF_TEMP_COMMAND_TOPIC = "temperature_command_topic"
 CONF_TEMP_HIGH_COMMAND_TEMPLATE = "temperature_high_command_template"
 CONF_TEMP_HIGH_COMMAND_TOPIC = "temperature_high_command_topic"
 CONF_TEMP_HIGH_STATE_TEMPLATE = "temperature_high_state_template"
@@ -147,13 +136,10 @@
 CONF_TEMP_LOW_COMMAND_TOPIC = "temperature_low_command_topic"
 CONF_TEMP_LOW_STATE_TEMPLATE = "temperature_low_state_template"
 CONF_TEMP_LOW_STATE_TOPIC = "temperature_low_state_topic"
-CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
-CONF_TEMP_STATE_TOPIC = "temperature_state_topic"
-CONF_TEMP_INITIAL = "initial"
-CONF_TEMP_MAX = "max_temp"
-CONF_TEMP_MIN = "min_temp"
 CONF_TEMP_STEP = "temp_step"
 
+DEFAULT_INITIAL_TEMPERATURE = 21.0
+
 MQTT_CLIMATE_ATTRIBUTES_BLOCKED = frozenset(
     {
         climate.ATTR_AUX_HEAT,
@@ -199,6 +185,7 @@
     CONF_FAN_MODE_COMMAND_TEMPLATE,
     CONF_HUMIDITY_COMMAND_TEMPLATE,
     CONF_MODE_COMMAND_TEMPLATE,
+    CONF_POWER_COMMAND_TEMPLATE,
     CONF_PRESET_MODE_COMMAND_TEMPLATE,
     CONF_SWING_MODE_COMMAND_TEMPLATE,
     CONF_TEMP_COMMAND_TEMPLATE,
@@ -316,6 +303,7 @@ def valid_humidity_state_configuration(config: ConfigType) -> ConfigType:
         vol.Optional(CONF_PAYLOAD_ON, default="ON"): cv.string,
         vol.Optional(CONF_PAYLOAD_OFF, default="OFF"): cv.string,
         vol.Optional(CONF_POWER_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(CONF_POWER_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_POWER_STATE_TEMPLATE): cv.template,
         vol.Optional(CONF_POWER_STATE_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_PRECISION): vol.In(
@@ -342,9 +330,9 @@ def valid_humidity_state_configuration(config: ConfigType) -> ConfigType:
         ): cv.ensure_list,
         vol.Optional(CONF_SWING_MODE_STATE_TEMPLATE): cv.template,
         vol.Optional(CONF_SWING_MODE_STATE_TOPIC): valid_subscribe_topic,
-        vol.Optional(CONF_TEMP_INITIAL, default=21): cv.positive_int,
-        vol.Optional(CONF_TEMP_MIN, default=DEFAULT_MIN_TEMP): vol.Coerce(float),
-        vol.Optional(CONF_TEMP_MAX, default=DEFAULT_MAX_TEMP): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_INITIAL): cv.positive_int,
+        vol.Optional(CONF_TEMP_MIN): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_MAX): vol.Coerce(float),
         vol.Optional(CONF_TEMP_STEP, default=1.0): vol.Coerce(float),
         vol.Optional(CONF_TEMP_COMMAND_TEMPLATE): cv.template,
         vol.Optional(CONF_TEMP_COMMAND_TOPIC): valid_publish_topic,
@@ -364,23 +352,10 @@ def valid_humidity_state_configuration(config: ConfigType) -> ConfigType:
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    # Support CONF_SEND_IF_OFF is removed with release 2022.9
-    cv.removed(CONF_SEND_IF_OFF),
-    # AWAY and HOLD mode topics and templates are no longer supported,
-    # support was removed with release 2022.9
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
-    # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
+    # CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # are deprecated, support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE
     # was already removed or never added support was deprecated with release 2023.2
     # and will be removed with release 2023.8
-    cv.deprecated(CONF_POWER_COMMAND_TOPIC),
     cv.deprecated(CONF_POWER_STATE_TEMPLATE),
     cv.deprecated(CONF_POWER_STATE_TOPIC),
     _PLATFORM_SCHEMA_BASE,
@@ -389,33 +364,13 @@ def valid_humidity_state_configuration(config: ConfigType) -> ConfigType:
     valid_humidity_state_configuration,
 )
 
-# Configuring MQTT Climate under the climate platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(climate.DOMAIN),
-)
-
 _DISCOVERY_SCHEMA_BASE = _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA)
 
 DISCOVERY_SCHEMA = vol.All(
     _DISCOVERY_SCHEMA_BASE,
-    # Support CONF_SEND_IF_OFF is removed with release 2022.9
-    cv.removed(CONF_SEND_IF_OFF),
-    # AWAY and HOLD mode topics and templates are no longer supported,
-    # support was removed with release 2022.9
-    cv.removed(CONF_AWAY_MODE_COMMAND_TOPIC),
-    cv.removed(CONF_AWAY_MODE_STATE_TEMPLATE),
-    cv.removed(CONF_AWAY_MODE_STATE_TOPIC),
-    cv.removed(CONF_HOLD_COMMAND_TEMPLATE),
-    cv.removed(CONF_HOLD_COMMAND_TOPIC),
-    cv.removed(CONF_HOLD_STATE_TEMPLATE),
-    cv.removed(CONF_HOLD_STATE_TOPIC),
-    cv.removed(CONF_HOLD_LIST),
-    # CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
+    # CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
     # support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE was already removed or never added
     # support was deprecated with release 2023.2 and will be removed with release 2023.8
-    cv.deprecated(CONF_POWER_COMMAND_TOPIC),
     cv.deprecated(CONF_POWER_STATE_TEMPLATE),
     cv.deprecated(CONF_POWER_STATE_TOPIC),
     valid_preset_mode_configuration,
@@ -447,19 +402,209 @@ async def _async_setup_entity(
     async_add_entities([MqttClimate(hass, config, config_entry, discovery_data)])
 
 
-class MqttClimate(MqttEntity, ClimateEntity):
-    """Representation of an MQTT climate device."""
+class MqttTemperatureControlEntity(MqttEntity, ABC):
+    """Helper entity class to control temperature.
 
-    _entity_id_format = climate.ENTITY_ID_FORMAT
-    _attributes_extra_blocked = MQTT_CLIMATE_ATTRIBUTES_BLOCKED
+    MqttTemperatureControlEntity supports shared methods for
+    climate and water_heater platforms.
+    """
+
+    _attr_target_temperature_low: float | None
+    _attr_target_temperature_high: float | None
 
-    _command_templates: dict[str, Callable[[PublishPayloadType], PublishPayloadType]]
-    _value_templates: dict[str, Callable[[ReceivePayloadType], ReceivePayloadType]]
-    _feature_preset_mode: bool
     _optimistic: bool
-    _optimistic_preset_mode: bool
     _topic: dict[str, Any]
 
+    _command_templates: dict[str, Callable[[PublishPayloadType], PublishPayloadType]]
+    _value_templates: dict[str, Callable[[ReceivePayloadType], ReceivePayloadType]]
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        config_entry: ConfigEntry,
+        discovery_data: DiscoveryInfoType | None,
+    ) -> None:
+        """Initialize the temperature controlled device."""
+        self._attr_target_temperature_low = None
+        self._attr_target_temperature_high = None
+        self._feature_preset_mode = False
+        MqttEntity.__init__(self, hass, config, config_entry, discovery_data)
+
+    def add_subscription(
+        self,
+        topics: dict[str, dict[str, Any]],
+        topic: str,
+        msg_callback: Callable[[ReceiveMessage], None],
+    ) -> None:
+        """Add a subscription."""
+        qos: int = self._config[CONF_QOS]
+        if topic in self._topic and self._topic[topic] is not None:
+            topics[topic] = {
+                "topic": self._topic[topic],
+                "msg_callback": msg_callback,
+                "qos": qos,
+                "encoding": self._config[CONF_ENCODING] or None,
+            }
+
+    def render_template(
+        self, msg: ReceiveMessage, template_name: str
+    ) -> ReceivePayloadType:
+        """Render a template by name."""
+        template = self._value_templates[template_name]
+        return template(msg.payload)
+
+    @callback
+    def handle_climate_attribute_received(
+        self, msg: ReceiveMessage, template_name: str, attr: str
+    ) -> None:
+        """Handle climate attributes coming via MQTT."""
+        payload = self.render_template(msg, template_name)
+        if not payload:
+            _LOGGER.debug(
+                "Invalid empty payload for attribute %s, ignoring update",
+                attr,
+            )
+            return
+        if payload == PAYLOAD_NONE:
+            setattr(self, attr, None)
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+            return
+        try:
+            setattr(self, attr, float(payload))
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+        except ValueError:
+            _LOGGER.error("Could not parse %s from %s", template_name, payload)
+
+    def prepare_subscribe_topics(
+        self, topics: dict[str, dict[str, Any]]
+    ) -> None:  # noqa: C901
+        """(Re)Subscribe to topics."""
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_current_temperature_received(msg: ReceiveMessage) -> None:
+            """Handle current temperature coming via MQTT."""
+            self.handle_climate_attribute_received(
+                msg, CONF_CURRENT_TEMP_TEMPLATE, "_attr_current_temperature"
+            )
+
+        self.add_subscription(
+            topics, CONF_CURRENT_TEMP_TOPIC, handle_current_temperature_received
+        )
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_target_temperature_received(msg: ReceiveMessage) -> None:
+            """Handle target temperature coming via MQTT."""
+            self.handle_climate_attribute_received(
+                msg, CONF_TEMP_STATE_TEMPLATE, "_attr_target_temperature"
+            )
+
+        self.add_subscription(
+            topics, CONF_TEMP_STATE_TOPIC, handle_target_temperature_received
+        )
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_temperature_low_received(msg: ReceiveMessage) -> None:
+            """Handle target temperature low coming via MQTT."""
+            self.handle_climate_attribute_received(
+                msg, CONF_TEMP_LOW_STATE_TEMPLATE, "_attr_target_temperature_low"
+            )
+
+        self.add_subscription(
+            topics, CONF_TEMP_LOW_STATE_TOPIC, handle_temperature_low_received
+        )
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_temperature_high_received(msg: ReceiveMessage) -> None:
+            """Handle target temperature high coming via MQTT."""
+            self.handle_climate_attribute_received(
+                msg, CONF_TEMP_HIGH_STATE_TEMPLATE, "_attr_target_temperature_high"
+            )
+
+        self.add_subscription(
+            topics, CONF_TEMP_HIGH_STATE_TOPIC, handle_temperature_high_received
+        )
+
+        self._sub_state = subscription.async_prepare_subscribe_topics(
+            self.hass, self._sub_state, topics
+        )
+
+    async def _subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+        await subscription.async_subscribe_topics(self.hass, self._sub_state)
+
+    async def _publish(self, topic: str, payload: PublishPayloadType) -> None:
+        if self._topic[topic] is not None:
+            await self.async_publish(
+                self._topic[topic],
+                payload,
+                self._config[CONF_QOS],
+                self._config[CONF_RETAIN],
+                self._config[CONF_ENCODING],
+            )
+
+    async def _set_climate_attribute(
+        self,
+        temp: float | None,
+        cmnd_topic: str,
+        cmnd_template: str,
+        state_topic: str,
+        attr: str,
+    ) -> bool:
+        if temp is None:
+            return False
+        changed = False
+        if self._optimistic or self._topic[state_topic] is None:
+            # optimistic mode
+            changed = True
+            setattr(self, attr, temp)
+
+        payload = self._command_templates[cmnd_template](temp)
+        await self._publish(cmnd_topic, payload)
+        return changed
+
+    @abstractmethod
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperatures."""
+        changed = await self._set_climate_attribute(
+            kwargs.get(ATTR_TEMPERATURE),
+            CONF_TEMP_COMMAND_TOPIC,
+            CONF_TEMP_COMMAND_TEMPLATE,
+            CONF_TEMP_STATE_TOPIC,
+            "_attr_target_temperature",
+        )
+
+        changed |= await self._set_climate_attribute(
+            kwargs.get(ATTR_TARGET_TEMP_LOW),
+            CONF_TEMP_LOW_COMMAND_TOPIC,
+            CONF_TEMP_LOW_COMMAND_TEMPLATE,
+            CONF_TEMP_LOW_STATE_TOPIC,
+            "_attr_target_temperature_low",
+        )
+
+        changed |= await self._set_climate_attribute(
+            kwargs.get(ATTR_TARGET_TEMP_HIGH),
+            CONF_TEMP_HIGH_COMMAND_TOPIC,
+            CONF_TEMP_HIGH_COMMAND_TEMPLATE,
+            CONF_TEMP_HIGH_STATE_TOPIC,
+            "_attr_target_temperature_high",
+        )
+
+        if not changed:
+            return
+        self.async_write_ha_state()
+
+
+class MqttClimate(MqttTemperatureControlEntity, ClimateEntity):
+    """Representation of an MQTT climate device."""
+
+    _entity_id_format = climate.ENTITY_ID_FORMAT
+    _attributes_extra_blocked = MQTT_CLIMATE_ATTRIBUTES_BLOCKED
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -473,9 +618,9 @@ def __init__(
         self._attr_hvac_mode = None
         self._attr_is_aux_heat = None
         self._attr_swing_mode = None
-        self._attr_target_temperature_low = None
-        self._attr_target_temperature_high = None
-        MqttEntity.__init__(self, hass, config, config_entry, discovery_data)
+        MqttTemperatureControlEntity.__init__(
+            self, hass, config, config_entry, discovery_data
+        )
 
     @staticmethod
     def config_schema() -> vol.Schema:
@@ -485,28 +630,41 @@ def config_schema() -> vol.Schema:
     def _setup_from_config(self, config: ConfigType) -> None:
         """(Re)Setup the entity."""
         self._attr_hvac_modes = config[CONF_MODE_LIST]
-        self._attr_min_temp = config[CONF_TEMP_MIN]
-        self._attr_max_temp = config[CONF_TEMP_MAX]
+        # Make sure the min an max temp is converted to the correct when not set
+        self._attr_temperature_unit = config.get(
+            CONF_TEMPERATURE_UNIT, self.hass.config.units.temperature_unit
+        )
+        if (min_temp := config.get(CONF_TEMP_MIN)) is not None:
+            self._attr_min_temp = min_temp
+        if (max_temp := config.get(CONF_TEMP_MAX)) is not None:
+            self._attr_max_temp = max_temp
         self._attr_min_humidity = config[CONF_HUMIDITY_MIN]
         self._attr_max_humidity = config[CONF_HUMIDITY_MAX]
-        self._attr_precision = config.get(CONF_PRECISION, super().precision)
+        if (precision := config.get(CONF_PRECISION)) is not None:
+            self._attr_precision = precision
         self._attr_fan_modes = config[CONF_FAN_MODE_LIST]
         self._attr_swing_modes = config[CONF_SWING_MODE_LIST]
         self._attr_target_temperature_step = config[CONF_TEMP_STEP]
-        self._attr_temperature_unit = config.get(
-            CONF_TEMPERATURE_UNIT, self.hass.config.units.temperature_unit
-        )
 
         self._topic = {key: config.get(key) for key in TOPIC_KEYS}
 
         self._optimistic = config[CONF_OPTIMISTIC]
 
+        # Set init temp, if it is missing convert the default to the temperature units
+        init_temp: float = config.get(
+            CONF_TEMP_INITIAL,
+            TemperatureConverter.convert(
+                DEFAULT_INITIAL_TEMPERATURE,
+                UnitOfTemperature.CELSIUS,
+                self.temperature_unit,
+            ),
+        )
         if self._topic[CONF_TEMP_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature = init_temp
         if self._topic[CONF_TEMP_LOW_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature_low = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature_low = init_temp
         if self._topic[CONF_TEMP_HIGH_STATE_TOPIC] is None or self._optimistic:
-            self._attr_target_temperature_high = config[CONF_TEMP_INITIAL]
+            self._attr_target_temperature_high = init_temp
 
         if self._topic[CONF_FAN_MODE_STATE_TOPIC] is None or self._optimistic:
             self._attr_fan_mode = FAN_LOW
@@ -594,32 +752,12 @@ def _setup_from_config(self, config: ConfigType) -> None:
     def _prepare_subscribe_topics(self) -> None:  # noqa: C901
         """(Re)Subscribe to topics."""
         topics: dict[str, dict[str, Any]] = {}
-        qos: int = self._config[CONF_QOS]
-
-        def add_subscription(
-            topics: dict[str, dict[str, Any]],
-            topic: str,
-            msg_callback: Callable[[ReceiveMessage], None],
-        ) -> None:
-            if self._topic[topic] is not None:
-                topics[topic] = {
-                    "topic": self._topic[topic],
-                    "msg_callback": msg_callback,
-                    "qos": qos,
-                    "encoding": self._config[CONF_ENCODING] or None,
-                }
-
-        def render_template(
-            msg: ReceiveMessage, template_name: str
-        ) -> ReceivePayloadType:
-            template = self._value_templates[template_name]
-            return template(msg.payload)
 
         @callback
         @log_messages(self.hass, self.entity_id)
         def handle_action_received(msg: ReceiveMessage) -> None:
             """Handle receiving action via MQTT."""
-            payload = render_template(msg, CONF_ACTION_TEMPLATE)
+            payload = self.render_template(msg, CONF_ACTION_TEMPLATE)
             if not payload or payload == PAYLOAD_NONE:
                 _LOGGER.debug(
                     "Invalid %s action: %s, ignoring",
@@ -638,87 +776,17 @@ def handle_action_received(msg: ReceiveMessage) -> None:
                 return
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        add_subscription(topics, CONF_ACTION_TOPIC, handle_action_received)
-
-        @callback
-        def handle_climate_attribute_received(
-            msg: ReceiveMessage, template_name: str, attr: str
-        ) -> None:
-            """Handle climate attributes coming via MQTT."""
-            payload = render_template(msg, template_name)
-            if not payload:
-                _LOGGER.debug(
-                    "Invalid empty payload for attribute %s, ignoring update",
-                    attr,
-                )
-                return
-            if payload == PAYLOAD_NONE:
-                setattr(self, attr, None)
-                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
-                return
-            try:
-                setattr(self, attr, float(payload))
-                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
-            except ValueError:
-                _LOGGER.error("Could not parse %s from %s", template_name, payload)
-
-        @callback
-        @log_messages(self.hass, self.entity_id)
-        def handle_current_temperature_received(msg: ReceiveMessage) -> None:
-            """Handle current temperature coming via MQTT."""
-            handle_climate_attribute_received(
-                msg, CONF_CURRENT_TEMP_TEMPLATE, "_attr_current_temperature"
-            )
-
-        add_subscription(
-            topics, CONF_CURRENT_TEMP_TOPIC, handle_current_temperature_received
-        )
-
-        @callback
-        @log_messages(self.hass, self.entity_id)
-        def handle_target_temperature_received(msg: ReceiveMessage) -> None:
-            """Handle target temperature coming via MQTT."""
-            handle_climate_attribute_received(
-                msg, CONF_TEMP_STATE_TEMPLATE, "_attr_target_temperature"
-            )
-
-        add_subscription(
-            topics, CONF_TEMP_STATE_TOPIC, handle_target_temperature_received
-        )
-
-        @callback
-        @log_messages(self.hass, self.entity_id)
-        def handle_temperature_low_received(msg: ReceiveMessage) -> None:
-            """Handle target temperature low coming via MQTT."""
-            handle_climate_attribute_received(
-                msg, CONF_TEMP_LOW_STATE_TEMPLATE, "_attr_target_temperature_low"
-            )
-
-        add_subscription(
-            topics, CONF_TEMP_LOW_STATE_TOPIC, handle_temperature_low_received
-        )
-
-        @callback
-        @log_messages(self.hass, self.entity_id)
-        def handle_temperature_high_received(msg: ReceiveMessage) -> None:
-            """Handle target temperature high coming via MQTT."""
-            handle_climate_attribute_received(
-                msg, CONF_TEMP_HIGH_STATE_TEMPLATE, "_attr_target_temperature_high"
-            )
-
-        add_subscription(
-            topics, CONF_TEMP_HIGH_STATE_TOPIC, handle_temperature_high_received
-        )
+        self.add_subscription(topics, CONF_ACTION_TOPIC, handle_action_received)
 
         @callback
         @log_messages(self.hass, self.entity_id)
         def handle_current_humidity_received(msg: ReceiveMessage) -> None:
             """Handle current humidity coming via MQTT."""
-            handle_climate_attribute_received(
+            self.handle_climate_attribute_received(
                 msg, CONF_CURRENT_HUMIDITY_TEMPLATE, "_attr_current_humidity"
             )
 
-        add_subscription(
+        self.add_subscription(
             topics, CONF_CURRENT_HUMIDITY_TOPIC, handle_current_humidity_received
         )
 
@@ -727,11 +795,11 @@ def handle_current_humidity_received(msg: ReceiveMessage) -> None:
         def handle_target_humidity_received(msg: ReceiveMessage) -> None:
             """Handle target humidity coming via MQTT."""
 
-            handle_climate_attribute_received(
+            self.handle_climate_attribute_received(
                 msg, CONF_HUMIDITY_STATE_TEMPLATE, "_attr_target_humidity"
             )
 
-        add_subscription(
+        self.add_subscription(
             topics, CONF_HUMIDITY_STATE_TOPIC, handle_target_humidity_received
         )
 
@@ -740,7 +808,7 @@ def handle_mode_received(
             msg: ReceiveMessage, template_name: str, attr: str, mode_list: str
         ) -> None:
             """Handle receiving listed mode via MQTT."""
-            payload = render_template(msg, template_name)
+            payload = self.render_template(msg, template_name)
 
             if payload not in self._config[mode_list]:
                 _LOGGER.error("Invalid %s mode: %s", mode_list, payload)
@@ -756,7 +824,9 @@ def handle_current_mode_received(msg: ReceiveMessage) -> None:
                 msg, CONF_MODE_STATE_TEMPLATE, "_attr_hvac_mode", CONF_MODE_LIST
             )
 
-        add_subscription(topics, CONF_MODE_STATE_TOPIC, handle_current_mode_received)
+        self.add_subscription(
+            topics, CONF_MODE_STATE_TOPIC, handle_current_mode_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -769,7 +839,9 @@ def handle_fan_mode_received(msg: ReceiveMessage) -> None:
                 CONF_FAN_MODE_LIST,
             )
 
-        add_subscription(topics, CONF_FAN_MODE_STATE_TOPIC, handle_fan_mode_received)
+        self.add_subscription(
+            topics, CONF_FAN_MODE_STATE_TOPIC, handle_fan_mode_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -782,7 +854,7 @@ def handle_swing_mode_received(msg: ReceiveMessage) -> None:
                 CONF_SWING_MODE_LIST,
             )
 
-        add_subscription(
+        self.add_subscription(
             topics, CONF_SWING_MODE_STATE_TOPIC, handle_swing_mode_received
         )
 
@@ -791,7 +863,7 @@ def handle_onoff_mode_received(
             msg: ReceiveMessage, template_name: str, attr: str
         ) -> None:
             """Handle receiving on/off mode via MQTT."""
-            payload = render_template(msg, template_name)
+            payload = self.render_template(msg, template_name)
             payload_on: str = self._config[CONF_PAYLOAD_ON]
             payload_off: str = self._config[CONF_PAYLOAD_OFF]
 
@@ -817,13 +889,13 @@ def handle_aux_mode_received(msg: ReceiveMessage) -> None:
                 msg, CONF_AUX_STATE_TEMPLATE, "_attr_is_aux_heat"
             )
 
-        add_subscription(topics, CONF_AUX_STATE_TOPIC, handle_aux_mode_received)
+        self.add_subscription(topics, CONF_AUX_STATE_TOPIC, handle_aux_mode_received)
 
         @callback
         @log_messages(self.hass, self.entity_id)
         def handle_preset_mode_received(msg: ReceiveMessage) -> None:
             """Handle receiving preset mode via MQTT."""
-            preset_mode = render_template(msg, CONF_PRESET_MODE_VALUE_TEMPLATE)
+            preset_mode = self.render_template(msg, CONF_PRESET_MODE_VALUE_TEMPLATE)
             if preset_mode in [PRESET_NONE, PAYLOAD_NONE]:
                 self._attr_preset_mode = PRESET_NONE
                 get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
@@ -831,7 +903,10 @@ def handle_preset_mode_received(msg: ReceiveMessage) -> None:
             if not preset_mode:
                 _LOGGER.debug("Ignoring empty preset_mode from '%s'", msg.topic)
                 return
-            if not self.preset_modes or preset_mode not in self.preset_modes:
+            if (
+                not self._attr_preset_modes
+                or preset_mode not in self._attr_preset_modes
+            ):
                 _LOGGER.warning(
                     "'%s' received on topic %s. '%s' is not a valid preset mode",
                     msg.payload,
@@ -843,81 +918,18 @@ def handle_preset_mode_received(msg: ReceiveMessage) -> None:
 
                 get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        add_subscription(
+        self.add_subscription(
             topics, CONF_PRESET_MODE_STATE_TOPIC, handle_preset_mode_received
         )
 
-        self._sub_state = subscription.async_prepare_subscribe_topics(
-            self.hass, self._sub_state, topics
-        )
-
-    async def _subscribe_topics(self) -> None:
-        """(Re)Subscribe to topics."""
-        await subscription.async_subscribe_topics(self.hass, self._sub_state)
-
-    async def _publish(self, topic: str, payload: PublishPayloadType) -> None:
-        if self._topic[topic] is not None:
-            await self.async_publish(
-                self._topic[topic],
-                payload,
-                self._config[CONF_QOS],
-                self._config[CONF_RETAIN],
-                self._config[CONF_ENCODING],
-            )
-
-    async def _set_climate_attribute(
-        self,
-        temp: float | None,
-        cmnd_topic: str,
-        cmnd_template: str,
-        state_topic: str,
-        attr: str,
-    ) -> bool:
-        if temp is None:
-            return False
-        changed = False
-        if self._optimistic or self._topic[state_topic] is None:
-            # optimistic mode
-            changed = True
-            setattr(self, attr, temp)
-
-        payload = self._command_templates[cmnd_template](temp)
-        await self._publish(cmnd_topic, payload)
-        return changed
+        self.prepare_subscribe_topics(topics)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperatures."""
         operation_mode: HVACMode | None
         if (operation_mode := kwargs.get(ATTR_HVAC_MODE)) is not None:
             await self.async_set_hvac_mode(operation_mode)
-
-        changed = await self._set_climate_attribute(
-            kwargs.get(ATTR_TEMPERATURE),
-            CONF_TEMP_COMMAND_TOPIC,
-            CONF_TEMP_COMMAND_TEMPLATE,
-            CONF_TEMP_STATE_TOPIC,
-            "_attr_target_temperature",
-        )
-
-        changed |= await self._set_climate_attribute(
-            kwargs.get(ATTR_TARGET_TEMP_LOW),
-            CONF_TEMP_LOW_COMMAND_TOPIC,
-            CONF_TEMP_LOW_COMMAND_TEMPLATE,
-            CONF_TEMP_LOW_STATE_TOPIC,
-            "_attr_target_temperature_low",
-        )
-
-        changed |= await self._set_climate_attribute(
-            kwargs.get(ATTR_TARGET_TEMP_HIGH),
-            CONF_TEMP_HIGH_COMMAND_TOPIC,
-            CONF_TEMP_HIGH_COMMAND_TEMPLATE,
-            CONF_TEMP_HIGH_STATE_TOPIC,
-            "_attr_target_temperature_high",
-        )
-
-        if not changed:
-            return
-        self.async_write_ha_state()
+        await super().async_set_temperature(**kwargs)
 
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
@@ -952,13 +964,6 @@ async def async_set_fan_mode(self, fan_mode: str) -> None:
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new operation mode."""
-        if hvac_mode == HVACMode.OFF:
-            await self._publish(
-                CONF_POWER_COMMAND_TOPIC, self._config[CONF_PAYLOAD_OFF]
-            )
-        else:
-            await self._publish(CONF_POWER_COMMAND_TOPIC, self._config[CONF_PAYLOAD_ON])
-
         payload = self._command_templates[CONF_MODE_COMMAND_TEMPLATE](hvac_mode)
         await self._publish(CONF_MODE_COMMAND_TOPIC, payload)
 
@@ -1003,3 +1008,28 @@ async def async_turn_aux_heat_on(self) -> None:
     async def async_turn_aux_heat_off(self) -> None:
         """Turn auxiliary heater off."""
         await self._set_aux_heat(False)
+
+    async def async_turn_on(self) -> None:
+        """Turn the entity on."""
+        if CONF_POWER_COMMAND_TOPIC in self._config:
+            mqtt_payload = self._command_templates[CONF_POWER_COMMAND_TEMPLATE](
+                self._config[CONF_PAYLOAD_ON]
+            )
+            await self._publish(CONF_POWER_COMMAND_TOPIC, mqtt_payload)
+            return
+        # Fall back to default behavior without power command topic
+        await super().async_turn_on()
+
+    async def async_turn_off(self) -> None:
+        """Turn the entity off."""
+        if CONF_POWER_COMMAND_TOPIC in self._config:
+            mqtt_payload = self._command_templates[CONF_POWER_COMMAND_TEMPLATE](
+                self._config[CONF_PAYLOAD_OFF]
+            )
+            await self._publish(CONF_POWER_COMMAND_TOPIC, mqtt_payload)
+            if self._optimistic:
+                self._attr_hvac_mode = HVACMode.OFF
+                self.async_write_ha_state()
+            return
+        # Fall back to default behavior without power command topic
+        await super().async_turn_off()
diff --git a/homeassistant/components/mqtt/config_integration.py b/homeassistant/components/mqtt/config_integration.py
index 469f52e1488013..ba2e0427ba78ec 100644
--- a/homeassistant/components/mqtt/config_integration.py
+++ b/homeassistant/components/mqtt/config_integration.py
@@ -24,6 +24,7 @@
     device_tracker as device_tracker_platform,
     fan as fan_platform,
     humidifier as humidifier_platform,
+    image as image_platform,
     light as light_platform,
     lock as lock_platform,
     number as number_platform,
@@ -35,6 +36,7 @@
     text as text_platform,
     update as update_platform,
     vacuum as vacuum_platform,
+    water_heater as water_heater_platform,
 )
 from .const import (
     CONF_BIRTH_MESSAGE,
@@ -88,6 +90,10 @@
             cv.ensure_list,
             [humidifier_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
         ),
+        Platform.IMAGE.value: vol.All(
+            cv.ensure_list,
+            [image_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
+        ),
         Platform.LOCK.value: vol.All(
             cv.ensure_list,
             [lock_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
@@ -132,6 +138,10 @@
             cv.ensure_list,
             [vacuum_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
         ),
+        Platform.WATER_HEATER.value: vol.All(
+            cv.ensure_list,
+            [water_heater_platform.PLATFORM_SCHEMA_MODERN],  # type: ignore[has-type]
+        ),
     }
 )
 
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index c91c54a79a41d2..d09a2bb8cb6e17 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -29,6 +29,26 @@
 CONF_WILL_MESSAGE = "will_message"
 CONF_PAYLOAD_RESET = "payload_reset"
 
+CONF_ACTION_TEMPLATE = "action_template"
+CONF_ACTION_TOPIC = "action_topic"
+CONF_CURRENT_HUMIDITY_TEMPLATE = "current_humidity_template"
+CONF_CURRENT_HUMIDITY_TOPIC = "current_humidity_topic"
+CONF_CURRENT_TEMP_TEMPLATE = "current_temperature_template"
+CONF_CURRENT_TEMP_TOPIC = "current_temperature_topic"
+CONF_MODE_COMMAND_TEMPLATE = "mode_command_template"
+CONF_MODE_COMMAND_TOPIC = "mode_command_topic"
+CONF_MODE_LIST = "modes"
+CONF_MODE_STATE_TEMPLATE = "mode_state_template"
+CONF_MODE_STATE_TOPIC = "mode_state_topic"
+CONF_PRECISION = "precision"
+CONF_TEMP_COMMAND_TEMPLATE = "temperature_command_template"
+CONF_TEMP_COMMAND_TOPIC = "temperature_command_topic"
+CONF_TEMP_STATE_TEMPLATE = "temperature_state_template"
+CONF_TEMP_STATE_TOPIC = "temperature_state_topic"
+CONF_TEMP_INITIAL = "initial"
+CONF_TEMP_MAX = "max_temp"
+CONF_TEMP_MIN = "min_temp"
+
 CONF_CERTIFICATE = "certificate"
 CONF_CLIENT_KEY = "client_key"
 CONF_CLIENT_CERT = "client_cert"
@@ -95,6 +115,7 @@
     Platform.COVER,
     Platform.FAN,
     Platform.HUMIDIFIER,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
@@ -106,6 +127,7 @@
     Platform.TEXT,
     Platform.UPDATE,
     Platform.VACUUM,
+    Platform.WATER_HEATER,
 ]
 
 RELOADABLE_PLATFORMS = [
@@ -118,6 +140,7 @@
     Platform.DEVICE_TRACKER,
     Platform.FAN,
     Platform.HUMIDIFIER,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
@@ -129,4 +152,5 @@
     Platform.TEXT,
     Platform.UPDATE,
     Platform.VACUUM,
+    Platform.WATER_HEATER,
 ]
diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index e7c458e6822fc0..0b435db0b7a97e 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -46,12 +46,7 @@
     DEFAULT_OPTIMISTIC,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
 from .util import get_mqtt_data, valid_publish_topic, valid_subscribe_topic
 
@@ -205,19 +200,11 @@ def validate_options(config: ConfigType) -> ConfigType:
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
-    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE,
     validate_options,
 )
 
-# Configuring MQTT Covers under the cover platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(cover.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = vol.All(
-    cv.removed("tilt_invert_state"),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     validate_options,
 )
diff --git a/homeassistant/components/mqtt/device_tracker.py b/homeassistant/components/mqtt/device_tracker.py
index dbe7188da7ded2..a9c4017593c9a9 100644
--- a/homeassistant/components/mqtt/device_tracker.py
+++ b/homeassistant/components/mqtt/device_tracker.py
@@ -36,7 +36,6 @@
     MQTT_ENTITY_COMMON_SCHEMA,
     MqttEntity,
     async_setup_entry_helper,
-    warn_for_legacy_schema,
 )
 from .models import MqttValueTemplate, ReceiveMessage, ReceivePayloadType
 from .util import get_mqtt_data, valid_subscribe_topic
@@ -78,11 +77,6 @@ def valid_config(config: ConfigType) -> ConfigType:
     PLATFORM_SCHEMA_MODERN_BASE.extend({}, extra=vol.REMOVE_EXTRA), valid_config
 )
 
-# Configuring MQTT Device Trackers under the device_tracker platform key was deprecated
-# in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(warn_for_legacy_schema(device_tracker.DOMAIN))
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 342e7d121f2ef2..70e5ac9e5356b8 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -54,6 +54,7 @@
     "device_tracker",
     "fan",
     "humidifier",
+    "image",
     "light",
     "lock",
     "number",
@@ -66,6 +67,7 @@
     "text",
     "update",
     "vacuum",
+    "water_heater",
 ]
 
 MQTT_DISCOVERY_UPDATED = "mqtt_discovery_updated_{}"
@@ -113,7 +115,7 @@ def async_discovery_message_received(msg: ReceiveMessage) -> None:  # noqa: C901
                         "Received message on illegal discovery topic '%s'. The topic"
                         " contains "
                         "not allowed characters. For more information see "
-                        "https://www.home-assistant.io/docs/mqtt/discovery/#discovery-topic"
+                        "https://www.home-assistant.io/integrations/mqtt/#discovery-topic"
                     ),
                     topic,
                 )
diff --git a/homeassistant/components/mqtt/fan.py b/homeassistant/components/mqtt/fan.py
index e8259c608096f1..f5e92d8ecf958a 100644
--- a/homeassistant/components/mqtt/fan.py
+++ b/homeassistant/components/mqtt/fan.py
@@ -50,12 +50,7 @@
     PAYLOAD_NONE,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MessageCallbackType,
     MqttCommandTemplate,
@@ -181,12 +176,6 @@ def valid_preset_mode_configuration(config: ConfigType) -> ConfigType:
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Fans under the fan platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(fan.DOMAIN),
-)
-
 PLATFORM_SCHEMA_MODERN = vol.All(
     _PLATFORM_SCHEMA_BASE,
     valid_speed_range_configuration,
diff --git a/homeassistant/components/mqtt/humidifier.py b/homeassistant/components/mqtt/humidifier.py
index 2c6dae54f4c80e..392a112bcdb79a 100644
--- a/homeassistant/components/mqtt/humidifier.py
+++ b/homeassistant/components/mqtt/humidifier.py
@@ -10,10 +10,13 @@
 
 from homeassistant.components import humidifier
 from homeassistant.components.humidifier import (
+    ATTR_ACTION,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MODE,
     DEFAULT_MAX_HUMIDITY,
     DEFAULT_MIN_HUMIDITY,
+    HumidifierAction,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -35,8 +38,12 @@
 from . import subscription
 from .config import MQTT_RW_SCHEMA
 from .const import (
+    CONF_ACTION_TEMPLATE,
+    CONF_ACTION_TOPIC,
     CONF_COMMAND_TEMPLATE,
     CONF_COMMAND_TOPIC,
+    CONF_CURRENT_HUMIDITY_TEMPLATE,
+    CONF_CURRENT_HUMIDITY_TOPIC,
     CONF_ENCODING,
     CONF_QOS,
     CONF_RETAIN,
@@ -45,12 +52,7 @@
     PAYLOAD_NONE,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -116,12 +118,16 @@ def valid_humidity_range_configuration(config: ConfigType) -> ConfigType:
 
 _PLATFORM_SCHEMA_BASE = MQTT_RW_SCHEMA.extend(
     {
+        vol.Optional(CONF_ACTION_TEMPLATE): cv.template,
+        vol.Optional(CONF_ACTION_TOPIC): valid_subscribe_topic,
         # CONF_AVAIALABLE_MODES_LIST and CONF_MODE_COMMAND_TOPIC must be used together
         vol.Inclusive(
             CONF_AVAILABLE_MODES_LIST, "available_modes", default=[]
         ): cv.ensure_list,
         vol.Inclusive(CONF_MODE_COMMAND_TOPIC, "available_modes"): valid_publish_topic,
         vol.Optional(CONF_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_HUMIDITY_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_HUMIDITY_TOPIC): valid_subscribe_topic,
         vol.Optional(
             CONF_DEVICE_CLASS, default=HumidifierDeviceClass.HUMIDIFIER
         ): vol.In(
@@ -151,13 +157,6 @@ def valid_humidity_range_configuration(config: ConfigType) -> ConfigType:
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Humidifiers under the humidifier platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(humidifier.DOMAIN),
-)
-
 PLATFORM_SCHEMA_MODERN = vol.All(
     _PLATFORM_SCHEMA_BASE,
     valid_humidity_range_configuration,
@@ -170,6 +169,17 @@ def valid_humidity_range_configuration(config: ConfigType) -> ConfigType:
     valid_mode_configuration,
 )
 
+TOPICS = (
+    CONF_ACTION_TOPIC,
+    CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC,
+    CONF_CURRENT_HUMIDITY_TOPIC,
+    CONF_TARGET_HUMIDITY_STATE_TOPIC,
+    CONF_TARGET_HUMIDITY_COMMAND_TOPIC,
+    CONF_MODE_STATE_TOPIC,
+    CONF_MODE_COMMAND_TOPIC,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -231,17 +241,7 @@ def _setup_from_config(self, config: ConfigType) -> None:
         self._attr_min_humidity = config[CONF_TARGET_HUMIDITY_MIN]
         self._attr_max_humidity = config[CONF_TARGET_HUMIDITY_MAX]
 
-        self._topic = {
-            key: config.get(key)
-            for key in (
-                CONF_STATE_TOPIC,
-                CONF_COMMAND_TOPIC,
-                CONF_TARGET_HUMIDITY_STATE_TOPIC,
-                CONF_TARGET_HUMIDITY_COMMAND_TOPIC,
-                CONF_MODE_STATE_TOPIC,
-                CONF_MODE_COMMAND_TOPIC,
-            )
-        }
+        self._topic = {key: config.get(key) for key in TOPICS}
         self._payload = {
             "STATE_ON": config[CONF_PAYLOAD_ON],
             "STATE_OFF": config[CONF_PAYLOAD_OFF],
@@ -254,6 +254,8 @@ def _setup_from_config(self, config: ConfigType) -> None:
             self._attr_available_modes = []
         if self._attr_available_modes:
             self._attr_supported_features = HumidifierEntityFeature.MODES
+        if CONF_MODE_STATE_TOPIC in config:
+            self._attr_mode = None
 
         optimistic: bool = config[CONF_OPTIMISTIC]
         self._optimistic = optimistic or self._topic[CONF_STATE_TOPIC] is None
@@ -275,6 +277,8 @@ def _setup_from_config(self, config: ConfigType) -> None:
 
         self._value_templates = {}
         value_templates: dict[str, Template | None] = {
+            ATTR_ACTION: config.get(CONF_ACTION_TEMPLATE),
+            ATTR_CURRENT_HUMIDITY: config.get(CONF_CURRENT_HUMIDITY_TEMPLATE),
             CONF_STATE: config.get(CONF_STATE_VALUE_TEMPLATE),
             ATTR_HUMIDITY: config.get(CONF_TARGET_HUMIDITY_STATE_TEMPLATE),
             ATTR_MODE: config.get(CONF_MODE_STATE_TEMPLATE),
@@ -285,6 +289,22 @@ def _setup_from_config(self, config: ConfigType) -> None:
                 entity=self,
             ).async_render_with_possible_json_value
 
+    def add_subscription(
+        self,
+        topics: dict[str, dict[str, Any]],
+        topic: str,
+        msg_callback: Callable[[ReceiveMessage], None],
+    ) -> None:
+        """Add a subscription."""
+        qos: int = self._config[CONF_QOS]
+        if topic in self._topic and self._topic[topic] is not None:
+            topics[topic] = {
+                "topic": self._topic[topic],
+                "msg_callback": msg_callback,
+                "qos": qos,
+                "encoding": self._config[CONF_ENCODING] or None,
+            }
+
     def _prepare_subscribe_topics(self) -> None:
         """(Re)Subscribe to topics."""
         topics: dict[str, Any] = {}
@@ -305,13 +325,68 @@ def state_received(msg: ReceiveMessage) -> None:
                 self._attr_is_on = None
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_STATE_TOPIC] is not None:
-            topics[CONF_STATE_TOPIC] = {
-                "topic": self._topic[CONF_STATE_TOPIC],
-                "msg_callback": state_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
+        self.add_subscription(topics, CONF_STATE_TOPIC, state_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def action_received(msg: ReceiveMessage) -> None:
+            """Handle new received MQTT message."""
+            action_payload = self._value_templates[ATTR_ACTION](msg.payload)
+            if not action_payload or action_payload == PAYLOAD_NONE:
+                _LOGGER.debug("Ignoring empty action from '%s'", msg.topic)
+                return
+            try:
+                self._attr_action = HumidifierAction(str(action_payload))
+            except ValueError:
+                _LOGGER.error(
+                    "'%s' received on topic %s. '%s' is not a valid action",
+                    msg.payload,
+                    msg.topic,
+                    action_payload,
+                )
+                return
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        self.add_subscription(topics, CONF_ACTION_TOPIC, action_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def current_humidity_received(msg: ReceiveMessage) -> None:
+            """Handle new received MQTT message for the current humidity."""
+            rendered_current_humidity_payload = self._value_templates[
+                ATTR_CURRENT_HUMIDITY
+            ](msg.payload)
+            if rendered_current_humidity_payload == self._payload["HUMIDITY_RESET"]:
+                self._attr_current_humidity = None
+                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+                return
+            if not rendered_current_humidity_payload:
+                _LOGGER.debug("Ignoring empty current humidity from '%s'", msg.topic)
+                return
+            try:
+                current_humidity = round(float(rendered_current_humidity_payload))
+            except ValueError:
+                _LOGGER.warning(
+                    "'%s' received on topic %s. '%s' is not a valid humidity",
+                    msg.payload,
+                    msg.topic,
+                    rendered_current_humidity_payload,
+                )
+                return
+            if current_humidity < 0 or current_humidity > 100:
+                _LOGGER.warning(
+                    "'%s' received on topic %s. '%s' is not a valid humidity",
+                    msg.payload,
+                    msg.topic,
+                    rendered_current_humidity_payload,
+                )
+                return
+            self._attr_current_humidity = current_humidity
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        self.add_subscription(
+            topics, CONF_CURRENT_HUMIDITY_TOPIC, current_humidity_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -351,14 +426,9 @@ def target_humidity_received(msg: ReceiveMessage) -> None:
             self._attr_target_humidity = target_humidity
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_TARGET_HUMIDITY_STATE_TOPIC] is not None:
-            topics[CONF_TARGET_HUMIDITY_STATE_TOPIC] = {
-                "topic": self._topic[CONF_TARGET_HUMIDITY_STATE_TOPIC],
-                "msg_callback": target_humidity_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
-            self._attr_target_humidity = None
+        self.add_subscription(
+            topics, CONF_TARGET_HUMIDITY_STATE_TOPIC, target_humidity_received
+        )
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -384,14 +454,7 @@ def mode_received(msg: ReceiveMessage) -> None:
             self._attr_mode = mode
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
-        if self._topic[CONF_MODE_STATE_TOPIC] is not None:
-            topics[CONF_MODE_STATE_TOPIC] = {
-                "topic": self._topic[CONF_MODE_STATE_TOPIC],
-                "msg_callback": mode_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
-            self._attr_mode = None
+        self.add_subscription(topics, CONF_MODE_STATE_TOPIC, mode_received)
 
         self._sub_state = subscription.async_prepare_subscribe_topics(
             self.hass, self._sub_state, topics
diff --git a/homeassistant/components/mqtt/image.py b/homeassistant/components/mqtt/image.py
new file mode 100644
index 00000000000000..2764539770daf8
--- /dev/null
+++ b/homeassistant/components/mqtt/image.py
@@ -0,0 +1,223 @@
+"""Support for MQTT images."""
+from __future__ import annotations
+
+from base64 import b64decode
+import binascii
+from collections.abc import Callable
+import functools
+import logging
+from typing import Any
+
+import httpx
+import voluptuous as vol
+
+from homeassistant.components import image
+from homeassistant.components.image import (
+    DEFAULT_CONTENT_TYPE,
+    ImageEntity,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.httpx_client import get_async_client
+from homeassistant.helpers.service_info.mqtt import ReceivePayloadType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
+
+from . import subscription
+from .config import MQTT_BASE_SCHEMA
+from .const import CONF_ENCODING, CONF_QOS
+from .debug_info import log_messages
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
+from .models import MessageCallbackType, MqttValueTemplate, ReceiveMessage
+from .util import get_mqtt_data, valid_subscribe_topic
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_CONTENT_TYPE = "content_type"
+CONF_IMAGE_ENCODING = "image_encoding"
+CONF_IMAGE_TOPIC = "image_topic"
+CONF_URL_TEMPLATE = "url_template"
+CONF_URL_TOPIC = "url_topic"
+
+DEFAULT_NAME = "MQTT Image"
+
+GET_IMAGE_TIMEOUT = 10
+
+
+def validate_topic_required(config: ConfigType) -> ConfigType:
+    """Ensure at least one subscribe topic is configured."""
+    if CONF_IMAGE_TOPIC not in config and CONF_URL_TOPIC not in config:
+        raise vol.Invalid("Expected one of [`image_topic`, `url_topic`], got none")
+    if CONF_CONTENT_TYPE in config and CONF_URL_TOPIC in config:
+        raise vol.Invalid(
+            "Option `content_type` can not be used together with `url_topic`"
+        )
+    return config
+
+
+PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
+    {
+        vol.Optional(CONF_CONTENT_TYPE): cv.string,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Exclusive(CONF_URL_TOPIC, "image_topic"): valid_subscribe_topic,
+        vol.Exclusive(CONF_IMAGE_TOPIC, "image_topic"): valid_subscribe_topic,
+        vol.Optional(CONF_IMAGE_ENCODING): "b64",
+        vol.Optional(CONF_URL_TEMPLATE): cv.template,
+    }
+).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
+
+PLATFORM_SCHEMA_MODERN = vol.All(PLATFORM_SCHEMA_BASE.schema, validate_topic_required)
+
+DISCOVERY_SCHEMA = vol.All(
+    PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA), validate_topic_required
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up MQTT image through YAML and through MQTT discovery."""
+    setup = functools.partial(
+        _async_setup_entity, hass, async_add_entities, config_entry=config_entry
+    )
+    await async_setup_entry_helper(hass, image.DOMAIN, setup, DISCOVERY_SCHEMA)
+
+
+async def _async_setup_entity(
+    hass: HomeAssistant,
+    async_add_entities: AddEntitiesCallback,
+    config: ConfigType,
+    config_entry: ConfigEntry,
+    discovery_data: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the MQTT Image."""
+    async_add_entities([MqttImage(hass, config, config_entry, discovery_data)])
+
+
+class MqttImage(MqttEntity, ImageEntity):
+    """representation of a MQTT image."""
+
+    _entity_id_format: str = image.ENTITY_ID_FORMAT
+    _last_image: bytes | None = None
+    _client: httpx.AsyncClient
+    _url_template: Callable[[ReceivePayloadType], ReceivePayloadType]
+    _topic: dict[str, Any]
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        config_entry: ConfigEntry,
+        discovery_data: DiscoveryInfoType | None,
+    ) -> None:
+        """Initialize the MQTT Image."""
+        self._client = get_async_client(hass)
+        ImageEntity.__init__(self, hass)
+        MqttEntity.__init__(self, hass, config, config_entry, discovery_data)
+
+    @staticmethod
+    def config_schema() -> vol.Schema:
+        """Return the config schema."""
+        return DISCOVERY_SCHEMA
+
+    def _setup_from_config(self, config: ConfigType) -> None:
+        """(Re)Setup the entity."""
+        self._topic = {
+            key: config.get(key)
+            for key in (
+                CONF_IMAGE_TOPIC,
+                CONF_URL_TOPIC,
+            )
+        }
+        if CONF_IMAGE_TOPIC in config:
+            self._attr_content_type = config.get(
+                CONF_CONTENT_TYPE, DEFAULT_CONTENT_TYPE
+            )
+        if CONF_URL_TOPIC in config:
+            self._attr_image_url = None
+        self._url_template = MqttValueTemplate(
+            config.get(CONF_URL_TEMPLATE), entity=self
+        ).async_render_with_possible_json_value
+
+    def _prepare_subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+
+        topics: dict[str, Any] = {}
+
+        def add_subscribe_topic(topic: str, msg_callback: MessageCallbackType) -> bool:
+            """Add a topic to subscribe to."""
+            encoding: str | None
+            encoding = (
+                None
+                if CONF_IMAGE_TOPIC in self._config
+                else self._config[CONF_ENCODING] or None
+            )
+            if has_topic := self._topic[topic] is not None:
+                topics[topic] = {
+                    "topic": self._topic[topic],
+                    "msg_callback": msg_callback,
+                    "qos": self._config[CONF_QOS],
+                    "encoding": encoding,
+                }
+            return has_topic
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def image_data_received(msg: ReceiveMessage) -> None:
+            """Handle new MQTT messages."""
+            try:
+                if CONF_IMAGE_ENCODING in self._config:
+                    self._last_image = b64decode(msg.payload)
+                else:
+                    assert isinstance(msg.payload, bytes)
+                    self._last_image = msg.payload
+            except (binascii.Error, ValueError, AssertionError) as err:
+                _LOGGER.error(
+                    "Error processing image data received at topic %s: %s",
+                    msg.topic,
+                    err,
+                )
+                self._last_image = None
+            self._attr_image_last_updated = dt_util.utcnow()
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        add_subscribe_topic(CONF_IMAGE_TOPIC, image_data_received)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def image_from_url_request_received(msg: ReceiveMessage) -> None:
+            """Handle new MQTT messages."""
+
+            try:
+                url = cv.url(self._url_template(msg.payload))
+                self._attr_image_url = url
+            except vol.Invalid:
+                _LOGGER.error(
+                    "Invalid image URL '%s' received at topic %s",
+                    msg.payload,
+                    msg.topic,
+                )
+            self._attr_image_last_updated = dt_util.utcnow()
+            self._cached_image = None
+            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        add_subscribe_topic(CONF_URL_TOPIC, image_from_url_request_received)
+
+        self._sub_state = subscription.async_prepare_subscribe_topics(
+            self.hass, self._sub_state, topics
+        )
+
+    async def _subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+        await subscription.async_subscribe_topics(self.hass, self._sub_state)
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        if CONF_IMAGE_TOPIC in self._config:
+            return self._last_image
+        return await super().async_image()
diff --git a/homeassistant/components/mqtt/light/__init__.py b/homeassistant/components/mqtt/light/__init__.py
index f91f76c6a82c51..2c70490ac5e3ad 100644
--- a/homeassistant/components/mqtt/light/__init__.py
+++ b/homeassistant/components/mqtt/light/__init__.py
@@ -12,7 +12,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from ..mixins import async_setup_entry_helper, warn_for_legacy_schema
+from ..mixins import async_setup_entry_helper
 from .schema import CONF_SCHEMA, MQTT_LIGHT_SCHEMA_SCHEMA
 from .schema_basic import (
     DISCOVERY_SCHEMA_BASIC,
@@ -58,12 +58,6 @@ def validate_mqtt_light_modern(config_value: dict[str, Any]) -> ConfigType:
     validate_mqtt_light_discovery,
 )
 
-# Configuring MQTT Lights under the light platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(light.DOMAIN),
-)
-
 PLATFORM_SCHEMA_MODERN = vol.All(
     MQTT_LIGHT_SCHEMA_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA),
     validate_mqtt_light_modern,
@@ -75,7 +69,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up MQTT lights configured under the light platform key (deprecated)."""
+    """Set up MQTT lights through YAML and through MQTT discovery."""
     setup = functools.partial(
         _async_setup_entity, hass, async_add_entities, config_entry=config_entry
     )
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index b3659a67e61409..7f2c2cf5e06abe 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -111,10 +111,6 @@
 CONF_XY_VALUE_TEMPLATE = "xy_value_template"
 CONF_WHITE_COMMAND_TOPIC = "white_command_topic"
 CONF_WHITE_SCALE = "white_scale"
-CONF_WHITE_VALUE_COMMAND_TOPIC = "white_value_command_topic"
-CONF_WHITE_VALUE_SCALE = "white_value_scale"
-CONF_WHITE_VALUE_STATE_TOPIC = "white_value_state_topic"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 CONF_ON_COMMAND_TYPE = "on_command_type"
 
 MQTT_LIGHT_ATTRIBUTES_BLOCKED = frozenset(
@@ -167,7 +163,7 @@
     CONF_XY_VALUE_TEMPLATE,
 ]
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_BASIC = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BRIGHTNESS_COMMAND_TEMPLATE): cv.template,
@@ -228,21 +224,7 @@
 )
 
 DISCOVERY_SCHEMA_BASIC = vol.All(
-    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_SCALE),
-    cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN_BASIC = vol.All(
-    # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_SCALE),
-    cv.removed(CONF_WHITE_VALUE_STATE_TOPIC),
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE,
+    PLATFORM_SCHEMA_MODERN_BASIC.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
 
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index c40dae659b7bad..70992887ca7f2e 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -101,8 +101,6 @@
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 
-CONF_WHITE_VALUE = "white_value"
-
 
 def valid_color_configuration(config: ConfigType) -> ConfigType:
     """Test color_mode is not combined with deprecated config."""
@@ -158,15 +156,11 @@ def valid_color_configuration(config: ConfigType) -> ConfigType:
 )
 
 DISCOVERY_SCHEMA_JSON = vol.All(
-    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     valid_color_configuration,
 )
 
 PLATFORM_SCHEMA_MODERN_JSON = vol.All(
-    # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE),
     _PLATFORM_SCHEMA_BASE,
     valid_color_configuration,
 )
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index c2b4de289fd5e0..063895d738c99a 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -75,7 +75,6 @@
 CONF_MAX_MIREDS = "max_mireds"
 CONF_MIN_MIREDS = "min_mireds"
 CONF_RED_TEMPLATE = "red_template"
-CONF_WHITE_VALUE_TEMPLATE = "white_value_template"
 
 COMMAND_TEMPLATES = (CONF_COMMAND_ON_TEMPLATE, CONF_COMMAND_OFF_TEMPLATE)
 VALUE_TEMPLATES = (
@@ -88,7 +87,7 @@
     CONF_STATE_TEMPLATE,
 )
 
-_PLATFORM_SCHEMA_BASE = (
+PLATFORM_SCHEMA_MODERN_TEMPLATE = (
     MQTT_RW_SCHEMA.extend(
         {
             vol.Optional(CONF_BLUE_TEMPLATE): cv.template,
@@ -111,15 +110,7 @@
 )
 
 DISCOVERY_SCHEMA_TEMPLATE = vol.All(
-    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN_TEMPLATE = vol.All(
-    # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
-    cv.removed(CONF_WHITE_VALUE_TEMPLATE),
-    _PLATFORM_SCHEMA_BASE,
+    PLATFORM_SCHEMA_MODERN_TEMPLATE.extend({}, extra=vol.REMOVE_EXTRA),
 )
 
 
diff --git a/homeassistant/components/mqtt/lock.py b/homeassistant/components/mqtt/lock.py
index 0598c0354ed9e7..966cbc211055e7 100644
--- a/homeassistant/components/mqtt/lock.py
+++ b/homeassistant/components/mqtt/lock.py
@@ -33,12 +33,7 @@
     CONF_STATE_TOPIC,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -94,12 +89,6 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Locks under the lock platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(lock.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 STATE_CONFIG_KEYS = [
diff --git a/homeassistant/components/mqtt/mixins.py b/homeassistant/components/mqtt/mixins.py
index 388264380915b2..34b61d89c48c87 100644
--- a/homeassistant/components/mqtt/mixins.py
+++ b/homeassistant/components/mqtt/mixins.py
@@ -28,16 +28,13 @@
     CONF_UNIQUE_ID,
     CONF_VALUE_TEMPLATE,
 )
-from homeassistant.core import Event, HomeAssistant, async_get_hass, callback
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
-from homeassistant.helpers.device_registry import (
-    EVENT_DEVICE_REGISTRY_UPDATED,
-    DeviceEntry,
-)
+from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -49,8 +46,10 @@
     async_generate_entity_id,
 )
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import async_track_entity_registry_updated_event
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.helpers.event import (
+    async_track_device_registry_updated_event,
+    async_track_entity_registry_updated_event,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.json import json_loads
 
@@ -231,51 +230,6 @@ def validate_device_has_at_least_one_identifier(value: ConfigType) -> ConfigType
 )
 
 
-def warn_for_legacy_schema(domain: str) -> Callable[[ConfigType], ConfigType]:
-    """Warn once when a legacy platform schema is used."""
-    warned = set()
-
-    def validator(config: ConfigType) -> ConfigType:
-        """Return a validator."""
-        nonlocal warned
-
-        # Logged error and repair can be removed from HA 2023.6
-        if domain in warned:
-            return config
-
-        _LOGGER.error(
-            (
-                "Manually configured MQTT %s(s) found under platform key '%s', "
-                "please move to the mqtt integration key, see "
-                "https://www.home-assistant.io/integrations/%s.mqtt/"
-            ),
-            domain,
-            domain,
-            domain,
-        )
-        warned.add(domain)
-        # Register a repair
-        async_create_issue(
-            async_get_hass(),
-            DOMAIN,
-            f"deprecated_yaml_{domain}",
-            breaks_in_ha_version="2022.12.0",  # Warning first added in 2022.6.0
-            is_fixable=False,
-            severity=IssueSeverity.ERROR,
-            translation_key="deprecated_yaml",
-            translation_placeholders={
-                "more_info_url": (
-                    "https://www.home-assistant.io"
-                    f"/integrations/{domain}.mqtt/#new_format"
-                ),
-                "platform": domain,
-            },
-        )
-        return config
-
-    return validator
-
-
 class SetupEntity(Protocol):
     """Protocol type for async_setup_entities."""
 
@@ -290,6 +244,20 @@ async def __call__(
         """Define setup_entities type."""
 
 
+@callback
+def async_handle_schema_error(
+    discovery_payload: MQTTDiscoveryPayload, err: vol.MultipleInvalid
+) -> None:
+    """Help handling schema errors on MQTT discovery messages."""
+    discovery_topic: str = discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]
+    _LOGGER.error(
+        "Error '%s' when processing MQTT discovery message topic: '%s', message: '%s'",
+        err,
+        discovery_topic,
+        discovery_payload,
+    )
+
+
 async def async_setup_entry_helper(
     hass: HomeAssistant,
     domain: str,
@@ -315,8 +283,15 @@ async def async_discover(discovery_payload: MQTTDiscoveryPayload) -> None:
         try:
             config: DiscoveryInfoType = discovery_schema(discovery_payload)
             await async_setup(config, discovery_data=discovery_data)
+        except vol.Invalid as err:
+            discovery_hash = discovery_data[ATTR_DISCOVERY_HASH]
+            clear_discovery_hash(hass, discovery_hash)
+            async_dispatcher_send(
+                hass, MQTT_DISCOVERY_DONE.format(discovery_hash), None
+            )
+            async_handle_schema_error(discovery_payload, err)
         except Exception:
-            discovery_hash: tuple[str, str] = discovery_data[ATTR_DISCOVERY_HASH]
+            discovery_hash = discovery_data[ATTR_DISCOVERY_HASH]
             clear_discovery_hash(hass, discovery_hash)
             async_dispatcher_send(
                 hass, MQTT_DISCOVERY_DONE.format(discovery_hash), None
@@ -680,8 +655,8 @@ def __init__(
         )
         config_entry.async_on_unload(self._entry_unload)
         if device_id is not None:
-            self._remove_device_updated = hass.bus.async_listen(
-                EVENT_DEVICE_REGISTRY_UPDATED, self._async_device_removed
+            self._remove_device_updated = async_track_device_registry_updated_event(
+                hass, device_id, self._async_device_removed
             )
         _LOGGER.info(
             "%s %s has been initialized",
@@ -1083,7 +1058,11 @@ async def mqtt_async_added_to_hass(self) -> None:
 
     async def discovery_update(self, discovery_payload: MQTTDiscoveryPayload) -> None:
         """Handle updated discovery message."""
-        config: DiscoveryInfoType = self.config_schema()(discovery_payload)
+        try:
+            config: DiscoveryInfoType = self.config_schema()(discovery_payload)
+        except vol.Invalid as err:
+            async_handle_schema_error(discovery_payload, err)
+            return
         self._config = config
         self._setup_common_attributes_from_config(self._config)
         self._setup_from_config(self._config)
@@ -1182,19 +1161,16 @@ def async_removed_from_device(
     hass: HomeAssistant, event: Event, mqtt_device_id: str, config_entry_id: str
 ) -> bool:
     """Check if the passed event indicates MQTT was removed from a device."""
-    device_id: str = event.data["device_id"]
-    if event.data["action"] not in ("remove", "update"):
-        return False
-
-    if device_id != mqtt_device_id:
+    action: str = event.data["action"]
+    if action not in ("remove", "update"):
         return False
 
-    if event.data["action"] == "update":
+    if action == "update":
         if "config_entries" not in event.data["changes"]:
             return False
         device_registry = dr.async_get(hass)
         if (
-            device_entry := device_registry.async_get(device_id)
+            device_entry := device_registry.async_get(event.data["device_id"])
         ) and config_entry_id in device_entry.config_entries:
             # Not removed from device
             return False
diff --git a/homeassistant/components/mqtt/models.py b/homeassistant/components/mqtt/models.py
index eac333e2a7a7b7..aeae184dc89dec 100644
--- a/homeassistant/components/mqtt/models.py
+++ b/homeassistant/components/mqtt/models.py
@@ -307,11 +307,9 @@ class MqttData:
     integration_unsubscribe: dict[str, CALLBACK_TYPE] = field(default_factory=dict)
     last_discovery: float = 0.0
     reload_dispatchers: list[CALLBACK_TYPE] = field(default_factory=list)
-    reload_entry: bool = False
     reload_handlers: dict[str, Callable[[], Coroutine[Any, Any, None]]] = field(
         default_factory=dict
     )
-    reload_needed: bool = False
     state_write_requests: EntityTopicState = field(default_factory=EntityTopicState)
     subscriptions_to_restore: list[Subscription] = field(default_factory=list)
     tags: dict[str, dict[str, MQTTTagScanner]] = field(default_factory=dict)
diff --git a/homeassistant/components/mqtt/number.py b/homeassistant/components/mqtt/number.py
index 1ab14b2b4f8f36..5986eab1207e6b 100644
--- a/homeassistant/components/mqtt/number.py
+++ b/homeassistant/components/mqtt/number.py
@@ -42,12 +42,7 @@
     CONF_STATE_TOPIC,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -107,12 +102,6 @@ def validate_config(config: ConfigType) -> ConfigType:
     validate_config,
 )
 
-# Configuring MQTT Number under the number platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(number.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = vol.All(
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
     validate_config,
@@ -197,6 +186,9 @@ def message_received(msg: ReceiveMessage) -> None:
             """Handle new MQTT messages."""
             num_value: int | float | None
             payload = str(self._value_template(msg.payload))
+            if not payload.strip():
+                _LOGGER.debug("Ignoring empty state update from '%s'", msg.topic)
+                return
             try:
                 if payload == self._config[CONF_PAYLOAD_RESET]:
                     num_value = None
diff --git a/homeassistant/components/mqtt/scene.py b/homeassistant/components/mqtt/scene.py
index dd7f3347845f91..f716e4fe46f8dd 100644
--- a/homeassistant/components/mqtt/scene.py
+++ b/homeassistant/components/mqtt/scene.py
@@ -24,7 +24,6 @@
     MQTT_AVAILABILITY_SCHEMA,
     MqttEntity,
     async_setup_entry_helper,
-    warn_for_legacy_schema,
 )
 from .util import valid_publish_topic
 
@@ -46,12 +45,6 @@
     }
 ).extend(MQTT_AVAILABILITY_SCHEMA.schema)
 
-# Configuring MQTT Scenes under the scene platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(scene.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/select.py b/homeassistant/components/mqtt/select.py
index b783a001f15017..26e72af9192390 100644
--- a/homeassistant/components/mqtt/select.py
+++ b/homeassistant/components/mqtt/select.py
@@ -28,12 +28,7 @@
     CONF_STATE_TOPIC,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -65,11 +60,6 @@
     },
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Select under the select platform key was deprecated in HA Core 2022.6
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(select.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = vol.All(PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA))
 
 
diff --git a/homeassistant/components/mqtt/sensor.py b/homeassistant/components/mqtt/sensor.py
index 9de442926a0cae..e4b5f61bda0c23 100644
--- a/homeassistant/components/mqtt/sensor.py
+++ b/homeassistant/components/mqtt/sensor.py
@@ -45,7 +45,6 @@
     MqttAvailability,
     MqttEntity,
     async_setup_entry_helper,
-    warn_for_legacy_schema,
 )
 from .models import (
     MqttValueTemplate,
@@ -53,7 +52,7 @@
     ReceiveMessage,
     ReceivePayloadType,
 )
-from .util import get_mqtt_data, valid_subscribe_topic
+from .util import get_mqtt_data
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -73,36 +72,11 @@
 DEFAULT_FORCE_UPDATE = False
 
 
-def validate_options(conf: ConfigType) -> ConfigType:
-    """Validate options.
-
-    If last reset topic is present it must be same as the state topic.
-    """
-    if (
-        CONF_LAST_RESET_TOPIC in conf
-        and CONF_STATE_TOPIC in conf
-        and conf[CONF_LAST_RESET_TOPIC] != conf[CONF_STATE_TOPIC]
-    ):
-        _LOGGER.warning(
-            "'%s' must be same as '%s'", CONF_LAST_RESET_TOPIC, CONF_STATE_TOPIC
-        )
-
-    if CONF_LAST_RESET_TOPIC in conf and CONF_LAST_RESET_VALUE_TEMPLATE not in conf:
-        _LOGGER.warning(
-            "'%s' must be set if '%s' is set",
-            CONF_LAST_RESET_VALUE_TEMPLATE,
-            CONF_LAST_RESET_TOPIC,
-        )
-
-    return conf
-
-
 _PLATFORM_SCHEMA_BASE = MQTT_RO_SCHEMA.extend(
     {
         vol.Optional(CONF_DEVICE_CLASS): vol.Any(DEVICE_CLASSES_SCHEMA, None),
         vol.Optional(CONF_EXPIRE_AFTER): cv.positive_int,
         vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
-        vol.Optional(CONF_LAST_RESET_TOPIC): valid_subscribe_topic,
         vol.Optional(CONF_LAST_RESET_VALUE_TEMPLATE): cv.template,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         vol.Optional(CONF_SUGGESTED_DISPLAY_PRECISION): cv.positive_int,
@@ -112,20 +86,17 @@ def validate_options(conf: ConfigType) -> ConfigType:
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
 PLATFORM_SCHEMA_MODERN = vol.All(
+    # Deprecated in HA Core 2021.11.0 https://github.com/home-assistant/core/pull/54840
+    # Removed in HA Core 2023.6.0
+    cv.removed(CONF_LAST_RESET_TOPIC),
     _PLATFORM_SCHEMA_BASE,
-    validate_options,
-)
-
-# Configuring MQTT Sensors under the sensor platform key was deprecated in
-# HA Core 2022.6
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(sensor.DOMAIN),
 )
 
 DISCOVERY_SCHEMA = vol.All(
-    cv.deprecated(CONF_LAST_RESET_TOPIC),
+    # Deprecated in HA Core 2021.11.0 https://github.com/home-assistant/core/pull/54840
+    # Removed in HA Core 2023.6.0
+    cv.removed(CONF_LAST_RESET_TOPIC),
     _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-    validate_options,
 )
 
 
@@ -319,10 +290,7 @@ def _update_last_reset(msg: ReceiveMessage) -> None:
         def message_received(msg: ReceiveMessage) -> None:
             """Handle new MQTT messages."""
             _update_state(msg)
-            if CONF_LAST_RESET_VALUE_TEMPLATE in self._config and (
-                CONF_LAST_RESET_TOPIC not in self._config
-                or self._config[CONF_LAST_RESET_TOPIC] == self._config[CONF_STATE_TOPIC]
-            ):
+            if CONF_LAST_RESET_VALUE_TEMPLATE in self._config:
                 _update_last_reset(msg)
             get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
 
@@ -333,24 +301,6 @@ def message_received(msg: ReceiveMessage) -> None:
             "encoding": self._config[CONF_ENCODING] or None,
         }
 
-        @callback
-        @log_messages(self.hass, self.entity_id)
-        def last_reset_message_received(msg: ReceiveMessage) -> None:
-            """Handle new last_reset messages."""
-            _update_last_reset(msg)
-            get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
-
-        if (
-            CONF_LAST_RESET_TOPIC in self._config
-            and self._config[CONF_LAST_RESET_TOPIC] != self._config[CONF_STATE_TOPIC]
-        ):
-            topics["last_reset_topic"] = {
-                "topic": self._config[CONF_LAST_RESET_TOPIC],
-                "msg_callback": last_reset_message_received,
-                "qos": self._config[CONF_QOS],
-                "encoding": self._config[CONF_ENCODING] or None,
-            }
-
         self._sub_state = subscription.async_prepare_subscribe_topics(
             self.hass, self._sub_state, topics
         )
diff --git a/homeassistant/components/mqtt/siren.py b/homeassistant/components/mqtt/siren.py
index e279deb70b36fb..4134dd9714863b 100644
--- a/homeassistant/components/mqtt/siren.py
+++ b/homeassistant/components/mqtt/siren.py
@@ -50,12 +50,7 @@
     PAYLOAD_NONE,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import (
     MqttCommandTemplate,
     MqttValueTemplate,
@@ -96,12 +91,6 @@
     },
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Sirens under the siren platform key was deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(siren.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = vol.All(PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA))
 
 MQTT_SIREN_ATTRIBUTES_BLOCKED = frozenset(
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index b55fa5779b8ed4..c1eff29e3bef09 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -1,14 +1,4 @@
 {
-  "issues": {
-    "deprecated_yaml": {
-      "title": "Your manually configured MQTT {platform}(s) needs attention",
-      "description": "Manually configured MQTT {platform}(s) found under platform key `{platform}`.\n\nPlease move the configuration to the `mqtt` integration key and restart Home Assistant to fix this issue. See the [documentation]({more_info_url}), for more information."
-    },
-    "deprecated_yaml_broker_settings": {
-      "title": "Deprecated MQTT settings found in `configuration.yaml`",
-      "description": "The following settings found in `configuration.yaml` were migrated to MQTT config entry and will now override the settings in `configuration.yaml`:\n`{deprecated_settings}`\n\nPlease remove these settings from `configuration.yaml` and restart Home Assistant to fix this issue. See the [documentation]({more_info_url}), for more information."
-    }
-  },
   "config": {
     "step": {
       "broker": {
@@ -140,7 +130,7 @@
   "selector": {
     "set_ca_cert": {
       "options": {
-        "off": "Off",
+        "off": "[%key:common::state::off%]",
         "auto": "Auto",
         "custom": "Custom"
       }
diff --git a/homeassistant/components/mqtt/subscription.py b/homeassistant/components/mqtt/subscription.py
index 7ccc31bd3357d2..dda80bba84e20a 100644
--- a/homeassistant/components/mqtt/subscription.py
+++ b/homeassistant/components/mqtt/subscription.py
@@ -8,8 +8,8 @@
 
 from homeassistant.core import HomeAssistant
 
-from . import debug_info
 from .. import mqtt
+from . import debug_info
 from .const import DEFAULT_QOS
 from .models import MessageCallbackType
 
diff --git a/homeassistant/components/mqtt/switch.py b/homeassistant/components/mqtt/switch.py
index 521b08d27489ab..7f4f609f265efe 100644
--- a/homeassistant/components/mqtt/switch.py
+++ b/homeassistant/components/mqtt/switch.py
@@ -37,12 +37,7 @@
     PAYLOAD_NONE,
 )
 from .debug_info import log_messages
-from .mixins import (
-    MQTT_ENTITY_COMMON_SCHEMA,
-    MqttEntity,
-    async_setup_entry_helper,
-    warn_for_legacy_schema,
-)
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
 from .models import MqttValueTemplate, ReceiveMessage
 from .util import get_mqtt_data
 
@@ -64,13 +59,6 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-# Configuring MQTT Switches under the switch platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(switch.DOMAIN),
-)
-
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
diff --git a/homeassistant/components/mqtt/vacuum/__init__.py b/homeassistant/components/mqtt/vacuum/__init__.py
index 86d94883c90628..068bc183ec411c 100644
--- a/homeassistant/components/mqtt/vacuum/__init__.py
+++ b/homeassistant/components/mqtt/vacuum/__init__.py
@@ -11,7 +11,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from ..mixins import async_setup_entry_helper, warn_for_legacy_schema
+from ..mixins import async_setup_entry_helper
 from .schema import CONF_SCHEMA, LEGACY, MQTT_VACUUM_SCHEMA, STATE
 from .schema_legacy import (
     DISCOVERY_SCHEMA_LEGACY,
@@ -46,13 +46,6 @@ def validate_mqtt_vacuum_modern(config_value: ConfigType) -> ConfigType:
     MQTT_VACUUM_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA), validate_mqtt_vacuum_discovery
 )
 
-# Configuring MQTT Vacuums under the vacuum platform key was deprecated in
-# HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(
-    warn_for_legacy_schema(vacuum.DOMAIN),
-)
-
 PLATFORM_SCHEMA_MODERN = vol.All(
     MQTT_VACUUM_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA), validate_mqtt_vacuum_modern
 )
diff --git a/homeassistant/components/mqtt/vacuum/schema_legacy.py b/homeassistant/components/mqtt/vacuum/schema_legacy.py
index 8a2912f19108e4..6cab62cdb5d0bb 100644
--- a/homeassistant/components/mqtt/vacuum/schema_legacy.py
+++ b/homeassistant/components/mqtt/vacuum/schema_legacy.py
@@ -8,7 +8,6 @@
 
 from homeassistant.components.vacuum import (
     ATTR_STATUS,
-    DOMAIN as VACUUM_DOMAIN,
     ENTITY_ID_FORMAT,
     VacuumEntity,
     VacuumEntityFeature,
@@ -26,7 +25,7 @@
 from ..config import MQTT_BASE_SCHEMA
 from ..const import CONF_COMMAND_TOPIC, CONF_ENCODING, CONF_QOS, CONF_RETAIN
 from ..debug_info import log_messages
-from ..mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, warn_for_legacy_schema
+from ..mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity
 from ..models import (
     MqttValueTemplate,
     PayloadSentinel,
@@ -160,13 +159,6 @@
     .extend(MQTT_VACUUM_SCHEMA.schema)
 )
 
-# Configuring MQTT Vacuums under the vacuum platform key was deprecated in
-# HA Core 2022.6;
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA_LEGACY = vol.All(
-    warn_for_legacy_schema(VACUUM_DOMAIN),
-)
-
 DISCOVERY_SCHEMA_LEGACY = PLATFORM_SCHEMA_LEGACY_MODERN.extend(
     {}, extra=vol.REMOVE_EXTRA
 )
diff --git a/homeassistant/components/mqtt/vacuum/schema_state.py b/homeassistant/components/mqtt/vacuum/schema_state.py
index 3f8c6953abee8c..fef185687db971 100644
--- a/homeassistant/components/mqtt/vacuum/schema_state.py
+++ b/homeassistant/components/mqtt/vacuum/schema_state.py
@@ -6,7 +6,6 @@
 import voluptuous as vol
 
 from homeassistant.components.vacuum import (
-    DOMAIN as VACUUM_DOMAIN,
     ENTITY_ID_FORMAT,
     STATE_CLEANING,
     STATE_DOCKED,
@@ -39,7 +38,7 @@
     CONF_STATE_TOPIC,
 )
 from ..debug_info import log_messages
-from ..mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, warn_for_legacy_schema
+from ..mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity
 from ..models import ReceiveMessage
 from ..util import get_mqtt_data, valid_publish_topic
 from .const import MQTT_VACUUM_ATTRIBUTES_BLOCKED
@@ -65,7 +64,6 @@
     VacuumEntityFeature.START
     | VacuumEntityFeature.STOP
     | VacuumEntityFeature.RETURN_HOME
-    | VacuumEntityFeature.STATUS
     | VacuumEntityFeature.BATTERY
     | VacuumEntityFeature.CLEAN_SPOT
 )
@@ -155,13 +153,6 @@
     .extend(MQTT_VACUUM_SCHEMA.schema)
 )
 
-# Configuring MQTT Vacuums under the vacuum platform key was deprecated in
-# HA Core 2022.6;
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA_STATE = vol.All(
-    warn_for_legacy_schema(VACUUM_DOMAIN),
-)
-
 DISCOVERY_SCHEMA_STATE = PLATFORM_SCHEMA_STATE_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
@@ -207,7 +198,7 @@ def config_schema() -> vol.Schema:
     def _setup_from_config(self, config: ConfigType) -> None:
         """(Re)Setup the entity."""
         supported_feature_strings: list[str] = config[CONF_SUPPORTED_FEATURES]
-        self._attr_supported_features = strings_to_services(
+        self._attr_supported_features = VacuumEntityFeature.STATE | strings_to_services(
             supported_feature_strings, STRING_TO_SERVICE
         )
         self._attr_fan_speed_list = config[CONF_FAN_SPEED_LIST]
diff --git a/homeassistant/components/mqtt/water_heater.py b/homeassistant/components/mqtt/water_heater.py
new file mode 100644
index 00000000000000..0f622d55b84f7c
--- /dev/null
+++ b/homeassistant/components/mqtt/water_heater.py
@@ -0,0 +1,318 @@
+"""Support for MQTT water heater devices."""
+from __future__ import annotations
+
+import functools
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import water_heater
+from homeassistant.components.water_heater import (
+    ATTR_OPERATION_MODE,
+    DEFAULT_MIN_TEMP,
+    STATE_ECO,
+    STATE_ELECTRIC,
+    STATE_GAS,
+    STATE_HEAT_PUMP,
+    STATE_HIGH_DEMAND,
+    STATE_PERFORMANCE,
+    WaterHeaterEntity,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_NAME,
+    CONF_OPTIMISTIC,
+    CONF_PAYLOAD_OFF,
+    CONF_PAYLOAD_ON,
+    CONF_TEMPERATURE_UNIT,
+    CONF_VALUE_TEMPLATE,
+    PRECISION_HALVES,
+    PRECISION_TENTHS,
+    PRECISION_WHOLE,
+    STATE_OFF,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.template import Template
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .climate import MqttTemperatureControlEntity
+from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
+from .const import (
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_CURRENT_TEMP_TOPIC,
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_LIST,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_MODE_STATE_TOPIC,
+    CONF_PRECISION,
+    CONF_RETAIN,
+    CONF_TEMP_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_INITIAL,
+    CONF_TEMP_MAX,
+    CONF_TEMP_MIN,
+    CONF_TEMP_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TOPIC,
+    DEFAULT_OPTIMISTIC,
+)
+from .debug_info import log_messages
+from .mixins import MQTT_ENTITY_COMMON_SCHEMA, async_setup_entry_helper
+from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
+from .util import get_mqtt_data, valid_publish_topic, valid_subscribe_topic
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "MQTT Water Heater"
+
+MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED = frozenset(
+    {
+        water_heater.ATTR_CURRENT_TEMPERATURE,
+        water_heater.ATTR_MAX_TEMP,
+        water_heater.ATTR_MIN_TEMP,
+        water_heater.ATTR_TEMPERATURE,
+        water_heater.ATTR_OPERATION_LIST,
+        water_heater.ATTR_OPERATION_MODE,
+    }
+)
+
+VALUE_TEMPLATE_KEYS = (
+    CONF_CURRENT_TEMP_TEMPLATE,
+    CONF_MODE_STATE_TEMPLATE,
+    CONF_TEMP_STATE_TEMPLATE,
+)
+
+COMMAND_TEMPLATE_KEYS = {
+    CONF_MODE_COMMAND_TEMPLATE,
+    CONF_TEMP_COMMAND_TEMPLATE,
+}
+
+
+TOPIC_KEYS = (
+    CONF_CURRENT_TEMP_TOPIC,
+    CONF_MODE_COMMAND_TOPIC,
+    CONF_MODE_STATE_TOPIC,
+    CONF_TEMP_COMMAND_TOPIC,
+    CONF_TEMP_STATE_TOPIC,
+)
+
+
+_PLATFORM_SCHEMA_BASE = MQTT_BASE_SCHEMA.extend(
+    {
+        vol.Optional(CONF_CURRENT_TEMP_TEMPLATE): cv.template,
+        vol.Optional(CONF_CURRENT_TEMP_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_MODE_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_MODE_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(
+            CONF_MODE_LIST,
+            default=[
+                STATE_ECO,
+                STATE_ELECTRIC,
+                STATE_GAS,
+                STATE_HEAT_PUMP,
+                STATE_HIGH_DEMAND,
+                STATE_PERFORMANCE,
+                STATE_OFF,
+            ],
+        ): cv.ensure_list,
+        vol.Optional(CONF_MODE_STATE_TEMPLATE): cv.template,
+        vol.Optional(CONF_MODE_STATE_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
+        vol.Optional(CONF_PAYLOAD_ON, default="ON"): cv.string,
+        vol.Optional(CONF_PAYLOAD_OFF, default="OFF"): cv.string,
+        vol.Optional(CONF_PRECISION): vol.In(
+            [PRECISION_TENTHS, PRECISION_HALVES, PRECISION_WHOLE]
+        ),
+        vol.Optional(CONF_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
+        vol.Optional(CONF_TEMP_INITIAL): cv.positive_int,
+        vol.Optional(CONF_TEMP_MIN): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_MAX): vol.Coerce(float),
+        vol.Optional(CONF_TEMP_COMMAND_TEMPLATE): cv.template,
+        vol.Optional(CONF_TEMP_COMMAND_TOPIC): valid_publish_topic,
+        vol.Optional(CONF_TEMP_STATE_TEMPLATE): cv.template,
+        vol.Optional(CONF_TEMP_STATE_TOPIC): valid_subscribe_topic,
+        vol.Optional(CONF_TEMPERATURE_UNIT): cv.temperature_unit,
+        vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    }
+).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
+
+PLATFORM_SCHEMA_MODERN = vol.All(
+    _PLATFORM_SCHEMA_BASE,
+)
+
+_DISCOVERY_SCHEMA_BASE = _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA)
+
+DISCOVERY_SCHEMA = vol.All(
+    _DISCOVERY_SCHEMA_BASE,
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up MQTT water heater device through YAML and through MQTT discovery."""
+    setup = functools.partial(
+        _async_setup_entity, hass, async_add_entities, config_entry=config_entry
+    )
+    await async_setup_entry_helper(hass, water_heater.DOMAIN, setup, DISCOVERY_SCHEMA)
+
+
+async def _async_setup_entity(
+    hass: HomeAssistant,
+    async_add_entities: AddEntitiesCallback,
+    config: ConfigType,
+    config_entry: ConfigEntry,
+    discovery_data: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the MQTT water heater devices."""
+    async_add_entities([MqttWaterHeater(hass, config, config_entry, discovery_data)])
+
+
+class MqttWaterHeater(MqttTemperatureControlEntity, WaterHeaterEntity):
+    """Representation of an MQTT water heater device."""
+
+    _entity_id_format = water_heater.ENTITY_ID_FORMAT
+    _attributes_extra_blocked = MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        config_entry: ConfigEntry,
+        discovery_data: DiscoveryInfoType | None,
+    ) -> None:
+        """Initialize the water heater device."""
+        MqttTemperatureControlEntity.__init__(
+            self, hass, config, config_entry, discovery_data
+        )
+
+    @staticmethod
+    def config_schema() -> vol.Schema:
+        """Return the config schema."""
+        return DISCOVERY_SCHEMA
+
+    def _setup_from_config(self, config: ConfigType) -> None:
+        """(Re)Setup the entity."""
+        self._attr_operation_list = config[CONF_MODE_LIST]
+        self._attr_temperature_unit = config.get(
+            CONF_TEMPERATURE_UNIT, self.hass.config.units.temperature_unit
+        )
+        if (min_temp := config.get(CONF_TEMP_MIN)) is not None:
+            self._attr_min_temp = min_temp
+        if (max_temp := config.get(CONF_TEMP_MAX)) is not None:
+            self._attr_max_temp = max_temp
+        if (precision := config.get(CONF_PRECISION)) is not None:
+            self._attr_precision = precision
+
+        self._topic = {key: config.get(key) for key in TOPIC_KEYS}
+
+        self._optimistic = config[CONF_OPTIMISTIC]
+
+        # Set init temp, if it is missing convert the default to the temperature units
+        init_temp: float = config.get(
+            CONF_TEMP_INITIAL,
+            TemperatureConverter.convert(
+                DEFAULT_MIN_TEMP,
+                UnitOfTemperature.FAHRENHEIT,
+                self.temperature_unit,
+            ),
+        )
+        if self._topic[CONF_TEMP_STATE_TOPIC] is None or self._optimistic:
+            self._attr_target_temperature = init_temp
+        if self._topic[CONF_MODE_STATE_TOPIC] is None or self._optimistic:
+            self._attr_current_operation = STATE_OFF
+
+        value_templates: dict[str, Template | None] = {}
+        for key in VALUE_TEMPLATE_KEYS:
+            value_templates[key] = None
+        if CONF_VALUE_TEMPLATE in config:
+            value_templates = {
+                key: config.get(CONF_VALUE_TEMPLATE) for key in VALUE_TEMPLATE_KEYS
+            }
+        for key in VALUE_TEMPLATE_KEYS & config.keys():
+            value_templates[key] = config[key]
+        self._value_templates = {
+            key: MqttValueTemplate(
+                template,
+                entity=self,
+            ).async_render_with_possible_json_value
+            for key, template in value_templates.items()
+        }
+
+        self._command_templates = {}
+        for key in COMMAND_TEMPLATE_KEYS:
+            self._command_templates[key] = MqttCommandTemplate(
+                config.get(key), entity=self
+            ).async_render
+
+        support = WaterHeaterEntityFeature(0)
+        if (self._topic[CONF_TEMP_STATE_TOPIC] is not None) or (
+            self._topic[CONF_TEMP_COMMAND_TOPIC] is not None
+        ):
+            support |= WaterHeaterEntityFeature.TARGET_TEMPERATURE
+
+        if (self._topic[CONF_MODE_STATE_TOPIC] is not None) or (
+            self._topic[CONF_MODE_COMMAND_TOPIC] is not None
+        ):
+            support |= WaterHeaterEntityFeature.OPERATION_MODE
+
+        self._attr_supported_features = support
+
+    def _prepare_subscribe_topics(self) -> None:
+        """(Re)Subscribe to topics."""
+        topics: dict[str, dict[str, Any]] = {}
+
+        @callback
+        def handle_mode_received(
+            msg: ReceiveMessage, template_name: str, attr: str, mode_list: str
+        ) -> None:
+            """Handle receiving listed mode via MQTT."""
+            payload = self.render_template(msg, template_name)
+
+            if payload not in self._config[mode_list]:
+                _LOGGER.error("Invalid %s mode: %s", mode_list, payload)
+            else:
+                setattr(self, attr, payload)
+                get_mqtt_data(self.hass).state_write_requests.write_state_request(self)
+
+        @callback
+        @log_messages(self.hass, self.entity_id)
+        def handle_current_mode_received(msg: ReceiveMessage) -> None:
+            """Handle receiving operation mode via MQTT."""
+            handle_mode_received(
+                msg,
+                CONF_MODE_STATE_TEMPLATE,
+                "_attr_current_operation",
+                CONF_MODE_LIST,
+            )
+
+        self.add_subscription(
+            topics, CONF_MODE_STATE_TOPIC, handle_current_mode_received
+        )
+
+        self.prepare_subscribe_topics(topics)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        operation_mode: str | None
+        if (operation_mode := kwargs.get(ATTR_OPERATION_MODE)) is not None:
+            await self.async_set_operation_mode(operation_mode)
+        await super().async_set_temperature(**kwargs)
+
+    async def async_set_operation_mode(self, operation_mode: str) -> None:
+        """Set new operation mode."""
+        payload = self._command_templates[CONF_MODE_COMMAND_TEMPLATE](operation_mode)
+        await self._publish(CONF_MODE_COMMAND_TOPIC, payload)
+
+        if self._optimistic or self._topic[CONF_MODE_STATE_TOPIC] is None:
+            self._attr_current_operation = operation_mode
+            self.async_write_ha_state()
diff --git a/homeassistant/components/mqtt_room/sensor.py b/homeassistant/components/mqtt_room/sensor.py
index 00441690b47f90..1b4cdb1c58317d 100644
--- a/homeassistant/components/mqtt_room/sensor.py
+++ b/homeassistant/components/mqtt_room/sensor.py
@@ -23,7 +23,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import dt, slugify
+from homeassistant.util import dt as dt_util, slugify
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -122,7 +122,7 @@ def update_state(device_id, room, distance):
             """Update the sensor state."""
             self._state = room
             self._distance = distance
-            self._updated = dt.utcnow()
+            self._updated = dt_util.utcnow()
 
             self.async_write_ha_state()
 
@@ -144,7 +144,7 @@ def message_received(msg):
                     # device is in the same room OR
                     # device is closer to another room OR
                     # last update from other room was too long ago
-                    timediff = dt.utcnow() - self._updated
+                    timediff = dt_util.utcnow() - self._updated
                     if (
                         device.get(ATTR_ROOM) == self._state
                         or device.get(ATTR_DISTANCE) < self._distance
@@ -174,7 +174,7 @@ def update(self) -> None:
         if (
             self._updated
             and self._consider_home
-            and dt.utcnow() - self._updated > self._consider_home
+            and dt_util.utcnow() - self._updated > self._consider_home
         ):
             self._state = STATE_NOT_HOME
 
diff --git a/homeassistant/components/my/__init__.py b/homeassistant/components/my/__init__.py
index b547662d1889db..d699e42e105016 100644
--- a/homeassistant/components/my/__init__.py
+++ b/homeassistant/components/my/__init__.py
@@ -1,11 +1,14 @@
 """Support for my.home-assistant.io redirect service."""
 from homeassistant.components import frontend
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "my"
 URL_PATH = "_my_redirect"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Register hidden _my_redirect panel."""
diff --git a/homeassistant/components/myq/manifest.json b/homeassistant/components/myq/manifest.json
index 05f698f2170e2f..5e03f962d15270 100644
--- a/homeassistant/components/myq/manifest.json
+++ b/homeassistant/components/myq/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "myq",
   "name": "MyQ",
-  "codeowners": ["@bdraco", "@ehendrix23"],
+  "codeowners": ["@ehendrix23"],
   "config_flow": true,
   "dhcp": [
     {
diff --git a/homeassistant/components/mysensors/device.py b/homeassistant/components/mysensors/device.py
index d7405dba187e97..42c5a40636e5f7 100644
--- a/homeassistant/components/mysensors/device.py
+++ b/homeassistant/components/mysensors/device.py
@@ -227,7 +227,6 @@ def extra_state_attributes(self) -> dict[str, Any]:
         """Return entity specific state attributes."""
         attr = self._extra_attributes
 
-        assert self.platform
         assert self.platform.config_entry
         attr[ATTR_DEVICE] = self.platform.config_entry.data[CONF_DEVICE]
 
diff --git a/homeassistant/components/mysensors/strings.json b/homeassistant/components/mysensors/strings.json
index dc5dc76c7ae35e..7e0ff2c99d6e36 100644
--- a/homeassistant/components/mysensors/strings.json
+++ b/homeassistant/components/mysensors/strings.json
@@ -19,7 +19,7 @@
         "description": "Ethernet gateway setup",
         "data": {
           "device": "IP address of the gateway",
-          "tcp_port": "port",
+          "tcp_port": "[%key:common::config_flow::data::port%]",
           "version": "MySensors version",
           "persistence_file": "persistence file (leave empty to auto-generate)"
         }
@@ -30,17 +30,17 @@
           "device": "Serial port",
           "baud_rate": "baud rate",
           "version": "MySensors version",
-          "persistence_file": "persistence file (leave empty to auto-generate)"
+          "persistence_file": "Persistence file (leave empty to auto-generate)"
         }
       },
       "gw_mqtt": {
         "description": "MQTT gateway setup",
         "data": {
-          "retain": "mqtt retain",
-          "topic_in_prefix": "prefix for input topics (topic_in_prefix)",
-          "topic_out_prefix": "prefix for output topics (topic_out_prefix)",
+          "retain": "MQTT retain",
+          "topic_in_prefix": "Prefix for input topics (topic_in_prefix)",
+          "topic_out_prefix": "Prefix for output topics (topic_out_prefix)",
           "version": "MySensors version",
-          "persistence_file": "persistence file (leave empty to auto-generate)"
+          "persistence_file": "Persistence file (leave empty to auto-generate)"
         }
       }
     },
diff --git a/homeassistant/components/mystrom/__init__.py b/homeassistant/components/mystrom/__init__.py
index 54a24b9b4af4d8..64f7dafc1b7a49 100644
--- a/homeassistant/components/mystrom/__init__.py
+++ b/homeassistant/components/mystrom/__init__.py
@@ -1 +1,94 @@
-"""The mystrom component."""
+"""The myStrom integration."""
+from __future__ import annotations
+
+import logging
+
+import pymystrom
+from pymystrom.bulb import MyStromBulb
+from pymystrom.exceptions import MyStromConnectionError
+from pymystrom.switch import MyStromSwitch
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import DOMAIN
+from .models import MyStromData
+
+PLATFORMS_SWITCH = [Platform.SWITCH]
+PLATFORMS_BULB = [Platform.LIGHT]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def _async_get_device_state(
+    device: MyStromSwitch | MyStromBulb, ip_address: str
+) -> None:
+    try:
+        await device.get_state()
+    except MyStromConnectionError as err:
+        _LOGGER.error("No route to myStrom plug: %s", ip_address)
+        raise ConfigEntryNotReady() from err
+
+
+def _get_mystrom_bulb(host: str, mac: str) -> MyStromBulb:
+    return MyStromBulb(host, mac)
+
+
+def _get_mystrom_switch(host: str) -> MyStromSwitch:
+    return MyStromSwitch(host)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up myStrom from a config entry."""
+    host = entry.data[CONF_HOST]
+    device = None
+    try:
+        info = await pymystrom.get_device_info(host)
+    except MyStromConnectionError as err:
+        _LOGGER.error("No route to myStrom plug: %s", host)
+        raise ConfigEntryNotReady() from err
+
+    device_type = info["type"]
+    if device_type in [101, 106, 107]:
+        device = _get_mystrom_switch(host)
+        platforms = PLATFORMS_SWITCH
+        await _async_get_device_state(device, info["ip"])
+    elif device_type in [102, 105]:
+        mac = info["mac"]
+        device = _get_mystrom_bulb(host, mac)
+        platforms = PLATFORMS_BULB
+        await _async_get_device_state(device, info["ip"])
+        if device.bulb_type not in ["rgblamp", "strip"]:
+            _LOGGER.error(
+                "Device %s (%s) is not a myStrom bulb nor myStrom LED Strip",
+                host,
+                mac,
+            )
+            return False
+    else:
+        _LOGGER.error("Unsupported myStrom device type: %s", device_type)
+        return False
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = MyStromData(
+        device=device,
+        info=info,
+    )
+    await hass.config_entries.async_forward_entry_setups(entry, platforms)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    device_type = hass.data[DOMAIN][entry.entry_id].info["type"]
+    platforms = []
+    if device_type in [101, 106, 107]:
+        platforms.extend(PLATFORMS_SWITCH)
+    elif device_type in [102, 105]:
+        platforms.extend(PLATFORMS_BULB)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, platforms):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/mystrom/config_flow.py b/homeassistant/components/mystrom/config_flow.py
new file mode 100644
index 00000000000000..3dc334d825261e
--- /dev/null
+++ b/homeassistant/components/mystrom/config_flow.py
@@ -0,0 +1,57 @@
+"""Config flow for myStrom integration."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import pymystrom
+from pymystrom.exceptions import MyStromConnectionError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST, CONF_NAME
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "myStrom Device"
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): str,
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for myStrom."""
+
+    VERSION = 1
+
+    async def async_step_import(self, import_config: dict[str, Any]) -> FlowResult:
+        """Handle import from config."""
+        return await self.async_step_user(import_config)
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            try:
+                info = await pymystrom.get_device_info(user_input[CONF_HOST])
+            except MyStromConnectionError:
+                errors["base"] = "cannot_connect"
+            else:
+                await self.async_set_unique_id(info["mac"])
+                self._abort_if_unique_id_configured()
+                data = {CONF_HOST: user_input[CONF_HOST]}
+                title = user_input.get(CONF_NAME) or DEFAULT_NAME
+                return self.async_create_entry(title=title, data=data)
+
+        schema = self.add_suggested_values_to_schema(STEP_USER_DATA_SCHEMA, user_input)
+        return self.async_show_form(step_id="user", data_schema=schema, errors=errors)
diff --git a/homeassistant/components/mystrom/const.py b/homeassistant/components/mystrom/const.py
index 87697acbe967ae..5641463abf1c7b 100644
--- a/homeassistant/components/mystrom/const.py
+++ b/homeassistant/components/mystrom/const.py
@@ -1,2 +1,4 @@
 """Constants for the myStrom integration."""
 DOMAIN = "mystrom"
+DEFAULT_NAME = "myStrom"
+MANUFACTURER = "myStrom"
diff --git a/homeassistant/components/mystrom/light.py b/homeassistant/components/mystrom/light.py
index 26ce5b115671f3..14badde17d246c 100644
--- a/homeassistant/components/mystrom/light.py
+++ b/homeassistant/components/mystrom/light.py
@@ -4,7 +4,6 @@
 import logging
 from typing import Any
 
-from pymystrom.bulb import MyStromBulb
 from pymystrom.exceptions import MyStromConnectionError
 import voluptuous as vol
 
@@ -17,13 +16,17 @@
     LightEntity,
     LightEntityFeature,
 )
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .const import DOMAIN, MANUFACTURER
+
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = "myStrom bulb"
@@ -31,8 +34,6 @@
 EFFECT_RAINBOW = "rainbow"
 EFFECT_SUNRISE = "sunrise"
 
-MYSTROM_EFFECT_LIST = [EFFECT_RAINBOW, EFFECT_SUNRISE]
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
@@ -42,6 +43,15 @@
 )
 
 
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the myStrom entities."""
+    info = hass.data[DOMAIN][entry.entry_id].info
+    device = hass.data[DOMAIN][entry.entry_id].device
+    async_add_entities([MyStromLight(device, entry.title, info["mac"])])
+
+
 async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
@@ -49,23 +59,20 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the myStrom light integration."""
-    host = config.get(CONF_HOST)
-    mac = config.get(CONF_MAC)
-    name = config.get(CONF_NAME)
-
-    bulb = MyStromBulb(host, mac)
-    try:
-        await bulb.get_state()
-        if bulb.bulb_type not in ["rgblamp", "strip"]:
-            _LOGGER.error(
-                "Device %s (%s) is not a myStrom bulb nor myStrom LED Strip", host, mac
-            )
-            return
-    except MyStromConnectionError as err:
-        _LOGGER.warning("No route to myStrom bulb: %s", host)
-        raise PlatformNotReady() from err
-
-    async_add_entities([MyStromLight(bulb, name, mac)], True)
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
 
 
 class MyStromLight(LightEntity):
@@ -74,52 +81,21 @@ class MyStromLight(LightEntity):
     _attr_color_mode = ColorMode.HS
     _attr_supported_color_modes = {ColorMode.HS}
     _attr_supported_features = LightEntityFeature.EFFECT | LightEntityFeature.FLASH
+    _attr_effect_list = [EFFECT_RAINBOW, EFFECT_SUNRISE]
 
     def __init__(self, bulb, name, mac):
         """Initialize the light."""
         self._bulb = bulb
-        self._name = name
-        self._state = None
-        self._available = False
-        self._brightness = 0
-        self._color_h = 0
-        self._color_s = 0
-        self._mac = mac
-
-    @property
-    def name(self):
-        """Return the display name of this light."""
-        return self._name
-
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._mac
-
-    @property
-    def brightness(self):
-        """Return the brightness of the light."""
-        return self._brightness
-
-    @property
-    def hs_color(self):
-        """Return the color of the light."""
-        return self._color_h, self._color_s
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self._available
-
-    @property
-    def effect_list(self):
-        """Return the list of supported effects."""
-        return MYSTROM_EFFECT_LIST
-
-    @property
-    def is_on(self):
-        """Return true if light is on."""
-        return self._state
+        self._attr_name = name
+        self._attr_available = False
+        self._attr_unique_id = mac
+        self._attr_hs_color = 0, 0
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, mac)},
+            name=name,
+            manufacturer=MANUFACTURER,
+            sw_version=self._bulb.firmware,
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the light."""
@@ -130,7 +106,10 @@ async def async_turn_on(self, **kwargs: Any) -> None:
             color_h, color_s = kwargs[ATTR_HS_COLOR]
         elif ATTR_BRIGHTNESS in kwargs:
             # Brightness update, keep color
-            color_h, color_s = self._color_h, self._color_s
+            if self.hs_color is not None:
+                color_h, color_s = self.hs_color
+            else:
+                color_h, color_s = 0, 0  # Back to white
         else:
             color_h, color_s = 0, 0  # Back to white
 
@@ -159,7 +138,7 @@ async def async_update(self) -> None:
         """Fetch new state data for this light."""
         try:
             await self._bulb.get_state()
-            self._state = self._bulb.state
+            self._attr_is_on = self._bulb.state
 
             colors = self._bulb.color
             try:
@@ -168,11 +147,10 @@ async def async_update(self) -> None:
                 color_s, color_v = colors.split(";")
                 color_h = 0
 
-            self._color_h = int(color_h)
-            self._color_s = int(color_s)
-            self._brightness = int(color_v) * 255 / 100
+            self._attr_hs_color = int(color_h), int(color_s)
+            self._attr_brightness = int(int(color_v) * 255 / 100)
 
-            self._available = True
+            self._attr_available = True
         except MyStromConnectionError:
             _LOGGER.warning("No route to myStrom bulb")
-            self._available = False
+            self._attr_available = False
diff --git a/homeassistant/components/mystrom/manifest.json b/homeassistant/components/mystrom/manifest.json
index 7659b1d8025e55..eaf9eb6acdca62 100644
--- a/homeassistant/components/mystrom/manifest.json
+++ b/homeassistant/components/mystrom/manifest.json
@@ -2,6 +2,7 @@
   "domain": "mystrom",
   "name": "myStrom",
   "codeowners": ["@fabaff"],
+  "config_flow": true,
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/mystrom",
   "iot_class": "local_polling",
diff --git a/homeassistant/components/mystrom/models.py b/homeassistant/components/mystrom/models.py
new file mode 100644
index 00000000000000..96cc40996ef508
--- /dev/null
+++ b/homeassistant/components/mystrom/models.py
@@ -0,0 +1,14 @@
+"""Models for the mystrom integration."""
+from dataclasses import dataclass
+from typing import Any
+
+from pymystrom.bulb import MyStromBulb
+from pymystrom.switch import MyStromSwitch
+
+
+@dataclass
+class MyStromData:
+    """Data class for mystrom device data."""
+
+    device: MyStromSwitch | MyStromBulb
+    info: dict[str, Any]
diff --git a/homeassistant/components/mystrom/strings.json b/homeassistant/components/mystrom/strings.json
new file mode 100644
index 00000000000000..259501e14864e5
--- /dev/null
+++ b/homeassistant/components/mystrom/strings.json
@@ -0,0 +1,24 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
+  "issues": {
+    "deprecated_yaml": {
+      "title": "The myStrom YAML configuration is being removed",
+      "description": "Configuring myStrom using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the myStrom YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+    }
+  }
+}
diff --git a/homeassistant/components/mystrom/switch.py b/homeassistant/components/mystrom/switch.py
index 7bce3000424c6c..8e89bb5f1518b7 100644
--- a/homeassistant/components/mystrom/switch.py
+++ b/homeassistant/components/mystrom/switch.py
@@ -5,17 +5,20 @@
 from typing import Any
 
 from pymystrom.exceptions import MyStromConnectionError
-from pymystrom.switch import MyStromSwitch as _MyStromSwitch
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .const import DOMAIN, MANUFACTURER
+
 DEFAULT_NAME = "myStrom Switch"
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,6 +31,14 @@
 )
 
 
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the myStrom entities."""
+    device = hass.data[DOMAIN][entry.entry_id].device
+    async_add_entities([MyStromSwitch(device, entry.title)])
+
+
 async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
@@ -35,17 +46,20 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the myStrom switch/plug integration."""
-    name = config.get(CONF_NAME)
-    host = config.get(CONF_HOST)
-
-    try:
-        plug = _MyStromSwitch(host)
-        await plug.get_state()
-    except MyStromConnectionError as err:
-        _LOGGER.error("No route to myStrom plug: %s", host)
-        raise PlatformNotReady() from err
-
-    async_add_entities([MyStromSwitch(plug, name)])
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
 
 
 class MyStromSwitch(SwitchEntity):
@@ -53,30 +67,15 @@ class MyStromSwitch(SwitchEntity):
 
     def __init__(self, plug, name):
         """Initialize the myStrom switch/plug."""
-        self._name = name
         self.plug = plug
-        self._available = True
-        self.relay = None
-
-    @property
-    def name(self):
-        """Return the name of the switch."""
-        return self._name
-
-    @property
-    def is_on(self):
-        """Return true if switch is on."""
-        return bool(self.relay)
-
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self.plug._mac  # pylint: disable=protected-access
-
-    @property
-    def available(self):
-        """Could the device be accessed during the last update call."""
-        return self._available
+        self._attr_name = name
+        self._attr_unique_id = self.plug.mac
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self.plug.mac)},
+            name=name,
+            manufacturer=MANUFACTURER,
+            sw_version=self.plug.firmware,
+        )
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
@@ -96,9 +95,9 @@ async def async_update(self) -> None:
         """Get the latest data from the device and update the data."""
         try:
             await self.plug.get_state()
-            self.relay = self.plug.relay
-            self._available = True
+            self._attr_is_on = self.plug.relay
+            self._attr_available = True
         except MyStromConnectionError:
-            if self._available:
-                self._available = False
+            if self.available:
+                self._attr_available = False
                 _LOGGER.error("No route to myStrom plug")
diff --git a/homeassistant/components/nad/manifest.json b/homeassistant/components/nad/manifest.json
index dd354086a1a449..2e2d44341afe7e 100644
--- a/homeassistant/components/nad/manifest.json
+++ b/homeassistant/components/nad/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nad",
   "iot_class": "local_polling",
   "loggers": ["nad_receiver"],
-  "requirements": ["nad_receiver==0.3.0"]
+  "requirements": ["nad-receiver==0.3.0"]
 }
diff --git a/homeassistant/components/nam/button.py b/homeassistant/components/nam/button.py
index a55215962086e5..a280369e7c8582 100644
--- a/homeassistant/components/nam/button.py
+++ b/homeassistant/components/nam/button.py
@@ -23,7 +23,6 @@
 
 RESTART_BUTTON: ButtonEntityDescription = ButtonEntityDescription(
     key="restart",
-    translation_key="restart",
     device_class=ButtonDeviceClass.RESTART,
     entity_category=EntityCategory.CONFIG,
 )
diff --git a/homeassistant/components/nam/sensor.py b/homeassistant/components/nam/sensor.py
index 3f9821a1e34f00..3c0b8bc9ba4784 100644
--- a/homeassistant/components/nam/sensor.py
+++ b/homeassistant/components/nam/sensor.py
@@ -338,7 +338,6 @@ class NAMSensorEntityDescription(SensorEntityDescription, NAMSensorRequiredKeysM
     ),
     NAMSensorEntityDescription(
         key=ATTR_SIGNAL_STRENGTH,
-        translation_key="signal_strength",
         suggested_display_precision=0,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
diff --git a/homeassistant/components/nam/strings.json b/homeassistant/components/nam/strings.json
index e60855b882c1a3..e443a398984493 100644
--- a/homeassistant/components/nam/strings.json
+++ b/homeassistant/components/nam/strings.json
@@ -39,11 +39,6 @@
     }
   },
   "entity": {
-    "button": {
-      "restart": {
-        "name": "[%key:component::button::entity_component::restart::name%]"
-      }
-    },
     "sensor": {
       "bme280_humidity": {
         "name": "BME280 humidity"
@@ -153,9 +148,6 @@
       "dht22_temperature": {
         "name": "DHT22 temperature"
       },
-      "signal_strength": {
-        "name": "[%key:component::sensor::entity_component::signal_strength::name%]"
-      },
       "last_restart": {
         "name": "Last restart"
       }
diff --git a/homeassistant/components/ness_alarm/__init__.py b/homeassistant/components/ness_alarm/__init__.py
index c81c3e0c7f7c71..c1d97f781afa89 100644
--- a/homeassistant/components/ness_alarm/__init__.py
+++ b/homeassistant/components/ness_alarm/__init__.py
@@ -1,6 +1,7 @@
 """Support for Ness D8X/D16X devices."""
 from collections import namedtuple
 import datetime
+import logging
 
 from nessclient import ArmingState, Client
 import voluptuous as vol
@@ -21,8 +22,11 @@
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import ConfigType
 
+_LOGGER = logging.getLogger(__name__)
+
 DOMAIN = "ness_alarm"
 DATA_NESS = "ness_alarm"
 
@@ -109,6 +113,14 @@ async def _close(event):
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close)
 
+    async def _started(event):
+        # Force update for current arming status and current zone states (once Home Assistant has finished loading required sensors and panel)
+        _LOGGER.debug("invoking client keepalive() & update()")
+        hass.loop.create_task(client.keepalive())
+        hass.loop.create_task(client.update())
+
+    async_at_started(hass, _started)
+
     hass.async_create_task(
         async_load_platform(
             hass, Platform.BINARY_SENSOR, DOMAIN, {CONF_ZONES: zones}, config
@@ -131,10 +143,6 @@ def on_state_change(arming_state: ArmingState):
     client.on_zone_change(on_zone_change)
     client.on_state_change(on_state_change)
 
-    # Force update for current arming status and current zone states
-    hass.loop.create_task(client.keepalive())
-    hass.loop.create_task(client.update())
-
     async def handle_panic(call: ServiceCall) -> None:
         await client.panic(call.data[ATTR_CODE])
 
diff --git a/homeassistant/components/nest/camera_sdm.py b/homeassistant/components/nest/camera_sdm.py
index 834202ba58d064..3eceb448fa4e89 100644
--- a/homeassistant/components/nest/camera_sdm.py
+++ b/homeassistant/components/nest/camera_sdm.py
@@ -61,6 +61,7 @@ class NestCamera(Camera):
     """Devices that support cameras."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, device: Device) -> None:
         """Initialize the camera."""
diff --git a/homeassistant/components/nest/climate_sdm.py b/homeassistant/components/nest/climate_sdm.py
index ab0ce20a9a1a8d..ca975ed055d5f4 100644
--- a/homeassistant/components/nest/climate_sdm.py
+++ b/homeassistant/components/nest/climate_sdm.py
@@ -99,6 +99,7 @@ class ThermostatEntity(ClimateEntity):
     _attr_max_temp = MAX_TEMP
     _attr_has_entity_name = True
     _attr_should_poll = False
+    _attr_name = None
 
     def __init__(self, device: Device) -> None:
         """Initialize ThermostatEntity."""
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index 6af293aba9733e..dbb30ceb52adea 100644
--- a/homeassistant/components/nest/manifest.json
+++ b/homeassistant/components/nest/manifest.json
@@ -20,5 +20,5 @@
   "iot_class": "cloud_push",
   "loggers": ["google_nest_sdm", "nest"],
   "quality_scale": "platinum",
-  "requirements": ["python-nest==4.2.0", "google-nest-sdm==2.2.4"]
+  "requirements": ["python-nest==4.2.0", "google-nest-sdm==2.2.5"]
 }
diff --git a/homeassistant/components/nest/sensor_sdm.py b/homeassistant/components/nest/sensor_sdm.py
index 8eb607b2056650..a74d0f3a54b9af 100644
--- a/homeassistant/components/nest/sensor_sdm.py
+++ b/homeassistant/components/nest/sensor_sdm.py
@@ -79,7 +79,6 @@ class TemperatureSensor(SensorBase):
 
     _attr_device_class = SensorDeviceClass.TEMPERATURE
     _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS
-    _attr_translation_key = "temperature"
 
     @property
     def native_value(self) -> float:
@@ -96,7 +95,6 @@ class HumiditySensor(SensorBase):
 
     _attr_device_class = SensorDeviceClass.HUMIDITY
     _attr_native_unit_of_measurement = PERCENTAGE
-    _attr_translation_key = "humidity"
 
     @property
     def native_value(self) -> int:
diff --git a/homeassistant/components/nest/strings.json b/homeassistant/components/nest/strings.json
index 2578437acf4792..a452d015a2b946 100644
--- a/homeassistant/components/nest/strings.json
+++ b/homeassistant/components/nest/strings.json
@@ -86,15 +86,5 @@
       "title": "Legacy Works With Nest is being removed",
       "description": "Legacy Works With Nest is being removed from Home Assistant.\n\nYou must take action to use the SDM API. Remove all `nest` configuration from `configuration.yaml` and restart Home Assistant, then see the Nest [integration instructions]({documentation_url}) for set up instructions and supported devices."
     }
-  },
-  "entity": {
-    "sensor": {
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      }
-    }
   }
 }
diff --git a/homeassistant/components/netatmo/__init__.py b/homeassistant/components/netatmo/__init__.py
index aa8728d548d05e..e26a32965a3c0e 100644
--- a/homeassistant/components/netatmo/__init__.py
+++ b/homeassistant/components/netatmo/__init__.py
@@ -234,11 +234,10 @@ async def manage_cloudhook(state: cloud.CloudConnectionState) -> None:
             await register_webhook(None)
         cloud.async_listen_connection_change(hass, manage_cloudhook)
 
+    elif hass.state == CoreState.running:
+        await register_webhook(None)
     else:
-        if hass.state == CoreState.running:
-            await register_webhook(None)
-        else:
-            hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, register_webhook)
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, register_webhook)
 
     hass.services.async_register(DOMAIN, "register_webhook", register_webhook)
     hass.services.async_register(DOMAIN, "unregister_webhook", unregister_webhook)
diff --git a/homeassistant/components/netatmo/device_trigger.py b/homeassistant/components/netatmo/device_trigger.py
index f3f45458d78b6c..f4719badcfa0a6 100644
--- a/homeassistant/components/netatmo/device_trigger.py
+++ b/homeassistant/components/netatmo/device_trigger.py
@@ -56,7 +56,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_SUBTYPE): str,
     }
@@ -111,7 +111,7 @@ async def async_get_triggers(
                             CONF_PLATFORM: "device",
                             CONF_DEVICE_ID: device_id,
                             CONF_DOMAIN: DOMAIN,
-                            CONF_ENTITY_ID: entry.entity_id,
+                            CONF_ENTITY_ID: entry.id,
                             CONF_TYPE: trigger,
                             CONF_SUBTYPE: subtype,
                         }
@@ -122,7 +122,7 @@ async def async_get_triggers(
                         CONF_PLATFORM: "device",
                         CONF_DEVICE_ID: device_id,
                         CONF_DOMAIN: DOMAIN,
-                        CONF_ENTITY_ID: entry.entity_id,
+                        CONF_ENTITY_ID: entry.id,
                         CONF_TYPE: trigger,
                     }
                 )
diff --git a/homeassistant/components/netatmo/strings.json b/homeassistant/components/netatmo/strings.json
index a500689a937fd9..5fdf580c6aa647 100644
--- a/homeassistant/components/netatmo/strings.json
+++ b/homeassistant/components/netatmo/strings.json
@@ -47,9 +47,9 @@
   },
   "device_automation": {
     "trigger_subtype": {
-      "away": "away",
-      "schedule": "schedule",
-      "hg": "frost guard"
+      "away": "Away",
+      "schedule": "Schedule",
+      "hg": "Frost guard"
     },
     "trigger_type": {
       "turned_off": "{entity_name} turned off",
diff --git a/homeassistant/components/netdata/manifest.json b/homeassistant/components/netdata/manifest.json
index 2d7604765c437a..99410ce033d37d 100644
--- a/homeassistant/components/netdata/manifest.json
+++ b/homeassistant/components/netdata/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/netdata",
   "iot_class": "local_polling",
   "loggers": ["netdata"],
-  "requirements": ["netdata==1.0.1"]
+  "requirements": ["netdata==1.1.0"]
 }
diff --git a/homeassistant/components/netdata/sensor.py b/homeassistant/components/netdata/sensor.py
index 6606604ac90c9b..1ab7a48e1b3273 100644
--- a/homeassistant/components/netdata/sensor.py
+++ b/homeassistant/components/netdata/sensor.py
@@ -66,7 +66,7 @@ async def async_setup_platform(
     port = config[CONF_PORT]
     resources = config[CONF_RESOURCES]
 
-    netdata = NetdataData(Netdata(host, port=port))
+    netdata = NetdataData(Netdata(host, port=port, timeout=20.0))
     await netdata.async_update()
 
     if netdata.api.metrics is None:
diff --git a/homeassistant/components/netgear/__init__.py b/homeassistant/components/netgear/__init__.py
index 8f81de43ebbe76..ef31a887691288 100644
--- a/homeassistant/components/netgear/__init__.py
+++ b/homeassistant/components/netgear/__init__.py
@@ -208,7 +208,7 @@ async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> Non
 async def async_remove_config_entry_device(
     hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
-    """Remove a config entry from a device."""
+    """Remove a device from a config entry."""
     router = hass.data[DOMAIN][config_entry.entry_id][KEY_ROUTER]
 
     device_mac = None
diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py
index a57334d2531f03..32bb9a574cd025 100644
--- a/homeassistant/components/network/__init__.py
+++ b/homeassistant/components/network/__init__.py
@@ -6,11 +6,13 @@
 
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import UNDEFINED, ConfigType, UndefinedType
 from homeassistant.loader import bind_hass
 
 from . import util
 from .const import (
+    DOMAIN,
     IPV4_BROADCAST_ADDR,
     LOOPBACK_TARGET_IP,
     MDNS_TARGET_IP,
@@ -21,6 +23,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @bind_hass
 async def async_get_adapters(hass: HomeAssistant) -> list[Adapter]:
@@ -115,6 +119,32 @@ async def async_get_ipv4_broadcast_addresses(hass: HomeAssistant) -> set[IPv4Add
     return broadcast_addresses
 
 
+async def async_get_announce_addresses(hass: HomeAssistant) -> list[str]:
+    """Return a list of IP addresses to announce/use via zeroconf/ssdp/etc.
+
+    The default ip address is always returned first if available.
+    """
+    adapters = await async_get_adapters(hass)
+    addresses: list[str] = []
+    default_ip: str | None = None
+    for adapter in adapters:
+        if not adapter["enabled"]:
+            continue
+        for ips in adapter["ipv4"]:
+            addresses.append(str(IPv4Address(ips["address"])))
+        for ips in adapter["ipv6"]:
+            addresses.append(str(IPv6Address(ips["address"])))
+
+    # Puts the default IPv4 address first in the list to preserve compatibility,
+    # because some mDNS implementations ignores anything but the first announced
+    # address.
+    if default_ip := await async_get_source_ip(hass, target_ip=MDNS_TARGET_IP):
+        if default_ip in addresses:
+            addresses.remove(default_ip)
+        return [default_ip] + list(addresses)
+    return list(addresses)
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up network for Home Assistant."""
     # Avoid circular issue: http->network->websocket_api->http
diff --git a/homeassistant/components/nexia/__init__.py b/homeassistant/components/nexia/__init__.py
index b221f440ff8462..0644de58ee7b15 100644
--- a/homeassistant/components/nexia/__init__.py
+++ b/homeassistant/components/nexia/__init__.py
@@ -56,6 +56,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             )
             return False
         raise ConfigEntryNotReady(f"Error from Nexia service: {http_ex}") from http_ex
+    except aiohttp.ClientOSError as os_error:
+        raise ConfigEntryNotReady(
+            f"Error connecting to Nexia service: {os_error}"
+        ) from os_error
 
     coordinator = NexiaDataUpdateCoordinator(hass, nexia_home)
     await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/nextbus/manifest.json b/homeassistant/components/nextbus/manifest.json
index b77ffa86f03603..4b8bd1a929420f 100644
--- a/homeassistant/components/nextbus/manifest.json
+++ b/homeassistant/components/nextbus/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nextbus",
   "iot_class": "cloud_polling",
   "loggers": ["py_nextbus"],
-  "requirements": ["py_nextbusnext==0.1.5"]
+  "requirements": ["py-nextbusnext==0.1.5"]
 }
diff --git a/homeassistant/components/nextbus/sensor.py b/homeassistant/components/nextbus/sensor.py
index 02f5d8695ca136..b8f36e10fa1070 100644
--- a/homeassistant/components/nextbus/sensor.py
+++ b/homeassistant/components/nextbus/sensor.py
@@ -108,41 +108,19 @@ def __init__(self, client, agency, route, stop, name=None):
         self.agency = agency
         self.route = route
         self.stop = stop
-        self._custom_name = name
+        self._attr_extra_state_attributes = {}
+
         # Maybe pull a more user friendly name from the API here
-        self._name = f"{agency} {route}"
-        self._client = client
+        self._attr_name = f"{agency} {route}"
+        if name:
+            self._attr_name = name
 
-        # set up default state attributes
-        self._state = None
-        self._attributes = {}
+        self._client = client
 
     def _log_debug(self, message, *args):
         """Log debug message with prefix."""
         _LOGGER.debug(":".join((self.agency, self.route, self.stop, message)), *args)
 
-    @property
-    def name(self):
-        """Return sensor name.
-
-        Uses an auto generated name based on the data from the API unless a
-        custom name is provided in the configuration.
-        """
-        if self._custom_name:
-            return self._custom_name
-
-        return self._name
-
-    @property
-    def native_value(self):
-        """Return current state of the sensor."""
-        return self._state
-
-    @property
-    def extra_state_attributes(self):
-        """Return additional state attributes."""
-        return self._attributes
-
     def update(self) -> None:
         """Update sensor with new departures times."""
         # Note: using Multi because there is a bug with the single stop impl
@@ -151,21 +129,22 @@ def update(self) -> None:
         )
 
         self._log_debug("Predictions results: %s", results)
+        self._attr_attribution = results.get("copyright")
 
         if "Error" in results:
             self._log_debug("Could not get predictions: %s", results)
 
         if not results.get("predictions"):
             self._log_debug("No predictions available")
-            self._state = None
+            self._attr_native_value = None
             # Remove attributes that may now be outdated
-            self._attributes.pop("upcoming", None)
+            self._attr_extra_state_attributes.pop("upcoming", None)
             return
 
         results = results["predictions"]
 
         # Set detailed attributes
-        self._attributes.update(
+        self._attr_extra_state_attributes.update(
             {
                 "agency": results.get("agencyTitle"),
                 "route": results.get("routeTitle"),
@@ -176,13 +155,13 @@ def update(self) -> None:
         # List all messages in the attributes
         messages = listify(results.get("message", []))
         self._log_debug("Messages: %s", messages)
-        self._attributes["message"] = " -- ".join(
+        self._attr_extra_state_attributes["message"] = " -- ".join(
             message.get("text", "") for message in messages
         )
 
         # List out all directions in the attributes
         directions = listify(results.get("direction", []))
-        self._attributes["direction"] = ", ".join(
+        self._attr_extra_state_attributes["direction"] = ", ".join(
             direction.get("title", "") for direction in directions
         )
 
@@ -196,14 +175,16 @@ def update(self) -> None:
         # Short circuit if we don't have any actual bus predictions
         if not predictions:
             self._log_debug("No upcoming predictions available")
-            self._state = None
-            self._attributes["upcoming"] = "No upcoming predictions"
+            self._attr_native_value = None
+            self._attr_extra_state_attributes["upcoming"] = "No upcoming predictions"
             return
 
         # Generate list of upcoming times
-        self._attributes["upcoming"] = ", ".join(
+        self._attr_extra_state_attributes["upcoming"] = ", ".join(
             sorted((p["minutes"] for p in predictions), key=int)
         )
 
         latest_prediction = maybe_first(predictions)
-        self._state = utc_from_timestamp(int(latest_prediction["epochTime"]) / 1000)
+        self._attr_native_value = utc_from_timestamp(
+            int(latest_prediction["epochTime"]) / 1000
+        )
diff --git a/homeassistant/components/nextcloud/__init__.py b/homeassistant/components/nextcloud/__init__.py
index 65829f713ef52f..8e2f39cf9b5fcb 100644
--- a/homeassistant/components/nextcloud/__init__.py
+++ b/homeassistant/components/nextcloud/__init__.py
@@ -1,5 +1,4 @@
 """The Nextcloud integration."""
-import logging
 
 from nextcloudmonitor import (
     NextcloudMonitor,
@@ -7,12 +6,10 @@
     NextcloudMonitorConnectionError,
     NextcloudMonitorRequestError,
 )
-import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_PASSWORD,
-    CONF_SCAN_INTERVAL,
     CONF_URL,
     CONF_USERNAME,
     CONF_VERIFY_SSL,
@@ -21,58 +18,13 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 
-from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
+from .const import DOMAIN
 from .coordinator import NextcloudDataUpdateCoordinator
 
-_LOGGER = logging.getLogger(__name__)
 PLATFORMS = (Platform.SENSOR, Platform.BINARY_SENSOR)
 
-# Validate user configuration
-CONFIG_SCHEMA = vol.Schema(
-    vol.All(
-        cv.deprecated(DOMAIN),
-        {
-            DOMAIN: vol.Schema(
-                {
-                    vol.Required(CONF_URL): cv.url,
-                    vol.Required(CONF_USERNAME): cv.string,
-                    vol.Required(CONF_PASSWORD): cv.string,
-                    vol.Optional(
-                        CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL
-                    ): cv.time_period,
-                },
-            )
-        },
-    ),
-    extra=vol.ALLOW_EXTRA,
-)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Nextcloud integration."""
-    if DOMAIN in config:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "deprecated_yaml",
-            breaks_in_ha_version="2023.6.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_yaml",
-        )
-
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN,
-                context={"source": SOURCE_IMPORT},
-                data=config[DOMAIN],
-            )
-        )
-
-    return True
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/nextcloud/config_flow.py b/homeassistant/components/nextcloud/config_flow.py
index c5019603c09c10..ec56307aad77aa 100644
--- a/homeassistant/components/nextcloud/config_flow.py
+++ b/homeassistant/components/nextcloud/config_flow.py
@@ -2,14 +2,12 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-import logging
 from typing import Any
 
 from nextcloudmonitor import (
     NextcloudMonitor,
     NextcloudMonitorAuthorizationError,
     NextcloudMonitorConnectionError,
-    NextcloudMonitorError,
     NextcloudMonitorRequestError,
 )
 import voluptuous as vol
@@ -35,8 +33,6 @@
     }
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class NextcloudConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a Nextcloud config flow."""
@@ -54,25 +50,6 @@ def _try_connect_nc(self, user_input: dict) -> NextcloudMonitor:
             user_input.get(CONF_VERIFY_SSL, DEFAULT_VERIFY_SSL),
         )
 
-    async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
-        """Handle a flow initiated by configuration file."""
-        self._async_abort_entries_match({CONF_URL: user_input.get(CONF_URL)})
-        try:
-            await self.hass.async_add_executor_job(self._try_connect_nc, user_input)
-        except NextcloudMonitorError:
-            _LOGGER.error(
-                "Connection error during import of yaml configuration, import aborted"
-            )
-            return self.async_abort(reason="connection_error_during_import")
-        return await self.async_step_user(
-            {
-                CONF_URL: user_input[CONF_URL],
-                CONF_PASSWORD: user_input[CONF_PASSWORD],
-                CONF_USERNAME: user_input[CONF_USERNAME],
-                CONF_VERIFY_SSL: DEFAULT_VERIFY_SSL,
-            }
-        )
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
diff --git a/homeassistant/components/nextcloud/strings.json b/homeassistant/components/nextcloud/strings.json
index e068ae4041e54f..bcb530ffd734b3 100644
--- a/homeassistant/components/nextcloud/strings.json
+++ b/homeassistant/components/nextcloud/strings.json
@@ -28,11 +28,5 @@
       "connection_error": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Nextcloud YAML configuration has been deprecated",
-      "description": "Configuring Nextcloud using YAML has been deprecated.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the `nextcloud` YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/nibe_heatpump/__init__.py b/homeassistant/components/nibe_heatpump/__init__.py
index b46102879c4acb..a38e2182ad7562 100644
--- a/homeassistant/components/nibe_heatpump/__init__.py
+++ b/homeassistant/components/nibe_heatpump/__init__.py
@@ -5,7 +5,6 @@
 from collections import defaultdict
 from collections.abc import Callable, Iterable
 from datetime import timedelta
-from functools import cached_property
 from typing import Any, Generic, TypeVar
 
 from nibe.coil import Coil, CoilData
@@ -15,6 +14,7 @@
 from nibe.exceptions import CoilNotFoundException, ReadException
 from nibe.heatpump import HeatPump, Model, Series
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_IP_ADDRESS,
diff --git a/homeassistant/components/nina/__init__.py b/homeassistant/components/nina/__init__.py
index 88d61a427b5e38..fbb8e32bebe89e 100644
--- a/homeassistant/components/nina/__init__.py
+++ b/homeassistant/components/nina/__init__.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+import re
 from typing import Any
 
 from async_timeout import timeout
@@ -13,7 +14,15 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import _LOGGER, CONF_FILTER_CORONA, CONF_REGIONS, DOMAIN, SCAN_INTERVAL
+from .const import (
+    _LOGGER,
+    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
+    CONF_REGIONS,
+    DOMAIN,
+    NO_MATCH_REGEX,
+    SCAN_INTERVAL,
+)
 
 PLATFORMS: list[str] = [Platform.BINARY_SENSOR]
 
@@ -23,8 +32,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     regions: dict[str, str] = entry.data[CONF_REGIONS]
 
+    if CONF_HEADLINE_FILTER not in entry.data:
+        filter_regex = NO_MATCH_REGEX
+
+        if entry.data[CONF_FILTER_CORONA]:
+            filter_regex = ".*corona.*"
+
+        new_data = {**entry.data, CONF_HEADLINE_FILTER: filter_regex}
+        new_data.pop(CONF_FILTER_CORONA, None)
+        hass.config_entries.async_update_entry(entry, data=new_data)
+
     coordinator = NINADataUpdateCoordinator(
-        hass, regions, entry.data[CONF_FILTER_CORONA]
+        hass, regions, entry.data[CONF_HEADLINE_FILTER]
     )
 
     await coordinator.async_config_entry_first_refresh()
@@ -70,12 +89,12 @@ class NINADataUpdateCoordinator(
     """Class to manage fetching NINA data API."""
 
     def __init__(
-        self, hass: HomeAssistant, regions: dict[str, str], corona_filter: bool
+        self, hass: HomeAssistant, regions: dict[str, str], headline_filter: str
     ) -> None:
         """Initialize."""
         self._regions: dict[str, str] = regions
         self._nina: Nina = Nina(async_get_clientsession(hass))
-        self.corona_filter: bool = corona_filter
+        self.headline_filter: str = headline_filter
 
         for region in regions:
             self._nina.addRegion(region)
@@ -125,7 +144,9 @@ def _parse_data(self) -> dict[str, list[NinaWarningData]]:
             warnings_for_regions: list[NinaWarningData] = []
 
             for raw_warn in raw_warnings:
-                if "corona" in raw_warn.headline.lower() and self.corona_filter:
+                if re.search(
+                    self.headline_filter, raw_warn.headline, flags=re.IGNORECASE
+                ):
                     continue
 
                 warning_data: NinaWarningData = NinaWarningData(
diff --git a/homeassistant/components/nina/config_flow.py b/homeassistant/components/nina/config_flow.py
index f1579bc05eca8a..d41fa6dee3eb95 100644
--- a/homeassistant/components/nina/config_flow.py
+++ b/homeassistant/components/nina/config_flow.py
@@ -18,12 +18,13 @@
 
 from .const import (
     _LOGGER,
-    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
     CONF_MESSAGE_SLOTS,
     CONF_REGIONS,
     CONST_REGION_MAPPING,
     CONST_REGIONS,
     DOMAIN,
+    NO_MATCH_REGEX,
 )
 
 
@@ -125,6 +126,9 @@ async def async_step_user(
                 if group_input := user_input.get(group):
                     user_input[CONF_REGIONS] += group_input
 
+            if not user_input[CONF_HEADLINE_FILTER]:
+                user_input[CONF_HEADLINE_FILTER] = NO_MATCH_REGEX
+
             if user_input[CONF_REGIONS]:
                 return self.async_create_entry(
                     title="NINA",
@@ -144,7 +148,7 @@ async def async_step_user(
                     vol.Required(CONF_MESSAGE_SLOTS, default=5): vol.All(
                         int, vol.Range(min=1, max=20)
                     ),
-                    vol.Required(CONF_FILTER_CORONA, default=True): cv.boolean,
+                    vol.Optional(CONF_HEADLINE_FILTER, default=""): cv.string,
                 }
             ),
             errors=errors,
@@ -255,10 +259,10 @@ async def async_step_init(self, user_input=None):
                         CONF_MESSAGE_SLOTS,
                         default=self.data[CONF_MESSAGE_SLOTS],
                     ): vol.All(int, vol.Range(min=1, max=20)),
-                    vol.Required(
-                        CONF_FILTER_CORONA,
-                        default=self.data[CONF_FILTER_CORONA],
-                    ): cv.boolean,
+                    vol.Optional(
+                        CONF_HEADLINE_FILTER,
+                        default=self.data[CONF_HEADLINE_FILTER],
+                    ): cv.string,
                 }
             ),
             errors=errors,
diff --git a/homeassistant/components/nina/const.py b/homeassistant/components/nina/const.py
index 8ba7c5ffaa6028..36096d97dc1fa1 100644
--- a/homeassistant/components/nina/const.py
+++ b/homeassistant/components/nina/const.py
@@ -11,9 +11,12 @@
 
 DOMAIN: str = "nina"
 
+NO_MATCH_REGEX: str = "/(?!)/"
+
 CONF_REGIONS: str = "regions"
 CONF_MESSAGE_SLOTS: str = "slots"
-CONF_FILTER_CORONA: str = "corona_filter"
+CONF_FILTER_CORONA: str = "corona_filter"  # deprecated
+CONF_HEADLINE_FILTER: str = "headline_filter"
 
 ATTR_HEADLINE: str = "headline"
 ATTR_DESCRIPTION: str = "description"
diff --git a/homeassistant/components/nina/manifest.json b/homeassistant/components/nina/manifest.json
index 6386a70d08b8bc..98a088620eac2b 100644
--- a/homeassistant/components/nina/manifest.json
+++ b/homeassistant/components/nina/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nina",
   "iot_class": "cloud_polling",
   "loggers": ["pynina"],
-  "requirements": ["pynina==0.3.0"]
+  "requirements": ["PyNINA==0.3.0"]
 }
diff --git a/homeassistant/components/nina/strings.json b/homeassistant/components/nina/strings.json
index b22c2640084fc5..23a1fb8dfa6b22 100644
--- a/homeassistant/components/nina/strings.json
+++ b/homeassistant/components/nina/strings.json
@@ -11,7 +11,7 @@
           "_r_to_u": "City/county (R-U)",
           "_v_to_z": "City/county (V-Z)",
           "slots": "Maximum warnings per city/county",
-          "corona_filter": "Remove Corona Warnings"
+          "headline_filter": "Blacklist regex to filter warning headlines"
         }
       }
     },
@@ -36,7 +36,7 @@
           "_r_to_u": "City/county (R-U)",
           "_v_to_z": "City/county (V-Z)",
           "slots": "Maximum warnings per city/county",
-          "corona_filter": "Remove Corona Warnings"
+          "headline_filter": "Blacklist regex to filter warning headlines"
         }
       }
     },
diff --git a/homeassistant/components/noaa_tides/manifest.json b/homeassistant/components/noaa_tides/manifest.json
index 7b954153cf1746..85c6fbcb78844f 100644
--- a/homeassistant/components/noaa_tides/manifest.json
+++ b/homeassistant/components/noaa_tides/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/noaa_tides",
   "iot_class": "cloud_polling",
   "loggers": ["noaa_coops"],
-  "requirements": ["noaa-coops==0.1.8"]
+  "requirements": ["noaa-coops==0.1.9"]
 }
diff --git a/homeassistant/components/nobo_hub/climate.py b/homeassistant/components/nobo_hub/climate.py
index 7cb69dfb79a736..f55dc9344ab65d 100644
--- a/homeassistant/components/nobo_hub/climate.py
+++ b/homeassistant/components/nobo_hub/climate.py
@@ -18,17 +18,14 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_IDENTIFIERS,
     ATTR_NAME,
-    ATTR_SUGGESTED_AREA,
-    ATTR_VIA_DEVICE,
     PRECISION_TENTHS,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ATTR_SERIAL,
@@ -95,12 +92,12 @@ def __init__(self, zone_id, hub: nobo, override_type) -> None:
         self._attr_hvac_mode = HVACMode.AUTO
         self._attr_hvac_modes = [HVACMode.HEAT, HVACMode.AUTO]
         self._override_type = override_type
-        self._attr_device_info: DeviceInfo = {
-            ATTR_IDENTIFIERS: {(DOMAIN, f"{hub.hub_serial}:{zone_id}")},
-            ATTR_NAME: hub.zones[zone_id][ATTR_NAME],
-            ATTR_VIA_DEVICE: (DOMAIN, hub.hub_info[ATTR_SERIAL]),
-            ATTR_SUGGESTED_AREA: hub.zones[zone_id][ATTR_NAME],
-        }
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{hub.hub_serial}:{zone_id}")},
+            name=hub.zones[zone_id][ATTR_NAME],
+            via_device=(DOMAIN, hub.hub_info[ATTR_SERIAL]),
+            suggested_area=hub.zones[zone_id][ATTR_NAME],
+        )
         self._read_state()
 
     async def async_added_to_hass(self) -> None:
@@ -158,7 +155,7 @@ async def async_update(self) -> None:
     @callback
     def _read_state(self) -> None:
         """Read the current state from the hub. These are only local calls."""
-        state = self._nobo.get_current_zone_mode(self._id, dt.now())
+        state = self._nobo.get_current_zone_mode(self._id, dt_util.now())
         self._attr_hvac_mode = HVACMode.AUTO
         self._attr_preset_mode = PRESET_NONE
 
diff --git a/homeassistant/components/nobo_hub/sensor.py b/homeassistant/components/nobo_hub/sensor.py
index 3bb1fa373a5675..c5536bad6ea2e7 100644
--- a/homeassistant/components/nobo_hub/sensor.py
+++ b/homeassistant/components/nobo_hub/sensor.py
@@ -10,12 +10,8 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_IDENTIFIERS,
-    ATTR_MANUFACTURER,
     ATTR_MODEL,
     ATTR_NAME,
-    ATTR_SUGGESTED_AREA,
-    ATTR_VIA_DEVICE,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -60,16 +56,18 @@ def __init__(self, serial: str, hub: nobo) -> None:
         self._attr_unique_id = component[ATTR_SERIAL]
         self._attr_name = "Temperature"
         self._attr_has_entity_name = True
-        self._attr_device_info: DeviceInfo = {
-            ATTR_IDENTIFIERS: {(DOMAIN, component[ATTR_SERIAL])},
-            ATTR_NAME: component[ATTR_NAME],
-            ATTR_MANUFACTURER: NOBO_MANUFACTURER,
-            ATTR_MODEL: component[ATTR_MODEL].name,
-            ATTR_VIA_DEVICE: (DOMAIN, hub.hub_info[ATTR_SERIAL]),
-        }
         zone_id = component[ATTR_ZONE_ID]
+        suggested_area = None
         if zone_id != "-1":
-            self._attr_device_info[ATTR_SUGGESTED_AREA] = hub.zones[zone_id][ATTR_NAME]
+            suggested_area = hub.zones[zone_id][ATTR_NAME]
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, component[ATTR_SERIAL])},
+            name=component[ATTR_NAME],
+            manufacturer=NOBO_MANUFACTURER,
+            model=component[ATTR_MODEL].name,
+            via_device=(DOMAIN, hub.hub_info[ATTR_SERIAL]),
+            suggested_area=suggested_area,
+        )
         self._read_state()
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/norway_air/manifest.json b/homeassistant/components/norway_air/manifest.json
index 12cd22149d327d..4a3fc7cee96e12 100644
--- a/homeassistant/components/norway_air/manifest.json
+++ b/homeassistant/components/norway_air/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/norway_air",
   "iot_class": "cloud_polling",
   "loggers": ["metno"],
-  "requirements": ["pyMetno==0.9.0"]
+  "requirements": ["PyMetno==0.10.0"]
 }
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
index eae47b55179875..e9e61527884ac8 100644
--- a/homeassistant/components/notify/__init__.py
+++ b/homeassistant/components/notify/__init__.py
@@ -19,7 +19,6 @@
     ATTR_TITLE,
     DOMAIN,
     NOTIFY_SERVICE_SCHEMA,
-    PERSISTENT_NOTIFICATION_SERVICE_SCHEMA,
     SERVICE_NOTIFY,
     SERVICE_PERSISTENT_NOTIFICATION,
 )
@@ -70,13 +69,19 @@ async def persistent_notification(service: ServiceCall) -> None:
             title_tpl.hass = hass
             title = title_tpl.async_render(parse_result=False)
 
-        pn.async_create(hass, message.async_render(parse_result=False), title)
+        notification_id = None
+        if data := service.data.get(ATTR_DATA):
+            notification_id = data.get(pn.ATTR_NOTIFICATION_ID)
+
+        pn.async_create(
+            hass, message.async_render(parse_result=False), title, notification_id
+        )
 
     hass.services.async_register(
         DOMAIN,
         SERVICE_PERSISTENT_NOTIFICATION,
         persistent_notification,
-        schema=PERSISTENT_NOTIFICATION_SERVICE_SCHEMA,
+        schema=NOTIFY_SERVICE_SCHEMA,
     )
 
     return True
diff --git a/homeassistant/components/notify/const.py b/homeassistant/components/notify/const.py
index d30702915d9dd4..38dba680635bad 100644
--- a/homeassistant/components/notify/const.py
+++ b/homeassistant/components/notify/const.py
@@ -31,10 +31,3 @@
         vol.Optional(ATTR_DATA): dict,
     }
 )
-
-PERSISTENT_NOTIFICATION_SERVICE_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_MESSAGE): cv.template,
-        vol.Optional(ATTR_TITLE): cv.template,
-    }
-)
diff --git a/homeassistant/components/notify/services.yaml b/homeassistant/components/notify/services.yaml
index 1a0de7344a3372..9311acf2ba9536 100644
--- a/homeassistant/components/notify/services.yaml
+++ b/homeassistant/components/notify/services.yaml
@@ -51,3 +51,11 @@ persistent_notification:
       example: "Your Garage Door Friend"
       selector:
         text:
+    data:
+      name: Data
+      description:
+        Extended information for notification. Optional depending on the
+        platform.
+      example: platform specific
+      selector:
+        object:
diff --git a/homeassistant/components/notion/binary_sensor.py b/homeassistant/components/notion/binary_sensor.py
index f70af18c3e1518..ff58d566a34776 100644
--- a/homeassistant/components/notion/binary_sensor.py
+++ b/homeassistant/components/notion/binary_sensor.py
@@ -52,7 +52,6 @@ class NotionBinarySensorDescription(
 BINARY_SENSOR_DESCRIPTIONS = (
     NotionBinarySensorDescription(
         key=SENSOR_BATTERY,
-        name="Low battery",
         device_class=BinarySensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         listener_kind=ListenerKind.BATTERY,
@@ -60,28 +59,24 @@ class NotionBinarySensorDescription(
     ),
     NotionBinarySensorDescription(
         key=SENSOR_DOOR,
-        name="Door",
         device_class=BinarySensorDeviceClass.DOOR,
         listener_kind=ListenerKind.DOOR,
         on_state="open",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_GARAGE_DOOR,
-        name="Garage door",
         device_class=BinarySensorDeviceClass.GARAGE_DOOR,
         listener_kind=ListenerKind.GARAGE_DOOR,
         on_state="open",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_LEAK,
-        name="Leak detector",
         device_class=BinarySensorDeviceClass.MOISTURE,
         listener_kind=ListenerKind.LEAK_STATUS,
         on_state="leak",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_MISSING,
-        name="Missing",
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
         entity_category=EntityCategory.DIAGNOSTIC,
         listener_kind=ListenerKind.CONNECTED,
@@ -89,28 +84,28 @@ class NotionBinarySensorDescription(
     ),
     NotionBinarySensorDescription(
         key=SENSOR_SAFE,
-        name="Safe",
+        translation_key="safe",
         device_class=BinarySensorDeviceClass.DOOR,
         listener_kind=ListenerKind.SAFE,
         on_state="open",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_SLIDING,
-        name="Sliding door/window",
+        translation_key="sliding_door_window",
         device_class=BinarySensorDeviceClass.DOOR,
         listener_kind=ListenerKind.SLIDING_DOOR_OR_WINDOW,
         on_state="open",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_SMOKE_CO,
-        name="Smoke/Carbon monoxide detector",
+        translation_key="smoke_carbon_monoxide_detector",
         device_class=BinarySensorDeviceClass.SMOKE,
         listener_kind=ListenerKind.SMOKE,
         on_state="alarm",
     ),
     NotionBinarySensorDescription(
         key=SENSOR_WINDOW_HINGED,
-        name="Hinged window",
+        translation_key="hinged_window",
         listener_kind=ListenerKind.HINGED_WINDOW,
         on_state="open",
     ),
diff --git a/homeassistant/components/notion/const.py b/homeassistant/components/notion/const.py
index 5e89767d0e0498..0961b7c10c5d4f 100644
--- a/homeassistant/components/notion/const.py
+++ b/homeassistant/components/notion/const.py
@@ -9,6 +9,7 @@
 SENSOR_GARAGE_DOOR = "garage_door"
 SENSOR_LEAK = "leak"
 SENSOR_MISSING = "missing"
+SENSOR_MOLD = "mold"
 SENSOR_SAFE = "safe"
 SENSOR_SLIDING = "sliding"
 SENSOR_SMOKE_CO = "alarm"
diff --git a/homeassistant/components/notion/sensor.py b/homeassistant/components/notion/sensor.py
index e6ff3eaab6941c..4777cc94fbfd24 100644
--- a/homeassistant/components/notion/sensor.py
+++ b/homeassistant/components/notion/sensor.py
@@ -15,7 +15,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NotionEntity
-from .const import DOMAIN, SENSOR_TEMPERATURE
+from .const import DOMAIN, SENSOR_MOLD, SENSOR_TEMPERATURE
 from .model import NotionEntityDescriptionMixin
 
 
@@ -25,9 +25,14 @@ class NotionSensorDescription(SensorEntityDescription, NotionEntityDescriptionMi
 
 
 SENSOR_DESCRIPTIONS = (
+    NotionSensorDescription(
+        key=SENSOR_MOLD,
+        translation_key="mold_risk",
+        icon="mdi:liquid-spot",
+        listener_kind=ListenerKind.MOLD,
+    ),
     NotionSensorDescription(
         key=SENSOR_TEMPERATURE,
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
@@ -76,11 +81,11 @@ def native_unit_of_measurement(self) -> str | None:
 
     @property
     def native_value(self) -> str | None:
-        """Return the value reported by the sensor.
-
-        The Notion API only returns a localized string for temperature (e.g. "70°"); we
-        simply remove the degree symbol:
-        """
+        """Return the value reported by the sensor."""
         if not self.listener.status_localized:
             return None
-        return self.listener.status_localized.state[:-1]
+        if self.listener.listener_kind == ListenerKind.TEMPERATURE:
+            # The Notion API only returns a localized string for temperature (e.g.
+            # "70°"); we simply remove the degree symbol:
+            return self.listener.status_localized.state[:-1]
+        return self.listener.status_localized.state
diff --git a/homeassistant/components/notion/strings.json b/homeassistant/components/notion/strings.json
index 49721568ff23f5..24a06d7ee714e5 100644
--- a/homeassistant/components/notion/strings.json
+++ b/homeassistant/components/notion/strings.json
@@ -24,5 +24,26 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "safe": {
+        "name": "Safe"
+      },
+      "sliding_door_window": {
+        "name": "Sliding door/window"
+      },
+      "smoke_carbon_monoxide_detector": {
+        "name": "Smoke/Carbon monoxide detector"
+      },
+      "hinged_window": {
+        "name": "Hinged window"
+      }
+    },
+    "sensor": {
+      "mold_risk": {
+        "name": "Mold risk"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/nsw_fuel_station/__init__.py b/homeassistant/components/nsw_fuel_station/__init__.py
index 6d45104e5d3113..818656779a3fae 100644
--- a/homeassistant/components/nsw_fuel_station/__init__.py
+++ b/homeassistant/components/nsw_fuel_station/__init__.py
@@ -8,6 +8,7 @@
 from nsw_fuel import FuelCheckClient, FuelCheckError, Station
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -18,6 +19,8 @@
 DOMAIN = "nsw_fuel_station"
 SCAN_INTERVAL = datetime.timedelta(hours=1)
 
+CONFIG_SCHEMA = cv.platform_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the NSW Fuel Station platform."""
diff --git a/homeassistant/components/nsw_rural_fire_service_feed/manifest.json b/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
index 02f7b985b3b2f2..cea62996e6d10a 100644
--- a/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
+++ b/homeassistant/components/nsw_rural_fire_service_feed/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_nsw_rfs_incidents"],
-  "requirements": ["aio_geojson_nsw_rfs_incidents==0.6"]
+  "requirements": ["aio-geojson-nsw-rfs-incidents==0.6"]
 }
diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py
index b0bfe18614e670..d237303e7c98a7 100644
--- a/homeassistant/components/nuki/__init__.py
+++ b/homeassistant/components/nuki/__init__.py
@@ -30,6 +30,7 @@
     entity_registry as er,
     issue_registry as ir,
 )
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.network import NoURLAvailableError, get_url
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -368,13 +369,13 @@ def __init__(self, coordinator: NukiCoordinator, nuki_device: _NukiDeviceT) -> N
         self._nuki_device = nuki_device
 
     @property
-    def device_info(self):
+    def device_info(self) -> DeviceInfo:
         """Device info for Nuki entities."""
-        return {
-            "identifiers": {(DOMAIN, parse_id(self._nuki_device.nuki_id))},
-            "name": self._nuki_device.name,
-            "manufacturer": "Nuki Home Solutions GmbH",
-            "model": self._nuki_device.device_model_str.capitalize(),
-            "sw_version": self._nuki_device.firmware_version,
-            "via_device": (DOMAIN, self.coordinator.bridge_id),
-        }
+        return DeviceInfo(
+            identifiers={(DOMAIN, parse_id(self._nuki_device.nuki_id))},
+            name=self._nuki_device.name,
+            manufacturer="Nuki Home Solutions GmbH",
+            model=self._nuki_device.device_model_str.capitalize(),
+            sw_version=self._nuki_device.firmware_version,
+            via_device=(DOMAIN, self.coordinator.bridge_id),
+        )
diff --git a/homeassistant/components/nuki/lock.py b/homeassistant/components/nuki/lock.py
index 55560d3bf8c213..a1a75ef8260a82 100644
--- a/homeassistant/components/nuki/lock.py
+++ b/homeassistant/components/nuki/lock.py
@@ -72,6 +72,7 @@ class NukiDeviceEntity(NukiEntity[_NukiDeviceT], LockEntity):
     _attr_has_entity_name = True
     _attr_supported_features = LockEntityFeature.OPEN
     _attr_translation_key = "nuki_lock"
+    _attr_name = None
 
     @property
     def unique_id(self) -> str | None:
diff --git a/homeassistant/components/nuki/manifest.json b/homeassistant/components/nuki/manifest.json
index 8b87816fb7d099..b84bee660c1b10 100644
--- a/homeassistant/components/nuki/manifest.json
+++ b/homeassistant/components/nuki/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/nuki",
   "iot_class": "local_polling",
   "loggers": ["pynuki"],
-  "requirements": ["pynuki==1.6.1"]
+  "requirements": ["pynuki==1.6.2"]
 }
diff --git a/homeassistant/components/nuki/sensor.py b/homeassistant/components/nuki/sensor.py
index c4578c7d14d1df..06cfa065c54bb8 100644
--- a/homeassistant/components/nuki/sensor.py
+++ b/homeassistant/components/nuki/sensor.py
@@ -29,7 +29,6 @@ class NukiBatterySensor(NukiEntity[NukiDevice], SensorEntity):
     """Representation of a Nuki Lock Battery sensor."""
 
     _attr_has_entity_name = True
-    _attr_translation_key = "battery"
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_device_class = SensorDeviceClass.BATTERY
     _attr_entity_category = EntityCategory.DIAGNOSTIC
diff --git a/homeassistant/components/nuki/strings.json b/homeassistant/components/nuki/strings.json
index f139124e961420..4629f6a2a3b534 100644
--- a/homeassistant/components/nuki/strings.json
+++ b/homeassistant/components/nuki/strings.json
@@ -44,11 +44,6 @@
           }
         }
       }
-    },
-    "sensor": {
-      "battery": {
-        "name": "[%key:component::sensor::entity_component::battery::name%]"
-      }
     }
   }
 }
diff --git a/homeassistant/components/number/__init__.py b/homeassistant/components/number/__init__.py
index 2ad63c75e04072..24c44b901a1304 100644
--- a/homeassistant/components/number/__init__.py
+++ b/homeassistant/components/number/__init__.py
@@ -135,39 +135,6 @@ class NumberEntityDescription(EntityDescription):
     step: None = None
     unit_of_measurement: None = None  # Type override, use native_unit_of_measurement
 
-    def __post_init__(self) -> None:
-        """Post initialisation processing."""
-        if (
-            self.max_value is not None
-            or self.min_value is not None
-            or self.step is not None
-            or self.unit_of_measurement is not None
-        ):
-            if (  # type: ignore[unreachable]
-                self.__class__.__name__ == "NumberEntityDescription"
-            ):
-                caller = inspect.stack()[2]
-                module = inspect.getmodule(caller[0])
-            else:
-                module = inspect.getmodule(self)
-            if module and module.__file__ and "custom_components" in module.__file__:
-                report_issue = "report it to the custom integration author."
-            else:
-                report_issue = (
-                    "create a bug report at "
-                    "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue"
-                )
-            _LOGGER.warning(
-                (
-                    "%s is setting deprecated attributes on an instance of"
-                    " NumberEntityDescription, this is not valid and will be"
-                    " unsupported from Home Assistant 2022.10. Please %s"
-                ),
-                module.__name__ if module else self.__class__.__name__,
-                report_issue,
-            )
-            self.native_unit_of_measurement = self.unit_of_measurement
-
 
 def ceil_decimal(value: float, precision: float = 0) -> float:
     """Return the ceiling of f with d decimals.
@@ -258,6 +225,13 @@ def capability_attributes(self) -> dict[str, Any]:
             ATTR_MODE: self.mode,
         }
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For numbers this is True if the entity has a device class.
+        """
+        return self.device_class is not None
+
     @property
     def device_class(self) -> NumberDeviceClass | None:
         """Return the class of this entity."""
@@ -283,15 +257,6 @@ def native_min_value(self) -> float:
     @final
     def min_value(self) -> float:
         """Return the minimum value."""
-        if hasattr(self, "_attr_min_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_min_value  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.min_value is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.min_value
         return self._convert_to_state_value(self.native_min_value, floor_decimal)
 
     @property
@@ -310,15 +275,6 @@ def native_max_value(self) -> float:
     @final
     def max_value(self) -> float:
         """Return the maximum value."""
-        if hasattr(self, "_attr_max_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_max_value  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.max_value is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.max_value
         return self._convert_to_state_value(self.native_max_value, ceil_decimal)
 
     @property
@@ -335,15 +291,6 @@ def native_step(self) -> float | None:
     @final
     def step(self) -> float:
         """Return the increment/decrement step."""
-        if hasattr(self, "_attr_step"):
-            self._report_deprecated_number_entity()
-            return self._attr_step  # type: ignore[return-value]
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.step is not None
-        ):
-            self._report_deprecated_number_entity()  # type: ignore[unreachable]
-            return self.entity_description.step
         if hasattr(self, "_attr_native_step"):
             return self._attr_native_step
         if (native_step := self.native_step) is not None:
@@ -389,17 +336,6 @@ def unit_of_measurement(self) -> str | None:
         if self._number_option_unit_of_measurement:
             return self._number_option_unit_of_measurement
 
-        if hasattr(self, "_attr_unit_of_measurement"):
-            self._report_deprecated_number_entity()
-            return self._attr_unit_of_measurement
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description.unit_of_measurement is not None
-        ):
-            return (  # type: ignore[unreachable]
-                self.entity_description.unit_of_measurement
-            )
-
         native_unit_of_measurement = self.native_unit_of_measurement
 
         if (
@@ -420,10 +356,6 @@ def native_value(self) -> float | None:
     @final
     def value(self) -> float | None:
         """Return the entity value to represent the entity state."""
-        if hasattr(self, "_attr_value"):
-            self._report_deprecated_number_entity()
-            return self._attr_value
-
         if (native_value := self.native_value) is None:
             return native_value
         return self._convert_to_state_value(native_value, round)
@@ -450,7 +382,6 @@ def _convert_to_state_value(
         self, value: float, method: Callable[[float, int], float]
     ) -> float:
         """Convert a value in the number's native unit to the configured unit."""
-
         native_unit_of_measurement = self.native_unit_of_measurement
         unit_of_measurement = self.unit_of_measurement
         device_class = self.device_class
@@ -480,7 +411,6 @@ def _convert_to_state_value(
 
     def convert_to_native_value(self, value: float) -> float:
         """Convert a value to the number's native unit."""
-
         native_unit_of_measurement = self.native_unit_of_measurement
         unit_of_measurement = self.unit_of_measurement
         device_class = self.device_class
@@ -501,21 +431,6 @@ def convert_to_native_value(self, value: float) -> float:
 
         return value
 
-    def _report_deprecated_number_entity(self) -> None:
-        """Report that the number entity has not been upgraded."""
-        if not self._deprecated_number_entity_reported:
-            self._deprecated_number_entity_reported = True
-            report_issue = self._suggest_report_issue()
-            _LOGGER.warning(
-                (
-                    "Entity %s (%s) is using deprecated NumberEntity features which"
-                    " will be unsupported from Home Assistant Core 2022.10, please %s"
-                ),
-                self.entity_id,
-                type(self),
-                report_issue,
-            )
-
     @callback
     def async_registry_entry_updated(self) -> None:
         """Run when the entity registry entry has been updated."""
diff --git a/homeassistant/components/number/device_action.py b/homeassistant/components/number/device_action.py
index 971f8d5a514d9b..22a51d85ad997f 100644
--- a/homeassistant/components/number/device_action.py
+++ b/homeassistant/components/number/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,15 +20,22 @@
 
 ATYP_SET_VALUE = "set_value"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): ATYP_SET_VALUE,
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_VALUE): vol.Coerce(float),
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -44,7 +52,7 @@ async def async_get_actions(
             {
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: ATYP_SET_VALUE,
             }
         )
diff --git a/homeassistant/components/nws/manifest.json b/homeassistant/components/nws/manifest.json
index ed7d825afff930..7f5d01f9897726 100644
--- a/homeassistant/components/nws/manifest.json
+++ b/homeassistant/components/nws/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["metar", "pynws"],
   "quality_scale": "platinum",
-  "requirements": ["pynws==1.4.1"]
+  "requirements": ["pynws==1.5.0"]
 }
diff --git a/homeassistant/components/nws/weather.py b/homeassistant/components/nws/weather.py
index 9edf6e61751b3a..e8a35ba66f11aa 100644
--- a/homeassistant/components/nws/weather.py
+++ b/homeassistant/components/nws/weather.py
@@ -8,6 +8,8 @@
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_SUNNY,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
+    ATTR_FORECAST_NATIVE_DEW_POINT,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
@@ -52,16 +54,13 @@
 PARALLEL_UPDATES = 0
 
 
-def convert_condition(
-    time: str, weather: tuple[tuple[str, int | None], ...]
-) -> tuple[str, int | None]:
+def convert_condition(time: str, weather: tuple[tuple[str, int | None], ...]) -> str:
     """Convert NWS codes to HA condition.
 
     Choose first condition in CONDITION_CLASSES that exists in weather code.
     If no match is found, return first condition from NWS
     """
     conditions: list[str] = [w[0] for w in weather]
-    prec_probs = [w[1] or 0 for w in weather]
 
     # Choose condition with highest priority.
     cond = next(
@@ -75,10 +74,10 @@ def convert_condition(
 
     if cond == "clear":
         if time == "day":
-            return ATTR_CONDITION_SUNNY, max(prec_probs)
+            return ATTR_CONDITION_SUNNY
         if time == "night":
-            return ATTR_CONDITION_CLEAR_NIGHT, max(prec_probs)
-    return cond, max(prec_probs)
+            return ATTR_CONDITION_CLEAR_NIGHT
+    return cond
 
 
 async def async_setup_entry(
@@ -219,8 +218,7 @@ def condition(self) -> str | None:
             time = self.observation.get("iconTime")
 
         if weather:
-            cond, _ = convert_condition(time, weather)
-            return cond
+            return convert_condition(time, weather)
         return None
 
     @property
@@ -256,16 +254,27 @@ def forecast(self) -> list[Forecast] | None:
             else:
                 data[ATTR_FORECAST_NATIVE_TEMP] = None
 
+            data[ATTR_FORECAST_PRECIPITATION_PROBABILITY] = forecast_entry.get(
+                "probabilityOfPrecipitation"
+            )
+
+            if (dewp := forecast_entry.get("dewpoint")) is not None:
+                data[ATTR_FORECAST_NATIVE_DEW_POINT] = TemperatureConverter.convert(
+                    dewp, UnitOfTemperature.FAHRENHEIT, UnitOfTemperature.CELSIUS
+                )
+            else:
+                data[ATTR_FORECAST_NATIVE_DEW_POINT] = None
+
+            data[ATTR_FORECAST_HUMIDITY] = forecast_entry.get("relativeHumidity")
+
             if self.mode == DAYNIGHT:
                 data[ATTR_FORECAST_DAYTIME] = forecast_entry.get("isDaytime")
+
             time = forecast_entry.get("iconTime")
             weather = forecast_entry.get("iconWeather")
-            if time and weather:
-                cond, precip = convert_condition(time, weather)
-            else:
-                cond, precip = None, None
-            data[ATTR_FORECAST_CONDITION] = cond
-            data[ATTR_FORECAST_PRECIPITATION_PROBABILITY] = precip
+            data[ATTR_FORECAST_CONDITION] = (
+                convert_condition(time, weather) if time and weather else None
+            )
 
             data[ATTR_FORECAST_WIND_BEARING] = forecast_entry.get("windBearing")
             wind_speed = forecast_entry.get("windSpeedAvg")
diff --git a/homeassistant/components/obihai/__init__.py b/homeassistant/components/obihai/__init__.py
index 12cb9e25f849d0..a3e16fbad76454 100644
--- a/homeassistant/components/obihai/__init__.py
+++ b/homeassistant/components/obihai/__init__.py
@@ -3,13 +3,22 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import format_mac
 
 from .connectivity import ObihaiConnection
-from .const import LOGGER, PLATFORMS
+from .const import DOMAIN, LOGGER, PLATFORMS
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up from a config entry."""
+
+    requester = ObihaiConnection(
+        entry.data[CONF_HOST],
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+    )
+    await hass.async_add_executor_job(requester.update)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = requester
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -22,17 +31,12 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     LOGGER.debug("Migrating from version %s", version)
     if version != 2:
-        requester = ObihaiConnection(
-            entry.data[CONF_HOST],
-            username=entry.data[CONF_USERNAME],
-            password=entry.data[CONF_PASSWORD],
-        )
-        await hass.async_add_executor_job(requester.update)
+        requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
 
-        new_unique_id = await hass.async_add_executor_job(
+        device_mac = await hass.async_add_executor_job(
             requester.pyobihai.get_device_mac
         )
-        hass.config_entries.async_update_entry(entry, unique_id=new_unique_id)
+        hass.config_entries.async_update_entry(entry, unique_id=format_mac(device_mac))
 
         entry.version = 2
 
diff --git a/homeassistant/components/obihai/button.py b/homeassistant/components/obihai/button.py
index 0b84d40f4d2d06..d1b924b46934eb 100644
--- a/homeassistant/components/obihai/button.py
+++ b/homeassistant/components/obihai/button.py
@@ -2,21 +2,19 @@
 
 from __future__ import annotations
 
-from pyobihai import PyObihai
-
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
     ButtonEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 
 from .connectivity import ObihaiConnection
-from .const import OBIHAI
+from .const import DOMAIN, OBIHAI
 
 BUTTON_DESCRIPTION = ButtonEntityDescription(
     key="reboot",
@@ -32,13 +30,10 @@ async def async_setup_entry(
     async_add_entities: entity_platform.AddEntitiesCallback,
 ) -> None:
     """Set up the Obihai sensor entries."""
-    username = entry.data[CONF_USERNAME]
-    password = entry.data[CONF_PASSWORD]
-    host = entry.data[CONF_HOST]
-    requester = ObihaiConnection(host, username, password)
 
-    await hass.async_add_executor_job(requester.update)
-    buttons = [ObihaiButton(requester.pyobihai, requester.serial)]
+    requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
+
+    buttons = [ObihaiButton(requester)]
     async_add_entities(buttons, update_before_add=True)
 
 
@@ -47,10 +42,11 @@ class ObihaiButton(ButtonEntity):
 
     entity_description = BUTTON_DESCRIPTION
 
-    def __init__(self, pyobihai: PyObihai, serial: str) -> None:
+    def __init__(self, requester: ObihaiConnection) -> None:
         """Initialize monitor sensor."""
-        self._pyobihai = pyobihai
-        self._attr_unique_id = f"{serial}-reboot"
+        self.requester = requester
+        self._pyobihai = requester.pyobihai
+        self._attr_unique_id = f"{requester.serial}-reboot"
 
     def press(self) -> None:
         """Press button."""
diff --git a/homeassistant/components/obihai/config_flow.py b/homeassistant/components/obihai/config_flow.py
index 6216fe0b973036..1790add84f07ec 100644
--- a/homeassistant/components/obihai/config_flow.py
+++ b/homeassistant/components/obihai/config_flow.py
@@ -10,9 +10,10 @@
 
 from homeassistant.components import dhcp
 from homeassistant.config_entries import ConfigFlow
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.device_registry import format_mac
 
 from .connectivity import validate_auth
 from .const import DEFAULT_PASSWORD, DEFAULT_USERNAME, DOMAIN
@@ -77,7 +78,7 @@ async def async_step_user(
                     device_mac = await self.hass.async_add_executor_job(
                         pyobihai.get_device_mac
                     )
-                    await self.async_set_unique_id(device_mac)
+                    await self.async_set_unique_id(format_mac(device_mac))
                     self._abort_if_unique_id_configured()
 
                     return self.async_create_entry(
@@ -104,7 +105,7 @@ async def async_step_dhcp_confirm(
     ) -> FlowResult:
         """Attempt to confirm."""
         assert self._dhcp_discovery_info
-        await self.async_set_unique_id(self._dhcp_discovery_info.macaddress)
+        await self.async_set_unique_id(format_mac(self._dhcp_discovery_info.macaddress))
         self._abort_if_unique_id_configured()
 
         if user_input is None:
@@ -135,28 +136,3 @@ async def async_step_dhcp_confirm(
             )
 
         return await self.async_step_user(user_input=user_input)
-
-    # DEPRECATED
-    async def async_step_import(self, config: dict[str, Any]) -> FlowResult:
-        """Handle a flow initialized by importing a config."""
-
-        try:
-            _ = await self.hass.async_add_executor_job(gethostbyname, config[CONF_HOST])
-        except gaierror:
-            return self.async_abort(reason="cannot_connect")
-
-        if pyobihai := await async_validate_creds(self.hass, config):
-            device_mac = await self.hass.async_add_executor_job(pyobihai.get_device_mac)
-            await self.async_set_unique_id(device_mac)
-            self._abort_if_unique_id_configured()
-
-            return self.async_create_entry(
-                title=config.get(CONF_NAME, config[CONF_HOST]),
-                data={
-                    CONF_HOST: config[CONF_HOST],
-                    CONF_PASSWORD: config[CONF_PASSWORD],
-                    CONF_USERNAME: config[CONF_USERNAME],
-                },
-            )
-
-        return self.async_abort(reason="invalid_auth")
diff --git a/homeassistant/components/obihai/connectivity.py b/homeassistant/components/obihai/connectivity.py
index 071390f1ad9a97..1ab3095a5a8b00 100644
--- a/homeassistant/components/obihai/connectivity.py
+++ b/homeassistant/components/obihai/connectivity.py
@@ -53,14 +53,15 @@ def __init__(
         self.line_services: list = []
         self.call_direction: list = []
         self.pyobihai: PyObihai = None
+        self.available: bool = True
 
     def update(self) -> bool:
         """Validate connection and retrieve a list of sensors."""
 
         if not self.pyobihai:
-            self.pyobihai = get_pyobihai(self.host, self.username, self.password)
+            self.pyobihai = validate_auth(self.host, self.username, self.password)
 
-            if not self.pyobihai.check_account():
+            if not self.pyobihai:
                 return False
 
         self.serial = self.pyobihai.get_device_serial()
diff --git a/homeassistant/components/obihai/manifest.json b/homeassistant/components/obihai/manifest.json
index 2907f3f179db46..0f13bde5d6ba46 100644
--- a/homeassistant/components/obihai/manifest.json
+++ b/homeassistant/components/obihai/manifest.json
@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/obihai",
   "iot_class": "local_polling",
   "loggers": ["pyobihai"],
-  "requirements": ["pyobihai==1.3.2"]
+  "requirements": ["pyobihai==1.4.2"]
 }
diff --git a/homeassistant/components/obihai/sensor.py b/homeassistant/components/obihai/sensor.py
index 61411b0ce27155..53208a1e6a1fe6 100644
--- a/homeassistant/components/obihai/sensor.py
+++ b/homeassistant/components/obihai/sensor.py
@@ -1,63 +1,19 @@
 """Support for Obihai Sensors."""
 from __future__ import annotations
 
-from datetime import timedelta
-
-from pyobihai import PyObihai
-import voluptuous as vol
-
-from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA,
-    SensorDeviceClass,
-    SensorEntity,
-)
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+import datetime
+
+from requests.exceptions import RequestException
+
+from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .connectivity import ObihaiConnection
-from .const import DEFAULT_PASSWORD, DEFAULT_USERNAME, DOMAIN, OBIHAI
-
-SCAN_INTERVAL = timedelta(seconds=5)
+from .const import DOMAIN, LOGGER, OBIHAI
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_HOST): cv.string,
-        vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
-        vol.Optional(CONF_PASSWORD, default=DEFAULT_PASSWORD): cv.string,
-    }
-)
-
-
-# DEPRECATED
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Obihai sensor platform."""
-    ir.async_create_issue(
-        hass,
-        DOMAIN,
-        "manual_migration",
-        breaks_in_ha_version="2023.6.0",
-        is_fixable=False,
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="manual_migration",
-    )
-
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=config,
-        )
-    )
+SCAN_INTERVAL = datetime.timedelta(seconds=5)
 
 
 async def async_setup_entry(
@@ -65,24 +21,18 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Obihai sensor entries."""
 
-    username = entry.data[CONF_USERNAME]
-    password = entry.data[CONF_PASSWORD]
-    host = entry.data[CONF_HOST]
-    requester = ObihaiConnection(host, username, password)
+    requester: ObihaiConnection = hass.data[DOMAIN][entry.entry_id]
 
-    await hass.async_add_executor_job(requester.update)
     sensors = []
     for key in requester.services:
-        sensors.append(ObihaiServiceSensors(requester.pyobihai, requester.serial, key))
+        sensors.append(ObihaiServiceSensors(requester, key))
 
     if requester.line_services is not None:
         for key in requester.line_services:
-            sensors.append(
-                ObihaiServiceSensors(requester.pyobihai, requester.serial, key)
-            )
+            sensors.append(ObihaiServiceSensors(requester, key))
 
     for key in requester.call_direction:
-        sensors.append(ObihaiServiceSensors(requester.pyobihai, requester.serial, key))
+        sensors.append(ObihaiServiceSensors(requester, key))
 
     async_add_entities(sensors, update_before_add=True)
 
@@ -90,89 +40,83 @@ async def async_setup_entry(
 class ObihaiServiceSensors(SensorEntity):
     """Get the status of each Obihai Lines."""
 
-    def __init__(self, pyobihai: PyObihai, serial: str, service_name: str) -> None:
+    def __init__(self, requester: ObihaiConnection, service_name: str) -> None:
         """Initialize monitor sensor."""
-        self._service_name = service_name
-        self._state = None
-        self._name = f"{OBIHAI} {self._service_name}"
-        self._pyobihai = pyobihai
-        self._unique_id = f"{serial}-{self._service_name}"
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return self._name
-
-    @property
-    def native_value(self):
-        """Return the state of the sensor."""
-        return self._state
 
-    @property
-    def available(self):
-        """Return if sensor is available."""
-        if self._state is not None:
-            return True
-        return False
-
-    @property
-    def unique_id(self):
-        """Return the unique ID."""
-        return self._unique_id
-
-    @property
-    def device_class(self):
-        """Return the device class for uptime sensor."""
+        self.requester = requester
+        self._service_name = service_name
+        self._attr_name = f"{OBIHAI} {self._service_name}"
+        self._pyobihai = requester.pyobihai
+        self._attr_unique_id = f"{requester.serial}-{self._service_name}"
         if self._service_name == "Last Reboot":
-            return SensorDeviceClass.TIMESTAMP
-        return None
+            self._attr_device_class = SensorDeviceClass.TIMESTAMP
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return an icon."""
+
         if self._service_name == "Call Direction":
-            if self._state == "No Active Calls":
+            if self._attr_native_value == "No Active Calls":
                 return "mdi:phone-off"
-            if self._state == "Inbound Call":
+            if self._attr_native_value == "Inbound Call":
                 return "mdi:phone-incoming"
             return "mdi:phone-outgoing"
         if "Caller Info" in self._service_name:
             return "mdi:phone-log"
         if "Port" in self._service_name:
-            if self._state == "Ringing":
+            if self._attr_native_value == "Ringing":
                 return "mdi:phone-ring"
-            if self._state == "Off Hook":
+            if self._attr_native_value == "Off Hook":
                 return "mdi:phone-in-talk"
             return "mdi:phone-hangup"
         if "Service Status" in self._service_name:
             if "OBiTALK Service Status" in self._service_name:
                 return "mdi:phone-check"
-            if self._state == "0":
+            if self._attr_native_value == "0":
                 return "mdi:phone-hangup"
             return "mdi:phone-in-talk"
         if "Reboot Required" in self._service_name:
-            if self._state == "false":
+            if self._attr_native_value == "false":
                 return "mdi:restart-off"
             return "mdi:restart-alert"
         return "mdi:phone"
 
     def update(self) -> None:
         """Update the sensor."""
-        if not self._pyobihai.check_account():
-            self._state = None
-            return
 
-        services = self._pyobihai.get_state()
+        LOGGER.debug("Running update on %s", self._service_name)
+        try:
+            # port connection, and last caller info
+            if "Caller Info" in self._service_name or "Port" in self._service_name:
+                services = self._pyobihai.get_line_state()
+
+                if services is not None and self._service_name in services:
+                    self._attr_native_value = services.get(self._service_name)
+            elif self._service_name == "Call Direction":
+                call_direction = self._pyobihai.get_call_direction()
 
-        if self._service_name in services:
-            self._state = services.get(self._service_name)
+                if self._service_name in call_direction:
+                    self._attr_native_value = call_direction.get(self._service_name)
+            else:  # SIP Profile service sensors, phone sensor, and last reboot
+                services = self._pyobihai.get_state()
 
-        services = self._pyobihai.get_line_state()
+                if self._service_name in services:
+                    self._attr_native_value = services.get(self._service_name)
 
-        if services is not None and self._service_name in services:
-            self._state = services.get(self._service_name)
+            if not self.requester.available:
+                self.requester.available = True
+                LOGGER.info("Connection restored")
+            self._attr_available = True
+
+            return
 
-        call_direction = self._pyobihai.get_call_direction()
+        except RequestException as exc:
+            if self.requester.available:
+                LOGGER.warning("Connection failed, Obihai offline? %s", exc)
+        except IndexError as exc:
+            if self.requester.available:
+                LOGGER.warning("Connection failed, bad response: %s", exc)
 
-        if self._service_name in call_direction:
-            self._state = call_direction.get(self._service_name)
+        self._attr_native_value = None
+        self._attr_available = False
+        self.requester.available = False
diff --git a/homeassistant/components/obihai/strings.json b/homeassistant/components/obihai/strings.json
index 1b91cd606543f2..823bc2e1b8de11 100644
--- a/homeassistant/components/obihai/strings.json
+++ b/homeassistant/components/obihai/strings.json
@@ -24,11 +24,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "manual_migration": {
-      "title": "Obihai YAML configuration is being removed",
-      "description": "Configuration of the Obihai platform in YAML is deprecated and will be removed in Home Assistant 2023.6; Your existing configuration has been imported into the UI automatically and can be safely removed from your configuration.yaml file."
-    }
   }
 }
diff --git a/homeassistant/components/onboarding/__init__.py b/homeassistant/components/onboarding/__init__.py
index c36f19fd28d921..d334a0051c3db7 100644
--- a/homeassistant/components/onboarding/__init__.py
+++ b/homeassistant/components/onboarding/__init__.py
@@ -2,6 +2,7 @@
 from typing import TYPE_CHECKING
 
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -19,6 +20,8 @@
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 4
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 class OnboadingStorage(Store):
     """Store onboarding data."""
diff --git a/homeassistant/components/onboarding/views.py b/homeassistant/components/onboarding/views.py
index 51817be35b8b5c..5b47394e0e4b37 100644
--- a/homeassistant/components/onboarding/views.py
+++ b/homeassistant/components/onboarding/views.py
@@ -193,7 +193,7 @@ async def post(self, request):
             await self._async_mark_done(hass)
 
             # Integrations to set up when finishing onboarding
-            onboard_integrations = ["met", "radio_browser"]
+            onboard_integrations = ["google_translate", "met", "radio_browser"]
 
             # pylint: disable-next=import-outside-toplevel
             from homeassistant.components import hassio
diff --git a/homeassistant/components/oncue/const.py b/homeassistant/components/oncue/const.py
index bf248369987625..7118944a4ec457 100644
--- a/homeassistant/components/oncue/const.py
+++ b/homeassistant/components/oncue/const.py
@@ -3,10 +3,15 @@
 import asyncio
 
 import aiohttp
+from aiooncue import ServiceFailedException
 
 DOMAIN = "oncue"
 
-CONNECTION_EXCEPTIONS = (asyncio.TimeoutError, aiohttp.ClientError)
+CONNECTION_EXCEPTIONS = (
+    asyncio.TimeoutError,
+    aiohttp.ClientError,
+    ServiceFailedException,
+)
 
 CONNECTION_ESTABLISHED_KEY: str = "NetworkConnectionEstablished"
 
diff --git a/homeassistant/components/oncue/manifest.json b/homeassistant/components/oncue/manifest.json
index 02c953736bb718..24414e4efb8bb4 100644
--- a/homeassistant/components/oncue/manifest.json
+++ b/homeassistant/components/oncue/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/oncue",
   "iot_class": "cloud_polling",
   "loggers": ["aiooncue"],
-  "requirements": ["aiooncue==0.3.4"]
+  "requirements": ["aiooncue==0.3.5"]
 }
diff --git a/homeassistant/components/ondilo_ico/sensor.py b/homeassistant/components/ondilo_ico/sensor.py
index 129cdf509797f4..5e226dcead7656 100644
--- a/homeassistant/components/ondilo_ico/sensor.py
+++ b/homeassistant/components/ondilo_ico/sensor.py
@@ -70,8 +70,8 @@
     SensorEntityDescription(
         key="rssi",
         name="RSSI",
+        icon="mdi:wifi",
         native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
diff --git a/homeassistant/components/onvif/__init__.py b/homeassistant/components/onvif/__init__.py
index a834a8f2df6d34..ea6cd542fea75b 100644
--- a/homeassistant/components/onvif/__init__.py
+++ b/homeassistant/components/onvif/__init__.py
@@ -1,10 +1,11 @@
 """The ONVIF integration."""
 import asyncio
+from contextlib import suppress
 from http import HTTPStatus
 import logging
 
 from httpx import RequestError
-from onvif.exceptions import ONVIFAuthError, ONVIFError, ONVIFTimeoutError
+from onvif.exceptions import ONVIFError
 from onvif.util import is_auth_error, stringify_onvif_error
 from zeep.exceptions import Fault, TransportError
 
@@ -120,31 +121,31 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return await hass.config_entries.async_unload_platforms(entry, device.platforms)
 
 
-async def _get_snapshot_auth(device):
+async def _get_snapshot_auth(device: ONVIFDevice) -> str | None:
     """Determine auth type for snapshots."""
-    if not device.capabilities.snapshot or not (device.username and device.password):
-        return HTTP_DIGEST_AUTHENTICATION
+    if not device.capabilities.snapshot:
+        return None
 
-    try:
-        snapshot = await device.device.get_snapshot(device.profiles[0].token)
+    for basic_auth in (False, True):
+        method = HTTP_BASIC_AUTHENTICATION if basic_auth else HTTP_DIGEST_AUTHENTICATION
+        with suppress(ONVIFError):
+            if await device.device.get_snapshot(device.profiles[0].token, basic_auth):
+                return method
 
-        if snapshot:
-            return HTTP_DIGEST_AUTHENTICATION
-        return HTTP_BASIC_AUTHENTICATION
-    except (ONVIFAuthError, ONVIFTimeoutError):
-        return HTTP_BASIC_AUTHENTICATION
-    except ONVIFError:
-        return HTTP_DIGEST_AUTHENTICATION
+    return None
 
 
-async def async_populate_snapshot_auth(hass, device, entry):
+async def async_populate_snapshot_auth(
+    hass: HomeAssistant, device: ONVIFDevice, entry: ConfigEntry
+) -> None:
     """Check if digest auth for snapshots is possible."""
-    auth = await _get_snapshot_auth(device)
-    new_data = {**entry.data, CONF_SNAPSHOT_AUTH: auth}
-    hass.config_entries.async_update_entry(entry, data=new_data)
+    if auth := await _get_snapshot_auth(device):
+        hass.config_entries.async_update_entry(
+            entry, data={**entry.data, CONF_SNAPSHOT_AUTH: auth}
+        )
 
 
-async def async_populate_options(hass, entry):
+async def async_populate_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Populate default options for device."""
     options = {
         CONF_EXTRA_ARGUMENTS: DEFAULT_ARGUMENTS,
diff --git a/homeassistant/components/onvif/config_flow.py b/homeassistant/components/onvif/config_flow.py
index 020649db87ebdd..c1df94f5f8383b 100644
--- a/homeassistant/components/onvif/config_flow.py
+++ b/homeassistant/components/onvif/config_flow.py
@@ -35,6 +35,7 @@
 from .const import (
     CONF_DEVICE_ID,
     CONF_ENABLE_WEBHOOKS,
+    CONF_HARDWARE,
     DEFAULT_ARGUMENTS,
     DEFAULT_ENABLE_WEBHOOKS,
     DEFAULT_PORT,
@@ -50,12 +51,15 @@
 def wsdiscovery() -> list[Service]:
     """Get ONVIF Profile S devices from network."""
     discovery = WSDiscovery(ttl=4)
-    discovery.start()
-    services = discovery.searchServices(
-        scopes=[Scope("onvif://www.onvif.org/Profile/Streaming")]
-    )
-    discovery.stop()
-    return services
+    try:
+        discovery.start()
+        return discovery.searchServices(
+            scopes=[Scope("onvif://www.onvif.org/Profile/Streaming")]
+        )
+    finally:
+        discovery.stop()
+        # Stop the threads started by WSDiscovery since otherwise there is a leak.
+        discovery._stopThreads()  # pylint: disable=protected-access
 
 
 async def async_discovery(hass: HomeAssistant) -> list[dict[str, Any]]:
@@ -71,11 +75,14 @@ async def async_discovery(hass: HomeAssistant) -> list[dict[str, Any]]:
             CONF_NAME: service.getEPR(),
             CONF_HOST: url.hostname,
             CONF_PORT: url.port or 80,
+            CONF_HARDWARE: None,
         }
         for scope in service.getScopes():
             scope_str = scope.getValue()
             if scope_str.lower().startswith("onvif://www.onvif.org/name"):
                 device[CONF_NAME] = scope_str.split("/")[-1]
+            if scope_str.lower().startswith("onvif://www.onvif.org/hardware"):
+                device[CONF_HARDWARE] = scope_str.split("/")[-1]
             if scope_str.lower().startswith("onvif://www.onvif.org/mac"):
                 device[CONF_DEVICE_ID] = scope_str.split("/")[-1]
         devices.append(device)
@@ -192,8 +199,7 @@ async def async_step_device(self, user_input=None):
                 return await self.async_step_configure()
 
             for device in self.devices:
-                name = f"{device[CONF_NAME]} ({device[CONF_HOST]})"
-                if name == user_input[CONF_HOST]:
+                if device[CONF_HOST] == user_input[CONF_HOST]:
                     self.device_id = device[CONF_DEVICE_ID]
                     self.onvif_config = {
                         CONF_NAME: device[CONF_NAME],
@@ -215,15 +221,16 @@ async def async_step_device(self, user_input=None):
         LOGGER.debug("Discovered ONVIF devices %s", pformat(self.devices))
 
         if self.devices:
-            names = [
-                f"{device[CONF_NAME]} ({device[CONF_HOST]})" for device in self.devices
-            ]
-
-            names.append(CONF_MANUAL_INPUT)
+            devices = {CONF_MANUAL_INPUT: CONF_MANUAL_INPUT}
+            for device in self.devices:
+                description = f"{device[CONF_NAME]} ({device[CONF_HOST]})"
+                if hardware := device[CONF_HARDWARE]:
+                    description += f" [{hardware}]"
+                devices[device[CONF_HOST]] = description
 
             return self.async_show_form(
                 step_id="device",
-                data_schema=vol.Schema({vol.Optional(CONF_HOST): vol.In(names)}),
+                data_schema=vol.Schema({vol.Optional(CONF_HOST): vol.In(devices)}),
             )
 
         return await self.async_step_configure()
diff --git a/homeassistant/components/onvif/const.py b/homeassistant/components/onvif/const.py
index 8d95ef484bf95c..77fa098a316060 100644
--- a/homeassistant/components/onvif/const.py
+++ b/homeassistant/components/onvif/const.py
@@ -13,6 +13,7 @@
 DEFAULT_ARGUMENTS = "-pred 1"
 
 CONF_DEVICE_ID = "deviceid"
+CONF_HARDWARE = "hardware"
 CONF_SNAPSHOT_AUTH = "snapshot_auth"
 CONF_ENABLE_WEBHOOKS = "enable_webhooks"
 DEFAULT_ENABLE_WEBHOOKS = True
diff --git a/homeassistant/components/onvif/device.py b/homeassistant/components/onvif/device.py
index e470b3c700bfc6..a524d8ea519825 100644
--- a/homeassistant/components/onvif/device.py
+++ b/homeassistant/components/onvif/device.py
@@ -23,7 +23,7 @@
     CONF_USERNAME,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 import homeassistant.util.dt as dt_util
 
 from .const import (
@@ -189,14 +189,19 @@ async def async_manually_set_date_and_time(self) -> None:
         dt_param.DateTimeType = "Manual"
         # Retrieve DST setting from system
         dt_param.DaylightSavings = bool(time.localtime().tm_isdst)
-        dt_param.UTCDateTime = device_time.UTCDateTime
+        dt_param.UTCDateTime = {
+            "Date": {
+                "Year": system_date.year,
+                "Month": system_date.month,
+                "Day": system_date.day,
+            },
+            "Time": {
+                "Hour": system_date.hour,
+                "Minute": system_date.minute,
+                "Second": system_date.second,
+            },
+        }
         # Retrieve timezone from system
-        dt_param.UTCDateTime.Date.Year = system_date.year
-        dt_param.UTCDateTime.Date.Month = system_date.month
-        dt_param.UTCDateTime.Date.Day = system_date.day
-        dt_param.UTCDateTime.Time.Hour = system_date.hour
-        dt_param.UTCDateTime.Time.Minute = system_date.minute
-        dt_param.UTCDateTime.Time.Second = system_date.second
         system_timezone = str(system_date.astimezone().tzinfo)
         timezone_names: list[str | None] = [system_timezone]
         if (time_zone := device_time.TimeZone) and system_timezone != time_zone.TZ:
@@ -283,6 +288,22 @@ async def async_check_date_and_time(self) -> None:
         if abs(self._dt_diff_seconds) < 5:
             return
 
+        if device_time.DateTimeType != "Manual":
+            self._async_log_time_out_of_sync(cam_date_utc, system_date)
+            return
+
+        # Set Date and Time ourselves if Date and Time is set manually in the camera.
+        try:
+            await self.async_manually_set_date_and_time()
+        except (RequestError, TransportError, IndexError, Fault):
+            LOGGER.warning("%s: Could not sync date/time on this camera", self.name)
+            self._async_log_time_out_of_sync(cam_date_utc, system_date)
+
+    @callback
+    def _async_log_time_out_of_sync(
+        self, cam_date_utc: dt.datetime, system_date: dt.datetime
+    ) -> None:
+        """Log a warning if the camera and system date/time are not synced."""
         LOGGER.warning(
             (
                 "The date/time on %s (UTC) is '%s', "
@@ -294,15 +315,6 @@ async def async_check_date_and_time(self) -> None:
             system_date,
         )
 
-        if device_time.DateTimeType != "Manual":
-            return
-
-        # Set Date and Time ourselves if Date and Time is set manually in the camera.
-        try:
-            await self.async_manually_set_date_and_time()
-        except (RequestError, TransportError, IndexError, Fault):
-            LOGGER.warning("%s: Could not sync date/time on this camera", self.name)
-
     async def async_get_device_info(self) -> DeviceInfo:
         """Obtain information about this device."""
         device_mgmt = await self.device.create_devicemgmt_service()
diff --git a/homeassistant/components/onvif/manifest.json b/homeassistant/components/onvif/manifest.json
index a749e59be48c64..e92e80a9a68aaa 100644
--- a/homeassistant/components/onvif/manifest.json
+++ b/homeassistant/components/onvif/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/onvif",
   "iot_class": "local_push",
   "loggers": ["onvif", "wsdiscovery", "zeep"],
-  "requirements": ["onvif-zeep-async==3.1.7", "WSDiscovery==2.0.0"]
+  "requirements": ["onvif-zeep-async==3.1.9", "WSDiscovery==2.0.0"]
 }
diff --git a/homeassistant/components/open_meteo/weather.py b/homeassistant/components/open_meteo/weather.py
index 2d06b20a30a358..b23abb54f8b6ce 100644
--- a/homeassistant/components/open_meteo/weather.py
+++ b/homeassistant/components/open_meteo/weather.py
@@ -34,6 +34,7 @@ class OpenMeteoWeatherEntity(
     """Defines an Open-Meteo weather entity."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
     _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
diff --git a/homeassistant/components/openhome/__init__.py b/homeassistant/components/openhome/__init__.py
index 78294ceb6f4def..c7ee5a7d00c728 100644
--- a/homeassistant/components/openhome/__init__.py
+++ b/homeassistant/components/openhome/__init__.py
@@ -1 +1,55 @@
 """The openhome component."""
+
+import asyncio
+import logging
+
+import aiohttp
+from async_upnp_client.client import UpnpError
+from openhomedevice.device import Device
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [Platform.MEDIA_PLAYER, Platform.UPDATE]
+
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Cleanup before removing config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    )
+    hass.data[DOMAIN].pop(config_entry.entry_id)
+
+    return unload_ok
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+) -> bool:
+    """Set up the configuration config entry."""
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
+
+    device = await hass.async_add_executor_job(Device, config_entry.data[CONF_HOST])
+
+    try:
+        await device.init()
+    except (asyncio.TimeoutError, aiohttp.ClientError, UpnpError) as exc:
+        raise ConfigEntryNotReady from exc
+
+    _LOGGER.debug("Initialised device: %s", device.uuid())
+
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = device
+
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
+
+    return True
diff --git a/homeassistant/components/openhome/config_flow.py b/homeassistant/components/openhome/config_flow.py
new file mode 100644
index 00000000000000..c8a13a3c7aab3e
--- /dev/null
+++ b/homeassistant/components/openhome/config_flow.py
@@ -0,0 +1,66 @@
+"""Config flow for Linn / OpenHome."""
+
+import logging
+from typing import Any
+
+from homeassistant.components.ssdp import (
+    ATTR_UPNP_FRIENDLY_NAME,
+    ATTR_UPNP_UDN,
+    SsdpServiceInfo,
+)
+from homeassistant.config_entries import ConfigFlow
+from homeassistant.const import CONF_HOST, CONF_NAME
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def _is_complete_discovery(discovery_info: SsdpServiceInfo) -> bool:
+    """Test if discovery is complete and usable."""
+    return bool(ATTR_UPNP_UDN in discovery_info.upnp and discovery_info.ssdp_location)
+
+
+class OpenhomeConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle an Openhome config flow."""
+
+    async def async_step_ssdp(self, discovery_info: SsdpServiceInfo) -> FlowResult:
+        """Handle a flow initialized by discovery."""
+        _LOGGER.debug("async_step_ssdp: started")
+
+        if not _is_complete_discovery(discovery_info):
+            _LOGGER.debug("async_step_ssdp: Incomplete discovery, ignoring")
+            return self.async_abort(reason="incomplete_discovery")
+
+        _LOGGER.debug(
+            "async_step_ssdp: setting unique id %s", discovery_info.upnp[ATTR_UPNP_UDN]
+        )
+
+        await self.async_set_unique_id(discovery_info.upnp[ATTR_UPNP_UDN])
+        self._abort_if_unique_id_configured({CONF_HOST: discovery_info.ssdp_location})
+
+        _LOGGER.debug(
+            "async_step_ssdp: create entry %s", discovery_info.upnp[ATTR_UPNP_UDN]
+        )
+
+        self.context[CONF_NAME] = discovery_info.upnp[ATTR_UPNP_FRIENDLY_NAME]
+        self.context[CONF_HOST] = discovery_info.ssdp_location
+
+        return await self.async_step_confirm()
+
+    async def async_step_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle user-confirmation of discovered node."""
+
+        if user_input is not None:
+            return self.async_create_entry(
+                title=self.context[CONF_NAME],
+                data={CONF_HOST: self.context[CONF_HOST]},
+            )
+
+        return self.async_show_form(
+            step_id="confirm",
+            description_placeholders={CONF_NAME: self.context[CONF_NAME]},
+        )
diff --git a/homeassistant/components/openhome/manifest.json b/homeassistant/components/openhome/manifest.json
index aa563151f0be28..de6c56a01ddaac 100644
--- a/homeassistant/components/openhome/manifest.json
+++ b/homeassistant/components/openhome/manifest.json
@@ -2,8 +2,23 @@
   "domain": "openhome",
   "name": "Linn / OpenHome",
   "codeowners": ["@bazwilliams"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/openhome",
   "iot_class": "local_polling",
   "loggers": ["async_upnp_client", "openhomedevice"],
-  "requirements": ["openhomedevice==2.0.2"]
+  "requirements": ["openhomedevice==2.2.0"],
+  "ssdp": [
+    {
+      "st": "urn:av-openhome-org:service:Product:1"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:2"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:3"
+    },
+    {
+      "st": "urn:av-openhome-org:service:Product:4"
+    }
+  ]
 }
diff --git a/homeassistant/components/openhome/media_player.py b/homeassistant/components/openhome/media_player.py
index b625d9976da20c..77ab0ac0aafb5c 100644
--- a/homeassistant/components/openhome/media_player.py
+++ b/homeassistant/components/openhome/media_player.py
@@ -9,7 +9,6 @@
 
 import aiohttp
 from async_upnp_client.client import UpnpError
-from openhomedevice.device import Device
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -21,12 +20,13 @@
     MediaType,
     async_process_play_media_url,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import ATTR_PIN_INDEX, DATA_OPENHOME, SERVICE_INVOKE_PIN
+from .const import ATTR_PIN_INDEX, DOMAIN, SERVICE_INVOKE_PIN
 
 _OpenhomeDeviceT = TypeVar("_OpenhomeDeviceT", bound="OpenhomeDevice")
 _R = TypeVar("_R")
@@ -41,34 +41,20 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Openhome platform."""
+    """Set up the Openhome config entry."""
 
-    if not discovery_info:
-        return
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
 
-    openhome_data = hass.data.setdefault(DATA_OPENHOME, set())
-
-    name = discovery_info.get("name")
-    description = discovery_info.get("ssdp_description")
-
-    _LOGGER.info("Openhome device found: %s", name)
-    device = await hass.async_add_executor_job(Device, description)
-    await device.init()
-
-    # if device has already been discovered
-    if device.uuid() in openhome_data:
-        return
+    device = hass.data[DOMAIN][config_entry.entry_id]
 
     entity = OpenhomeDevice(hass, device)
 
     async_add_entities([entity])
-    openhome_data.add(device.uuid())
 
     platform = entity_platform.async_get_current_platform()
 
@@ -133,6 +119,18 @@ def __init__(self, hass, device):
         self._attr_state = MediaPlayerState.PLAYING
         self._available = True
 
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return DeviceInfo(
+            identifiers={
+                (DOMAIN, self._device.uuid()),
+            },
+            manufacturer=self._device.manufacturer(),
+            model=self._device.model_name(),
+            name=self._device.friendly_name(),
+        )
+
     @property
     def available(self):
         """Device is available."""
diff --git a/homeassistant/components/openhome/update.py b/homeassistant/components/openhome/update.py
new file mode 100644
index 00000000000000..54c2d16fb2b35e
--- /dev/null
+++ b/homeassistant/components/openhome/update.py
@@ -0,0 +1,103 @@
+"""Update entities for Linn devices."""
+from __future__ import annotations
+
+import asyncio
+import logging
+from typing import Any
+
+import aiohttp
+from async_upnp_client.client import UpnpError
+
+from homeassistant.components.update import (
+    UpdateDeviceClass,
+    UpdateEntity,
+    UpdateEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up update entities for Reolink component."""
+
+    _LOGGER.debug("Setting up config entry: %s", config_entry.unique_id)
+
+    device = hass.data[DOMAIN][config_entry.entry_id]
+
+    entity = OpenhomeUpdateEntity(device)
+
+    await entity.async_update()
+
+    async_add_entities([entity])
+
+
+class OpenhomeUpdateEntity(UpdateEntity):
+    """Update entity for a Linn DS device."""
+
+    _attr_device_class = UpdateDeviceClass.FIRMWARE
+    _attr_supported_features = UpdateEntityFeature.INSTALL
+    _attr_has_entity_name = True
+    _attr_name = None
+
+    def __init__(self, device):
+        """Initialize a Linn DS update entity."""
+        self._device = device
+        self._attr_unique_id = f"{device.uuid()}-update"
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return DeviceInfo(
+            identifiers={
+                (DOMAIN, self._device.uuid()),
+            },
+            manufacturer=self._device.manufacturer(),
+            model=self._device.model_name(),
+            name=self._device.friendly_name(),
+        )
+
+    async def async_update(self) -> None:
+        """Update state of entity."""
+
+        software_status = await self._device.software_status()
+
+        if not software_status:
+            self._attr_installed_version = None
+            self._attr_latest_version = None
+            self._attr_release_summary = None
+            self._attr_release_url = None
+            return
+
+        self._attr_installed_version = software_status["current_software"]["version"]
+
+        if software_status["status"] == "update_available":
+            self._attr_latest_version = software_status["update_info"]["updates"][0][
+                "version"
+            ]
+            self._attr_release_summary = software_status["update_info"]["updates"][0][
+                "description"
+            ]
+            self._attr_release_url = software_status["update_info"]["releasenotesuri"]
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install the latest firmware version."""
+        try:
+            if self.latest_version:
+                await self._device.update_firmware()
+        except (asyncio.TimeoutError, aiohttp.ClientError, UpnpError) as err:
+            raise HomeAssistantError(
+                f"Error updating {self._device.device.friendly_name}: {err}"
+            ) from err
diff --git a/homeassistant/components/opensky/manifest.json b/homeassistant/components/opensky/manifest.json
index 7fdb6cfd677e1c..6c6d3acb30eb4e 100644
--- a/homeassistant/components/opensky/manifest.json
+++ b/homeassistant/components/opensky/manifest.json
@@ -1,7 +1,8 @@
 {
   "domain": "opensky",
   "name": "OpenSky Network",
-  "codeowners": [],
+  "codeowners": ["@joostlek"],
   "documentation": "https://www.home-assistant.io/integrations/opensky",
-  "iot_class": "cloud_polling"
+  "iot_class": "cloud_polling",
+  "requirements": ["python-opensky==0.0.10"]
 }
diff --git a/homeassistant/components/opensky/sensor.py b/homeassistant/components/opensky/sensor.py
index 03e242f40b2974..cdedd0c9620b7d 100644
--- a/homeassistant/components/opensky/sensor.py
+++ b/homeassistant/components/opensky/sensor.py
@@ -3,7 +3,7 @@
 
 from datetime import timedelta
 
-import requests
+from python_opensky import BoundingBox, OpenSky, StateVector
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
@@ -14,14 +14,12 @@
     CONF_LONGITUDE,
     CONF_NAME,
     CONF_RADIUS,
-    UnitOfLength,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import location as util_location
-from homeassistant.util.unit_conversion import DistanceConverter
 
 CONF_ALTITUDE = "altitude"
 
@@ -79,15 +77,18 @@ def setup_platform(
     """Set up the Open Sky platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+    radius = config.get(CONF_RADIUS, 0)
+    bounding_box = OpenSky.get_bounding_box(latitude, longitude, radius * 1000)
+    session = async_get_clientsession(hass)
+    opensky = OpenSky(session=session)
     add_entities(
         [
             OpenSkySensor(
                 hass,
                 config.get(CONF_NAME, DOMAIN),
-                latitude,
-                longitude,
-                config.get(CONF_RADIUS),
-                config.get(CONF_ALTITUDE),
+                opensky,
+                bounding_box,
+                config[CONF_ALTITUDE],
             )
         ],
         True,
@@ -101,38 +102,43 @@ class OpenSkySensor(SensorEntity):
         "Information provided by the OpenSky Network (https://opensky-network.org)"
     )
 
-    def __init__(self, hass, name, latitude, longitude, radius, altitude):
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        name: str,
+        opensky: OpenSky,
+        bounding_box: BoundingBox,
+        altitude: float,
+    ) -> None:
         """Initialize the sensor."""
-        self._session = requests.Session()
-        self._latitude = latitude
-        self._longitude = longitude
-        self._radius = DistanceConverter.convert(
-            radius, UnitOfLength.KILOMETERS, UnitOfLength.METERS
-        )
         self._altitude = altitude
         self._state = 0
         self._hass = hass
         self._name = name
-        self._previously_tracked = None
+        self._previously_tracked: set[str] = set()
+        self._opensky = opensky
+        self._bounding_box = bounding_box
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the sensor."""
         return self._name
 
     @property
-    def native_value(self):
+    def native_value(self) -> int:
         """Return the state of the sensor."""
         return self._state
 
-    def _handle_boundary(self, flights, event, metadata):
+    def _handle_boundary(
+        self, flights: set[str], event: str, metadata: dict[str, StateVector]
+    ) -> None:
         """Handle flights crossing region boundary."""
         for flight in flights:
             if flight in metadata:
-                altitude = metadata[flight].get(ATTR_ALTITUDE)
-                longitude = metadata[flight].get(ATTR_LONGITUDE)
-                latitude = metadata[flight].get(ATTR_LATITUDE)
-                icao24 = metadata[flight].get(ATTR_ICAO24)
+                altitude = metadata[flight].barometric_altitude
+                longitude = metadata[flight].longitude
+                latitude = metadata[flight].latitude
+                icao24 = metadata[flight].icao24
             else:
                 # Assume Flight has landed if missing.
                 altitude = 0
@@ -150,33 +156,27 @@ def _handle_boundary(self, flights, event, metadata):
             }
             self._hass.bus.fire(event, data)
 
-    def update(self) -> None:
+    async def async_update(self) -> None:
         """Update device state."""
         currently_tracked = set()
-        flight_metadata = {}
-        states = self._session.get(OPENSKY_API_URL).json().get(ATTR_STATES)
-        for state in states:
-            flight = dict(zip(OPENSKY_API_FIELDS, state))
-            callsign = flight[ATTR_CALLSIGN].strip()
+        flight_metadata: dict[str, StateVector] = {}
+        response = await self._opensky.get_states(bounding_box=self._bounding_box)
+        for flight in response.states:
+            if not flight.callsign:
+                continue
+            callsign = flight.callsign.strip()
             if callsign != "":
                 flight_metadata[callsign] = flight
             else:
                 continue
             if (
-                (longitude := flight.get(ATTR_LONGITUDE)) is None
-                or (latitude := flight.get(ATTR_LATITUDE)) is None
-                or flight.get(ATTR_ON_GROUND)
+                flight.longitude is None
+                or flight.latitude is None
+                or flight.on_ground
+                or flight.barometric_altitude is None
             ):
                 continue
-            distance = util_location.distance(
-                self._latitude,
-                self._longitude,
-                latitude,
-                longitude,
-            )
-            if distance is None or distance > self._radius:
-                continue
-            altitude = flight.get(ATTR_ALTITUDE)
+            altitude = flight.barometric_altitude
             if altitude > self._altitude and self._altitude != 0:
                 continue
             currently_tracked.add(callsign)
@@ -189,11 +189,11 @@ def update(self) -> None:
         self._previously_tracked = currently_tracked
 
     @property
-    def native_unit_of_measurement(self):
+    def native_unit_of_measurement(self) -> str:
         """Return the unit of measurement."""
         return "flights"
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return the icon."""
         return "mdi:airplane"
diff --git a/homeassistant/components/openuv/binary_sensor.py b/homeassistant/components/openuv/binary_sensor.py
index 1e69af66eec530..e9f9ee99ff6bc1 100644
--- a/homeassistant/components/openuv/binary_sensor.py
+++ b/homeassistant/components/openuv/binary_sensor.py
@@ -19,7 +19,7 @@
 
 BINARY_SENSOR_DESCRIPTION_PROTECTION_WINDOW = BinarySensorEntityDescription(
     key=TYPE_PROTECTION_WINDOW,
-    name="Protection window",
+    translation_key="protection_window",
     icon="mdi:sunglasses",
 )
 
diff --git a/homeassistant/components/openuv/sensor.py b/homeassistant/components/openuv/sensor.py
index 44bde8341a0bc8..90eefac594a7f9 100644
--- a/homeassistant/components/openuv/sensor.py
+++ b/homeassistant/components/openuv/sensor.py
@@ -49,67 +49,67 @@
 SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key=TYPE_CURRENT_OZONE_LEVEL,
-        name="Current ozone level",
+        translation_key="current_ozone_level",
         native_unit_of_measurement="du",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_CURRENT_UV_INDEX,
-        name="Current UV index",
+        translation_key="current_uv_index",
         icon="mdi:weather-sunny",
         native_unit_of_measurement=UV_INDEX,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_CURRENT_UV_LEVEL,
-        name="Current UV level",
+        translation_key="current_uv_level",
         icon="mdi:weather-sunny",
     ),
     SensorEntityDescription(
         key=TYPE_MAX_UV_INDEX,
-        name="Max UV index",
+        translation_key="max_uv_index",
         icon="mdi:weather-sunny",
         native_unit_of_measurement=UV_INDEX,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_1,
-        name="Skin type 1 safe exposure time",
+        translation_key="skin_type_1_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_2,
-        name="Skin type 2 safe exposure time",
+        translation_key="skin_type_2_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_3,
-        name="Skin type 3 safe exposure time",
+        translation_key="skin_type_3_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_4,
-        name="Skin type 4 safe exposure time",
+        translation_key="skin_type_4_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_5,
-        name="Skin type 5 safe exposure time",
+        translation_key="skin_type_5_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TYPE_SAFE_EXPOSURE_TIME_6,
-        name="Skin type 6 safe exposure time",
+        translation_key="skin_type_6_safe_exposure_time",
         icon="mdi:timer-outline",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/openuv/strings.json b/homeassistant/components/openuv/strings.json
index 9542cb8b1a7142..4aa29d11fcf26c 100644
--- a/homeassistant/components/openuv/strings.json
+++ b/homeassistant/components/openuv/strings.json
@@ -46,5 +46,44 @@
       "title": "The {deprecated_service} service is being removed",
       "description": "Update any automations or scripts that use this service to instead use the `{alternate_service}` service with `{alternate_targets}` as the target."
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "protection_window": {
+        "name": "Protection window"
+      }
+    },
+    "sensor": {
+      "current_ozone_level": {
+        "name": "Current ozone level"
+      },
+      "current_uv_index": {
+        "name": "Current UV index"
+      },
+      "current_uv_level": {
+        "name": "Current UV level"
+      },
+      "max_uv_index": {
+        "name": "Max UV index"
+      },
+      "skin_type_1_safe_exposure_time": {
+        "name": "Skin type 1 safe exposure time"
+      },
+      "skin_type_2_safe_exposure_time": {
+        "name": "Skin type 2 safe exposure time"
+      },
+      "skin_type_3_safe_exposure_time": {
+        "name": "Skin type 3 safe exposure time"
+      },
+      "skin_type_4_safe_exposure_time": {
+        "name": "Skin type 4 safe exposure time"
+      },
+      "skin_type_5_safe_exposure_time": {
+        "name": "Skin type 5 safe exposure time"
+      },
+      "skin_type_6_safe_exposure_time": {
+        "name": "Skin type 6 safe exposure time"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/openweathermap/const.py b/homeassistant/components/openweathermap/const.py
index 4af068f2b84057..d53fbc136b21da 100644
--- a/homeassistant/components/openweathermap/const.py
+++ b/homeassistant/components/openweathermap/const.py
@@ -35,6 +35,7 @@
 ATTR_API_WEATHER = "weather"
 ATTR_API_TEMPERATURE = "temperature"
 ATTR_API_FEELS_LIKE_TEMPERATURE = "feels_like_temperature"
+ATTR_API_WIND_GUST = "wind_gust"
 ATTR_API_WIND_SPEED = "wind_speed"
 ATTR_API_WIND_BEARING = "wind_bearing"
 ATTR_API_HUMIDITY = "humidity"
@@ -50,7 +51,10 @@
 UPDATE_LISTENER = "update_listener"
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 
+ATTR_API_FORECAST_CLOUDS = "clouds"
 ATTR_API_FORECAST_CONDITION = "condition"
+ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE = "feels_like_temperature"
+ATTR_API_FORECAST_HUMIDITY = "humidity"
 ATTR_API_FORECAST_PRECIPITATION = "precipitation"
 ATTR_API_FORECAST_PRECIPITATION_PROBABILITY = "precipitation_probability"
 ATTR_API_FORECAST_PRESSURE = "pressure"
diff --git a/homeassistant/components/openweathermap/weather.py b/homeassistant/components/openweathermap/weather.py
index da29031d513d43..30f98bb39d1f25 100644
--- a/homeassistant/components/openweathermap/weather.py
+++ b/homeassistant/components/openweathermap/weather.py
@@ -4,7 +4,10 @@
 from typing import cast
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
@@ -29,9 +32,15 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
+    ATTR_API_CLOUDS,
     ATTR_API_CONDITION,
+    ATTR_API_DEW_POINT,
+    ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_FORECAST,
+    ATTR_API_FORECAST_CLOUDS,
     ATTR_API_FORECAST_CONDITION,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE,
+    ATTR_API_FORECAST_HUMIDITY,
     ATTR_API_FORECAST_PRECIPITATION,
     ATTR_API_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_API_FORECAST_PRESSURE,
@@ -44,6 +53,7 @@
     ATTR_API_PRESSURE,
     ATTR_API_TEMPERATURE,
     ATTR_API_WIND_BEARING,
+    ATTR_API_WIND_GUST,
     ATTR_API_WIND_SPEED,
     ATTRIBUTION,
     DEFAULT_NAME,
@@ -64,6 +74,9 @@
     ATTR_API_FORECAST_TIME: ATTR_FORECAST_TIME,
     ATTR_API_FORECAST_WIND_BEARING: ATTR_FORECAST_WIND_BEARING,
     ATTR_API_FORECAST_WIND_SPEED: ATTR_FORECAST_NATIVE_WIND_SPEED,
+    ATTR_API_FORECAST_CLOUDS: ATTR_FORECAST_CLOUD_COVERAGE,
+    ATTR_API_FORECAST_HUMIDITY: ATTR_FORECAST_HUMIDITY,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE: ATTR_FORECAST_NATIVE_APPARENT_TEMP,
 }
 
 
@@ -116,6 +129,16 @@ def condition(self) -> str | None:
         """Return the current condition."""
         return self._weather_coordinator.data[ATTR_API_CONDITION]
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the Cloud coverage in %."""
+        return self._weather_coordinator.data[ATTR_API_CLOUDS]
+
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature."""
+        return self._weather_coordinator.data[ATTR_API_FEELS_LIKE_TEMPERATURE]
+
     @property
     def native_temperature(self) -> float | None:
         """Return the temperature."""
@@ -131,6 +154,16 @@ def humidity(self) -> float | None:
         """Return the humidity."""
         return self._weather_coordinator.data[ATTR_API_HUMIDITY]
 
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point."""
+        return self._weather_coordinator.data[ATTR_API_DEW_POINT]
+
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed."""
+        return self._weather_coordinator.data[ATTR_API_WIND_GUST]
+
     @property
     def native_wind_speed(self) -> float | None:
         """Return the wind speed."""
diff --git a/homeassistant/components/openweathermap/weather_update_coordinator.py b/homeassistant/components/openweathermap/weather_update_coordinator.py
index 90e2c426d27b3d..521c1f87ca206a 100644
--- a/homeassistant/components/openweathermap/weather_update_coordinator.py
+++ b/homeassistant/components/openweathermap/weather_update_coordinator.py
@@ -12,7 +12,7 @@
 from homeassistant.const import UnitOfTemperature
 from homeassistant.helpers import sun
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import (
@@ -21,7 +21,10 @@
     ATTR_API_DEW_POINT,
     ATTR_API_FEELS_LIKE_TEMPERATURE,
     ATTR_API_FORECAST,
+    ATTR_API_FORECAST_CLOUDS,
     ATTR_API_FORECAST_CONDITION,
+    ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE,
+    ATTR_API_FORECAST_HUMIDITY,
     ATTR_API_FORECAST_PRECIPITATION,
     ATTR_API_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_API_FORECAST_PRESSURE,
@@ -41,6 +44,7 @@
     ATTR_API_WEATHER,
     ATTR_API_WEATHER_CODE,
     ATTR_API_WIND_BEARING,
+    ATTR_API_WIND_GUST,
     ATTR_API_WIND_SPEED,
     CONDITION_CLASSES,
     DOMAIN,
@@ -130,6 +134,7 @@ def _convert_weather_response(self, weather_response):
             ATTR_API_PRESSURE: current_weather.pressure.get("press"),
             ATTR_API_HUMIDITY: current_weather.humidity,
             ATTR_API_WIND_BEARING: current_weather.wind().get("deg"),
+            ATTR_API_WIND_GUST: current_weather.wind().get("gust"),
             ATTR_API_WIND_SPEED: current_weather.wind().get("speed"),
             ATTR_API_CLOUDS: current_weather.clouds,
             ATTR_API_RAIN: self._get_rain(current_weather.rain),
@@ -159,7 +164,7 @@ def _get_forecast_from_weather_response(self, weather_response):
     def _convert_forecast(self, entry):
         """Convert the forecast data."""
         forecast = {
-            ATTR_API_FORECAST_TIME: dt.utc_from_timestamp(
+            ATTR_API_FORECAST_TIME: dt_util.utc_from_timestamp(
                 entry.reference_time("unix")
             ).isoformat(),
             ATTR_API_FORECAST_PRECIPITATION: self._calc_precipitation(
@@ -174,7 +179,11 @@ def _convert_forecast(self, entry):
             ATTR_API_FORECAST_CONDITION: self._get_condition(
                 entry.weather_code, entry.reference_time("unix")
             ),
-            ATTR_API_CLOUDS: entry.clouds,
+            ATTR_API_FORECAST_CLOUDS: entry.clouds,
+            ATTR_API_FORECAST_FEELS_LIKE_TEMPERATURE: entry.temperature("celsius").get(
+                "feels_like_day"
+            ),
+            ATTR_API_FORECAST_HUMIDITY: entry.humidity,
         }
 
         temperature_dict = entry.temperature("celsius")
@@ -252,7 +261,7 @@ def _get_condition(self, weather_code, timestamp=None):
         """Get weather condition from weather data."""
         if weather_code == WEATHER_CODE_SUNNY_OR_CLEAR_NIGHT:
             if timestamp:
-                timestamp = dt.utc_from_timestamp(timestamp)
+                timestamp = dt_util.utc_from_timestamp(timestamp)
 
             if sun.is_up(self.hass, timestamp):
                 return ATTR_CONDITION_SUNNY
diff --git a/homeassistant/components/opnsense/__init__.py b/homeassistant/components/opnsense/__init__.py
index bd074cf5e5ea94..0111379df44e8d 100644
--- a/homeassistant/components/opnsense/__init__.py
+++ b/homeassistant/components/opnsense/__init__.py
@@ -49,7 +49,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     tracker_interfaces = conf[CONF_TRACKER_INTERFACE]
 
     interfaces_client = diagnostics.InterfaceClient(
-        api_key, api_secret, url, verify_ssl
+        api_key, api_secret, url, verify_ssl, timeout=20
     )
     try:
         interfaces_client.get_arp()
@@ -60,7 +60,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if tracker_interfaces:
         # Verify that specified tracker interfaces are valid
         netinsight_client = diagnostics.NetworkInsightClient(
-            api_key, api_secret, url, verify_ssl
+            api_key, api_secret, url, verify_ssl, timeout=20
         )
         interfaces = list(netinsight_client.get_interfaces().values())
         for interface in tracker_interfaces:
diff --git a/homeassistant/components/opnsense/manifest.json b/homeassistant/components/opnsense/manifest.json
index 89e8efa34260ed..bf8a41d17855d8 100644
--- a/homeassistant/components/opnsense/manifest.json
+++ b/homeassistant/components/opnsense/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opnsense",
   "iot_class": "local_polling",
   "loggers": ["pbr", "pyopnsense"],
-  "requirements": ["pyopnsense==0.2.0"]
+  "requirements": ["pyopnsense==0.4.0"]
 }
diff --git a/homeassistant/components/opower/__init__.py b/homeassistant/components/opower/__init__.py
new file mode 100644
index 00000000000000..f4fca22c9b4424
--- /dev/null
+++ b/homeassistant/components/opower/__init__.py
@@ -0,0 +1,31 @@
+"""The Opower integration."""
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import OpowerCoordinator
+
+PLATFORMS: list[Platform] = [Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Opower from a config entry."""
+
+    coordinator = OpowerCoordinator(hass, entry.data)
+    await coordinator.async_config_entry_first_refresh()
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/opower/config_flow.py b/homeassistant/components/opower/config_flow.py
new file mode 100644
index 00000000000000..fdf007c3b681a4
--- /dev/null
+++ b/homeassistant/components/opower/config_flow.py
@@ -0,0 +1,112 @@
+"""Config flow for Opower integration."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+import logging
+from typing import Any
+
+from opower import CannotConnect, InvalidAuth, Opower, get_supported_utility_names
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
+
+from .const import CONF_UTILITY, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_UTILITY): vol.In(get_supported_utility_names()),
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+
+
+async def _validate_login(
+    hass: HomeAssistant, login_data: dict[str, str]
+) -> dict[str, str]:
+    """Validate login data and return any errors."""
+    api = Opower(
+        async_create_clientsession(hass),
+        login_data[CONF_UTILITY],
+        login_data[CONF_USERNAME],
+        login_data[CONF_PASSWORD],
+    )
+    errors: dict[str, str] = {}
+    try:
+        await api.async_login()
+    except InvalidAuth:
+        errors["base"] = "invalid_auth"
+    except CannotConnect:
+        errors["base"] = "cannot_connect"
+    return errors
+
+
+class OpowerConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Opower."""
+
+    VERSION = 1
+
+    def __init__(self) -> None:
+        """Initialize a new OpowerConfigFlow."""
+        self.reauth_entry: config_entries.ConfigEntry | None = None
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            self._async_abort_entries_match(
+                {
+                    CONF_UTILITY: user_input[CONF_UTILITY],
+                    CONF_USERNAME: user_input[CONF_USERNAME],
+                }
+            )
+            errors = await _validate_login(self.hass, user_input)
+            if not errors:
+                return self.async_create_entry(
+                    title=f"{user_input[CONF_UTILITY]} ({user_input[CONF_USERNAME]})",
+                    data=user_input,
+                )
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Handle configuration by re-auth."""
+        self.reauth_entry = self.hass.config_entries.async_get_entry(
+            self.context["entry_id"]
+        )
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Dialog that informs the user that reauth is required."""
+        assert self.reauth_entry
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            data = {**self.reauth_entry.data, **user_input}
+            errors = await _validate_login(self.hass, data)
+            if not errors:
+                self.hass.config_entries.async_update_entry(
+                    self.reauth_entry, data=data
+                )
+                await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)
+                return self.async_abort(reason="reauth_successful")
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_USERNAME): self.reauth_entry.data[CONF_USERNAME],
+                    vol.Required(CONF_PASSWORD): str,
+                }
+            ),
+            errors=errors,
+        )
diff --git a/homeassistant/components/opower/const.py b/homeassistant/components/opower/const.py
new file mode 100644
index 00000000000000..b996a214a05916
--- /dev/null
+++ b/homeassistant/components/opower/const.py
@@ -0,0 +1,5 @@
+"""Constants for the Opower integration."""
+
+DOMAIN = "opower"
+
+CONF_UTILITY = "utility"
diff --git a/homeassistant/components/opower/coordinator.py b/homeassistant/components/opower/coordinator.py
new file mode 100644
index 00000000000000..c331f45bc4977c
--- /dev/null
+++ b/homeassistant/components/opower/coordinator.py
@@ -0,0 +1,220 @@
+"""Coordinator to handle Opower connections."""
+from datetime import datetime, timedelta
+import logging
+from types import MappingProxyType
+from typing import Any, cast
+
+from opower import (
+    Account,
+    AggregateType,
+    CostRead,
+    Forecast,
+    InvalidAuth,
+    MeterType,
+    Opower,
+)
+
+from homeassistant.components.recorder import get_instance
+from homeassistant.components.recorder.models import StatisticData, StatisticMetaData
+from homeassistant.components.recorder.statistics import (
+    async_add_external_statistics,
+    get_last_statistics,
+    statistics_during_period,
+)
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, UnitOfEnergy, UnitOfVolume
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import CONF_UTILITY, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
+    """Handle fetching Opower data, updating sensors and inserting statistics."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry_data: MappingProxyType[str, Any],
+    ) -> None:
+        """Initialize the data handler."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name="Opower",
+            # Data is updated daily on Opower.
+            # Refresh every 12h to be at most 12h behind.
+            update_interval=timedelta(hours=12),
+        )
+        self.api = Opower(
+            aiohttp_client.async_get_clientsession(hass),
+            entry_data[CONF_UTILITY],
+            entry_data[CONF_USERNAME],
+            entry_data[CONF_PASSWORD],
+        )
+
+    async def _async_update_data(
+        self,
+    ) -> dict[str, Forecast]:
+        """Fetch data from API endpoint."""
+        try:
+            # Login expires after a few minutes.
+            # Given the infrequent updating (every 12h)
+            # assume previous session has expired and re-login.
+            await self.api.async_login()
+        except InvalidAuth as err:
+            raise ConfigEntryAuthFailed from err
+        forecasts: list[Forecast] = await self.api.async_get_forecast()
+        _LOGGER.debug("Updating sensor data with: %s", forecasts)
+        await self._insert_statistics([forecast.account for forecast in forecasts])
+        return {forecast.account.utility_account_id: forecast for forecast in forecasts}
+
+    async def _insert_statistics(self, accounts: list[Account]) -> None:
+        """Insert Opower statistics."""
+        for account in accounts:
+            id_prefix = "_".join(
+                (
+                    self.api.utility.subdomain(),
+                    account.meter_type.name.lower(),
+                    account.utility_account_id,
+                )
+            )
+            cost_statistic_id = f"{DOMAIN}:{id_prefix}_energy_cost"
+            consumption_statistic_id = f"{DOMAIN}:{id_prefix}_energy_consumption"
+            _LOGGER.debug(
+                "Updating Statistics for %s and %s",
+                cost_statistic_id,
+                consumption_statistic_id,
+            )
+
+            last_stat = await get_instance(self.hass).async_add_executor_job(
+                get_last_statistics, self.hass, 1, consumption_statistic_id, True, set()
+            )
+            if not last_stat:
+                _LOGGER.debug("Updating statistic for the first time")
+                cost_reads = await self._async_get_all_cost_reads(account)
+                cost_sum = 0.0
+                consumption_sum = 0.0
+                last_stats_time = None
+            else:
+                cost_reads = await self._async_get_recent_cost_reads(
+                    account, last_stat[consumption_statistic_id][0]["start"]
+                )
+                if not cost_reads:
+                    _LOGGER.debug("No recent usage/cost data. Skipping update")
+                    continue
+                stats = await get_instance(self.hass).async_add_executor_job(
+                    statistics_during_period,
+                    self.hass,
+                    cost_reads[0].start_time,
+                    None,
+                    {cost_statistic_id, consumption_statistic_id},
+                    "hour" if account.meter_type == MeterType.ELEC else "day",
+                    None,
+                    {"sum"},
+                )
+                cost_sum = cast(float, stats[cost_statistic_id][0]["sum"])
+                consumption_sum = cast(float, stats[consumption_statistic_id][0]["sum"])
+                last_stats_time = stats[cost_statistic_id][0]["start"]
+
+            cost_statistics = []
+            consumption_statistics = []
+
+            for cost_read in cost_reads:
+                start = cost_read.start_time
+                if last_stats_time is not None and start.timestamp() <= last_stats_time:
+                    continue
+                cost_sum += cost_read.provided_cost
+                consumption_sum += cost_read.consumption
+
+                cost_statistics.append(
+                    StatisticData(
+                        start=start, state=cost_read.provided_cost, sum=cost_sum
+                    )
+                )
+                consumption_statistics.append(
+                    StatisticData(
+                        start=start, state=cost_read.consumption, sum=consumption_sum
+                    )
+                )
+
+            name_prefix = " ".join(
+                (
+                    "Opower",
+                    self.api.utility.subdomain(),
+                    account.meter_type.name.lower(),
+                    account.utility_account_id,
+                )
+            )
+            cost_metadata = StatisticMetaData(
+                has_mean=False,
+                has_sum=True,
+                name=f"{name_prefix} cost",
+                source=DOMAIN,
+                statistic_id=cost_statistic_id,
+                unit_of_measurement=None,
+            )
+            consumption_metadata = StatisticMetaData(
+                has_mean=False,
+                has_sum=True,
+                name=f"{name_prefix} consumption",
+                source=DOMAIN,
+                statistic_id=consumption_statistic_id,
+                unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR
+                if account.meter_type == MeterType.ELEC
+                else UnitOfVolume.CENTUM_CUBIC_FEET,
+            )
+
+            async_add_external_statistics(self.hass, cost_metadata, cost_statistics)
+            async_add_external_statistics(
+                self.hass, consumption_metadata, consumption_statistics
+            )
+
+    async def _async_get_all_cost_reads(self, account: Account) -> list[CostRead]:
+        """Get all cost reads since account activation but at different resolutions depending on age.
+
+        - month resolution for all years (since account activation)
+        - day resolution for past 3 years
+        - hour resolution for past 2 months, only for electricity, not gas
+        """
+        cost_reads = []
+        start = None
+        end = datetime.now() - timedelta(days=3 * 365)
+        cost_reads += await self.api.async_get_cost_reads(
+            account, AggregateType.BILL, start, end
+        )
+        start = end if not cost_reads else cost_reads[-1].end_time
+        end = (
+            datetime.now() - timedelta(days=2 * 30)
+            if account.meter_type == MeterType.ELEC
+            else datetime.now()
+        )
+        cost_reads += await self.api.async_get_cost_reads(
+            account, AggregateType.DAY, start, end
+        )
+        if account.meter_type == MeterType.ELEC:
+            start = end if not cost_reads else cost_reads[-1].end_time
+            end = datetime.now()
+            cost_reads += await self.api.async_get_cost_reads(
+                account, AggregateType.HOUR, start, end
+            )
+        return cost_reads
+
+    async def _async_get_recent_cost_reads(
+        self, account: Account, last_stat_time: float
+    ) -> list[CostRead]:
+        """Get cost reads within the past 30 days to allow corrections in data from utilities.
+
+        Hourly for electricity, daily for gas.
+        """
+        return await self.api.async_get_cost_reads(
+            account,
+            AggregateType.HOUR
+            if account.meter_type == MeterType.ELEC
+            else AggregateType.DAY,
+            datetime.fromtimestamp(last_stat_time) - timedelta(days=30),
+            datetime.now(),
+        )
diff --git a/homeassistant/components/opower/manifest.json b/homeassistant/components/opower/manifest.json
new file mode 100644
index 00000000000000..3b48e96a35194c
--- /dev/null
+++ b/homeassistant/components/opower/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "opower",
+  "name": "Opower",
+  "codeowners": ["@tronikos"],
+  "config_flow": true,
+  "dependencies": ["recorder"],
+  "documentation": "https://www.home-assistant.io/integrations/opower",
+  "iot_class": "cloud_polling",
+  "requirements": ["opower==0.0.12"]
+}
diff --git a/homeassistant/components/opower/sensor.py b/homeassistant/components/opower/sensor.py
new file mode 100644
index 00000000000000..36f88a36e8aba1
--- /dev/null
+++ b/homeassistant/components/opower/sensor.py
@@ -0,0 +1,235 @@
+"""Support for Opower sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from opower import Forecast, MeterType, UnitOfMeasure
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import UnitOfEnergy, UnitOfVolume
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import OpowerCoordinator
+
+
+@dataclass
+class OpowerEntityDescriptionMixin:
+    """Mixin values for required keys."""
+
+    value_fn: Callable[[Forecast], str | float]
+
+
+@dataclass
+class OpowerEntityDescription(SensorEntityDescription, OpowerEntityDescriptionMixin):
+    """Class describing Opower sensors entities."""
+
+
+# suggested_display_precision=0 for all sensors since
+# Opower provides 0 decimal points for all these.
+# (for the statistics in the energy dashboard Opower does provide decimal points)
+ELEC_SENSORS: tuple[OpowerEntityDescription, ...] = (
+    OpowerEntityDescription(
+        key="elec_usage_to_date",
+        name="Current bill electric usage to date",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.usage_to_date,
+    ),
+    OpowerEntityDescription(
+        key="elec_forecasted_usage",
+        name="Current bill electric forecasted usage",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.forecasted_usage,
+    ),
+    OpowerEntityDescription(
+        key="elec_typical_usage",
+        name="Typical monthly electric usage",
+        device_class=SensorDeviceClass.ENERGY,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.typical_usage,
+    ),
+    OpowerEntityDescription(
+        key="elec_cost_to_date",
+        name="Current bill electric cost to date",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.cost_to_date,
+    ),
+    OpowerEntityDescription(
+        key="elec_forecasted_cost",
+        name="Current bill electric forecasted cost",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.forecasted_cost,
+    ),
+    OpowerEntityDescription(
+        key="elec_typical_cost",
+        name="Typical monthly electric cost",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.typical_cost,
+    ),
+)
+GAS_SENSORS: tuple[OpowerEntityDescription, ...] = (
+    OpowerEntityDescription(
+        key="gas_usage_to_date",
+        name="Current bill gas usage to date",
+        device_class=SensorDeviceClass.GAS,
+        native_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        suggested_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.usage_to_date,
+    ),
+    OpowerEntityDescription(
+        key="gas_forecasted_usage",
+        name="Current bill gas forecasted usage",
+        device_class=SensorDeviceClass.GAS,
+        native_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        suggested_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.forecasted_usage,
+    ),
+    OpowerEntityDescription(
+        key="gas_typical_usage",
+        name="Typical monthly gas usage",
+        device_class=SensorDeviceClass.GAS,
+        native_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        suggested_unit_of_measurement=UnitOfVolume.CENTUM_CUBIC_FEET,
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.typical_usage,
+    ),
+    OpowerEntityDescription(
+        key="gas_cost_to_date",
+        name="Current bill gas cost to date",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.cost_to_date,
+    ),
+    OpowerEntityDescription(
+        key="gas_forecasted_cost",
+        name="Current bill gas forecasted cost",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.forecasted_cost,
+    ),
+    OpowerEntityDescription(
+        key="gas_typical_cost",
+        name="Typical monthly gas cost",
+        device_class=SensorDeviceClass.MONETARY,
+        native_unit_of_measurement="USD",
+        suggested_unit_of_measurement="USD",
+        state_class=SensorStateClass.TOTAL,
+        suggested_display_precision=0,
+        value_fn=lambda data: data.typical_cost,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Opower sensor."""
+
+    coordinator: OpowerCoordinator = hass.data[DOMAIN][entry.entry_id]
+    entities: list[OpowerSensor] = []
+    forecasts = coordinator.data.values()
+    for forecast in forecasts:
+        device_id = f"{coordinator.api.utility.subdomain()}_{forecast.account.utility_account_id}"
+        device = DeviceInfo(
+            identifiers={(DOMAIN, device_id)},
+            name=f"{forecast.account.meter_type.name} account {forecast.account.utility_account_id}",
+            manufacturer="Opower",
+            model=coordinator.api.utility.name(),
+            entry_type=DeviceEntryType.SERVICE,
+        )
+        sensors: tuple[OpowerEntityDescription, ...] = ()
+        if (
+            forecast.account.meter_type == MeterType.ELEC
+            and forecast.unit_of_measure == UnitOfMeasure.KWH
+        ):
+            sensors = ELEC_SENSORS
+        elif (
+            forecast.account.meter_type == MeterType.GAS
+            and forecast.unit_of_measure == UnitOfMeasure.THERM
+        ):
+            sensors = GAS_SENSORS
+        for sensor in sensors:
+            entities.append(
+                OpowerSensor(
+                    coordinator,
+                    sensor,
+                    forecast.account.utility_account_id,
+                    device,
+                    device_id,
+                )
+            )
+
+    async_add_entities(entities)
+
+
+class OpowerSensor(CoordinatorEntity[OpowerCoordinator], SensorEntity):
+    """Representation of an Opower sensor."""
+
+    entity_description: OpowerEntityDescription
+
+    def __init__(
+        self,
+        coordinator: OpowerCoordinator,
+        description: OpowerEntityDescription,
+        utility_account_id: str,
+        device: DeviceInfo,
+        device_id: str,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{device_id}_{description.key}"
+        self._attr_device_info = device
+        self.utility_account_id = utility_account_id
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the state."""
+        if self.coordinator.data is not None:
+            return self.entity_description.value_fn(
+                self.coordinator.data[self.utility_account_id]
+            )
+        return None
diff --git a/homeassistant/components/opower/strings.json b/homeassistant/components/opower/strings.json
new file mode 100644
index 00000000000000..037983eb6ffd49
--- /dev/null
+++ b/homeassistant/components/opower/strings.json
@@ -0,0 +1,28 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "utility": "Utility name",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "data": {
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    }
+  }
+}
diff --git a/homeassistant/components/opple/manifest.json b/homeassistant/components/opple/manifest.json
index 9d87114c2d045f..174907dfd0faab 100644
--- a/homeassistant/components/opple/manifest.json
+++ b/homeassistant/components/opple/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opple",
   "iot_class": "local_polling",
   "loggers": ["pyoppleio"],
-  "requirements": ["pyoppleio==1.0.5"]
+  "requirements": ["pyoppleio-legacy==1.0.8"]
 }
diff --git a/homeassistant/components/otbr/__init__.py b/homeassistant/components/otbr/__init__.py
index 5942d67b50d5ab..8f8810b5f33b17 100644
--- a/homeassistant/components/otbr/__init__.py
+++ b/homeassistant/components/otbr/__init__.py
@@ -10,6 +10,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
@@ -17,6 +18,8 @@
 from .const import DOMAIN
 from .util import OTBRData, update_issues
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Open Thread Border Router component."""
diff --git a/homeassistant/components/otbr/config_flow.py b/homeassistant/components/otbr/config_flow.py
index 32842ad6cc7809..67c8412102d6a5 100644
--- a/homeassistant/components/otbr/config_flow.py
+++ b/homeassistant/components/otbr/config_flow.py
@@ -2,19 +2,29 @@
 from __future__ import annotations
 
 import asyncio
+from contextlib import suppress
 import logging
+from typing import cast
 
 import aiohttp
 import python_otbr_api
 from python_otbr_api import tlv_parser
+from python_otbr_api.tlv_parser import MeshcopTLVType
 import voluptuous as vol
 import yarl
 
-from homeassistant.components.hassio import HassioServiceInfo
+from homeassistant.components.hassio import (
+    HassioAPIError,
+    HassioServiceInfo,
+    async_get_addon_info,
+)
+from homeassistant.components.homeassistant_yellow import hardware as yellow_hardware
 from homeassistant.components.thread import async_get_preferred_dataset
 from homeassistant.config_entries import SOURCE_HASSIO, ConfigFlow
 from homeassistant.const import CONF_URL
+from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DEFAULT_CHANNEL, DOMAIN
@@ -23,6 +33,32 @@
 _LOGGER = logging.getLogger(__name__)
 
 
+def _is_yellow(hass: HomeAssistant) -> bool:
+    """Return True if Home Assistant is running on a Home Assistant Yellow."""
+    try:
+        yellow_hardware.async_info(hass)
+    except HomeAssistantError:
+        return False
+    return True
+
+
+async def _title(hass: HomeAssistant, discovery_info: HassioServiceInfo) -> str:
+    """Return config entry title."""
+    device: str | None = None
+
+    with suppress(HassioAPIError):
+        addon_info = await async_get_addon_info(hass, discovery_info.slug)
+        device = addon_info.get("options", {}).get("device")
+
+    if _is_yellow(hass) and device == "/dev/TTYAMA1":
+        return "Home Assistant Yellow"
+
+    if device and "SkyConnect" in device:
+        return "Home Assistant SkyConnect"
+
+    return discovery_info.name
+
+
 class OTBRConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Open Thread Border Router."""
 
@@ -38,8 +74,8 @@ async def _connect_and_set_dataset(self, otbr_url: str) -> None:
             thread_dataset_tlv = await async_get_preferred_dataset(self.hass)
             if thread_dataset_tlv:
                 dataset = tlv_parser.parse_tlv(thread_dataset_tlv)
-                if channel_str := dataset.get(tlv_parser.MeshcopTLVType.CHANNEL):
-                    thread_dataset_channel = int(channel_str, base=16)
+                if channel := dataset.get(MeshcopTLVType.CHANNEL):
+                    thread_dataset_channel = cast(tlv_parser.Channel, channel).channel
 
             if thread_dataset_tlv is not None and (
                 not allowed_channel or allowed_channel == thread_dataset_channel
@@ -50,7 +86,7 @@ async def _connect_and_set_dataset(self, otbr_url: str) -> None:
                     "not importing TLV with channel %s", thread_dataset_channel
                 )
                 await api.create_active_dataset(
-                    python_otbr_api.OperationalDataSet(
+                    python_otbr_api.ActiveDataSet(
                         channel=allowed_channel if allowed_channel else DEFAULT_CHANNEL,
                         network_name="home-assistant",
                     )
@@ -122,6 +158,6 @@ async def async_step_hassio(self, discovery_info: HassioServiceInfo) -> FlowResu
 
         await self.async_set_unique_id(discovery_info.uuid)
         return self.async_create_entry(
-            title="Open Thread Border Router",
+            title=await _title(self.hass, discovery_info),
             data=config_entry_data,
         )
diff --git a/homeassistant/components/otbr/manifest.json b/homeassistant/components/otbr/manifest.json
index c10a2417dc6a38..94659df8547d03 100644
--- a/homeassistant/components/otbr/manifest.json
+++ b/homeassistant/components/otbr/manifest.json
@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/otbr",
   "integration_type": "service",
   "iot_class": "local_polling",
-  "requirements": ["python-otbr-api==1.0.9"]
+  "requirements": ["python-otbr-api==2.2.0"]
 }
diff --git a/homeassistant/components/otbr/silabs_multiprotocol.py b/homeassistant/components/otbr/silabs_multiprotocol.py
new file mode 100644
index 00000000000000..9a462c4610bda0
--- /dev/null
+++ b/homeassistant/components/otbr/silabs_multiprotocol.py
@@ -0,0 +1,87 @@
+"""Silicon Labs Multiprotocol support."""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+
+import aiohttp
+from python_otbr_api import tlv_parser
+from python_otbr_api.tlv_parser import MeshcopTLVType
+
+from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon import (
+    is_multiprotocol_url,
+)
+from homeassistant.components.thread import async_add_dataset
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import DOMAIN
+from .util import OTBRData
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_change_channel(hass: HomeAssistant, channel: int, delay: float) -> None:
+    """Set the channel to be used.
+
+    Does nothing if not configured.
+    """
+    if DOMAIN not in hass.data:
+        return
+
+    data: OTBRData = hass.data[DOMAIN]
+    await data.set_channel(channel, delay)
+
+    # Import the new dataset
+    dataset_tlvs = await data.get_pending_dataset_tlvs()
+    if dataset_tlvs is None:
+        # The activation timer may have expired already
+        dataset_tlvs = await data.get_active_dataset_tlvs()
+    if dataset_tlvs is None:
+        # Don't try to import a None dataset
+        return
+
+    dataset = tlv_parser.parse_tlv(dataset_tlvs.hex())
+    dataset.pop(MeshcopTLVType.DELAYTIMER, None)
+    dataset.pop(MeshcopTLVType.PENDINGTIMESTAMP, None)
+    dataset_tlvs_str = tlv_parser.encode_tlv(dataset)
+    await async_add_dataset(hass, DOMAIN, dataset_tlvs_str)
+
+
+async def async_get_channel(hass: HomeAssistant) -> int | None:
+    """Return the channel.
+
+    Returns None if not configured.
+    """
+    if DOMAIN not in hass.data:
+        return None
+
+    data: OTBRData = hass.data[DOMAIN]
+
+    try:
+        dataset = await data.get_active_dataset()
+    except (
+        HomeAssistantError,
+        aiohttp.ClientError,
+        asyncio.TimeoutError,
+    ) as err:
+        _LOGGER.warning("Failed to communicate with OTBR %s", err)
+        return None
+
+    if dataset is None:
+        return None
+
+    return dataset.channel
+
+
+async def async_using_multipan(hass: HomeAssistant) -> bool:
+    """Return if the multiprotocol device is used.
+
+    Returns False if not configured.
+    """
+    if DOMAIN not in hass.data:
+        return False
+
+    data: OTBRData = hass.data[DOMAIN]
+    return is_multiprotocol_url(data.url)
diff --git a/homeassistant/components/otbr/util.py b/homeassistant/components/otbr/util.py
index b2ce05f280ca40..2d6217ea585a4c 100644
--- a/homeassistant/components/otbr/util.py
+++ b/homeassistant/components/otbr/util.py
@@ -2,21 +2,22 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Coroutine
-import contextlib
 import dataclasses
 from functools import wraps
-from typing import Any, Concatenate, ParamSpec, TypeVar
+from typing import Any, Concatenate, ParamSpec, TypeVar, cast
 
 import python_otbr_api
-from python_otbr_api import tlv_parser
+from python_otbr_api import PENDING_DATASET_DELAY_TIMER, tlv_parser
 from python_otbr_api.pskc import compute_pskc
+from python_otbr_api.tlv_parser import MeshcopTLVType
 
 from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon import (
+    MultiprotocolAddonManager,
+    get_addon_manager,
     is_multiprotocol_url,
     multi_pan_addon_using_device,
 )
 from homeassistant.components.homeassistant_yellow import RADIO_DEVICE as YELLOW_RADIO
-from homeassistant.components.zha import api as zha_api
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import issue_registry as ir
@@ -72,60 +73,59 @@ async def set_enabled(self, enabled: bool) -> None:
         """Enable or disable the router."""
         return await self.api.set_enabled(enabled)
 
+    @_handle_otbr_error
+    async def get_active_dataset(self) -> python_otbr_api.ActiveDataSet | None:
+        """Get current active operational dataset, or None."""
+        return await self.api.get_active_dataset()
+
     @_handle_otbr_error
     async def get_active_dataset_tlvs(self) -> bytes | None:
         """Get current active operational dataset in TLVS format, or None."""
         return await self.api.get_active_dataset_tlvs()
 
+    @_handle_otbr_error
+    async def get_pending_dataset_tlvs(self) -> bytes | None:
+        """Get current pending operational dataset in TLVS format, or None."""
+        return await self.api.get_pending_dataset_tlvs()
+
     @_handle_otbr_error
     async def create_active_dataset(
-        self, dataset: python_otbr_api.OperationalDataSet
+        self, dataset: python_otbr_api.ActiveDataSet
     ) -> None:
         """Create an active operational dataset."""
         return await self.api.create_active_dataset(dataset)
 
+    @_handle_otbr_error
+    async def delete_active_dataset(self) -> None:
+        """Delete the active operational dataset."""
+        return await self.api.delete_active_dataset()
+
     @_handle_otbr_error
     async def set_active_dataset_tlvs(self, dataset: bytes) -> None:
         """Set current active operational dataset in TLVS format."""
         await self.api.set_active_dataset_tlvs(dataset)
 
+    @_handle_otbr_error
+    async def set_channel(
+        self, channel: int, delay: float = PENDING_DATASET_DELAY_TIMER / 1000
+    ) -> None:
+        """Set current channel."""
+        await self.api.set_channel(channel, delay=int(delay * 1000))
+
     @_handle_otbr_error
     async def get_extended_address(self) -> bytes:
         """Get extended address (EUI-64)."""
         return await self.api.get_extended_address()
 
 
-def _get_zha_url(hass: HomeAssistant) -> str | None:
-    """Get ZHA radio path, or None if there's no ZHA config entry."""
-    with contextlib.suppress(ValueError):
-        return zha_api.async_get_radio_path(hass)
-    return None
-
-
-async def _get_zha_channel(hass: HomeAssistant) -> int | None:
-    """Get ZHA channel, or None if there's no ZHA config entry."""
-    zha_network_settings: zha_api.NetworkBackup | None
-    with contextlib.suppress(ValueError):
-        zha_network_settings = await zha_api.async_get_network_settings(hass)
-    if not zha_network_settings:
-        return None
-    channel: int = zha_network_settings.network_info.channel
-    # ZHA uses channel 0 when no channel is set
-    return channel or None
-
-
 async def get_allowed_channel(hass: HomeAssistant, otbr_url: str) -> int | None:
     """Return the allowed channel, or None if there's no restriction."""
     if not is_multiprotocol_url(otbr_url):
         # The OTBR is not sharing the radio, no restriction
         return None
 
-    zha_url = _get_zha_url(hass)
-    if not zha_url or not is_multiprotocol_url(zha_url):
-        # ZHA is not configured or not sharing the radio with this OTBR, no restriction
-        return None
-
-    return await _get_zha_channel(hass)
+    addon_manager: MultiprotocolAddonManager = await get_addon_manager(hass)
+    return addon_manager.async_get_channel()
 
 
 async def _warn_on_channel_collision(
@@ -146,14 +146,10 @@ def delete_issue() -> None:
 
     dataset = tlv_parser.parse_tlv(dataset_tlvs.hex())
 
-    if (channel_s := dataset.get(tlv_parser.MeshcopTLVType.CHANNEL)) is None:
-        delete_issue()
-        return
-    try:
-        channel = int(channel_s, 16)
-    except ValueError:
+    if (channel_s := dataset.get(MeshcopTLVType.CHANNEL)) is None:
         delete_issue()
         return
+    channel = cast(tlv_parser.Channel, channel_s).channel
 
     if channel == allowed_channel:
         delete_issue()
@@ -186,20 +182,20 @@ def _warn_on_default_network_settings(
     insecure = False
 
     if (
-        network_key := dataset.get(tlv_parser.MeshcopTLVType.NETWORKKEY)
-    ) is not None and bytes.fromhex(network_key) in INSECURE_NETWORK_KEYS:
+        network_key := dataset.get(MeshcopTLVType.NETWORKKEY)
+    ) is not None and network_key.data in INSECURE_NETWORK_KEYS:
         insecure = True
     if (
         not insecure
-        and tlv_parser.MeshcopTLVType.EXTPANID in dataset
-        and tlv_parser.MeshcopTLVType.NETWORKNAME in dataset
-        and tlv_parser.MeshcopTLVType.PSKC in dataset
+        and MeshcopTLVType.EXTPANID in dataset
+        and MeshcopTLVType.NETWORKNAME in dataset
+        and MeshcopTLVType.PSKC in dataset
     ):
-        ext_pan_id = dataset[tlv_parser.MeshcopTLVType.EXTPANID]
-        network_name = dataset[tlv_parser.MeshcopTLVType.NETWORKNAME]
-        pskc = bytes.fromhex(dataset[tlv_parser.MeshcopTLVType.PSKC])
+        ext_pan_id = dataset[MeshcopTLVType.EXTPANID]
+        network_name = cast(tlv_parser.NetworkName, dataset[MeshcopTLVType.NETWORKNAME])
+        pskc = dataset[MeshcopTLVType.PSKC].data
         for passphrase in INSECURE_PASSPHRASES:
-            if pskc == compute_pskc(ext_pan_id, network_name, passphrase):
+            if pskc == compute_pskc(ext_pan_id.data, network_name.name, passphrase):
                 insecure = True
                 break
 
diff --git a/homeassistant/components/otbr/websocket_api.py b/homeassistant/components/otbr/websocket_api.py
index 2189df363ba066..06bbca3a4abc27 100644
--- a/homeassistant/components/otbr/websocket_api.py
+++ b/homeassistant/components/otbr/websocket_api.py
@@ -1,7 +1,10 @@
 """Websocket API for OTBR."""
 
+from typing import cast
+
 import python_otbr_api
 from python_otbr_api import tlv_parser
+from python_otbr_api.tlv_parser import MeshcopTLVType
 import voluptuous as vol
 
 from homeassistant.components import websocket_api
@@ -78,9 +81,15 @@ async def websocket_create_network(
         connection.send_error(msg["id"], "set_enabled_failed", str(exc))
         return
 
+    try:
+        await data.delete_active_dataset()
+    except HomeAssistantError as exc:
+        connection.send_error(msg["id"], "delete_active_dataset_failed", str(exc))
+        return
+
     try:
         await data.create_active_dataset(
-            python_otbr_api.OperationalDataSet(
+            python_otbr_api.ActiveDataSet(
                 channel=channel, network_name="home-assistant"
             )
         )
@@ -133,8 +142,8 @@ async def websocket_set_network(
         connection.send_error(msg["id"], "unknown_dataset", "Unknown dataset")
         return
     dataset = tlv_parser.parse_tlv(dataset_tlv)
-    if channel_str := dataset.get(tlv_parser.MeshcopTLVType.CHANNEL):
-        thread_dataset_channel = int(channel_str, base=16)
+    if channel := dataset.get(MeshcopTLVType.CHANNEL):
+        thread_dataset_channel = cast(tlv_parser.Channel, channel).channel
 
     data: OTBRData = hass.data[DOMAIN]
     allowed_channel = await get_allowed_channel(hass, data.url)
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
index d79d2fca68674c..5807ccecd74de8 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_heater_with_adjustable_temperature_setpoint.py
@@ -45,7 +45,7 @@
 PRESET_MODE_TO_OVERKIZ = {v: k for k, v in OVERKIZ_TO_PRESET_MODE.items()}
 
 # Map Overkiz HVAC modes to Home Assistant HVAC modes
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.ON: HVACMode.HEAT,
     OverkizCommandParam.OFF: HVACMode.OFF,
     OverkizCommandParam.AUTO: HVACMode.AUTO,
@@ -83,7 +83,7 @@ def __init__(
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         states = self.device.states
         if (state := states[OverkizState.CORE_OPERATING_MODE]) and state.value_as_str:
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
index c8e4920a1139b9..0c378d088c5ddc 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_electrical_towel_dryer.py
@@ -20,7 +20,7 @@
 
 PRESET_DRYING = "drying"
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.EXTERNAL: HVACMode.HEAT,  # manu
     OverkizCommandParam.INTERNAL: HVACMode.AUTO,  # prog
     OverkizCommandParam.STANDBY: HVACMode.OFF,
@@ -62,7 +62,7 @@ def __init__(
             self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         if OverkizState.CORE_OPERATING_MODE in self.device.states:
             return OVERKIZ_TO_HVAC_MODE[
@@ -71,7 +71,7 @@ def hvac_mode(self) -> str:
 
         return HVACMode.OFF
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.executor.async_execute_command(
             OverkizCommand.SET_TOWEL_DRYER_OPERATING_MODE,
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
index b6835d93ebb019..7722269a48bbd2 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_heating_zone.py
@@ -21,7 +21,7 @@
 from ..coordinator import OverkizDataUpdateCoordinator
 from ..entity import OverkizEntity
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.AUTO: HVACMode.AUTO,
     OverkizCommandParam.ECO: HVACMode.AUTO,
     OverkizCommandParam.MANU: HVACMode.HEAT,
@@ -101,7 +101,7 @@ def current_temperature(self) -> float | None:
         return None
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODE[
             cast(str, self.executor.select_state(OverkizState.IO_PASS_APC_HEATING_MODE))
@@ -135,7 +135,7 @@ async def async_set_heating_mode(self, mode: str) -> None:
             OverkizCommand.REFRESH_PASS_APC_HEATING_PROFILE
         )
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.async_set_heating_mode(HVAC_MODE_TO_OVERKIZ[hvac_mode])
 
diff --git a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
index 33c1f0c4a2a263..74f7637b9975b6 100644
--- a/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
+++ b/homeassistant/components/overkiz/climate_entities/atlantic_pass_apc_zone_control.py
@@ -8,7 +8,7 @@
 
 from ..entity import OverkizEntity
 
-OVERKIZ_TO_HVAC_MODE: dict[str, str] = {
+OVERKIZ_TO_HVAC_MODE: dict[str, HVACMode] = {
     OverkizCommandParam.HEATING: HVACMode.HEAT,
     OverkizCommandParam.DRYING: HVACMode.DRY,
     OverkizCommandParam.COOLING: HVACMode.COOL,
@@ -25,7 +25,7 @@ class AtlanticPassAPCZoneControl(OverkizEntity, ClimateEntity):
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODE[
             cast(
@@ -33,7 +33,7 @@ def hvac_mode(self) -> str:
             )
         ]
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
         await self.executor.async_execute_command(
             OverkizCommand.SET_PASS_APC_OPERATING_MODE, HVAC_MODE_TO_OVERKIZ[hvac_mode]
diff --git a/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py b/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
index aaae64e0454cf8..7409b5307cf8da 100644
--- a/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
+++ b/homeassistant/components/overkiz/climate_entities/somfy_thermostat.py
@@ -74,7 +74,7 @@ def __init__(
         )
 
     @property
-    def hvac_mode(self) -> str:
+    def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
         return OVERKIZ_TO_HVAC_MODES[
             cast(
diff --git a/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py b/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
index fdaf0d61f1f7af..3d883738de22a9 100644
--- a/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
+++ b/homeassistant/components/overkiz/climate_entities/valve_heating_temperature_interface.py
@@ -73,7 +73,7 @@ def __init__(
         )
 
     @property
-    def hvac_action(self) -> str:
+    def hvac_action(self) -> HVACAction:
         """Return the current running hvac operation."""
         return OVERKIZ_TO_HVAC_ACTION[
             cast(str, self.executor.select_state(OverkizState.CORE_OPEN_CLOSED_VALVE))
diff --git a/homeassistant/components/overkiz/const.py b/homeassistant/components/overkiz/const.py
index 0db01a2d84c2b7..102d09a76b1402 100644
--- a/homeassistant/components/overkiz/const.py
+++ b/homeassistant/components/overkiz/const.py
@@ -87,6 +87,7 @@
     UIWidget.ATLANTIC_HEAT_RECOVERY_VENTILATION: Platform.CLIMATE,  # widgetName, uiClass is HeatingSystem (not supported)
     UIWidget.ATLANTIC_PASS_APC_DHW: Platform.WATER_HEATER,  # widgetName, uiClass is WaterHeatingSystem (not supported)
     UIWidget.ATLANTIC_PASS_APC_HEATING_AND_COOLING_ZONE: Platform.CLIMATE,  # widgetName, uiClass is HeatingSystem (not supported)
+    UIWidget.ATLANTIC_PASS_APC_HEATING_ZONE: Platform.CLIMATE,  # widgetName, uiClass is HeatingSystem (not supported)
     UIWidget.ATLANTIC_PASS_APC_ZONE_CONTROL: Platform.CLIMATE,  # widgetName, uiClass is HeatingSystem (not supported)
     UIWidget.DOMESTIC_HOT_WATER_PRODUCTION: Platform.WATER_HEATER,  # widgetName, uiClass is WaterHeatingSystem (not supported)
     UIWidget.DOMESTIC_HOT_WATER_TANK: Platform.SWITCH,  # widgetName, uiClass is WaterHeatingSystem (not supported)
diff --git a/homeassistant/components/overkiz/entity.py b/homeassistant/components/overkiz/entity.py
index 6306a11acf0531..16ea12a5d9669d 100644
--- a/homeassistant/components/overkiz/entity.py
+++ b/homeassistant/components/overkiz/entity.py
@@ -18,6 +18,7 @@ class OverkizEntity(CoordinatorEntity[OverkizDataUpdateCoordinator]):
     """Representation of an Overkiz device entity."""
 
     _attr_has_entity_name = True
+    _attr_name: str | None = None
 
     def __init__(
         self, device_url: str, coordinator: OverkizDataUpdateCoordinator
@@ -118,3 +119,5 @@ def __init__(
             # In case of sub device, use the provided label
             # and append the name of the type of entity
             self._attr_name = f"{self.device.label} {description.name}"
+        elif isinstance(description.name, str):
+            self._attr_name = description.name
diff --git a/homeassistant/components/overkiz/manifest.json b/homeassistant/components/overkiz/manifest.json
index 2d81b7bab07132..d88996c7e024a0 100644
--- a/homeassistant/components/overkiz/manifest.json
+++ b/homeassistant/components/overkiz/manifest.json
@@ -13,7 +13,7 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["boto3", "botocore", "pyhumps", "pyoverkiz", "s3transfer"],
-  "requirements": ["pyoverkiz==1.7.9"],
+  "requirements": ["pyoverkiz==1.9.0"],
   "zeroconf": [
     {
       "type": "_kizbox._tcp.local.",
diff --git a/homeassistant/components/overkiz/strings.json b/homeassistant/components/overkiz/strings.json
index 41405780124e0c..a82284c24af2d6 100644
--- a/homeassistant/components/overkiz/strings.json
+++ b/homeassistant/components/overkiz/strings.json
@@ -59,9 +59,9 @@
     "select": {
       "open_closed_pedestrian": {
         "state": {
-          "open": "Open",
+          "open": "[%key:common::state::open%]",
           "pedestrian": "Pedestrian",
-          "closed": "Closed"
+          "closed": "[%key:common::state::closed%]"
         }
       },
       "memorized_simple_volume": {
@@ -121,8 +121,8 @@
       },
       "three_way_handle_direction": {
         "state": {
-          "closed": "Closed",
-          "open": "Open",
+          "closed": "[%key:common::state::closed%]",
+          "open": "[%key:common::state::open%]",
           "tilt": "Tilt"
         }
       }
diff --git a/homeassistant/components/owntracks/config_flow.py b/homeassistant/components/owntracks/config_flow.py
index b82a87273883a9..13b2051ffa24dc 100644
--- a/homeassistant/components/owntracks/config_flow.py
+++ b/homeassistant/components/owntracks/config_flow.py
@@ -34,8 +34,8 @@ async def async_step_user(self, user_input=None):
 
         if supports_encryption():
             secret_desc = (
-                f"The encryption key is {secret} (on Android under preferences ->"
-                " advanced)"
+                f"The encryption key is {secret} (on Android under Preferences >"
+                " Advanced)"
             )
         else:
             secret_desc = "Encryption is not supported because nacl is not installed."
diff --git a/homeassistant/components/owntracks/strings.json b/homeassistant/components/owntracks/strings.json
index a127d9d6a4a98b..2486e01223ffc5 100644
--- a/homeassistant/components/owntracks/strings.json
+++ b/homeassistant/components/owntracks/strings.json
@@ -11,7 +11,7 @@
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     },
     "create_entry": {
-      "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to preferences -> connection. Change the following settings:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left -> settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
+      "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to Preferences > Connection. Change the following settings:\n - Mode: HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left > Settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
     }
   }
 }
diff --git a/homeassistant/components/p1_monitor/sensor.py b/homeassistant/components/p1_monitor/sensor.py
index f192dd44300866..21a878fa18743a 100644
--- a/homeassistant/components/p1_monitor/sensor.py
+++ b/homeassistant/components/p1_monitor/sensor.py
@@ -4,7 +4,6 @@
 from typing import Literal
 
 from homeassistant.components.sensor import (
-    DOMAIN as SENSOR_DOMAIN,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
@@ -39,7 +38,7 @@
 SENSORS_SMARTMETER: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="gas_consumption",
-        name="Gas Consumption",
+        translation_key="gas_consumption",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         device_class=SensorDeviceClass.GAS,
@@ -47,49 +46,49 @@
     ),
     SensorEntityDescription(
         key="power_consumption",
-        name="Power Consumption",
+        translation_key="power_consumption",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="energy_consumption_high",
-        name="Energy Consumption - High Tariff",
+        translation_key="energy_consumption_high",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="energy_consumption_low",
-        name="Energy Consumption - Low Tariff",
+        translation_key="energy_consumption_low",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="power_production",
-        name="Power Production",
+        translation_key="power_production",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="energy_production_high",
-        name="Energy Production - High Tariff",
+        translation_key="energy_production_high",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="energy_production_low",
-        name="Energy Production - Low Tariff",
+        translation_key="energy_production_low",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
     SensorEntityDescription(
         key="energy_tariff_period",
-        name="Energy Tariff Period",
+        translation_key="energy_tariff_period",
         icon="mdi:calendar-clock",
     ),
 )
@@ -97,84 +96,84 @@
 SENSORS_PHASES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="voltage_phase_l1",
-        name="Voltage Phase L1",
+        translation_key="voltage_phase_l1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="voltage_phase_l2",
-        name="Voltage Phase L2",
+        translation_key="voltage_phase_l2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="voltage_phase_l3",
-        name="Voltage Phase L3",
+        translation_key="voltage_phase_l3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="current_phase_l1",
-        name="Current Phase L1",
+        translation_key="current_phase_l1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="current_phase_l2",
-        name="Current Phase L2",
+        translation_key="current_phase_l2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="current_phase_l3",
-        name="Current Phase L3",
+        translation_key="current_phase_l3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_consumed_phase_l1",
-        name="Power Consumed Phase L1",
+        translation_key="power_consumed_phase_l1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_consumed_phase_l2",
-        name="Power Consumed Phase L2",
+        translation_key="power_consumed_phase_l2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_consumed_phase_l3",
-        name="Power Consumed Phase L3",
+        translation_key="power_consumed_phase_l3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_produced_phase_l1",
-        name="Power Produced Phase L1",
+        translation_key="power_produced_phase_l1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_produced_phase_l2",
-        name="Power Produced Phase L2",
+        translation_key="power_produced_phase_l2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="power_produced_phase_l3",
-        name="Power Produced Phase L3",
+        translation_key="power_produced_phase_l3",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -184,32 +183,32 @@
 SENSORS_SETTINGS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="gas_consumption_price",
-        name="Gas Consumption Price",
+        translation_key="gas_consumption_price",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}",
     ),
     SensorEntityDescription(
         key="energy_consumption_price_low",
-        name="Energy Consumption Price - Low",
+        translation_key="energy_consumption_price_low",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
     ),
     SensorEntityDescription(
         key="energy_consumption_price_high",
-        name="Energy Consumption Price - High",
+        translation_key="energy_consumption_price_high",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
     ),
     SensorEntityDescription(
         key="energy_production_price_low",
-        name="Energy Production Price - Low",
+        translation_key="energy_production_price_low",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
     ),
     SensorEntityDescription(
         key="energy_production_price_high",
-        name="Energy Production Price - High",
+        translation_key="energy_production_price_high",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}",
     ),
@@ -218,21 +217,21 @@
 SENSORS_WATERMETER: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="consumption_day",
-        name="Consumption Day",
+        translation_key="consumption_day",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfVolume.LITERS,
         device_class=SensorDeviceClass.WATER,
     ),
     SensorEntityDescription(
         key="consumption_total",
-        name="Consumption Total",
+        translation_key="consumption_total",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
         device_class=SensorDeviceClass.WATER,
     ),
     SensorEntityDescription(
         key="pulse_count",
-        name="Pulse Count",
+        translation_key="pulse_count",
     ),
 )
 
@@ -248,7 +247,6 @@ async def async_setup_entry(
             coordinator=coordinator,
             description=description,
             name="SmartMeter",
-            service_key="smartmeter",
             service=SERVICE_SMARTMETER,
         )
         for description in SENSORS_SMARTMETER
@@ -258,7 +256,6 @@ async def async_setup_entry(
             coordinator=coordinator,
             description=description,
             name="Phases",
-            service_key="phases",
             service=SERVICE_PHASES,
         )
         for description in SENSORS_PHASES
@@ -268,7 +265,6 @@ async def async_setup_entry(
             coordinator=coordinator,
             description=description,
             name="Settings",
-            service_key="settings",
             service=SERVICE_SETTINGS,
         )
         for description in SENSORS_SETTINGS
@@ -279,7 +275,6 @@ async def async_setup_entry(
                 coordinator=coordinator,
                 description=description,
                 name="WaterMeter",
-                service_key="watermeter",
                 service=SERVICE_WATERMETER,
             )
             for description in SENSORS_WATERMETER
@@ -292,30 +287,28 @@ class P1MonitorSensorEntity(
 ):
     """Defines an P1 Monitor sensor."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         *,
         coordinator: P1MonitorDataUpdateCoordinator,
         description: SensorEntityDescription,
-        service_key: Literal["smartmeter", "watermeter", "phases", "settings"],
         name: str,
-        service: str,
+        service: Literal["smartmeter", "watermeter", "phases", "settings"],
     ) -> None:
         """Initialize P1 Monitor sensor."""
         super().__init__(coordinator=coordinator)
-        self._service_key = service_key
+        self._service_key = service
 
-        self.entity_id = f"{SENSOR_DOMAIN}.{service}_{description.key}"
         self.entity_description = description
         self._attr_unique_id = (
-            f"{coordinator.config_entry.entry_id}_{service_key}_{description.key}"
+            f"{coordinator.config_entry.entry_id}_{service}_{description.key}"
         )
 
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
-            identifiers={
-                (DOMAIN, f"{coordinator.config_entry.entry_id}_{service_key}")
-            },
+            identifiers={(DOMAIN, f"{coordinator.config_entry.entry_id}_{service}")},
             configuration_url=f"http://{coordinator.config_entry.data[CONF_HOST]}",
             manufacturer="P1 Monitor",
             name=name,
diff --git a/homeassistant/components/p1_monitor/strings.json b/homeassistant/components/p1_monitor/strings.json
index 0c745554e9dbc8..781ca109235196 100644
--- a/homeassistant/components/p1_monitor/strings.json
+++ b/homeassistant/components/p1_monitor/strings.json
@@ -14,5 +14,93 @@
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "gas_consumption": {
+        "name": "Gas consumption"
+      },
+      "power_consumption": {
+        "name": "Power consumption"
+      },
+      "energy_consumption_high": {
+        "name": "Energy consumption - High tariff"
+      },
+      "energy_consumption_low": {
+        "name": "Energy consumption - Low tariff"
+      },
+      "power_production": {
+        "name": "Power production"
+      },
+      "energy_production_high": {
+        "name": "Energy production - High tariff"
+      },
+      "energy_production_low": {
+        "name": "Energy production - Low tariff"
+      },
+      "energy_tariff_period": {
+        "name": "Energy tariff period"
+      },
+      "voltage_phase_l1": {
+        "name": "Voltage phase L1"
+      },
+      "voltage_phase_l2": {
+        "name": "Voltage phase L2"
+      },
+      "voltage_phase_l3": {
+        "name": "Voltage phase L3"
+      },
+      "current_phase_l1": {
+        "name": "Current phase L1"
+      },
+      "current_phase_l2": {
+        "name": "Current phase L2"
+      },
+      "current_phase_l3": {
+        "name": "Current phase L3"
+      },
+      "power_consumed_phase_l1": {
+        "name": "Power consumed phase L1"
+      },
+      "power_consumed_phase_l2": {
+        "name": "Power consumed phase L2"
+      },
+      "power_consumed_phase_l3": {
+        "name": "Power consumed phase L3"
+      },
+      "power_produced_phase_l1": {
+        "name": "Power produced phase L1"
+      },
+      "power_produced_phase_l2": {
+        "name": "Power produced phase L2"
+      },
+      "power_produced_phase_l3": {
+        "name": "Power produced phase L3"
+      },
+      "gas_consumption_price": {
+        "name": "Gas consumption price"
+      },
+      "energy_consumption_price_low": {
+        "name": "Energy consumption price - Low"
+      },
+      "energy_consumption_price_high": {
+        "name": "Energy consumption price - High"
+      },
+      "energy_production_price_low": {
+        "name": "Energy production price - Low"
+      },
+      "energy_production_price_high": {
+        "name": "Energy production price - High"
+      },
+      "consumption_day": {
+        "name": "Consumption day"
+      },
+      "consumption_total": {
+        "name": "Consumption total"
+      },
+      "pulse_count": {
+        "name": "Pulse count"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/panasonic_viera/manifest.json b/homeassistant/components/panasonic_viera/manifest.json
index d626ae2bf9e026..2afa6599cb205c 100644
--- a/homeassistant/components/panasonic_viera/manifest.json
+++ b/homeassistant/components/panasonic_viera/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/panasonic_viera",
   "iot_class": "local_polling",
   "loggers": ["panasonic_viera"],
-  "requirements": ["panasonic_viera==0.3.6"]
+  "requirements": ["panasonic-viera==0.3.6"]
 }
diff --git a/homeassistant/components/persistent_notification/__init__.py b/homeassistant/components/persistent_notification/__init__.py
index 36b496ddde218a..581720c2730346 100644
--- a/homeassistant/components/persistent_notification/__init__.py
+++ b/homeassistant/components/persistent_notification/__init__.py
@@ -1,44 +1,77 @@
 """Support for displaying persistent notifications."""
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
+from datetime import datetime
 import logging
-from typing import Any
+from typing import Any, Final, TypedDict
 
 import voluptuous as vol
 
+from homeassistant.backports.enum import StrEnum
 from homeassistant.components import websocket_api
-from homeassistant.const import ATTR_FRIENDLY_NAME
-from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity import async_generate_entity_id
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, ServiceCall, callback
+from homeassistant.helpers import config_validation as cv, singleton
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+)
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
-from homeassistant.util import slugify
 import homeassistant.util.dt as dt_util
-
-ATTR_CREATED_AT = "created_at"
-ATTR_MESSAGE = "message"
-ATTR_NOTIFICATION_ID = "notification_id"
-ATTR_TITLE = "title"
-ATTR_STATUS = "status"
+from homeassistant.util.uuid import random_uuid_hex
 
 DOMAIN = "persistent_notification"
 
-ENTITY_ID_FORMAT = DOMAIN + ".{}"
+ATTR_CREATED_AT: Final = "created_at"
+ATTR_MESSAGE: Final = "message"
+ATTR_NOTIFICATION_ID: Final = "notification_id"
+ATTR_TITLE: Final = "title"
+ATTR_STATUS: Final = "status"
 
+
+# Remove EVENT_PERSISTENT_NOTIFICATIONS_UPDATED in Home Assistant 2023.9
 EVENT_PERSISTENT_NOTIFICATIONS_UPDATED = "persistent_notifications_updated"
 
+
+class Notification(TypedDict):
+    """Persistent notification."""
+
+    created_at: datetime
+    message: str
+    notification_id: str
+    title: str | None
+
+
+class UpdateType(StrEnum):
+    """Persistent notification update type."""
+
+    CURRENT = "current"
+    ADDED = "added"
+    REMOVED = "removed"
+    UPDATED = "updated"
+
+
+SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED = "persistent_notifications_updated"
+
 SCHEMA_SERVICE_NOTIFICATION = vol.Schema(
     {vol.Required(ATTR_NOTIFICATION_ID): cv.string}
 )
 
-DEFAULT_OBJECT_ID = "notification"
 _LOGGER = logging.getLogger(__name__)
 
-STATE = "notifying"
-STATUS_UNREAD = "unread"
-STATUS_READ = "read"
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
+@callback
+def async_register_callback(
+    hass: HomeAssistant,
+    _callback: Callable[[UpdateType, dict[str, Notification]], None],
+) -> CALLBACK_TYPE:
+    """Register a callback."""
+    return async_dispatcher_connect(
+        hass, SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED, _callback
+    )
 
 
 @bind_hass
@@ -65,64 +98,64 @@ def async_create(
     message: str,
     title: str | None = None,
     notification_id: str | None = None,
-    *,
-    context: Context | None = None,
 ) -> None:
     """Generate a notification."""
-    if (notifications := hass.data.get(DOMAIN)) is None:
-        notifications = hass.data[DOMAIN] = {}
-
-    if notification_id is not None:
-        entity_id = ENTITY_ID_FORMAT.format(slugify(notification_id))
-    else:
-        entity_id = async_generate_entity_id(
-            ENTITY_ID_FORMAT, DEFAULT_OBJECT_ID, hass=hass
-        )
-        notification_id = entity_id.split(".")[1]
-
-    attr: dict[str, str] = {ATTR_MESSAGE: message}
-    if title is not None:
-        attr[ATTR_TITLE] = title
-        attr[ATTR_FRIENDLY_NAME] = title
-
-    hass.states.async_set(entity_id, STATE, attr, context=context)
-
-    # Store notification and fire event
-    # This will eventually replace state machine storage
-    notifications[entity_id] = {
+    notifications = _async_get_or_create_notifications(hass)
+    if notification_id is None:
+        notification_id = random_uuid_hex()
+    notifications[notification_id] = {
         ATTR_MESSAGE: message,
         ATTR_NOTIFICATION_ID: notification_id,
-        ATTR_STATUS: STATUS_UNREAD,
         ATTR_TITLE: title,
         ATTR_CREATED_AT: dt_util.utcnow(),
     }
 
-    hass.bus.async_fire(EVENT_PERSISTENT_NOTIFICATIONS_UPDATED, context=context)
+    async_dispatcher_send(
+        hass,
+        SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED,
+        UpdateType.ADDED,
+        {notification_id: notifications[notification_id]},
+    )
 
 
 @callback
-@bind_hass
-def async_dismiss(
-    hass: HomeAssistant, notification_id: str, *, context: Context | None = None
-) -> None:
-    """Remove a notification."""
-    if (notifications := hass.data.get(DOMAIN)) is None:
-        notifications = hass.data[DOMAIN] = {}
+@singleton.singleton(DOMAIN)
+def _async_get_or_create_notifications(hass: HomeAssistant) -> dict[str, Notification]:
+    """Get or create notifications data."""
+    return {}
 
-    entity_id = ENTITY_ID_FORMAT.format(slugify(notification_id))
 
-    if entity_id not in notifications:
+@callback
+@bind_hass
+def async_dismiss(hass: HomeAssistant, notification_id: str) -> None:
+    """Remove a notification."""
+    notifications = _async_get_or_create_notifications(hass)
+    if not (notification := notifications.pop(notification_id, None)):
         return
+    async_dispatcher_send(
+        hass,
+        SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED,
+        UpdateType.REMOVED,
+        {notification_id: notification},
+    )
 
-    hass.states.async_remove(entity_id, context)
 
-    del notifications[entity_id]
-    hass.bus.async_fire(EVENT_PERSISTENT_NOTIFICATIONS_UPDATED)
+@callback
+def async_dismiss_all(hass: HomeAssistant) -> None:
+    """Remove all notifications."""
+    notifications = _async_get_or_create_notifications(hass)
+    notifications_copy = notifications.copy()
+    notifications.clear()
+    async_dispatcher_send(
+        hass,
+        SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED,
+        UpdateType.REMOVED,
+        notifications_copy,
+    )
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the persistent notification component."""
-    notifications = hass.data.setdefault(DOMAIN, {})
 
     @callback
     def create_service(call: ServiceCall) -> None:
@@ -132,34 +165,17 @@ def create_service(call: ServiceCall) -> None:
             call.data[ATTR_MESSAGE],
             call.data.get(ATTR_TITLE),
             call.data.get(ATTR_NOTIFICATION_ID),
-            context=call.context,
         )
 
     @callback
     def dismiss_service(call: ServiceCall) -> None:
         """Handle the dismiss notification service call."""
-        async_dismiss(hass, call.data[ATTR_NOTIFICATION_ID], context=call.context)
+        async_dismiss(hass, call.data[ATTR_NOTIFICATION_ID])
 
     @callback
-    def mark_read_service(call: ServiceCall) -> None:
-        """Handle the mark_read notification service call."""
-        notification_id = call.data.get(ATTR_NOTIFICATION_ID)
-        entity_id = ENTITY_ID_FORMAT.format(slugify(notification_id))
-
-        if entity_id not in notifications:
-            _LOGGER.error(
-                (
-                    "Marking persistent_notification read failed: "
-                    "Notification ID %s not found"
-                ),
-                notification_id,
-            )
-            return
-
-        notifications[entity_id][ATTR_STATUS] = STATUS_READ
-        hass.bus.async_fire(
-            EVENT_PERSISTENT_NOTIFICATIONS_UPDATED, context=call.context
-        )
+    def dismiss_all_service(call: ServiceCall) -> None:
+        """Handle the dismiss all notification service call."""
+        async_dismiss_all(hass)
 
     hass.services.async_register(
         DOMAIN,
@@ -178,11 +194,10 @@ def mark_read_service(call: ServiceCall) -> None:
         DOMAIN, "dismiss", dismiss_service, SCHEMA_SERVICE_NOTIFICATION
     )
 
-    hass.services.async_register(
-        DOMAIN, "mark_read", mark_read_service, SCHEMA_SERVICE_NOTIFICATION
-    )
+    hass.services.async_register(DOMAIN, "dismiss_all", dismiss_all_service, None)
 
     websocket_api.async_register_command(hass, websocket_get_notifications)
+    websocket_api.async_register_command(hass, websocket_subscribe_notifications)
 
     return True
 
@@ -197,19 +212,36 @@ def websocket_get_notifications(
     """Return a list of persistent_notifications."""
     connection.send_message(
         websocket_api.result_message(
-            msg["id"],
-            [
-                {
-                    key: data[key]
-                    for key in (
-                        ATTR_NOTIFICATION_ID,
-                        ATTR_MESSAGE,
-                        ATTR_STATUS,
-                        ATTR_TITLE,
-                        ATTR_CREATED_AT,
-                    )
-                }
-                for data in hass.data[DOMAIN].values()
-            ],
+            msg["id"], list(_async_get_or_create_notifications(hass).values())
         )
     )
+
+
+@callback
+@websocket_api.websocket_command(
+    {vol.Required("type"): "persistent_notification/subscribe"}
+)
+def websocket_subscribe_notifications(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: Mapping[str, Any],
+) -> None:
+    """Return a list of persistent_notifications."""
+    notifications = _async_get_or_create_notifications(hass)
+    msg_id = msg["id"]
+
+    @callback
+    def _async_send_notification_update(
+        update_type: UpdateType, notifications: dict[str, Notification]
+    ) -> None:
+        connection.send_message(
+            websocket_api.event_message(
+                msg["id"], {"type": update_type, "notifications": notifications}
+            )
+        )
+
+    connection.subscriptions[msg_id] = async_dispatcher_connect(
+        hass, SIGNAL_PERSISTENT_NOTIFICATIONS_UPDATED, _async_send_notification_update
+    )
+    connection.send_result(msg_id)
+    _async_send_notification_update(UpdateType.CURRENT, notifications)
diff --git a/homeassistant/components/persistent_notification/services.yaml b/homeassistant/components/persistent_notification/services.yaml
index 5695a3c3b82071..046ea237560233 100644
--- a/homeassistant/components/persistent_notification/services.yaml
+++ b/homeassistant/components/persistent_notification/services.yaml
@@ -4,14 +4,14 @@ create:
   fields:
     message:
       name: Message
-      description: Message body of the notification. [Templates accepted]
+      description: Message body of the notification.
       required: true
       example: Please check your configuration.yaml.
       selector:
         text:
     title:
       name: Title
-      description: Optional title for your notification. [Templates accepted]
+      description: Optional title for your notification.
       example: Test notification
       selector:
         text:
@@ -34,14 +34,6 @@ dismiss:
       selector:
         text:
 
-mark_read:
-  name: Mark read
-  description: Mark a notification read.
-  fields:
-    notification_id:
-      name: Notification ID
-      description: Target ID of the notification, which should be mark read.
-      required: true
-      example: 1234
-      selector:
-        text:
+dismiss_all:
+  name: Dismiss All
+  description: Remove all notifications.
diff --git a/homeassistant/components/persistent_notification/trigger.py b/homeassistant/components/persistent_notification/trigger.py
new file mode 100644
index 00000000000000..4c9c2bd9204f99
--- /dev/null
+++ b/homeassistant/components/persistent_notification/trigger.py
@@ -0,0 +1,80 @@
+"""Offer persistent_notifications triggered automation rules."""
+from __future__ import annotations
+
+import logging
+from typing import Final
+
+import voluptuous as vol
+
+from homeassistant.const import CONF_PLATFORM
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.trigger import TriggerActionType, TriggerData, TriggerInfo
+from homeassistant.helpers.typing import ConfigType
+
+from . import Notification, UpdateType, async_register_callback
+
+_LOGGER = logging.getLogger(__name__)
+
+
+CONF_NOTIFICATION_ID: Final = "notification_id"
+CONF_UPDATE_TYPE: Final = "update_type"
+
+TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_PLATFORM): "persistent_notification",
+        vol.Optional(CONF_NOTIFICATION_ID): str,
+        vol.Optional(CONF_UPDATE_TYPE): vol.All(
+            cv.ensure_list, [vol.Coerce(UpdateType)]
+        ),
+    }
+)
+
+
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
+) -> CALLBACK_TYPE:
+    """Listen for state changes based on configuration."""
+    trigger_data: TriggerData = trigger_info["trigger_data"]
+    job = HassJob(action)
+
+    persistent_notification_id = config.get(CONF_NOTIFICATION_ID)
+    update_types = config.get(CONF_UPDATE_TYPE)
+
+    @callback
+    def persistent_notification_listener(
+        update_type: UpdateType, notifications: dict[str, Notification]
+    ) -> None:
+        """Listen for persistent_notification updates."""
+
+        for notification in notifications.values():
+            if update_types and update_type not in update_types:
+                continue
+            if (
+                persistent_notification_id
+                and notification[CONF_NOTIFICATION_ID] != persistent_notification_id
+            ):
+                continue
+
+            hass.async_run_hass_job(
+                job,
+                {
+                    "trigger": {
+                        **trigger_data,
+                        "platform": "persistent_notification",
+                        "update_type": update_type,
+                        "notification": notification,
+                    }
+                },
+            )
+
+    _LOGGER.debug(
+        "Attaching persistent_notification trigger for ID: '%s', update_types: %s",
+        persistent_notification_id,
+        update_types,
+    )
+
+    return async_register_callback(hass, persistent_notification_listener)
diff --git a/homeassistant/components/person/__init__.py b/homeassistant/components/person/__init__.py
index fe6925b48478eb..ea325380e111b0 100644
--- a/homeassistant/components/person/__init__.py
+++ b/homeassistant/components/person/__init__.py
@@ -47,6 +47,9 @@
 )
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.helpers.integration_platform import (
+    async_process_integration_platform_for_component,
+)
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
@@ -330,6 +333,9 @@ async def filter_yaml_data(hass: HomeAssistant, persons: list[dict]) -> list[dic
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the person component."""
+    # Process integration platforms right away since
+    # we will create entities before firing EVENT_COMPONENT_LOADED
+    await async_process_integration_platform_for_component(hass, DOMAIN)
     entity_component = EntityComponent[Person](_LOGGER, DOMAIN, hass)
     id_manager = collection.IDManager()
     yaml_collection = collection.YamlCollection(
diff --git a/homeassistant/components/philips_js/manifest.json b/homeassistant/components/philips_js/manifest.json
index 705acefa60f001..46b1340a28dc26 100644
--- a/homeassistant/components/philips_js/manifest.json
+++ b/homeassistant/components/philips_js/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/philips_js",
   "iot_class": "local_polling",
   "loggers": ["haphilipsjs"],
-  "requirements": ["ha-philipsjs==3.0.0"]
+  "requirements": ["ha-philipsjs==3.1.0"]
 }
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index c6ca70bdc847db..bdd55bb2dad9d5 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -70,6 +70,7 @@ class PhilipsTVMediaPlayer(
 
     _attr_device_class = MediaPlayerDeviceClass.TV
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/pi_hole/binary_sensor.py b/homeassistant/components/pi_hole/binary_sensor.py
index 7ec1bf40c665ef..5d1419db8b2e01 100644
--- a/homeassistant/components/pi_hole/binary_sensor.py
+++ b/homeassistant/components/pi_hole/binary_sensor.py
@@ -8,7 +8,6 @@
 from hole import Hole
 
 from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
@@ -39,42 +38,6 @@ class PiHoleBinarySensorEntityDescription(
 
 
 BINARY_SENSOR_TYPES: tuple[PiHoleBinarySensorEntityDescription, ...] = (
-    PiHoleBinarySensorEntityDescription(
-        # Deprecated, scheduled to be removed in 2022.6
-        key="core_update_available",
-        name="Core Update Available",
-        entity_registry_enabled_default=False,
-        device_class=BinarySensorDeviceClass.UPDATE,
-        extra_value=lambda api: {
-            "current_version": api.versions["core_current"],
-            "latest_version": api.versions["core_latest"],
-        },
-        state_value=lambda api: bool(api.versions["core_update"]),
-    ),
-    PiHoleBinarySensorEntityDescription(
-        # Deprecated, scheduled to be removed in 2022.6
-        key="web_update_available",
-        name="Web Update Available",
-        entity_registry_enabled_default=False,
-        device_class=BinarySensorDeviceClass.UPDATE,
-        extra_value=lambda api: {
-            "current_version": api.versions["web_current"],
-            "latest_version": api.versions["web_latest"],
-        },
-        state_value=lambda api: bool(api.versions["web_update"]),
-    ),
-    PiHoleBinarySensorEntityDescription(
-        # Deprecated, scheduled to be removed in 2022.6
-        key="ftl_update_available",
-        name="FTL Update Available",
-        entity_registry_enabled_default=False,
-        device_class=BinarySensorDeviceClass.UPDATE,
-        extra_value=lambda api: {
-            "current_version": api.versions["FTL_current"],
-            "latest_version": api.versions["FTL_latest"],
-        },
-        state_value=lambda api: bool(api.versions["FTL_update"]),
-    ),
     PiHoleBinarySensorEntityDescription(
         key="status",
         translation_key="status",
diff --git a/homeassistant/components/picnic/strings.json b/homeassistant/components/picnic/strings.json
index ff91b5259b2401..f0e0d93231c1de 100644
--- a/homeassistant/components/picnic/strings.json
+++ b/homeassistant/components/picnic/strings.json
@@ -50,7 +50,7 @@
         "name": "Status of last order"
       },
       "last_order_max_order_time": {
-        "name": "Max order time of last slot"
+        "name": "Max order time of last order"
       },
       "last_order_delivery_time": {
         "name": "Last order delivery time"
diff --git a/homeassistant/components/picotts/tts.py b/homeassistant/components/picotts/tts.py
index f9c93edb4fc032..23e94b5206d10f 100644
--- a/homeassistant/components/picotts/tts.py
+++ b/homeassistant/components/picotts/tts.py
@@ -46,7 +46,7 @@ def supported_languages(self):
         """Return list of supported languages."""
         return SUPPORT_LANGUAGES
 
-    def get_tts_audio(self, message, language, options=None):
+    def get_tts_audio(self, message, language, options):
         """Load TTS using pico2wave."""
         with tempfile.NamedTemporaryFile(suffix=".wav", delete=False) as tmpf:
             fname = tmpf.name
diff --git a/homeassistant/components/ping/__init__.py b/homeassistant/components/ping/__init__.py
index 2236b8dc3374ec..3ff36f2e283feb 100644
--- a/homeassistant/components/ping/__init__.py
+++ b/homeassistant/components/ping/__init__.py
@@ -6,6 +6,7 @@
 from icmplib import SocketPermissionError, ping as icmp_ping
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.typing import ConfigType
 
@@ -13,9 +14,11 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.platform_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the template integration."""
+    """Set up the ping integration."""
     await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
     hass.data[DOMAIN] = {
         PING_PRIVS: await hass.async_add_executor_job(_can_use_icmp_lib_with_privilege),
diff --git a/homeassistant/components/ping/binary_sensor.py b/homeassistant/components/ping/binary_sensor.py
index c8b4ce5a204396..786012d466cb92 100644
--- a/homeassistant/components/ping/binary_sensor.py
+++ b/homeassistant/components/ping/binary_sensor.py
@@ -6,14 +6,14 @@
 from datetime import timedelta
 import logging
 import re
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import async_timeout
 from icmplib import NameLookupError, async_ping
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
-    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA,
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
@@ -53,7 +53,7 @@
 
 WIN32_PING_MATCHER = re.compile(r"(?P<min>\d+)ms.+(?P<max>\d+)ms.+(?P<avg>\d+)ms")
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = PARENT_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
         vol.Optional(CONF_NAME): cv.string,
@@ -89,27 +89,14 @@ async def async_setup_platform(
 class PingBinarySensor(RestoreEntity, BinarySensorEntity):
     """Representation of a Ping Binary sensor."""
 
+    _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY
+
     def __init__(self, name: str, ping: PingDataSubProcess | PingDataICMPLib) -> None:
         """Initialize the Ping Binary sensor."""
-        self._available = False
-        self._name = name
+        self._attr_available = False
+        self._attr_name = name
         self._ping = ping
 
-    @property
-    def name(self) -> str:
-        """Return the name of the device."""
-        return self._name
-
-    @property
-    def available(self) -> bool:
-        """Return if we have done the first ping."""
-        return self._available
-
-    @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor."""
-        return BinarySensorDeviceClass.CONNECTIVITY
-
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
@@ -130,7 +117,7 @@ def extra_state_attributes(self) -> dict[str, Any] | None:
     async def async_update(self) -> None:
         """Get the latest data."""
         await self._ping.async_update()
-        self._available = True
+        self._attr_available = True
 
     async def async_added_to_hass(self) -> None:
         """Restore previous state on restart to avoid blocking startup."""
@@ -138,7 +125,7 @@ async def async_added_to_hass(self) -> None:
 
         last_state = await self.async_get_last_state()
         if last_state is not None:
-            self._available = True
+            self._attr_available = True
 
         if last_state is None or last_state.state != STATE_ON:
             self._ping.data = None
@@ -221,7 +208,7 @@ def __init__(
             self._ip_address,
         ]
 
-    async def async_ping(self):
+    async def async_ping(self) -> dict[str, Any] | None:
         """Send ICMP echo request and return details if success."""
         pinger = await asyncio.create_subprocess_exec(
             *self._ping_cmd,
@@ -249,7 +236,7 @@ async def async_ping(self):
                     out_error,
                 )
 
-            if pinger.returncode > 1:
+            if pinger.returncode and pinger.returncode > 1:
                 # returncode of 1 means the host is unreachable
                 _LOGGER.exception(
                     "Error running command: `%s`, return code: %s",
@@ -261,9 +248,13 @@ async def async_ping(self):
                 match = PING_MATCHER_BUSYBOX.search(
                     str(out_data).rsplit("\n", maxsplit=1)[-1]
                 )
+                if TYPE_CHECKING:
+                    assert match is not None
                 rtt_min, rtt_avg, rtt_max = match.groups()
                 return {"min": rtt_min, "avg": rtt_avg, "max": rtt_max, "mdev": ""}
             match = PING_MATCHER.search(str(out_data).rsplit("\n", maxsplit=1)[-1])
+            if TYPE_CHECKING:
+                assert match is not None
             rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups()
             return {"min": rtt_min, "avg": rtt_avg, "max": rtt_max, "mdev": rtt_mdev}
         except asyncio.TimeoutError:
@@ -274,7 +265,7 @@ async def async_ping(self):
             )
             if pinger:
                 with suppress(TypeError):
-                    await pinger.kill()
+                    await pinger.kill()  # type: ignore[func-returns-value]
                 del pinger
 
             return None
diff --git a/homeassistant/components/ping/device_tracker.py b/homeassistant/components/ping/device_tracker.py
index 68111df89eae5f..f546bd6bacc966 100644
--- a/homeassistant/components/ping/device_tracker.py
+++ b/homeassistant/components/ping/device_tracker.py
@@ -2,14 +2,13 @@
 from __future__ import annotations
 
 import asyncio
-from datetime import timedelta
+from datetime import datetime, timedelta
 import logging
 import subprocess
 
 from icmplib import async_multiping
 import voluptuous as vol
 
-from homeassistant import util
 from homeassistant.components.device_tracker import (
     CONF_SCAN_INTERVAL,
     PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
@@ -22,6 +21,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import gather_with_concurrency
 from homeassistant.util.process import kill_subprocess
 
@@ -44,7 +44,14 @@
 class HostSubProcess:
     """Host object with ping detection."""
 
-    def __init__(self, ip_address, dev_id, hass, config, privileged):
+    def __init__(
+        self,
+        ip_address: str,
+        dev_id: str,
+        hass: HomeAssistant,
+        config: ConfigType,
+        privileged: bool | None,
+    ) -> None:
         """Initialize the Host pinger."""
         self.hass = hass
         self.ip_address = ip_address
@@ -52,7 +59,7 @@ def __init__(self, ip_address, dev_id, hass, config, privileged):
         self._count = config[CONF_PING_COUNT]
         self._ping_cmd = ["ping", "-n", "-q", "-c1", "-W1", ip_address]
 
-    def ping(self):
+    def ping(self) -> bool | None:
         """Send an ICMP echo request and return True if success."""
         with subprocess.Popen(
             self._ping_cmd,
@@ -108,7 +115,7 @@ async def async_setup_scanner(
             for (dev_id, ip) in config[CONF_HOSTS].items()
         ]
 
-        async def async_update(now):
+        async def async_update(now: datetime) -> None:
             """Update all the hosts on every interval time."""
             results = await gather_with_concurrency(
                 CONCURRENT_PING_LIMIT,
@@ -124,7 +131,7 @@ async def async_update(now):
 
     else:
 
-        async def async_update(now):
+        async def async_update(now: datetime) -> None:
             """Update all the hosts on every interval time."""
             responses = await async_multiping(
                 list(ip_to_dev_id),
@@ -141,14 +148,14 @@ async def async_update(now):
                 )
             )
 
-    async def _async_update_interval(now):
+    async def _async_update_interval(now: datetime) -> None:
         try:
             await async_update(now)
         finally:
             if not hass.is_stopping:
                 async_track_point_in_utc_time(
-                    hass, _async_update_interval, util.dt.utcnow() + interval
+                    hass, _async_update_interval, now + interval
                 )
 
-    await _async_update_interval(None)
+    await _async_update_interval(dt_util.now())
     return True
diff --git a/homeassistant/components/plex/__init__.py b/homeassistant/components/plex/__init__.py
index 59ae14b8ca9e95..4ce5a359dcdb13 100644
--- a/homeassistant/components/plex/__init__.py
+++ b/homeassistant/components/plex/__init__.py
@@ -18,7 +18,11 @@
 from homeassistant.const import CONF_URL, CONF_VERIFY_SSL, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import (
@@ -54,6 +58,8 @@
 
 _LOGGER = logging.getLogger(__package__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 def is_plex_media_id(media_content_id):
     """Return whether the media_content_id is a valid Plex media_id."""
diff --git a/homeassistant/components/plex/manifest.json b/homeassistant/components/plex/manifest.json
index 4c4ed8d8d0a7a6..bc0c54c49bf195 100644
--- a/homeassistant/components/plex/manifest.json
+++ b/homeassistant/components/plex/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["plexapi", "plexwebsocket"],
   "requirements": [
-    "plexapi==4.13.2",
+    "PlexAPI==4.13.2",
     "plexauth==0.0.6",
     "plexwebsocket==0.0.13"
   ],
diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py
index be572679605981..6585c011c2d1a5 100644
--- a/homeassistant/components/plex/media_player.py
+++ b/homeassistant/components/plex/media_player.py
@@ -4,7 +4,7 @@
 from collections.abc import Callable
 from functools import wraps
 import logging
-from typing import Any, Concatenate, ParamSpec, TypeVar
+from typing import Any, Concatenate, ParamSpec, TypeVar, cast
 
 import plexapi.exceptions
 import requests.exceptions
@@ -535,7 +535,10 @@ def device_info(self) -> DeviceInfo | None:
             identifiers={(DOMAIN, self.machine_identifier)},
             manufacturer=self.device_platform or "Plex",
             model=self.device_product or self.device_make,
-            name=self.name,
+            # Instead of setting the device name to the entity name, plex
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             sw_version=self.device_version,
             via_device=(DOMAIN, self.plex_server.machine_identifier),
         )
diff --git a/homeassistant/components/plex/server.py b/homeassistant/components/plex/server.py
index 9684c79792a08d..1c3c944c9c4eb6 100644
--- a/homeassistant/components/plex/server.py
+++ b/homeassistant/components/plex/server.py
@@ -199,7 +199,8 @@ def _update_plexdirect_hostname():
                         if _update_plexdirect_hostname():
                             config_entry_update_needed = True
                         else:
-                            raise Unauthorized(  # pylint: disable=raise-missing-from
+                            # pylint: disable-next=raise-missing-from
+                            raise Unauthorized(  # noqa: TRY200
                                 "New certificate cannot be validated"
                                 " with provided token"
                             )
diff --git a/homeassistant/components/plex/services.py b/homeassistant/components/plex/services.py
index 62576471448d33..10d005d1043f06 100644
--- a/homeassistant/components/plex/services.py
+++ b/homeassistant/components/plex/services.py
@@ -145,7 +145,7 @@ def process_plex_payload(
             plex_server = get_plex_server(hass, plex_server_id=server_id)
         else:
             # Handle legacy payloads without server_id in URL host position
-            if plex_url.host == "search":
+            if plex_url.host == "search":  # noqa: PLR5501
                 content = {}
             else:
                 content = int(plex_url.host)  # type: ignore[arg-type]
diff --git a/homeassistant/components/plugwise/climate.py b/homeassistant/components/plugwise/climate.py
index f7941d1f02d9b1..36626c2324e46a 100644
--- a/homeassistant/components/plugwise/climate.py
+++ b/homeassistant/components/plugwise/climate.py
@@ -42,6 +42,7 @@ class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):
     """Representation of an Plugwise thermostat."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_translation_key = DOMAIN
 
diff --git a/homeassistant/components/plugwise/select.py b/homeassistant/components/plugwise/select.py
index c45d47004b8f62..b78fd689cb932e 100644
--- a/homeassistant/components/plugwise/select.py
+++ b/homeassistant/components/plugwise/select.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-from plugwise import Smile
+from plugwise import DeviceData, Smile
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.config_entries import ConfigEntry
@@ -23,8 +23,8 @@ class PlugwiseSelectDescriptionMixin:
     """Mixin values for Plugwise Select entities."""
 
     command: Callable[[Smile, str, str], Awaitable[Any]]
-    current_option_key: str
-    options_key: str
+    value_fn: Callable[[DeviceData], str]
+    options_fn: Callable[[DeviceData], list[str]]
 
 
 @dataclass
@@ -40,8 +40,8 @@ class PlugwiseSelectEntityDescription(
         translation_key="select_schedule",
         icon="mdi:calendar-clock",
         command=lambda api, loc, opt: api.set_schedule_state(loc, opt, STATE_ON),
-        current_option_key="selected_schedule",
-        options_key="available_schedules",
+        value_fn=lambda data: data["selected_schedule"],
+        options_fn=lambda data: data.get("available_schedules"),
     ),
     PlugwiseSelectEntityDescription(
         key="select_regulation_mode",
@@ -49,8 +49,8 @@ class PlugwiseSelectEntityDescription(
         icon="mdi:hvac",
         entity_category=EntityCategory.CONFIG,
         command=lambda api, loc, opt: api.set_regulation_mode(opt),
-        current_option_key="regulation_mode",
-        options_key="regulation_modes",
+        value_fn=lambda data: data["regulation_mode"],
+        options_fn=lambda data: data.get("regulation_modes"),
     ),
     PlugwiseSelectEntityDescription(
         key="select_dhw_mode",
@@ -58,8 +58,8 @@ class PlugwiseSelectEntityDescription(
         icon="mdi:shower",
         entity_category=EntityCategory.CONFIG,
         command=lambda api, loc, opt: api.set_dhw_mode(opt),
-        current_option_key="dhw_mode",
-        options_key="dhw_modes",
+        value_fn=lambda data: data["dhw_mode"],
+        options_fn=lambda data: data.get("dhw_modes"),
     ),
 )
 
@@ -77,10 +77,7 @@ async def async_setup_entry(
     entities: list[PlugwiseSelectEntity] = []
     for device_id, device in coordinator.data.devices.items():
         for description in SELECT_TYPES:
-            if (
-                description.options_key in device
-                and len(device[description.options_key]) > 1
-            ):
+            if (options := description.options_fn(device)) and len(options) > 1:
                 entities.append(
                     PlugwiseSelectEntity(coordinator, device_id, description)
                 )
@@ -107,12 +104,12 @@ def __init__(
     @property
     def current_option(self) -> str:
         """Return the selected entity option to represent the entity state."""
-        return self.device[self.entity_description.current_option_key]
+        return self.entity_description.value_fn(self.device)
 
     @property
     def options(self) -> list[str]:
         """Return the selectable entity options."""
-        return self.device[self.entity_description.options_key]
+        return self.entity_description.options_fn(self.device)
 
     async def async_select_option(self, option: str) -> None:
         """Change to the selected entity option."""
diff --git a/homeassistant/components/plugwise/sensor.py b/homeassistant/components/plugwise/sensor.py
index d708fe741c2ee0..7a504a0db84b08 100644
--- a/homeassistant/components/plugwise/sensor.py
+++ b/homeassistant/components/plugwise/sensor.py
@@ -343,6 +343,7 @@
         native_unit_of_measurement=LIGHT_LUX,
         device_class=SensorDeviceClass.ILLUMINANCE,
         state_class=SensorStateClass.MEASUREMENT,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SensorEntityDescription(
         key="modulation_level",
diff --git a/homeassistant/components/point/alarm_control_panel.py b/homeassistant/components/point/alarm_control_panel.py
index 21469c2c5a5c1f..bfffb934407892 100644
--- a/homeassistant/components/point/alarm_control_panel.py
+++ b/homeassistant/components/point/alarm_control_panel.py
@@ -67,7 +67,7 @@ def __init__(self, point_client: MinutPointClient, home_id: str) -> None:
         self._attr_device_info = DeviceInfo(
             identifiers={(POINT_DOMAIN, home_id)},
             manufacturer="Minut",
-            name=self._home["name"],
+            name=self._attr_name,
         )
 
     async def async_added_to_hass(self) -> None:
diff --git a/homeassistant/components/progettihwsw/__init__.py b/homeassistant/components/progettihwsw/__init__.py
index bce25c07b17568..d1d27b78769a26 100644
--- a/homeassistant/components/progettihwsw/__init__.py
+++ b/homeassistant/components/progettihwsw/__init__.py
@@ -1,7 +1,7 @@
 """Automation manager for boards manufactured by ProgettiHWSW Italy."""
 
-from ProgettiHWSW.ProgettiHWSWAPI import ProgettiHWSWAPI
 from ProgettiHWSW.input import Input
+from ProgettiHWSW.ProgettiHWSWAPI import ProgettiHWSWAPI
 from ProgettiHWSW.relay import Relay
 
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/progettihwsw/binary_sensor.py b/homeassistant/components/progettihwsw/binary_sensor.py
index 058d76cdf05d5d..b2019389fe3e42 100644
--- a/homeassistant/components/progettihwsw/binary_sensor.py
+++ b/homeassistant/components/progettihwsw/binary_sensor.py
@@ -2,8 +2,8 @@
 from datetime import timedelta
 import logging
 
-from ProgettiHWSW.input import Input
 import async_timeout
+from ProgettiHWSW.input import Input
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/progettihwsw/manifest.json b/homeassistant/components/progettihwsw/manifest.json
index e22abd6dd4a797..6cad66e136040f 100644
--- a/homeassistant/components/progettihwsw/manifest.json
+++ b/homeassistant/components/progettihwsw/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/progettihwsw",
   "iot_class": "local_polling",
   "loggers": ["ProgettiHWSW"],
-  "requirements": ["progettihwsw==0.1.1"]
+  "requirements": ["ProgettiHWSW==0.1.1"]
 }
diff --git a/homeassistant/components/progettihwsw/switch.py b/homeassistant/components/progettihwsw/switch.py
index 956848a659426e..dc7f838bcbc1ad 100644
--- a/homeassistant/components/progettihwsw/switch.py
+++ b/homeassistant/components/progettihwsw/switch.py
@@ -3,8 +3,8 @@
 import logging
 from typing import Any
 
-from ProgettiHWSW.relay import Relay
 import async_timeout
+from ProgettiHWSW.relay import Relay
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/prometheus/manifest.json b/homeassistant/components/prometheus/manifest.json
index dbbe8a1c9fcf3f..8ec332c1daf50a 100644
--- a/homeassistant/components/prometheus/manifest.json
+++ b/homeassistant/components/prometheus/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/prometheus",
   "iot_class": "assumed_state",
   "loggers": ["prometheus_client"],
-  "requirements": ["prometheus_client==0.7.1"]
+  "requirements": ["prometheus-client==0.7.1"]
 }
diff --git a/homeassistant/components/proximity/__init__.py b/homeassistant/components/proximity/__init__.py
index 0567c551d981bb..a45204351619db 100644
--- a/homeassistant/components/proximity/__init__.py
+++ b/homeassistant/components/proximity/__init__.py
@@ -110,6 +110,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class Proximity(Entity):
     """Representation of a Proximity."""
 
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
+
     def __init__(
         self,
         hass: HomeAssistant,
diff --git a/homeassistant/components/proxy/manifest.json b/homeassistant/components/proxy/manifest.json
index 7ebaa6e53dd610..88a2a6c9b0f91f 100644
--- a/homeassistant/components/proxy/manifest.json
+++ b/homeassistant/components/proxy/manifest.json
@@ -3,5 +3,5 @@
   "name": "Camera Proxy",
   "codeowners": [],
   "documentation": "https://www.home-assistant.io/integrations/proxy",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/prusalink/sensor.py b/homeassistant/components/prusalink/sensor.py
index 4f93fd3407e675..1ee4274e5bb021 100644
--- a/homeassistant/components/prusalink/sensor.py
+++ b/homeassistant/components/prusalink/sensor.py
@@ -47,6 +47,7 @@ class PrusaLinkSensorEntityDescription(
     "printer": (
         PrusaLinkSensorEntityDescription[PrinterInfo](
             key="printer.state",
+            name=None,
             icon="mdi:printer-3d",
             value_fn=lambda data: (
                 "pausing"
diff --git a/homeassistant/components/ps4/__init__.py b/homeassistant/components/ps4/__init__.py
index 0f5c57c5e4cb87..1c87a275126594 100644
--- a/homeassistant/components/ps4/__init__.py
+++ b/homeassistant/components/ps4/__init__.py
@@ -53,6 +53,8 @@
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 class PS4Data:
     """Init Data Class."""
diff --git a/homeassistant/components/ps4/media_player.py b/homeassistant/components/ps4/media_player.py
index 23438dd80c47a4..42bc15cf0ca1be 100644
--- a/homeassistant/components/ps4/media_player.py
+++ b/homeassistant/components/ps4/media_player.py
@@ -192,12 +192,10 @@ def _parse_status(self) -> None:
                             self.async_get_title_data(title_id, name),
                             "ps4.media_player-get_title_data",
                         )
-                else:
-                    if self.state != MediaPlayerState.IDLE:
-                        self.idle()
-            else:
-                if self.state != MediaPlayerState.STANDBY:
-                    self.state_standby()
+                elif self.state != MediaPlayerState.IDLE:
+                    self.idle()
+            elif self.state != MediaPlayerState.STANDBY:
+                self.state_standby()
 
         elif self._retry > DEFAULT_RETRIES:
             self.state_unknown()
diff --git a/homeassistant/components/pulseaudio_loopback/manifest.json b/homeassistant/components/pulseaudio_loopback/manifest.json
index f04538c01bbdfa..a67dc614c50b2f 100644
--- a/homeassistant/components/pulseaudio_loopback/manifest.json
+++ b/homeassistant/components/pulseaudio_loopback/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": [],
   "documentation": "https://www.home-assistant.io/integrations/pulseaudio_loopback",
   "iot_class": "local_polling",
-  "requirements": ["pulsectl==20.2.4"]
+  "requirements": ["pulsectl==23.5.2"]
 }
diff --git a/homeassistant/components/pure_energie/sensor.py b/homeassistant/components/pure_energie/sensor.py
index 7d584c7c1a8af2..9f67665d66c5d5 100644
--- a/homeassistant/components/pure_energie/sensor.py
+++ b/homeassistant/components/pure_energie/sensor.py
@@ -39,7 +39,7 @@ class PureEnergieSensorEntityDescription(
 SENSORS: tuple[PureEnergieSensorEntityDescription, ...] = (
     PureEnergieSensorEntityDescription(
         key="power_flow",
-        name="Power Flow",
+        translation_key="power_flow",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -47,7 +47,7 @@ class PureEnergieSensorEntityDescription(
     ),
     PureEnergieSensorEntityDescription(
         key="energy_consumption_total",
-        name="Energy Consumption",
+        translation_key="energy_consumption_total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -55,7 +55,7 @@ class PureEnergieSensorEntityDescription(
     ),
     PureEnergieSensorEntityDescription(
         key="energy_production_total",
-        name="Energy Production",
+        translation_key="energy_production_total",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -83,6 +83,7 @@ class PureEnergieSensorEntity(
 ):
     """Defines an Pure Energie sensor."""
 
+    _attr_has_entity_name = True
     entity_description: PureEnergieSensorEntityDescription
 
     def __init__(
diff --git a/homeassistant/components/pure_energie/strings.json b/homeassistant/components/pure_energie/strings.json
index a76b4a001e611c..3545f62d667650 100644
--- a/homeassistant/components/pure_energie/strings.json
+++ b/homeassistant/components/pure_energie/strings.json
@@ -22,5 +22,18 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "power_flow": {
+        "name": "Power flow"
+      },
+      "energy_consumption_total": {
+        "name": "Energy consumption"
+      },
+      "energy_production_total": {
+        "name": "Energy production"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/purpleair/__init__.py b/homeassistant/components/purpleair/__init__.py
index c90f4c9031ce2f..f5c4090dc87077 100644
--- a/homeassistant/components/purpleair/__init__.py
+++ b/homeassistant/components/purpleair/__init__.py
@@ -1,6 +1,9 @@
 """The PurpleAir integration."""
 from __future__ import annotations
 
+from collections.abc import Mapping
+from typing import Any
+
 from aiopurpleair.models.sensors import SensorModel
 
 from homeassistant.config_entries import ConfigEntry
@@ -9,7 +12,7 @@
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN
+from .const import CONF_SHOW_ON_MAP, DOMAIN
 from .coordinator import PurpleAirDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
@@ -60,16 +63,30 @@ def __init__(
         self._attr_device_info = DeviceInfo(
             configuration_url=self.coordinator.async_get_map_url(sensor_index),
             hw_version=self.sensor_data.hardware,
-            identifiers={(DOMAIN, str(self._sensor_index))},
+            identifiers={(DOMAIN, str(sensor_index))},
             manufacturer="PurpleAir, Inc.",
             model=self.sensor_data.model,
             name=self.sensor_data.name,
             sw_version=self.sensor_data.firmware_version,
         )
-        self._attr_extra_state_attributes = {
-            ATTR_LATITUDE: self.sensor_data.latitude,
-            ATTR_LONGITUDE: self.sensor_data.longitude,
-        }
+        self._entry = entry
+
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any]:
+        """Return entity specific state attributes."""
+        attrs = {}
+
+        # Displaying the geography on the map relies upon putting the latitude/longitude
+        # in the entity attributes with "latitude" and "longitude" as the keys.
+        # Conversely, we can hide the location on the map by using other keys, like
+        # "lati" and "long":
+        if self._entry.options.get(CONF_SHOW_ON_MAP):
+            attrs[ATTR_LATITUDE] = self.sensor_data.latitude
+            attrs[ATTR_LONGITUDE] = self.sensor_data.longitude
+        else:
+            attrs["lati"] = self.sensor_data.latitude
+            attrs["long"] = self.sensor_data.longitude
+        return attrs
 
     @property
     def sensor_data(self) -> SensorModel:
diff --git a/homeassistant/components/purpleair/config_flow.py b/homeassistant/components/purpleair/config_flow.py
index 604bcb28c0e3e9..c7988c02e6ae0a 100644
--- a/homeassistant/components/purpleair/config_flow.py
+++ b/homeassistant/components/purpleair/config_flow.py
@@ -31,7 +31,7 @@
     SelectSelectorMode,
 )
 
-from .const import CONF_SENSOR_INDICES, DOMAIN, LOGGER
+from .const import CONF_SENSOR_INDICES, CONF_SHOW_ON_MAP, DOMAIN, LOGGER
 
 CONF_DISTANCE = "distance"
 CONF_NEARBY_SENSOR_OPTIONS = "nearby_sensor_options"
@@ -318,6 +318,22 @@ def __init__(self, config_entry: ConfigEntry) -> None:
         self._flow_data: dict[str, Any] = {}
         self.config_entry = config_entry
 
+    @property
+    def settings_schema(self) -> vol.Schema:
+        """Return the settings schema."""
+        return vol.Schema(
+            {
+                vol.Optional(
+                    CONF_SHOW_ON_MAP,
+                    description={
+                        "suggested_value": self.config_entry.options.get(
+                            CONF_SHOW_ON_MAP
+                        )
+                    },
+                ): bool
+            }
+        )
+
     async def async_step_add_sensor(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
@@ -352,7 +368,7 @@ async def async_step_add_sensor(
     async def async_step_choose_sensor(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
-        """Handle the selection of a sensor."""
+        """Choose a sensor."""
         if user_input is None:
             options = self._flow_data.pop(CONF_NEARBY_SENSOR_OPTIONS)
             return self.async_show_form(
@@ -375,13 +391,13 @@ async def async_step_init(
         """Manage the options."""
         return self.async_show_menu(
             step_id="init",
-            menu_options=["add_sensor", "remove_sensor"],
+            menu_options=["add_sensor", "remove_sensor", "settings"],
         )
 
     async def async_step_remove_sensor(
         self, user_input: dict[str, Any] | None = None
     ) -> FlowResult:
-        """Add a sensor."""
+        """Remove a sensor."""
         if user_input is None:
             return self.async_show_form(
                 step_id="remove_sensor",
@@ -437,3 +453,15 @@ def async_device_entity_state_changed(_: Event) -> None:
         options[CONF_SENSOR_INDICES].remove(removed_sensor_index)
 
         return self.async_create_entry(data=options)
+
+    async def async_step_settings(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Manage settings."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="settings", data_schema=self.settings_schema
+            )
+
+        options = deepcopy({**self.config_entry.options})
+        return self.async_create_entry(data=options | user_input)
diff --git a/homeassistant/components/purpleair/const.py b/homeassistant/components/purpleair/const.py
index 60f51a9e7ddf9c..e3ea7807a21f00 100644
--- a/homeassistant/components/purpleair/const.py
+++ b/homeassistant/components/purpleair/const.py
@@ -7,3 +7,4 @@
 
 CONF_READ_KEY = "read_key"
 CONF_SENSOR_INDICES = "sensor_indices"
+CONF_SHOW_ON_MAP = "show_on_map"
diff --git a/homeassistant/components/purpleair/sensor.py b/homeassistant/components/purpleair/sensor.py
index 23370f8a20c2d0..fffceffa343ce4 100644
--- a/homeassistant/components/purpleair/sensor.py
+++ b/homeassistant/components/purpleair/sensor.py
@@ -50,7 +50,6 @@ class PurpleAirSensorEntityDescription(
 SENSOR_DESCRIPTIONS = [
     PurpleAirSensorEntityDescription(
         key="humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -58,7 +57,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm0.3_count_concentration",
-        name="PM0.3 count concentration",
+        translation_key="pm0_3_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -67,7 +66,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm0.5_count_concentration",
-        name="PM0.5 count concentration",
+        translation_key="pm0_5_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -76,7 +75,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm1.0_count_concentration",
-        name="PM1.0 count concentration",
+        translation_key="pm1_0_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -85,7 +84,6 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm1.0_mass_concentration",
-        name="PM1.0 mass concentration",
         device_class=SensorDeviceClass.PM1,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -93,7 +91,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm10.0_count_concentration",
-        name="PM10.0 count concentration",
+        translation_key="pm10_0_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -102,7 +100,6 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm10.0_mass_concentration",
-        name="PM10.0 mass concentration",
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -110,7 +107,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm2.5_count_concentration",
-        name="PM2.5 count concentration",
+        translation_key="pm2_5_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -119,7 +116,6 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm2.5_mass_concentration",
-        name="PM2.5 mass concentration",
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -127,7 +123,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pm5.0_count_concentration",
-        name="PM5.0 count concentration",
+        translation_key="pm5_0_count_concentration",
         entity_registry_enabled_default=False,
         icon="mdi:blur",
         native_unit_of_measurement=CONCENTRATION_PARTICLES_PER_100_MILLILITERS,
@@ -136,7 +132,6 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="pressure",
-        name="Pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
         state_class=SensorStateClass.MEASUREMENT,
@@ -144,7 +139,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="rssi",
-        name="RSSI",
+        translation_key="rssi",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -154,7 +149,6 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
         state_class=SensorStateClass.MEASUREMENT,
@@ -162,7 +156,7 @@ class PurpleAirSensorEntityDescription(
     ),
     PurpleAirSensorEntityDescription(
         key="uptime",
-        name="Uptime",
+        translation_key="uptime",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         device_class=SensorDeviceClass.DURATION,
@@ -171,8 +165,9 @@ class PurpleAirSensorEntityDescription(
         value_fn=lambda sensor: sensor.uptime,
     ),
     PurpleAirSensorEntityDescription(
+        # This sensor is an air quality index for VOCs. More info at https://github.com/home-assistant/core/pull/84896
         key="voc",
-        name="VOC",
+        translation_key="voc_aqi",
         device_class=SensorDeviceClass.AQI,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda sensor: sensor.voc,
diff --git a/homeassistant/components/purpleair/strings.json b/homeassistant/components/purpleair/strings.json
index 3d18fef3906468..5e7c61c182053c 100644
--- a/homeassistant/components/purpleair/strings.json
+++ b/homeassistant/components/purpleair/strings.json
@@ -79,7 +79,8 @@
       "init": {
         "menu_options": {
           "add_sensor": "Add sensor",
-          "remove_sensor": "Remove sensor"
+          "remove_sensor": "Remove sensor",
+          "settings": "Settings"
         }
       },
       "remove_sensor": {
@@ -90,6 +91,12 @@
         "data_description": {
           "sensor_device_id": "The sensor to remove"
         }
+      },
+      "settings": {
+        "title": "Settings",
+        "data": {
+          "show_on_map": "Show configured sensor locations on the map"
+        }
       }
     },
     "error": {
@@ -100,5 +107,36 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "pm0_3_count_concentration": {
+        "name": "PM0.3 count concentration"
+      },
+      "pm0_5_count_concentration": {
+        "name": "PM0.5 count concentration"
+      },
+      "pm1_0_count_concentration": {
+        "name": "PM1.0 count concentration"
+      },
+      "pm10_0_count_concentration": {
+        "name": "PM10.0 count concentration"
+      },
+      "pm2_5_count_concentration": {
+        "name": "PM2.5 count concentration"
+      },
+      "pm5_0_count_concentration": {
+        "name": "PM5.0 count concentration"
+      },
+      "rssi": {
+        "name": "RSSI"
+      },
+      "uptime": {
+        "name": "Uptime"
+      },
+      "voc_aqi": {
+        "name": "Volatile organic compounds air quality index"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/pushbullet/__init__.py b/homeassistant/components/pushbullet/__init__.py
index bed0e94ccd930d..14d90d4ca0b450 100644
--- a/homeassistant/components/pushbullet/__init__.py
+++ b/homeassistant/components/pushbullet/__init__.py
@@ -14,7 +14,7 @@
 )
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .api import PushBulletNotificationProvider
@@ -24,6 +24,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the pushbullet component."""
diff --git a/homeassistant/components/pushbullet/sensor.py b/homeassistant/components/pushbullet/sensor.py
index b61469f6b2a811..84d2998e992a70 100644
--- a/homeassistant/components/pushbullet/sensor.py
+++ b/homeassistant/components/pushbullet/sensor.py
@@ -16,50 +16,50 @@
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="application_name",
-        name="Application name",
+        translation_key="application_name",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="body",
-        name="Body",
+        translation_key="body",
     ),
     SensorEntityDescription(
         key="notification_id",
-        name="Notification ID",
+        translation_key="notification_id",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="notification_tag",
-        name="Notification tag",
+        translation_key="notification_tag",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="package_name",
-        name="Package name",
+        translation_key="package_name",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="receiver_email",
-        name="Receiver email",
+        translation_key="receiver_email",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="sender_email",
-        name="Sender email",
+        translation_key="sender_email",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="source_device_iden",
-        name="Sender device ID",
+        translation_key="source_device_identifier",
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="title",
-        name="Title",
+        translation_key="title",
     ),
     SensorEntityDescription(
         key="type",
-        name="Type",
+        translation_key="type",
         entity_registry_enabled_default=False,
     ),
 )
diff --git a/homeassistant/components/pushbullet/strings.json b/homeassistant/components/pushbullet/strings.json
index a6571ae7bf0f24..94d4202ea8c0d7 100644
--- a/homeassistant/components/pushbullet/strings.json
+++ b/homeassistant/components/pushbullet/strings.json
@@ -15,5 +15,39 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "application_name": {
+        "name": "Application name"
+      },
+      "body": {
+        "name": "Body"
+      },
+      "notification_id": {
+        "name": "Notification ID"
+      },
+      "notification_tag": {
+        "name": "Notification tag"
+      },
+      "package_name": {
+        "name": "Package name"
+      },
+      "receiver_email": {
+        "name": "Receiver email"
+      },
+      "sender_email": {
+        "name": "Sender email"
+      },
+      "source_device_identifier": {
+        "name": "Sender device ID"
+      },
+      "title": {
+        "name": "Title"
+      },
+      "type": {
+        "name": "Type"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/pushover/__init__.py b/homeassistant/components/pushover/__init__.py
index 551e374fbb644b..c3b15b7c130669 100644
--- a/homeassistant/components/pushover/__init__.py
+++ b/homeassistant/components/pushover/__init__.py
@@ -7,13 +7,15 @@
 from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_USER_KEY, DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the pushover component."""
diff --git a/homeassistant/components/pushover/manifest.json b/homeassistant/components/pushover/manifest.json
index d086321c0885ce..3b538f756e0591 100644
--- a/homeassistant/components/pushover/manifest.json
+++ b/homeassistant/components/pushover/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/pushover",
   "iot_class": "cloud_push",
   "loggers": ["pushover_complete"],
-  "requirements": ["pushover_complete==1.1.1"]
+  "requirements": ["pushover-complete==1.1.1"]
 }
diff --git a/homeassistant/components/pvoutput/sensor.py b/homeassistant/components/pvoutput/sensor.py
index 700757c6d58d38..b681678b098e62 100644
--- a/homeassistant/components/pvoutput/sensor.py
+++ b/homeassistant/components/pvoutput/sensor.py
@@ -45,7 +45,7 @@ class PVOutputSensorEntityDescription(
 SENSORS: tuple[PVOutputSensorEntityDescription, ...] = (
     PVOutputSensorEntityDescription(
         key="energy_consumption",
-        name="Energy consumed",
+        translation_key="energy_consumption",
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -53,7 +53,7 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="energy_generation",
-        name="Energy generated",
+        translation_key="energy_generation",
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -61,7 +61,7 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="normalized_output",
-        name="Efficiency",
+        translation_key="efficiency",
         native_unit_of_measurement=(
             f"{UnitOfEnergy.KILO_WATT_HOUR}/{UnitOfPower.KILO_WATT}"
         ),
@@ -70,7 +70,7 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="power_consumption",
-        name="Power consumed",
+        translation_key="power_consumption",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -78,7 +78,7 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="power_generation",
-        name="Power generated",
+        translation_key="power_generation",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
@@ -86,7 +86,6 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="temperature",
-        name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -94,7 +93,6 @@ class PVOutputSensorEntityDescription(
     ),
     PVOutputSensorEntityDescription(
         key="voltage",
-        name="Voltage",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
diff --git a/homeassistant/components/pvoutput/strings.json b/homeassistant/components/pvoutput/strings.json
index 12f30b773d5dcf..06d9897105353e 100644
--- a/homeassistant/components/pvoutput/strings.json
+++ b/homeassistant/components/pvoutput/strings.json
@@ -23,5 +23,24 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "energy_consumption": {
+        "name": "Energy consumed"
+      },
+      "energy_generation": {
+        "name": "Energy generated"
+      },
+      "efficiency": {
+        "name": "Efficiency"
+      },
+      "power_consumption": {
+        "name": "Power consumed"
+      },
+      "power_generation": {
+        "name": "Power generated"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/python_script/__init__.py b/homeassistant/components/python_script/__init__.py
index bbb262ac7db037..10751d28c06658 100644
--- a/homeassistant/components/python_script/__init__.py
+++ b/homeassistant/components/python_script/__init__.py
@@ -221,7 +221,7 @@ def protected_getattr(obj, name, default=None):
     try:
         _LOGGER.info("Executing %s: %s", filename, data)
         # pylint: disable-next=exec-used
-        exec(compiled.code, restricted_globals)
+        exec(compiled.code, restricted_globals)  # noqa: S102
     except ScriptError as err:
         logger.error("Error executing script: %s", err)
     except Exception as err:  # pylint: disable=broad-except
diff --git a/homeassistant/components/python_script/manifest.json b/homeassistant/components/python_script/manifest.json
index eb6cfe236e069b..63aa2f2f9162bb 100644
--- a/homeassistant/components/python_script/manifest.json
+++ b/homeassistant/components/python_script/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/python_script",
   "loggers": ["RestrictedPython"],
   "quality_scale": "internal",
-  "requirements": ["restrictedpython==6.0"]
+  "requirements": ["RestrictedPython==6.0"]
 }
diff --git a/homeassistant/components/qbittorrent/__init__.py b/homeassistant/components/qbittorrent/__init__.py
index 5154ae155ec972..53e8d4b96607c4 100644
--- a/homeassistant/components/qbittorrent/__init__.py
+++ b/homeassistant/components/qbittorrent/__init__.py
@@ -35,11 +35,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry.data[CONF_VERIFY_SSL],
         )
     except LoginRequired as err:
-        _LOGGER.error("Invalid credentials")
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady("Invalid credentials") from err
     except RequestException as err:
-        _LOGGER.error("Failed to connect")
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady("Failed to connect") from err
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
diff --git a/homeassistant/components/qbittorrent/manifest.json b/homeassistant/components/qbittorrent/manifest.json
index c56bb8102b8619..e2c1526e4f8a56 100644
--- a/homeassistant/components/qbittorrent/manifest.json
+++ b/homeassistant/components/qbittorrent/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["qbittorrent"],
-  "requirements": ["python-qbittorrent==0.4.2"]
+  "requirements": ["python-qbittorrent==0.4.3"]
 }
diff --git a/homeassistant/components/qbittorrent/sensor.py b/homeassistant/components/qbittorrent/sensor.py
index 6b758daab0ac03..15a634cf7a9872 100644
--- a/homeassistant/components/qbittorrent/sensor.py
+++ b/homeassistant/components/qbittorrent/sensor.py
@@ -86,7 +86,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.6.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=ir.IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
diff --git a/homeassistant/components/qld_bushfire/manifest.json b/homeassistant/components/qld_bushfire/manifest.json
index e21371d96af4de..5e7d9948309253 100644
--- a/homeassistant/components/qld_bushfire/manifest.json
+++ b/homeassistant/components/qld_bushfire/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["georss_qld_bushfire_alert_client"],
-  "requirements": ["georss_qld_bushfire_alert_client==0.5"]
+  "requirements": ["georss-qld-bushfire-alert-client==0.5"]
 }
diff --git a/homeassistant/components/qnap/__init__.py b/homeassistant/components/qnap/__init__.py
index 534096628dfd00..2491e69803f2da 100644
--- a/homeassistant/components/qnap/__init__.py
+++ b/homeassistant/components/qnap/__init__.py
@@ -1 +1,33 @@
 """The qnap component."""
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import QnapCoordinator
+
+PLATFORMS: list[Platform] = [
+    Platform.SENSOR,
+]
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Set the config entry up."""
+    hass.data.setdefault(DOMAIN, {})
+    coordinator = QnapCoordinator(hass, config_entry)
+    # Fetch initial data so we have data when entities subscribe
+    await coordinator.async_config_entry_first_refresh()
+    hass.data[DOMAIN][config_entry.entry_id] = coordinator
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    ):
+        hass.data[DOMAIN].pop(config_entry.entry_id)
+    return unload_ok
diff --git a/homeassistant/components/qnap/config_flow.py b/homeassistant/components/qnap/config_flow.py
new file mode 100644
index 00000000000000..689fe30a8705ad
--- /dev/null
+++ b/homeassistant/components/qnap/config_flow.py
@@ -0,0 +1,99 @@
+"""Config flow to configure qnap component."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from qnapstats import QNAPStats
+from requests.exceptions import ConnectTimeout
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_MONITORED_CONDITIONS,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import config_validation as cv
+
+from .const import (
+    CONF_DRIVES,
+    CONF_NICS,
+    CONF_VOLUMES,
+    DEFAULT_PORT,
+    DEFAULT_SSL,
+    DEFAULT_TIMEOUT,
+    DEFAULT_VERIFY_SSL,
+    DOMAIN,
+)
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
+        vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
+        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    }
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class QnapConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Qnap configuration flow."""
+
+    VERSION = 1
+
+    async def async_step_import(self, import_info: dict[str, Any]) -> FlowResult:
+        """Set the config entry up from yaml."""
+        import_info.pop(CONF_MONITORED_CONDITIONS, None)
+        import_info.pop(CONF_NICS, None)
+        import_info.pop(CONF_DRIVES, None)
+        import_info.pop(CONF_VOLUMES, None)
+        return await self.async_step_user(import_info)
+
+    async def async_step_user(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> FlowResult:
+        """Handle a flow initialized by the user."""
+        errors = {}
+        if user_input is not None:
+            host = user_input[CONF_HOST]
+            protocol = "https" if user_input[CONF_SSL] else "http"
+            api = QNAPStats(
+                host=f"{protocol}://{host}",
+                port=user_input[CONF_PORT],
+                username=user_input[CONF_USERNAME],
+                password=user_input[CONF_PASSWORD],
+                verify_ssl=user_input[CONF_VERIFY_SSL],
+                timeout=DEFAULT_TIMEOUT,
+            )
+            try:
+                stats = await self.hass.async_add_executor_job(api.get_system_stats)
+            except ConnectTimeout:
+                errors["base"] = "cannot_connect"
+            except TypeError:
+                errors["base"] = "invalid_auth"
+            except Exception as error:  # pylint: disable=broad-except
+                _LOGGER.error(error)
+                errors["base"] = "unknown"
+            else:
+                unique_id = stats["system"]["serial_number"]
+                await self.async_set_unique_id(unique_id)
+                self._abort_if_unique_id_configured()
+                title = stats["system"]["name"]
+                return self.async_create_entry(title=title, data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(DATA_SCHEMA, user_input),
+            errors=errors,
+        )
diff --git a/homeassistant/components/qnap/const.py b/homeassistant/components/qnap/const.py
new file mode 100644
index 00000000000000..d1bbb64cc47c95
--- /dev/null
+++ b/homeassistant/components/qnap/const.py
@@ -0,0 +1,12 @@
+"""The Qnap constants."""
+
+CONF_DRIVES = "drives"
+CONF_NICS = "nics"
+CONF_VOLUMES = "volumes"
+
+DEFAULT_PORT = 8080
+DEFAULT_TIMEOUT = 5
+DEFAULT_SSL = False
+DEFAULT_VERIFY_SSL = True
+
+DOMAIN = "qnap"
diff --git a/homeassistant/components/qnap/coordinator.py b/homeassistant/components/qnap/coordinator.py
new file mode 100644
index 00000000000000..b868a931ebd294
--- /dev/null
+++ b/homeassistant/components/qnap/coordinator.py
@@ -0,0 +1,59 @@
+"""Data coordinator for the qnap integration."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from qnapstats import QNAPStats
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_TIMEOUT,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+UPDATE_INTERVAL = timedelta(minutes=1)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class QnapCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
+    """Custom coordinator for the qnap integration."""
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+        """Initialize the qnap coordinator."""
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+
+        protocol = "https" if config_entry.data[CONF_SSL] else "http"
+        self._api = QNAPStats(
+            f"{protocol}://{config_entry.data.get(CONF_HOST)}",
+            config_entry.data.get(CONF_PORT),
+            config_entry.data.get(CONF_USERNAME),
+            config_entry.data.get(CONF_PASSWORD),
+            verify_ssl=config_entry.data.get(CONF_VERIFY_SSL),
+            timeout=config_entry.data.get(CONF_TIMEOUT),
+        )
+
+    def _sync_update(self) -> dict[str, dict[str, Any]]:
+        """Get the latest data from the Qnap API."""
+        return {
+            "system_stats": self._api.get_system_stats(),
+            "system_health": self._api.get_system_health(),
+            "smart_drive_health": self._api.get_smart_disk_health(),
+            "volumes": self._api.get_volumes(),
+            "bandwidth": self._api.get_bandwidth(),
+        }
+
+    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
+        """Get the latest data from the Qnap API."""
+        return await self.hass.async_add_executor_job(self._sync_update)
diff --git a/homeassistant/components/qnap/manifest.json b/homeassistant/components/qnap/manifest.json
index 95ab9264dfca08..608d57a7cc4c67 100644
--- a/homeassistant/components/qnap/manifest.json
+++ b/homeassistant/components/qnap/manifest.json
@@ -1,8 +1,10 @@
 {
   "domain": "qnap",
   "name": "QNAP",
-  "codeowners": [],
+  "codeowners": ["@disforw"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/qnap",
+  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["qnapstats"],
   "requirements": ["qnapstats==0.4.0"]
diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py
index 66fc56317182ab..6d214b63e2e184 100644
--- a/homeassistant/components/qnap/sensor.py
+++ b/homeassistant/components/qnap/sensor.py
@@ -1,17 +1,17 @@
 """Support for QNAP NAS Sensors."""
 from __future__ import annotations
 
-from datetime import timedelta
 import logging
 
-from qnapstats import QNAPStats
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.const import (
     ATTR_NAME,
@@ -31,14 +31,25 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import (
+    CONF_DRIVES,
+    CONF_NICS,
+    CONF_VOLUMES,
+    DEFAULT_PORT,
+    DEFAULT_TIMEOUT,
+    DOMAIN,
+)
+from .coordinator import QnapCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_DRIVE = "Drive"
-ATTR_DRIVE_SIZE = "Drive Size"
 ATTR_IP = "IP Address"
 ATTR_MAC = "MAC Address"
 ATTR_MASK = "Mask"
@@ -53,18 +64,6 @@
 ATTR_UPTIME = "Uptime"
 ATTR_VOLUME_SIZE = "Volume Size"
 
-CONF_DRIVES = "drives"
-CONF_NICS = "nics"
-CONF_VOLUMES = "volumes"
-DEFAULT_NAME = "QNAP"
-DEFAULT_PORT = 8080
-DEFAULT_TIMEOUT = 5
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
-
-NOTIFICATION_ID = "qnap_notification"
-NOTIFICATION_TITLE = "QNAP Sensor Setup"
-
 _SYSTEM_MON_COND: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="status",
@@ -76,6 +75,8 @@
         name="System Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:thermometer",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _CPU_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -84,12 +85,16 @@
         name="CPU Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:checkbox-marked-circle-outline",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="cpu_usage",
         name="CPU Usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:chip",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _MEMORY_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -99,6 +104,8 @@
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:memory",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="memory_used",
@@ -106,12 +113,15 @@
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:memory",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="memory_percent_used",
         name="Memory Usage",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:memory",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _NETWORK_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -126,6 +136,8 @@
         native_unit_of_measurement=UnitOfDataRate.MEBIBYTES_PER_SECOND,
         device_class=SensorDeviceClass.DATA_RATE,
         icon="mdi:upload",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="network_rx",
@@ -133,6 +145,8 @@
         native_unit_of_measurement=UnitOfDataRate.MEBIBYTES_PER_SECOND,
         device_class=SensorDeviceClass.DATA_RATE,
         icon="mdi:download",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _DRIVE_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -140,12 +154,16 @@
         key="drive_smart_status",
         name="SMART Status",
         icon="mdi:checkbox-marked-circle-outline",
+        entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key="drive_temp",
         name="Temperature",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
+        icon="mdi:thermometer",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 _VOLUME_MON_COND: tuple[SensorEntityDescription, ...] = (
@@ -155,6 +173,8 @@
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:chart-pie",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volume_size_free",
@@ -162,12 +182,15 @@
         native_unit_of_measurement=UnitOfInformation.GIBIBYTES,
         device_class=SensorDeviceClass.DATA_SIZE,
         icon="mdi:chart-pie",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="volume_percentage_used",
         name="Volume Used",
         native_unit_of_measurement=PERCENTAGE,
         icon="mdi:chart-pie",
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 
@@ -202,77 +225,90 @@
 )
 
 
-def setup_platform(
+async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the QNAP NAS sensor."""
-    api = QNAPStatsAPI(config)
-    api.update()
+    """Set up the qnap sensor platform from yaml."""
+
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2023.12.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
 
-    # QNAP is not available
-    if not api.data:
-        raise PlatformNotReady
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=config
+        )
+    )
 
-    monitored_conditions = config[CONF_MONITORED_CONDITIONS]
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: config_entries.ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up entry."""
+    coordinator = QnapCoordinator(hass, config_entry)
+    await coordinator.async_refresh()
+    if not coordinator.last_update_success:
+        raise PlatformNotReady
+    uid = config_entry.unique_id
+    assert uid is not None
     sensors: list[QNAPSensor] = []
 
-    # Basic sensors
     sensors.extend(
         [
-            QNAPSystemSensor(api, description)
+            QNAPSystemSensor(coordinator, description, uid)
             for description in _SYSTEM_MON_COND
-            if description.key in monitored_conditions
         ]
     )
+
     sensors.extend(
-        [
-            QNAPCPUSensor(api, description)
-            for description in _CPU_MON_COND
-            if description.key in monitored_conditions
-        ]
+        [QNAPCPUSensor(coordinator, description, uid) for description in _CPU_MON_COND]
     )
+
     sensors.extend(
         [
-            QNAPMemorySensor(api, description)
+            QNAPMemorySensor(coordinator, description, uid)
             for description in _MEMORY_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Network sensors
     sensors.extend(
         [
-            QNAPNetworkSensor(api, description, nic)
-            for nic in config.get(CONF_NICS, api.data["system_stats"]["nics"])
+            QNAPNetworkSensor(coordinator, description, uid, nic)
+            for nic in coordinator.data["system_stats"]["nics"]
             for description in _NETWORK_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Drive sensors
     sensors.extend(
         [
-            QNAPDriveSensor(api, description, drive)
-            for drive in config.get(CONF_DRIVES, api.data["smart_drive_health"])
+            QNAPDriveSensor(coordinator, description, uid, drive)
+            for drive in coordinator.data["smart_drive_health"]
             for description in _DRIVE_MON_COND
-            if description.key in monitored_conditions
         ]
     )
 
     # Volume sensors
     sensors.extend(
         [
-            QNAPVolumeSensor(api, description, volume)
-            for volume in config.get(CONF_VOLUMES, api.data["volumes"])
+            QNAPVolumeSensor(coordinator, description, uid, volume)
+            for volume in coordinator.data["volumes"]
             for description in _VOLUME_MON_COND
-            if description.key in monitored_conditions
         ]
     )
-
-    add_entities(sensors)
+    async_add_entities(sensors)
 
 
 def round_nicely(number):
@@ -285,62 +321,38 @@ def round_nicely(number):
     return round(number)
 
 
-class QNAPStatsAPI:
-    """Class to interface with the API."""
-
-    def __init__(self, config):
-        """Initialize the API wrapper."""
-
-        protocol = "https" if config[CONF_SSL] else "http"
-        self._api = QNAPStats(
-            f"{protocol}://{config.get(CONF_HOST)}",
-            config.get(CONF_PORT),
-            config.get(CONF_USERNAME),
-            config.get(CONF_PASSWORD),
-            verify_ssl=config.get(CONF_VERIFY_SSL),
-            timeout=config.get(CONF_TIMEOUT),
-        )
-
-        self.data = {}
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self):
-        """Update API information and store locally."""
-        try:
-            self.data["system_stats"] = self._api.get_system_stats()
-            self.data["system_health"] = self._api.get_system_health()
-            self.data["smart_drive_health"] = self._api.get_smart_disk_health()
-            self.data["volumes"] = self._api.get_volumes()
-            self.data["bandwidth"] = self._api.get_bandwidth()
-        except Exception:  # pylint: disable=broad-except
-            _LOGGER.exception("Failed to fetch QNAP stats from the NAS")
-
-
-class QNAPSensor(SensorEntity):
+class QNAPSensor(CoordinatorEntity[QnapCoordinator], SensorEntity):
     """Base class for a QNAP sensor."""
 
     def __init__(
-        self, api, description: SensorEntityDescription, monitor_device=None
+        self,
+        coordinator: QnapCoordinator,
+        description: SensorEntityDescription,
+        unique_id: str,
+        monitor_device: str | None = None,
     ) -> None:
         """Initialize the sensor."""
+        super().__init__(coordinator)
         self.entity_description = description
+        self.device_name = self.coordinator.data["system_stats"]["system"]["name"]
         self.monitor_device = monitor_device
-        self._api = api
+        self._attr_unique_id = f"{unique_id}_{description.key}"
+        if monitor_device:
+            self._attr_unique_id = f"{self._attr_unique_id}_{monitor_device}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, unique_id)},
+            name=self.device_name,
+            model=self.coordinator.data["system_stats"]["system"]["model"],
+            sw_version=self.coordinator.data["system_stats"]["firmware"]["version"],
+            manufacturer="QNAP",
+        )
 
     @property
     def name(self):
         """Return the name of the sensor, if any."""
-        server_name = self._api.data["system_stats"]["system"]["name"]
-
         if self.monitor_device is not None:
-            return (
-                f"{server_name} {self.entity_description.name} ({self.monitor_device})"
-            )
-        return f"{server_name} {self.entity_description.name}"
-
-    def update(self) -> None:
-        """Get the latest data for the states."""
-        self._api.update()
+            return f"{self.device_name} {self.entity_description.name} ({self.monitor_device})"
+        return f"{self.device_name} {self.entity_description.name}"
 
 
 class QNAPCPUSensor(QNAPSensor):
@@ -350,9 +362,9 @@ class QNAPCPUSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "cpu_temp":
-            return self._api.data["system_stats"]["cpu"]["temp_c"]
+            return self.coordinator.data["system_stats"]["cpu"]["temp_c"]
         if self.entity_description.key == "cpu_usage":
-            return self._api.data["system_stats"]["cpu"]["usage_percent"]
+            return self.coordinator.data["system_stats"]["cpu"]["usage_percent"]
 
 
 class QNAPMemorySensor(QNAPSensor):
@@ -361,11 +373,11 @@ class QNAPMemorySensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        free = float(self._api.data["system_stats"]["memory"]["free"]) / 1024
+        free = float(self.coordinator.data["system_stats"]["memory"]["free"]) / 1024
         if self.entity_description.key == "memory_free":
             return round_nicely(free)
 
-        total = float(self._api.data["system_stats"]["memory"]["total"]) / 1024
+        total = float(self.coordinator.data["system_stats"]["memory"]["total"]) / 1024
 
         used = total - free
         if self.entity_description.key == "memory_used":
@@ -377,8 +389,8 @@ def native_value(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]["memory"]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["memory"]
             size = round_nicely(float(data["total"]) / 1024)
             return {ATTR_MEMORY_SIZE: f"{size} {UnitOfInformation.GIBIBYTES}"}
 
@@ -390,10 +402,10 @@ class QNAPNetworkSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "network_link_status":
-            nic = self._api.data["system_stats"]["nics"][self.monitor_device]
+            nic = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
             return nic["link_status"]
 
-        data = self._api.data["bandwidth"][self.monitor_device]
+        data = self.coordinator.data["bandwidth"][self.monitor_device]
         if self.entity_description.key == "network_tx":
             return round_nicely(data["tx"] / 1024 / 1024)
 
@@ -403,8 +415,8 @@ def native_value(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]["nics"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
             return {
                 ATTR_IP: data["ip"],
                 ATTR_MASK: data["mask"],
@@ -423,16 +435,16 @@ class QNAPSystemSensor(QNAPSensor):
     def native_value(self):
         """Return the state of the sensor."""
         if self.entity_description.key == "status":
-            return self._api.data["system_health"]
+            return self.coordinator.data["system_health"]
 
         if self.entity_description.key == "system_temp":
-            return int(self._api.data["system_stats"]["system"]["temp_c"])
+            return int(self.coordinator.data["system_stats"]["system"]["temp_c"])
 
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["system_stats"]
+        if self.coordinator.data:
+            data = self.coordinator.data["system_stats"]
             days = int(data["uptime"]["days"])
             hours = int(data["uptime"]["hours"])
             minutes = int(data["uptime"]["minutes"])
@@ -451,7 +463,7 @@ class QNAPDriveSensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        data = self._api.data["smart_drive_health"][self.monitor_device]
+        data = self.coordinator.data["smart_drive_health"][self.monitor_device]
 
         if self.entity_description.key == "drive_smart_status":
             return data["health"]
@@ -462,7 +474,7 @@ def native_value(self):
     @property
     def name(self):
         """Return the name of the sensor, if any."""
-        server_name = self._api.data["system_stats"]["system"]["name"]
+        server_name = self.coordinator.data["system_stats"]["system"]["name"]
 
         return (
             f"{server_name} {self.entity_description.name} (Drive"
@@ -472,8 +484,8 @@ def name(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["smart_drive_health"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["smart_drive_health"][self.monitor_device]
             return {
                 ATTR_DRIVE: data["drive_number"],
                 ATTR_MODEL: data["model"],
@@ -488,7 +500,7 @@ class QNAPVolumeSensor(QNAPSensor):
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        data = self._api.data["volumes"][self.monitor_device]
+        data = self.coordinator.data["volumes"][self.monitor_device]
 
         free_gb = int(data["free_size"]) / 1024 / 1024 / 1024
         if self.entity_description.key == "volume_size_free":
@@ -506,12 +518,10 @@ def native_value(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self._api.data:
-            data = self._api.data["volumes"][self.monitor_device]
+        if self.coordinator.data:
+            data = self.coordinator.data["volumes"][self.monitor_device]
             total_gb = int(data["total_size"]) / 1024 / 1024 / 1024
 
             return {
-                ATTR_VOLUME_SIZE: (
-                    f"{round_nicely(total_gb)} {UnitOfInformation.GIBIBYTES}"
-                )
+                ATTR_VOLUME_SIZE: f"{round_nicely(total_gb)} {UnitOfInformation.GIBIBYTES}"
             }
diff --git a/homeassistant/components/qnap/strings.json b/homeassistant/components/qnap/strings.json
new file mode 100644
index 00000000000000..36946b81c0ca18
--- /dev/null
+++ b/homeassistant/components/qnap/strings.json
@@ -0,0 +1,29 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "title": "Connect to the QNAP device",
+        "description": "This qnap sensor allows getting various statistics from your QNAP NAS.",
+        "data": {
+          "host": "Hostname",
+          "username": "Username",
+          "password": "Password",
+          "port": "Port",
+          "ssl": "Enable SSL",
+          "verify_ssl": "Verify SSL"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "Cannot connect to host",
+      "invalid_auth": "Bad authentication",
+      "unknown": "Unknown error"
+    }
+  },
+  "issues": {
+    "deprecated_yaml": {
+      "title": "The QNAP YAML configuration is being removed",
+      "description": "Configuring QNAP using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the QNAP YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+    }
+  }
+}
diff --git a/homeassistant/components/qnap_qsw/update.py b/homeassistant/components/qnap_qsw/update.py
index 70bd4afa880a3f..38a963818d4945 100644
--- a/homeassistant/components/qnap_qsw/update.py
+++ b/homeassistant/components/qnap_qsw/update.py
@@ -1,7 +1,7 @@
 """Support for the QNAP QSW update."""
 from __future__ import annotations
 
-from typing import Final
+from typing import Any, Final
 
 from aioqsw.const import (
     QSD_DESCRIPTION,
@@ -16,6 +16,7 @@
     UpdateDeviceClass,
     UpdateEntity,
     UpdateEntityDescription,
+    UpdateEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
@@ -51,6 +52,7 @@ async def async_setup_entry(
 class QswUpdate(QswFirmwareEntity, UpdateEntity):
     """Define a QNAP QSW update."""
 
+    _attr_supported_features = UpdateEntityFeature.INSTALL
     entity_description: UpdateEntityDescription
 
     def __init__(
@@ -87,3 +89,13 @@ def _async_update_attrs(self) -> None:
         self._attr_release_summary = self.get_device_value(
             QSD_FIRMWARE_CHECK, QSD_DESCRIPTION
         )
+
+    async def async_install(
+        self, version: str | None, backup: bool, **kwargs: Any
+    ) -> None:
+        """Install an update."""
+        await self.coordinator.async_refresh()
+        await self.coordinator.qsw.live_update()
+
+        self._attr_installed_version = self.latest_version
+        self.async_write_ha_state()
diff --git a/homeassistant/components/qrcode/manifest.json b/homeassistant/components/qrcode/manifest.json
index 787255187cc9a4..a19760ad989f89 100644
--- a/homeassistant/components/qrcode/manifest.json
+++ b/homeassistant/components/qrcode/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/qrcode",
   "iot_class": "calculated",
   "loggers": ["pyzbar"],
-  "requirements": ["pillow==9.5.0", "pyzbar==0.1.7"]
+  "requirements": ["Pillow==9.5.0", "pyzbar==0.1.7"]
 }
diff --git a/homeassistant/components/rachio/manifest.json b/homeassistant/components/rachio/manifest.json
index 14582134e84f45..e58341633b1b07 100644
--- a/homeassistant/components/rachio/manifest.json
+++ b/homeassistant/components/rachio/manifest.json
@@ -25,7 +25,7 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["rachiopy"],
-  "requirements": ["rachiopy==1.0.3"],
+  "requirements": ["RachioPy==1.0.3"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/radarr/binary_sensor.py b/homeassistant/components/radarr/binary_sensor.py
index 5339588c5fa7a7..5d439680bc2f13 100644
--- a/homeassistant/components/radarr/binary_sensor.py
+++ b/homeassistant/components/radarr/binary_sensor.py
@@ -18,7 +18,7 @@
 
 BINARY_SENSOR_TYPE = BinarySensorEntityDescription(
     key="health",
-    name="Health",
+    translation_key="health",
     entity_category=EntityCategory.DIAGNOSTIC,
     device_class=BinarySensorDeviceClass.PROBLEM,
 )
diff --git a/homeassistant/components/radarr/sensor.py b/homeassistant/components/radarr/sensor.py
index 0ed64ce30354b4..367e302d56fd38 100644
--- a/homeassistant/components/radarr/sensor.py
+++ b/homeassistant/components/radarr/sensor.py
@@ -18,8 +18,6 @@
 from homeassistant.const import EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import RadarrEntity
 from .const import DOMAIN
@@ -78,7 +76,7 @@ class RadarrSensorEntityDescription(
     ),
     "movie": RadarrSensorEntityDescription[int](
         key="movies",
-        name="Movies",
+        translation_key="movies",
         native_unit_of_measurement="Movies",
         icon="mdi:television",
         entity_registry_enabled_default=False,
@@ -86,7 +84,7 @@ class RadarrSensorEntityDescription(
     ),
     "status": RadarrSensorEntityDescription[SystemStatus](
         key="start_time",
-        name="Start time",
+        translation_key="start_time",
         device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -104,24 +102,6 @@ class RadarrSensorEntityDescription(
 PARALLEL_UPDATES = 1
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Radarr platform."""
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "removed_yaml",
-        breaks_in_ha_version="2022.12.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="removed_yaml",
-    )
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
diff --git a/homeassistant/components/radarr/strings.json b/homeassistant/components/radarr/strings.json
index 299dd0a56b0f45..5cd7bcfc449344 100644
--- a/homeassistant/components/radarr/strings.json
+++ b/homeassistant/components/radarr/strings.json
@@ -35,10 +35,19 @@
       }
     }
   },
-  "issues": {
-    "removed_yaml": {
-      "title": "The Radarr YAML configuration has been removed",
-      "description": "Configuring Radarr using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+  "entity": {
+    "binary_sensor": {
+      "health": {
+        "name": "Health"
+      }
+    },
+    "sensor": {
+      "movies": {
+        "name": "Movies"
+      },
+      "start_time": {
+        "name": "Start time"
+      }
     }
   }
 }
diff --git a/homeassistant/components/radio_browser/__init__.py b/homeassistant/components/radio_browser/__init__.py
index d93d7c48823b15..fdd7537e9e1cb0 100644
--- a/homeassistant/components/radio_browser/__init__.py
+++ b/homeassistant/components/radio_browser/__init__.py
@@ -1,6 +1,7 @@
 """The Radio Browser integration."""
 from __future__ import annotations
 
+from aiodns.error import DNSError
 from radios import RadioBrowser, RadioBrowserError
 
 from homeassistant.config_entries import ConfigEntry
@@ -23,7 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         await radios.stats()
-    except RadioBrowserError as err:
+    except (DNSError, RadioBrowserError) as err:
         raise ConfigEntryNotReady("Could not connect to Radio Browser API") from err
 
     hass.data[DOMAIN] = radios
diff --git a/homeassistant/components/radiotherm/manifest.json b/homeassistant/components/radiotherm/manifest.json
index aaa8671cd58d80..185a034d7f21ae 100644
--- a/homeassistant/components/radiotherm/manifest.json
+++ b/homeassistant/components/radiotherm/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "radiotherm",
   "name": "Radio Thermostat",
-  "codeowners": ["@bdraco", "@vinnyfuria"],
+  "codeowners": ["@vinnyfuria"],
   "config_flow": true,
   "dhcp": [
     {
diff --git a/homeassistant/components/rainbird/binary_sensor.py b/homeassistant/components/rainbird/binary_sensor.py
index ee5be0e4617b92..139a17f5181969 100644
--- a/homeassistant/components/rainbird/binary_sensor.py
+++ b/homeassistant/components/rainbird/binary_sensor.py
@@ -20,7 +20,7 @@
 
 RAIN_SENSOR_ENTITY_DESCRIPTION = BinarySensorEntityDescription(
     key="rainsensor",
-    name="Rainsensor",
+    translation_key="rainsensor",
     icon="mdi:water",
 )
 
@@ -38,6 +38,8 @@ async def async_setup_entry(
 class RainBirdSensor(CoordinatorEntity[RainbirdUpdateCoordinator], BinarySensorEntity):
     """A sensor implementation for Rain Bird device."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: RainbirdUpdateCoordinator,
diff --git a/homeassistant/components/rainbird/coordinator.py b/homeassistant/components/rainbird/coordinator.py
index 14598921a61c6a..b503e72d3a6e4c 100644
--- a/homeassistant/components/rainbird/coordinator.py
+++ b/homeassistant/components/rainbird/coordinator.py
@@ -69,7 +69,7 @@ def serial_number(self) -> str:
     def device_info(self) -> DeviceInfo:
         """Return information about the device."""
         return DeviceInfo(
-            default_name=f"{MANUFACTURER} Controller",
+            name=f"{MANUFACTURER} Controller",
             identifiers={(DOMAIN, self._serial_number)},
             manufacturer=MANUFACTURER,
         )
diff --git a/homeassistant/components/rainbird/manifest.json b/homeassistant/components/rainbird/manifest.json
index 2216d060f29fc0..a44cfb3ce138ff 100644
--- a/homeassistant/components/rainbird/manifest.json
+++ b/homeassistant/components/rainbird/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/rainbird",
   "iot_class": "local_polling",
   "loggers": ["pyrainbird"],
-  "requirements": ["pyrainbird==2.0.0"]
+  "requirements": ["pyrainbird==2.1.0"]
 }
diff --git a/homeassistant/components/rainbird/number.py b/homeassistant/components/rainbird/number.py
index ac1ea9618706b1..febb960d652259 100644
--- a/homeassistant/components/rainbird/number.py
+++ b/homeassistant/components/rainbird/number.py
@@ -32,14 +32,14 @@ async def async_setup_entry(
 
 
 class RainDelayNumber(CoordinatorEntity[RainbirdUpdateCoordinator], NumberEntity):
-    """A number implemnetaiton for the rain delay."""
+    """A number implementation for the rain delay."""
 
     _attr_native_min_value = 0
     _attr_native_max_value = 14
     _attr_native_step = 1
     _attr_native_unit_of_measurement = UnitOfTime.DAYS
     _attr_icon = "mdi:water-off"
-    _attr_name = "Rain delay"
+    _attr_translation_key = "rain_delay"
     _attr_has_entity_name = True
 
     def __init__(
diff --git a/homeassistant/components/rainbird/sensor.py b/homeassistant/components/rainbird/sensor.py
index de74943baf9c4c..f5cf2390095ad2 100644
--- a/homeassistant/components/rainbird/sensor.py
+++ b/homeassistant/components/rainbird/sensor.py
@@ -1,4 +1,4 @@
-"""Support for Rain Bird Irrigation system LNK WiFi Module."""
+"""Support for Rain Bird Irrigation system LNK Wi-Fi Module."""
 from __future__ import annotations
 
 import logging
@@ -18,7 +18,7 @@
 
 RAIN_DELAY_ENTITY_DESCRIPTION = SensorEntityDescription(
     key="raindelay",
-    name="Raindelay",
+    translation_key="raindelay",
     icon="mdi:water-off",
 )
 
@@ -42,6 +42,8 @@ async def async_setup_entry(
 class RainBirdSensor(CoordinatorEntity[RainbirdUpdateCoordinator], SensorEntity):
     """A sensor implementation for Rain Bird device."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: RainbirdUpdateCoordinator,
diff --git a/homeassistant/components/rainbird/strings.json b/homeassistant/components/rainbird/strings.json
index 3b5ae332dbd436..a98baead976ae6 100644
--- a/homeassistant/components/rainbird/strings.json
+++ b/homeassistant/components/rainbird/strings.json
@@ -27,5 +27,22 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "rainsensor": {
+        "name": "Rainsensor"
+      }
+    },
+    "number": {
+      "rain_delay": {
+        "name": "Rain delay"
+      }
+    },
+    "sensor": {
+      "raindelay": {
+        "name": "Raindelay"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/rainbird/switch.py b/homeassistant/components/rainbird/switch.py
index 38f3c03fb03479..3e2a3115e29390 100644
--- a/homeassistant/components/rainbird/switch.py
+++ b/homeassistant/components/rainbird/switch.py
@@ -1,4 +1,4 @@
-"""Support for Rain Bird Irrigation system LNK WiFi Module."""
+"""Support for Rain Bird Irrigation system LNK Wi-Fi Module."""
 from __future__ import annotations
 
 import logging
@@ -67,12 +67,13 @@ def __init__(
             self._attr_name = imported_name
             self._attr_has_entity_name = False
         else:
+            self._attr_name = None
             self._attr_has_entity_name = True
         self._state = None
         self._duration_minutes = duration_minutes
         self._attr_unique_id = f"{coordinator.serial_number}-{zone}"
         self._attr_device_info = DeviceInfo(
-            default_name=f"{MANUFACTURER} Sprinkler {zone}",
+            name=f"{MANUFACTURER} Sprinkler {zone}",
             identifiers={(DOMAIN, self._attr_unique_id)},
             manufacturer=MANUFACTURER,
             via_device=(DOMAIN, coordinator.serial_number),
diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py
index 33650cfc2fef13..7f93db67c4cb32 100644
--- a/homeassistant/components/rainmachine/binary_sensor.py
+++ b/homeassistant/components/rainmachine/binary_sensor.py
@@ -44,14 +44,14 @@ class RainMachineBinarySensorDescription(
 BINARY_SENSOR_DESCRIPTIONS = (
     RainMachineBinarySensorDescription(
         key=TYPE_FLOW_SENSOR,
-        name="Flow sensor",
+        translation_key=TYPE_FLOW_SENSOR,
         icon="mdi:water-pump",
         api_category=DATA_PROVISION_SETTINGS,
         data_key="useFlowSensor",
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_FREEZE,
-        name="Freeze restrictions",
+        translation_key=TYPE_FREEZE,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
@@ -59,7 +59,7 @@ class RainMachineBinarySensorDescription(
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_HOURLY,
-        name="Hourly restrictions",
+        translation_key=TYPE_HOURLY,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
@@ -67,7 +67,7 @@ class RainMachineBinarySensorDescription(
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_MONTH,
-        name="Month restrictions",
+        translation_key=TYPE_MONTH,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
@@ -75,7 +75,7 @@ class RainMachineBinarySensorDescription(
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_RAINDELAY,
-        name="Rain delay restrictions",
+        translation_key=TYPE_RAINDELAY,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
@@ -83,7 +83,7 @@ class RainMachineBinarySensorDescription(
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_RAINSENSOR,
-        name="Rain sensor restrictions",
+        translation_key=TYPE_RAINSENSOR,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -92,7 +92,7 @@ class RainMachineBinarySensorDescription(
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_WEEKDAY,
-        name="Weekday restrictions",
+        translation_key=TYPE_WEEKDAY,
         icon="mdi:cancel",
         entity_category=EntityCategory.DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
diff --git a/homeassistant/components/rainmachine/button.py b/homeassistant/components/rainmachine/button.py
index d4ed17c72e9ee6..82829094957048 100644
--- a/homeassistant/components/rainmachine/button.py
+++ b/homeassistant/components/rainmachine/button.py
@@ -51,7 +51,6 @@ async def _async_reboot(controller: Controller) -> None:
 BUTTON_DESCRIPTIONS = (
     RainMachineButtonDescription(
         key=BUTTON_KIND_REBOOT,
-        name="Reboot",
         api_category=DATA_PROVISION_SETTINGS,
         push_action=_async_reboot,
     ),
diff --git a/homeassistant/components/rainmachine/manifest.json b/homeassistant/components/rainmachine/manifest.json
index 574ca3d7f43be3..dabae5ff8c66b3 100644
--- a/homeassistant/components/rainmachine/manifest.json
+++ b/homeassistant/components/rainmachine/manifest.json
@@ -10,7 +10,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["regenmaschine"],
-  "requirements": ["regenmaschine==2023.05.1"],
+  "requirements": ["regenmaschine==2023.06.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/rainmachine/select.py b/homeassistant/components/rainmachine/select.py
index f482deb4ef4518..2a5bc93f60146f 100644
--- a/homeassistant/components/rainmachine/select.py
+++ b/homeassistant/components/rainmachine/select.py
@@ -59,7 +59,7 @@ class FreezeProtectionSelectDescription(
 SELECT_DESCRIPTIONS = (
     FreezeProtectionSelectDescription(
         key=TYPE_FREEZE_PROTECTION_TEMPERATURE,
-        name="Freeze protection temperature",
+        translation_key=TYPE_FREEZE_PROTECTION_TEMPERATURE,
         icon="mdi:thermometer",
         entity_category=EntityCategory.CONFIG,
         api_category=DATA_RESTRICTIONS_UNIVERSAL,
diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py
index 22943d73fcb4dc..6333dcc82f4699 100644
--- a/homeassistant/components/rainmachine/sensor.py
+++ b/homeassistant/components/rainmachine/sensor.py
@@ -69,7 +69,7 @@ class RainMachineSensorCompletionTimerDescription(
 SENSOR_DESCRIPTIONS = (
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_CLICK_M3,
-        name="Flow sensor clicks per cubic meter",
+        translation_key=TYPE_FLOW_SENSOR_CLICK_M3,
         icon="mdi:water-pump",
         native_unit_of_measurement=f"clicks/{UnitOfVolume.CUBIC_METERS}",
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -80,7 +80,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_CONSUMED_LITERS,
-        name="Flow sensor consumed liters",
+        translation_key=TYPE_FLOW_SENSOR_CONSUMED_LITERS,
         icon="mdi:water-pump",
         device_class=SensorDeviceClass.WATER,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -92,7 +92,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_LEAK_CLICKS,
-        name="Flow sensor leak clicks",
+        translation_key=TYPE_FLOW_SENSOR_LEAK_CLICKS,
         icon="mdi:pipe-leak",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement="clicks",
@@ -103,7 +103,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_LEAK_VOLUME,
-        name="Flow sensor leak volume",
+        translation_key=TYPE_FLOW_SENSOR_LEAK_VOLUME,
         icon="mdi:pipe-leak",
         device_class=SensorDeviceClass.WATER,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -115,7 +115,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_START_INDEX,
-        name="Flow sensor start index",
+        translation_key=TYPE_FLOW_SENSOR_START_INDEX,
         icon="mdi:water-pump",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement="index",
@@ -125,7 +125,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_FLOW_SENSOR_WATERING_CLICKS,
-        name="Flow sensor clicks",
+        translation_key=TYPE_FLOW_SENSOR_WATERING_CLICKS,
         icon="mdi:water-pump",
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement="clicks",
@@ -136,7 +136,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_LAST_LEAK_DETECTED,
-        name="Last leak detected",
+        translation_key=TYPE_LAST_LEAK_DETECTED,
         icon="mdi:pipe-leak",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -147,7 +147,7 @@ class RainMachineSensorCompletionTimerDescription(
     ),
     RainMachineSensorDataDescription(
         key=TYPE_RAIN_SENSOR_RAIN_START,
-        name="Rain sensor rain start",
+        translation_key=TYPE_RAIN_SENSOR_RAIN_START,
         icon="mdi:weather-pouring",
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
diff --git a/homeassistant/components/rainmachine/strings.json b/homeassistant/components/rainmachine/strings.json
index 9991fd31e034c5..884d05359a61bb 100644
--- a/homeassistant/components/rainmachine/strings.json
+++ b/homeassistant/components/rainmachine/strings.json
@@ -28,5 +28,74 @@
         }
       }
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "flow_sensor": {
+        "name": "Flow sensor"
+      },
+      "freeze": {
+        "name": "Freeze restrictions"
+      },
+      "hourly": {
+        "name": "Hourly restrictions"
+      },
+      "month": {
+        "name": "Month restrictions"
+      },
+      "raindelay": {
+        "name": "Rain delay restrictions"
+      },
+      "rainsensor": {
+        "name": "Rain sensor restrictions"
+      },
+      "weekday": {
+        "name": "Weekday restrictions"
+      }
+    },
+    "select": {
+      "freeze_protection_temperature": {
+        "name": "Freeze protection temperature"
+      }
+    },
+    "sensor": {
+      "flow_sensor_clicks_cubic_meter": {
+        "name": "Flow sensor clicks per cubic meter"
+      },
+      "flow_sensor_consumed_liters": {
+        "name": "Flow sensor consumed liters"
+      },
+      "flow_sensor_leak_clicks": {
+        "name": "Flow sensor leak clicks"
+      },
+      "flow_sensor_leak_volume": {
+        "name": "Flow sensor leak volume"
+      },
+      "flow_sensor_start_index": {
+        "name": "Flow sensor start index"
+      },
+      "flow_sensor_watering_clicks": {
+        "name": "Flow sensor clicks"
+      },
+      "last_leak_detected": {
+        "name": "Last leak detected"
+      },
+      "rain_sensor_rain_start": {
+        "name": "Rain sensor rain start"
+      }
+    },
+    "switch": {
+      "freeze_protect_enabled": {
+        "name": "Freeze protection"
+      },
+      "hot_days_extra_watering": {
+        "name": "Extra water on hot days"
+      }
+    },
+    "update": {
+      "firmware": {
+        "name": "Firmware"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/rainmachine/switch.py b/homeassistant/components/rainmachine/switch.py
index 60db5085951cf3..e6ed92d04dc25b 100644
--- a/homeassistant/components/rainmachine/switch.py
+++ b/homeassistant/components/rainmachine/switch.py
@@ -161,14 +161,14 @@ class RainMachineRestrictionSwitchDescription(
 RESTRICTIONS_SWITCH_DESCRIPTIONS = (
     RainMachineRestrictionSwitchDescription(
         key=TYPE_RESTRICTIONS_FREEZE_PROTECT_ENABLED,
-        name="Freeze protection",
+        translation_key=TYPE_RESTRICTIONS_FREEZE_PROTECT_ENABLED,
         icon="mdi:snowflake-alert",
         api_category=DATA_RESTRICTIONS_UNIVERSAL,
         data_key="freezeProtectEnabled",
     ),
     RainMachineRestrictionSwitchDescription(
         key=TYPE_RESTRICTIONS_HOT_DAYS_EXTRA_WATERING,
-        name="Extra water on hot days",
+        translation_key=TYPE_RESTRICTIONS_HOT_DAYS_EXTRA_WATERING,
         icon="mdi:heat-wave",
         api_category=DATA_RESTRICTIONS_UNIVERSAL,
         data_key="hotDaysExtraWatering",
diff --git a/homeassistant/components/rainmachine/update.py b/homeassistant/components/rainmachine/update.py
index a811894a0c2895..372319ba9a0f71 100644
--- a/homeassistant/components/rainmachine/update.py
+++ b/homeassistant/components/rainmachine/update.py
@@ -44,7 +44,7 @@ class UpdateStates(Enum):
 
 UPDATE_DESCRIPTION = RainMachineEntityDescription(
     key="update",
-    name="Firmware",
+    translation_key="firmware",
     api_category=DATA_MACHINE_FIRMWARE_UPDATE_STATUS,
 )
 
@@ -52,7 +52,7 @@ class UpdateStates(Enum):
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
-    """Set up WLED update based on a config entry."""
+    """Set up Rainmachine update based on a config entry."""
     data: RainMachineData = hass.data[DOMAIN][entry.entry_id]
 
     async_add_entities([RainMachineUpdateEntity(entry, data, UPDATE_DESCRIPTION)])
@@ -62,6 +62,7 @@ class RainMachineUpdateEntity(RainMachineEntity, UpdateEntity):
     """Define a RainMachine update entity."""
 
     _attr_device_class = UpdateDeviceClass.FIRMWARE
+    _attr_name = None
     _attr_supported_features = (
         UpdateEntityFeature.INSTALL
         | UpdateEntityFeature.PROGRESS
diff --git a/homeassistant/components/rapt_ble/manifest.json b/homeassistant/components/rapt_ble/manifest.json
index d3eab0641a6259..1bde135de35099 100644
--- a/homeassistant/components/rapt_ble/manifest.json
+++ b/homeassistant/components/rapt_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/rapt_ble",
   "iot_class": "local_push",
-  "requirements": ["rapt-ble==0.1.1"]
+  "requirements": ["rapt-ble==0.1.2"]
 }
diff --git a/homeassistant/components/rdw/binary_sensor.py b/homeassistant/components/rdw/binary_sensor.py
index 13a045151435bf..9d895f35eb7c60 100644
--- a/homeassistant/components/rdw/binary_sensor.py
+++ b/homeassistant/components/rdw/binary_sensor.py
@@ -41,13 +41,13 @@ class RDWBinarySensorEntityDescription(
 BINARY_SENSORS: tuple[RDWBinarySensorEntityDescription, ...] = (
     RDWBinarySensorEntityDescription(
         key="liability_insured",
-        name="Liability insured",
+        translation_key="liability_insured",
         icon="mdi:shield-car",
         is_on_fn=lambda vehicle: vehicle.liability_insured,
     ),
     RDWBinarySensorEntityDescription(
         key="pending_recall",
-        name="Pending recall",
+        translation_key="pending_recall",
         device_class=BinarySensorDeviceClass.PROBLEM,
         is_on_fn=lambda vehicle: vehicle.pending_recall,
     ),
diff --git a/homeassistant/components/rdw/manifest.json b/homeassistant/components/rdw/manifest.json
index 0b5640fe3a41eb..5df34652f2b2ed 100644
--- a/homeassistant/components/rdw/manifest.json
+++ b/homeassistant/components/rdw/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "rdw",
   "name": "RDW",
-  "codeowners": ["@frenck"],
+  "codeowners": ["@frenck", "@joostlek"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/rdw",
   "integration_type": "service",
diff --git a/homeassistant/components/rdw/sensor.py b/homeassistant/components/rdw/sensor.py
index e262665dd63a1e..2c324ca7093b9d 100644
--- a/homeassistant/components/rdw/sensor.py
+++ b/homeassistant/components/rdw/sensor.py
@@ -42,13 +42,13 @@ class RDWSensorEntityDescription(
 SENSORS: tuple[RDWSensorEntityDescription, ...] = (
     RDWSensorEntityDescription(
         key="apk_expiration",
-        name="APK expiration",
+        translation_key="apk_expiration",
         device_class=SensorDeviceClass.DATE,
         value_fn=lambda vehicle: vehicle.apk_expiration,
     ),
     RDWSensorEntityDescription(
         key="ascription_date",
-        name="Ascription date",
+        translation_key="ascription_date",
         device_class=SensorDeviceClass.DATE,
         value_fn=lambda vehicle: vehicle.ascription_date,
     ),
diff --git a/homeassistant/components/rdw/strings.json b/homeassistant/components/rdw/strings.json
index 840802a12b7a92..cf24ec5115c592 100644
--- a/homeassistant/components/rdw/strings.json
+++ b/homeassistant/components/rdw/strings.json
@@ -14,5 +14,23 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown_license_plate": "Unknown license plate"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "liability_insured": {
+        "name": "Liability insured"
+      },
+      "pending_recall": {
+        "name": "Pending recall"
+      }
+    },
+    "sensor": {
+      "apk_expiration": {
+        "name": "APK expiration"
+      },
+      "ascription_date": {
+        "name": "Ascription date"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/recollect_waste/calendar.py b/homeassistant/components/recollect_waste/calendar.py
index 120ab77c3b3f36..c439f647da5414 100644
--- a/homeassistant/components/recollect_waste/calendar.py
+++ b/homeassistant/components/recollect_waste/calendar.py
@@ -48,6 +48,7 @@ class ReCollectWasteCalendar(ReCollectWasteEntity, CalendarEntity):
     """Define a ReCollect Waste calendar."""
 
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/recollect_waste/sensor.py b/homeassistant/components/recollect_waste/sensor.py
index 4883734f47e175..5989fb1cfe347a 100644
--- a/homeassistant/components/recollect_waste/sensor.py
+++ b/homeassistant/components/recollect_waste/sensor.py
@@ -28,11 +28,11 @@
 SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key=SENSOR_TYPE_CURRENT_PICKUP,
-        name="Current pickup",
+        translation_key=SENSOR_TYPE_CURRENT_PICKUP,
     ),
     SensorEntityDescription(
         key=SENSOR_TYPE_NEXT_PICKUP,
-        name="Next pickup",
+        translation_key=SENSOR_TYPE_NEXT_PICKUP,
     ),
 )
 
diff --git a/homeassistant/components/recollect_waste/strings.json b/homeassistant/components/recollect_waste/strings.json
index a350b9880fc89b..20aa5982f0d5c4 100644
--- a/homeassistant/components/recollect_waste/strings.json
+++ b/homeassistant/components/recollect_waste/strings.json
@@ -24,5 +24,15 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_pickup": {
+        "name": "Current pickup"
+      },
+      "next_pickup": {
+        "name": "Next pickup"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 7b43abd8dde93d..72d825d9e78505 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -135,7 +135,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     exclude_attributes_by_domain: dict[str, set[str]] = {}
     hass.data[EXCLUDE_ATTRIBUTES] = exclude_attributes_by_domain
     conf = config[DOMAIN]
-    entity_filter = convert_include_exclude_filter(conf)
+    entity_filter = convert_include_exclude_filter(conf).get_filter()
     auto_purge = conf[CONF_AUTO_PURGE]
     auto_repack = conf[CONF_AUTO_REPACK]
     keep_days = conf[CONF_PURGE_KEEP_DAYS]
diff --git a/homeassistant/components/recorder/core.py b/homeassistant/components/recorder/core.py
index 43915c0187b6a8..d4a026cfefc921 100644
--- a/homeassistant/components/recorder/core.py
+++ b/homeassistant/components/recorder/core.py
@@ -215,6 +215,7 @@ def __init__(
 
         self.schema_version = 0
         self._commits_without_expire = 0
+        self._event_session_has_pending_writes = False
 
         self.recorder_runs_manager = RecorderRunsManager()
         self.states_manager = StatesManager()
@@ -298,9 +299,39 @@ def _shutdown_pool(self) -> None:
     @callback
     def async_initialize(self) -> None:
         """Initialize the recorder."""
+        entity_filter = self.entity_filter
+        exclude_event_types = self.exclude_event_types
+        queue_put = self._queue.put_nowait
+        event_task = EventTask
+
+        @callback
+        def _event_listener(event: Event) -> None:
+            """Listen for new events and put them in the process queue."""
+            if event.event_type in exclude_event_types:
+                return
+
+            if (entity_id := event.data.get(ATTR_ENTITY_ID)) is None:
+                queue_put(event_task(event))
+                return
+
+            if isinstance(entity_id, str):
+                if entity_filter(entity_id):
+                    queue_put(event_task(event))
+                return
+
+            if isinstance(entity_id, list):
+                for eid in entity_id:
+                    if entity_filter(eid):
+                        queue_put(event_task(event))
+                        return
+                return
+
+            # Unknown what it is.
+            queue_put(event_task(event))
+
         self._event_listener = self.hass.bus.async_listen(
             MATCH_ALL,
-            self.event_listener,
+            _event_listener,
             run_immediately=True,
         )
         self._queue_watcher = async_track_time_interval(
@@ -322,7 +353,7 @@ def _async_commit(self, now: datetime) -> None:
         if (
             self._event_listener
             and not self._database_lock_task
-            and self._event_session_has_pending_writes()
+            and self._event_session_has_pending_writes
         ):
             self.queue_task(COMMIT_TASK)
 
@@ -411,27 +442,6 @@ def _async_stop_listeners(self) -> None:
             self._periodic_listener()
             self._periodic_listener = None
 
-    @callback
-    def _async_event_filter(self, event: Event) -> bool:
-        """Filter events."""
-        if event.event_type in self.exclude_event_types:
-            return False
-
-        if (entity_id := event.data.get(ATTR_ENTITY_ID)) is None:
-            return True
-
-        if isinstance(entity_id, str):
-            return self.entity_filter(entity_id)
-
-        if isinstance(entity_id, list):
-            for eid in entity_id:
-                if self.entity_filter(eid):
-                    return True
-            return False
-
-        # Unknown what it is.
-        return True
-
     async def _async_close(self, event: Event) -> None:
         """Empty the queue if its still present at close."""
 
@@ -543,10 +553,10 @@ def _adjust_lru_size(self) -> None:
         If the number of entities has increased, increase the size of the LRU
         cache to avoid thrashing.
         """
-        new_size = self.hass.states.async_entity_ids_count() * 2
-        self.state_attributes_manager.adjust_lru_size(new_size)
-        self.states_meta_manager.adjust_lru_size(new_size)
-        self.statistics_meta_manager.adjust_lru_size(new_size)
+        if new_size := self.hass.states.async_entity_ids_count() * 2:
+            self.state_attributes_manager.adjust_lru_size(new_size)
+            self.states_meta_manager.adjust_lru_size(new_size)
+            self.statistics_meta_manager.adjust_lru_size(new_size)
 
     @callback
     def async_periodic_statistics(self) -> None:
@@ -688,6 +698,11 @@ def run(self) -> None:
             # anything goes wrong in the run loop
             self._shutdown()
 
+    def _add_to_session(self, session: Session, obj: object) -> None:
+        """Add an object to the session."""
+        self._event_session_has_pending_writes = True
+        session.add(obj)
+
     def _run(self) -> None:
         """Start processing events to save."""
         self.thread_id = threading.get_ident()
@@ -1016,11 +1031,11 @@ def _process_non_state_changed_event_into_session(self, event: Event) -> None:
         else:
             event_types = EventTypes(event_type=event.event_type)
             event_type_manager.add_pending(event_types)
-            session.add(event_types)
+            self._add_to_session(session, event_types)
             dbevent.event_type_rel = event_types
 
         if not event.data:
-            session.add(dbevent)
+            self._add_to_session(session, dbevent)
             return
 
         event_data_manager = self.event_data_manager
@@ -1042,10 +1057,10 @@ def _process_non_state_changed_event_into_session(self, event: Event) -> None:
             # No matching attributes found, save them in the DB
             dbevent_data = EventData(shared_data=shared_data, hash=hash_)
             event_data_manager.add_pending(dbevent_data)
-            session.add(dbevent_data)
+            self._add_to_session(session, dbevent_data)
             dbevent.event_data_rel = dbevent_data
 
-        session.add(dbevent)
+        self._add_to_session(session, dbevent)
 
     def _process_state_changed_event_into_session(self, event: Event) -> None:
         """Process a state_changed event into the session."""
@@ -1090,7 +1105,7 @@ def _process_state_changed_event_into_session(self, event: Event) -> None:
         else:
             states_meta = StatesMeta(entity_id=entity_id)
             states_meta_manager.add_pending(states_meta)
-            session.add(states_meta)
+            self._add_to_session(session, states_meta)
             dbstate.states_meta_rel = states_meta
 
         # Map the event data to the StateAttributes table
@@ -1115,10 +1130,10 @@ def _process_state_changed_event_into_session(self, event: Event) -> None:
             # No matching attributes found, save them in the DB
             dbstate_attributes = StateAttributes(shared_attrs=shared_attrs, hash=hash_)
             state_attributes_manager.add_pending(dbstate_attributes)
-            session.add(dbstate_attributes)
+            self._add_to_session(session, dbstate_attributes)
             dbstate.state_attributes = dbstate_attributes
 
-        session.add(dbstate)
+        self._add_to_session(session, dbstate)
 
     def _handle_database_error(self, err: Exception) -> bool:
         """Handle a database error that may result in moving away the corrupt db."""
@@ -1130,14 +1145,9 @@ def _handle_database_error(self, err: Exception) -> bool:
             return True
         return False
 
-    def _event_session_has_pending_writes(self) -> bool:
-        """Return True if there are pending writes in the event session."""
-        session = self.event_session
-        return bool(session and (session.new or session.dirty))
-
     def _commit_event_session_or_retry(self) -> None:
         """Commit the event session if there is work to do."""
-        if not self._event_session_has_pending_writes():
+        if not self._event_session_has_pending_writes:
             return
         tries = 1
         while tries <= self.db_max_retries:
@@ -1163,6 +1173,7 @@ def _commit_event_session(self) -> None:
         self._commits_without_expire += 1
 
         session.commit()
+        self._event_session_has_pending_writes = False
         # We just committed the state attributes to the database
         # and we now know the attributes_ids.  We can save
         # many selects for matching attributes by loading them
@@ -1255,15 +1266,9 @@ def _send_keep_alive(self) -> None:
         _LOGGER.debug("Sending keepalive")
         self.event_session.connection().scalar(select(1))
 
-    @callback
-    def event_listener(self, event: Event) -> None:
-        """Listen for new events and put them in the process queue."""
-        if self._async_event_filter(event):
-            self.queue_task(EventTask(event))
-
     async def async_block_till_done(self) -> None:
         """Async version of block_till_done."""
-        if self._queue.empty() and not self._event_session_has_pending_writes():
+        if self._queue.empty() and not self._event_session_has_pending_writes:
             return
         event = asyncio.Event()
         self.queue_task(SynchronizeTask(event))
@@ -1417,6 +1422,8 @@ def _end_session(self) -> None:
         if self.event_session is None:
             return
         if self.recorder_runs_manager.active:
+            # .end will add to the event session
+            self._event_session_has_pending_writes = True
             self.recorder_runs_manager.end(self.event_session)
         try:
             self._commit_event_session_or_retry()
diff --git a/homeassistant/components/recorder/history/legacy.py b/homeassistant/components/recorder/history/legacy.py
index 74b17d9daa72e4..64ce1aa7d55655 100644
--- a/homeassistant/components/recorder/history/legacy.py
+++ b/homeassistant/components/recorder/history/legacy.py
@@ -434,11 +434,11 @@ def _state_changed_during_period_stmt(
             )
         else:
             stmt += lambda q: q.order_by(States.entity_id, States.last_updated.desc())
+    elif schema_version >= 31:
+        stmt += lambda q: q.order_by(States.entity_id, States.last_updated_ts)
     else:
-        if schema_version >= 31:
-            stmt += lambda q: q.order_by(States.entity_id, States.last_updated_ts)
-        else:
-            stmt += lambda q: q.order_by(States.entity_id, States.last_updated)
+        stmt += lambda q: q.order_by(States.entity_id, States.last_updated)
+
     if limit:
         stmt += lambda q: q.limit(limit)
     return stmt
diff --git a/homeassistant/components/recorder/history/modern.py b/homeassistant/components/recorder/history/modern.py
index 5322074c2058bb..393bcfa3676e09 100644
--- a/homeassistant/components/recorder/history/modern.py
+++ b/homeassistant/components/recorder/history/modern.py
@@ -9,7 +9,6 @@
 
 from sqlalchemy import (
     CompoundSelect,
-    Integer,
     Select,
     Subquery,
     and_,
@@ -19,7 +18,6 @@
     select,
     union_all,
 )
-from sqlalchemy.dialects import postgresql
 from sqlalchemy.engine.row import Row
 from sqlalchemy.orm.session import Session
 
@@ -52,16 +50,6 @@
 }
 
 
-CASTABLE_DOUBLE_TYPE = (
-    # MySQL/MariaDB < 10.4+ does not support casting to DOUBLE so we have to use Integer instead but it doesn't
-    # matter because we don't use the value as its always set to NULL
-    #
-    # sqlalchemy.exc.SAWarning: Datatype DOUBLE does not support CAST on MySQL/MariaDb; the CAST will be skipped.
-    #
-    Integer().with_variant(postgresql.DOUBLE_PRECISION(), "postgresql")
-)
-
-
 def _stmt_and_join_attributes(
     no_attributes: bool, include_last_changed: bool
 ) -> Select:
@@ -79,13 +67,9 @@ def _stmt_and_join_attributes_for_start_state(
 ) -> Select:
     """Return the statement and if StateAttributes should be joined."""
     _select = select(States.metadata_id, States.state)
-    _select = _select.add_columns(
-        literal(value=None).label("last_updated_ts").cast(CASTABLE_DOUBLE_TYPE)
-    )
+    _select = _select.add_columns(literal(value=0).label("last_updated_ts"))
     if include_last_changed:
-        _select = _select.add_columns(
-            literal(value=None).label("last_changed_ts").cast(CASTABLE_DOUBLE_TYPE)
-        )
+        _select = _select.add_columns(literal(value=0).label("last_changed_ts"))
     if not no_attributes:
         _select = _select.add_columns(SHARED_ATTR_OR_LEGACY_ATTRIBUTES)
     return _select
@@ -174,28 +158,29 @@ def _significant_states_stmt(
         stmt = stmt.outerjoin(
             StateAttributes, States.attributes_id == StateAttributes.attributes_id
         )
-    stmt = stmt.order_by(States.metadata_id, States.last_updated_ts)
     if not include_start_time_state or not run_start_ts:
+        stmt = stmt.order_by(States.metadata_id, States.last_updated_ts)
         return stmt
-    return _select_from_subquery(
-        union_all(
-            _select_from_subquery(
-                _get_start_time_state_stmt(
-                    run_start_ts,
-                    start_time_ts,
-                    single_metadata_id,
-                    metadata_ids,
-                    no_attributes,
-                    include_last_changed,
-                ).subquery(),
+    unioned_subquery = union_all(
+        _select_from_subquery(
+            _get_start_time_state_stmt(
+                run_start_ts,
+                start_time_ts,
+                single_metadata_id,
+                metadata_ids,
                 no_attributes,
                 include_last_changed,
-            ),
-            _select_from_subquery(stmt.subquery(), no_attributes, include_last_changed),
-        ).subquery(),
+            ).subquery(),
+            no_attributes,
+            include_last_changed,
+        ),
+        _select_from_subquery(stmt.subquery(), no_attributes, include_last_changed),
+    ).subquery()
+    return _select_from_subquery(
+        unioned_subquery,
         no_attributes,
         include_last_changed,
-    )
+    ).order_by(unioned_subquery.c.metadata_id, unioned_subquery.c.last_updated_ts)
 
 
 def get_significant_states_with_session(
@@ -279,6 +264,7 @@ def get_significant_states_with_session(
         entity_id_to_metadata_id,
         minimal_response,
         compressed_state_format,
+        no_attributes=no_attributes,
     )
 
 
@@ -433,6 +419,7 @@ def state_changes_during_period(
                 entity_ids,
                 entity_id_to_metadata_id,
                 descending=descending,
+                no_attributes=no_attributes,
             ),
         )
 
@@ -528,6 +515,7 @@ def get_last_state_changes(
                 None,
                 entity_ids,
                 entity_id_to_metadata_id,
+                no_attributes=False,
             ),
         )
 
@@ -651,6 +639,7 @@ def _sorted_states_to_dict(
     minimal_response: bool = False,
     compressed_state_format: bool = False,
     descending: bool = False,
+    no_attributes: bool = False,
 ) -> MutableMapping[str, list[State | dict[str, Any]]]:
     """Convert SQL results into JSON friendly data structure.
 
@@ -665,7 +654,7 @@ def _sorted_states_to_dict(
     """
     field_map = _FIELD_MAP
     state_class: Callable[
-        [Row, dict[str, dict[str, Any]], float | None, str, str, float | None],
+        [Row, dict[str, dict[str, Any]], float | None, str, str, float | None, bool],
         State | dict[str, Any],
     ]
     if compressed_state_format:
@@ -716,6 +705,7 @@ def _sorted_states_to_dict(
                     entity_id,
                     db_state[state_idx],
                     db_state[last_updated_ts_idx],
+                    False,
                 )
                 for db_state in group
             )
@@ -738,6 +728,7 @@ def _sorted_states_to_dict(
                     entity_id,
                     prev_state,  # type: ignore[arg-type]
                     first_state[last_updated_ts_idx],
+                    no_attributes,
                 )
             )
 
diff --git a/homeassistant/components/recorder/manifest.json b/homeassistant/components/recorder/manifest.json
index 33c6a516c65876..2e868542457646 100644
--- a/homeassistant/components/recorder/manifest.json
+++ b/homeassistant/components/recorder/manifest.json
@@ -7,7 +7,7 @@
   "iot_class": "local_push",
   "quality_scale": "internal",
   "requirements": [
-    "sqlalchemy==2.0.15",
+    "SQLAlchemy==2.0.15",
     "fnv-hash-fast==0.3.1",
     "psutil-home-assistant==0.0.1"
   ]
diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py
index b8436da97d58c9..33d8c7b5e67bc7 100644
--- a/homeassistant/components/recorder/migration.py
+++ b/homeassistant/components/recorder/migration.py
@@ -1303,7 +1303,7 @@ def _migrate_statistics_columns_to_timestamp(
             with session_scope(session=session_maker()) as session:
                 session.connection().execute(
                     text(
-                        f"UPDATE {table} set start_ts=strftime('%s',start) + "
+                        f"UPDATE {table} set start_ts=strftime('%s',start) + "  # noqa: S608
                         "cast(substr(start,-7) AS FLOAT), "
                         f"created_ts=strftime('%s',created) + "
                         "cast(substr(created,-7) AS FLOAT), "
@@ -1321,7 +1321,7 @@ def _migrate_statistics_columns_to_timestamp(
                 with session_scope(session=session_maker()) as session:
                     result = session.connection().execute(
                         text(
-                            f"UPDATE {table} set start_ts="
+                            f"UPDATE {table} set start_ts="  # noqa: S608
                             "IF(start is NULL or UNIX_TIMESTAMP(start) is NULL,0,"
                             "UNIX_TIMESTAMP(start) "
                             "), "
@@ -1343,7 +1343,7 @@ def _migrate_statistics_columns_to_timestamp(
                 with session_scope(session=session_maker()) as session:
                     result = session.connection().execute(
                         text(
-                            f"UPDATE {table} set start_ts="  # nosec
+                            f"UPDATE {table} set start_ts="  # noqa: S608
                             "(case when start is NULL then 0 else EXTRACT(EPOCH FROM start::timestamptz) end), "
                             "created_ts=EXTRACT(EPOCH FROM created::timestamptz), "
                             "last_reset_ts=EXTRACT(EPOCH FROM last_reset::timestamptz) "
diff --git a/homeassistant/components/recorder/models/state.py b/homeassistant/components/recorder/models/state.py
index 523ffdf18527c1..73e7798b9f5cc0 100644
--- a/homeassistant/components/recorder/models/state.py
+++ b/homeassistant/components/recorder/models/state.py
@@ -53,6 +53,7 @@ def __init__(  # pylint: disable=super-init-not-called
         entity_id: str,
         state: str,
         last_updated_ts: float | None,
+        no_attributes: bool,
     ) -> None:
         """Init the lazy state."""
         self._row = row
@@ -143,14 +144,14 @@ def row_to_compressed_state(
     entity_id: str,
     state: str,
     last_updated_ts: float | None,
+    no_attributes: bool,
 ) -> dict[str, Any]:
     """Convert a database row to a compressed state schema 41 and later."""
-    comp_state: dict[str, Any] = {
-        COMPRESSED_STATE_STATE: state,
-        COMPRESSED_STATE_ATTRIBUTES: decode_attributes_from_source(
+    comp_state: dict[str, Any] = {COMPRESSED_STATE_STATE: state}
+    if not no_attributes:
+        comp_state[COMPRESSED_STATE_ATTRIBUTES] = decode_attributes_from_source(
             getattr(row, "attributes", None), attr_cache
-        ),
-    }
+        )
     row_last_updated_ts: float = last_updated_ts or start_time_ts  # type: ignore[assignment]
     comp_state[COMPRESSED_STATE_LAST_UPDATED] = row_last_updated_ts
     if (
diff --git a/homeassistant/components/recorder/pool.py b/homeassistant/components/recorder/pool.py
index 09b113f03eba94..46f140305e361a 100644
--- a/homeassistant/components/recorder/pool.py
+++ b/homeassistant/components/recorder/pool.py
@@ -92,7 +92,7 @@ def _do_get_db_connection_protected(self) -> ConnectionPoolEntry:
             exclude_integrations={"recorder"},
             error_if_core=False,
         )
-        return super(NullPool, self)._create_connection()
+        return NullPool._create_connection(self)
 
 
 class MutexPool(StaticPool):
diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py
index 70f35d0349a5e0..9bbf35bb40ac2c 100644
--- a/homeassistant/components/recorder/statistics.py
+++ b/homeassistant/components/recorder/statistics.py
@@ -219,50 +219,34 @@ def _get_statistic_to_display_unit_converter(
     if display_unit == statistic_unit:
         return None
 
-    convert = converter.convert
-
-    def _from_normalized_unit(val: float | None) -> float | None:
-        """Return val."""
-        if val is None:
-            return val
-        return convert(val, statistic_unit, display_unit)
-
-    return _from_normalized_unit
+    return converter.converter_factory_allow_none(
+        from_unit=statistic_unit, to_unit=display_unit
+    )
 
 
 def _get_display_to_statistic_unit_converter(
     display_unit: str | None,
     statistic_unit: str | None,
-) -> Callable[[float], float]:
+) -> Callable[[float], float] | None:
     """Prepare a converter from the display unit to the statistics unit."""
-
-    def no_conversion(val: float) -> float:
-        """Return val."""
-        return val
-
-    if (converter := STATISTIC_UNIT_TO_UNIT_CONVERTER.get(statistic_unit)) is None:
-        return no_conversion
-
-    return partial(converter.convert, from_unit=display_unit, to_unit=statistic_unit)
+    if (
+        display_unit == statistic_unit
+        or (converter := STATISTIC_UNIT_TO_UNIT_CONVERTER.get(statistic_unit)) is None
+    ):
+        return None
+    return converter.converter_factory(from_unit=display_unit, to_unit=statistic_unit)
 
 
 def _get_unit_converter(
     from_unit: str, to_unit: str
-) -> Callable[[float | None], float | None]:
+) -> Callable[[float | None], float | None] | None:
     """Prepare a converter from a unit to another unit."""
-
-    def convert_units(
-        val: float | None, conv: type[BaseUnitConverter], from_unit: str, to_unit: str
-    ) -> float | None:
-        """Return converted val."""
-        if val is None:
-            return val
-        return conv.convert(val, from_unit=from_unit, to_unit=to_unit)
-
     for conv in STATISTIC_UNIT_TO_UNIT_CONVERTER.values():
         if from_unit in conv.VALID_UNITS and to_unit in conv.VALID_UNITS:
-            return partial(
-                convert_units, conv=conv, from_unit=from_unit, to_unit=to_unit
+            if from_unit == to_unit:
+                return None
+            return conv.converter_factory_allow_none(
+                from_unit=from_unit, to_unit=to_unit
             )
     raise HomeAssistantError
 
@@ -1494,7 +1478,9 @@ def statistic_during_period(
         state_unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
     convert = _get_statistic_to_display_unit_converter(unit, state_unit, units)
 
-    return {key: convert(value) if convert else value for key, value in result.items()}
+    if not convert:
+        return result
+    return {key: convert(value) for key, value in result.items()}
 
 
 _type_column_mapping = {
@@ -2290,10 +2276,10 @@ def adjust_statistics(
             return True
 
         statistic_unit = metadata[statistic_id][1]["unit_of_measurement"]
-        convert = _get_display_to_statistic_unit_converter(
+        if convert := _get_display_to_statistic_unit_converter(
             adjustment_unit, statistic_unit
-        )
-        sum_adjustment = convert(sum_adjustment)
+        ):
+            sum_adjustment = convert(sum_adjustment)
 
         _adjust_sum_statistics(
             session,
@@ -2360,7 +2346,14 @@ def change_statistics_unit(
 
         metadata_id = metadata[0]
 
-        convert = _get_unit_converter(old_unit, new_unit)
+        if not (convert := _get_unit_converter(old_unit, new_unit)):
+            _LOGGER.warning(
+                "Statistics unit of measurement for %s is already %s",
+                statistic_id,
+                new_unit,
+            )
+            return
+
         tables: tuple[type[StatisticsBase], ...] = (
             Statistics,
             StatisticsShortTerm,
@@ -2407,7 +2400,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
             with session_scope(session=instance.get_session()) as session:
                 session.connection().execute(
                     text(
-                        f"update {table} set start = NULL, created = NULL, last_reset = NULL;"
+                        f"update {table} set start = NULL, created = NULL, last_reset = NULL;"  # noqa: S608
                     )
                 )
     elif engine.dialect.name == SupportedDialect.MYSQL:
@@ -2417,7 +2410,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
                     session.connection()
                     .execute(
                         text(
-                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL where start is not NULL LIMIT 100000;"
+                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL where start is not NULL LIMIT 100000;"  # noqa: S608
                         )
                     )
                     .rowcount
@@ -2432,7 +2425,7 @@ def cleanup_statistics_timestamp_migration(instance: Recorder) -> bool:
                     session.connection()
                     .execute(
                         text(
-                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL "  # nosec
+                            f"UPDATE {table} set start=NULL, created=NULL, last_reset=NULL "  # noqa: S608
                             f"where id in (select id from {table} where start is not NULL LIMIT 100000)"
                         )
                     )
diff --git a/homeassistant/components/recorder/table_managers/event_data.py b/homeassistant/components/recorder/table_managers/event_data.py
index 4e08719e572c07..85266a3793989b 100644
--- a/homeassistant/components/recorder/table_managers/event_data.py
+++ b/homeassistant/components/recorder/table_managers/event_data.py
@@ -10,11 +10,11 @@
 from homeassistant.core import Event
 from homeassistant.util.json import JSON_ENCODE_EXCEPTIONS
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import EventData
 from ..queries import get_shared_event_datas
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/event_types.py b/homeassistant/components/recorder/table_managers/event_types.py
index d5541c547d513e..fd03bdd14d2f49 100644
--- a/homeassistant/components/recorder/table_managers/event_types.py
+++ b/homeassistant/components/recorder/table_managers/event_types.py
@@ -9,12 +9,12 @@
 
 from homeassistant.core import Event
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import EventTypes
 from ..queries import find_event_type_ids
 from ..tasks import RefreshEventTypesTask
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/state_attributes.py b/homeassistant/components/recorder/table_managers/state_attributes.py
index 442277be96ec31..3ae67b932bf4ce 100644
--- a/homeassistant/components/recorder/table_managers/state_attributes.py
+++ b/homeassistant/components/recorder/table_managers/state_attributes.py
@@ -11,11 +11,11 @@
 from homeassistant.helpers.entity import entity_sources
 from homeassistant.util.json import JSON_ENCODE_EXCEPTIONS
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import StateAttributes
 from ..queries import get_shared_attributes
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/table_managers/states_meta.py b/homeassistant/components/recorder/table_managers/states_meta.py
index bc4a8cfd2d9b18..b8f6204d3182db 100644
--- a/homeassistant/components/recorder/table_managers/states_meta.py
+++ b/homeassistant/components/recorder/table_managers/states_meta.py
@@ -8,11 +8,11 @@
 
 from homeassistant.core import Event
 
-from . import BaseLRUTableManager
 from ..const import SQLITE_MAX_BIND_VARS
 from ..db_schema import StatesMeta
 from ..queries import find_all_states_metadata_ids, find_states_metadata_ids
 from ..util import chunked, execute_stmt_lambda_element
+from . import BaseLRUTableManager
 
 if TYPE_CHECKING:
     from ..core import Recorder
diff --git a/homeassistant/components/recorder/util.py b/homeassistant/components/recorder/util.py
index 1c50fd0a77c26d..f3de9824a16241 100644
--- a/homeassistant/components/recorder/util.py
+++ b/homeassistant/components/recorder/util.py
@@ -278,9 +278,11 @@ def basic_sanity_check(cursor: SQLiteCursor) -> bool:
 
     for table in TABLES_TO_CHECK:
         if table in (TABLE_RECORDER_RUNS, TABLE_SCHEMA_CHANGES):
-            cursor.execute(f"SELECT * FROM {table};")  # nosec # not injection
+            cursor.execute(f"SELECT * FROM {table};")  # noqa: S608 # not injection
         else:
-            cursor.execute(f"SELECT * FROM {table} LIMIT 1;")  # nosec # not injection
+            cursor.execute(
+                f"SELECT * FROM {table} LIMIT 1;"  # noqa: S608 # not injection
+            )
 
     return True
 
@@ -528,11 +530,10 @@ def setup_connection_for_dialect(
                         version,
                     )
 
-            else:
-                if not version or version < MIN_VERSION_MYSQL:
-                    _fail_unsupported_version(
-                        version or version_string, "MySQL", MIN_VERSION_MYSQL
-                    )
+            elif not version or version < MIN_VERSION_MYSQL:
+                _fail_unsupported_version(
+                    version or version_string, "MySQL", MIN_VERSION_MYSQL
+                )
 
             slow_range_in_select = bool(
                 not version
diff --git a/homeassistant/components/remote/device_action.py b/homeassistant/components/remote/device_action.py
index 09c540b5e01451..936c7aca37a110 100644
--- a/homeassistant/components/remote/device_action.py
+++ b/homeassistant/components/remote/device_action.py
@@ -3,7 +3,10 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import CONF_DOMAIN
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
@@ -12,7 +15,14 @@
 
 # mypy: disallow-any-generics
 
-ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+_ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_call_action_from_config(
diff --git a/homeassistant/components/remote_rpi_gpio/__init__.py b/homeassistant/components/remote_rpi_gpio/__init__.py
index c77ae7fde9cb82..1654cc0c01db84 100644
--- a/homeassistant/components/remote_rpi_gpio/__init__.py
+++ b/homeassistant/components/remote_rpi_gpio/__init__.py
@@ -2,9 +2,6 @@
 from gpiozero import LED, DigitalInputDevice
 from gpiozero.pins.pigpio import PiGPIOFactory
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
-
 CONF_BOUNCETIME = "bouncetime"
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PULL_MODE = "pull_mode"
@@ -16,11 +13,6 @@
 DOMAIN = "remote_rpi_gpio"
 
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Raspberry Pi Remote GPIO component."""
-    return True
-
-
 def setup_output(address, port, invert_logic):
     """Set up a GPIO as output."""
 
diff --git a/homeassistant/components/remote_rpi_gpio/binary_sensor.py b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
index 37994830c4d792..bc0e694e8eba88 100644
--- a/homeassistant/components/remote_rpi_gpio/binary_sensor.py
+++ b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
@@ -11,6 +11,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
+from .. import remote_rpi_gpio
 from . import (
     CONF_BOUNCETIME,
     CONF_INVERT_LOGIC,
@@ -19,7 +20,6 @@
     DEFAULT_INVERT_LOGIC,
     DEFAULT_PULL_MODE,
 )
-from .. import remote_rpi_gpio
 
 CONF_PORTS = "ports"
 
diff --git a/homeassistant/components/remote_rpi_gpio/switch.py b/homeassistant/components/remote_rpi_gpio/switch.py
index 862efb0f89d97a..962cf6b4f3c23e 100644
--- a/homeassistant/components/remote_rpi_gpio/switch.py
+++ b/homeassistant/components/remote_rpi_gpio/switch.py
@@ -12,8 +12,8 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import CONF_INVERT_LOGIC, DEFAULT_INVERT_LOGIC
 from .. import remote_rpi_gpio
+from . import CONF_INVERT_LOGIC, DEFAULT_INVERT_LOGIC
 
 CONF_PORTS = "ports"
 
diff --git a/homeassistant/components/renault/binary_sensor.py b/homeassistant/components/renault/binary_sensor.py
index 83d86745d90b02..ef2d7196f04852 100644
--- a/homeassistant/components/renault/binary_sensor.py
+++ b/homeassistant/components/renault/binary_sensor.py
@@ -87,7 +87,6 @@ def icon(self) -> str | None:
             device_class=BinarySensorDeviceClass.PLUG,
             on_key="plugStatus",
             on_value=PlugState.PLUGGED.value,
-            translation_key="plugged_in",
         ),
         RenaultBinarySensorEntityDescription(
             key="charging",
@@ -95,7 +94,6 @@ def icon(self) -> str | None:
             device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
             on_key="chargingStatus",
             on_value=ChargeState.CHARGE_IN_PROGRESS.value,
-            translation_key="charging",
         ),
         RenaultBinarySensorEntityDescription(
             key="hvac_status",
@@ -112,7 +110,6 @@ def icon(self) -> str | None:
             device_class=BinarySensorDeviceClass.LOCK,
             on_key="lockStatus",
             on_value="unlocked",
-            translation_key="lock_status",
         ),
         RenaultBinarySensorEntityDescription(
             key="hatch_status",
diff --git a/homeassistant/components/renault/sensor.py b/homeassistant/components/renault/sensor.py
index 90ad70521df321..050c5a930f6be6 100644
--- a/homeassistant/components/renault/sensor.py
+++ b/homeassistant/components/renault/sensor.py
@@ -165,7 +165,6 @@ def _get_utc_value(entity: RenaultSensor[T]) -> datetime:
         entity_class=RenaultSensor[KamereonVehicleBatteryStatusData],
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        translation_key="battery_level",
     ),
     RenaultSensorEntityDescription(
         key="charge_state",
diff --git a/homeassistant/components/renault/services.yaml b/homeassistant/components/renault/services.yaml
index c8c3e9b12ba12e..5911c453c95863 100644
--- a/homeassistant/components/renault/services.yaml
+++ b/homeassistant/components/renault/services.yaml
@@ -1,4 +1,5 @@
 ac_start:
+  name: Start A/C
   description: Start A/C on vehicle.
   fields:
     vehicle:
@@ -25,6 +26,7 @@ ac_start:
         text:
 
 ac_cancel:
+  name: Cancel A/C
   description: Cancel A/C on vehicle.
   fields:
     vehicle:
@@ -36,6 +38,7 @@ ac_cancel:
           integration: renault
 
 charge_set_schedules:
+  name: Update charge schedule
   description: Update charge schedule on vehicle.
   fields:
     vehicle:
diff --git a/homeassistant/components/renault/strings.json b/homeassistant/components/renault/strings.json
index 066b49abcc0983..7cf016187be0c9 100644
--- a/homeassistant/components/renault/strings.json
+++ b/homeassistant/components/renault/strings.json
@@ -34,9 +34,6 @@
   },
   "entity": {
     "binary_sensor": {
-      "charging": {
-        "name": "[%key:component::binary_sensor::entity_component::battery_charging::name%]"
-      },
       "hatch_status": {
         "name": "Hatch"
       },
@@ -46,15 +43,9 @@
       "hvac_status": {
         "name": "HVAC"
       },
-      "lock_status": {
-        "name": "[%key:component::binary_sensor::entity_component::lock::name%]"
-      },
       "passenger_door_status": {
         "name": "Passenger door"
       },
-      "plugged_in": {
-        "name": "[%key:component::binary_sensor::entity_component::plug::name%]"
-      },
       "rear_left_door_status": {
         "name": "Rear left door"
       },
@@ -101,9 +92,6 @@
       "battery_last_activity": {
         "name": "Last battery activity"
       },
-      "battery_level": {
-        "name": "Battery level"
-      },
       "battery_temperature": {
         "name": "Battery temperature"
       },
diff --git a/homeassistant/components/renson/__init__.py b/homeassistant/components/renson/__init__.py
new file mode 100644
index 00000000000000..211f7c88e4089d
--- /dev/null
+++ b/homeassistant/components/renson/__init__.py
@@ -0,0 +1,88 @@
+"""The Renson integration."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+from typing import Any
+
+import async_timeout
+from renson_endura_delta.renson import RensonVentilation
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS = [
+    Platform.SENSOR,
+]
+
+
+@dataclass
+class RensonData:
+    """Renson data class."""
+
+    api: RensonVentilation
+    coordinator: RensonCoordinator
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Renson from a config entry."""
+
+    api = RensonVentilation(entry.data[CONF_HOST])
+    coordinator = RensonCoordinator("Renson", hass, api)
+
+    if not await hass.async_add_executor_job(api.connect):
+        raise ConfigEntryNotReady("Cannot connect to Renson device")
+
+    await coordinator.async_config_entry_first_refresh()
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = RensonData(
+        api,
+        coordinator,
+    )
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+class RensonCoordinator(DataUpdateCoordinator):
+    """Data update coordinator for Renson."""
+
+    def __init__(
+        self,
+        name: str,
+        hass: HomeAssistant,
+        api: RensonVentilation,
+        update_interval=timedelta(seconds=30),
+    ) -> None:
+        """Initialize my coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            # Name of the data. For logging purposes.
+            name=name,
+            # Polling interval. Will only be polled if there are subscribers.
+            update_interval=update_interval,
+        )
+        self.api = api
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Fetch data from API endpoint."""
+        async with async_timeout.timeout(30):
+            return await self.hass.async_add_executor_job(self.api.get_all_data)
diff --git a/homeassistant/components/renson/config_flow.py b/homeassistant/components/renson/config_flow.py
new file mode 100644
index 00000000000000..9883772ce02a54
--- /dev/null
+++ b/homeassistant/components/renson/config_flow.py
@@ -0,0 +1,70 @@
+"""Config flow for Renson integration."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from renson_endura_delta import renson
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.exceptions import HomeAssistantError
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Renson."""
+
+    VERSION = 1
+
+    async def validate_input(
+        self, hass: HomeAssistant, data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Validate the user input allows us to connect."""
+        api = renson.RensonVentilation(data[CONF_HOST])
+
+        if not await self.hass.async_add_executor_job(api.connect):
+            raise CannotConnect
+
+        return {"title": "Renson"}
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id="user", data_schema=STEP_USER_DATA_SCHEMA
+            )
+
+        errors = {}
+
+        try:
+            info = await self.validate_input(self.hass, user_input)
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected exception")
+            errors["base"] = "unknown"
+        else:
+            return self.async_create_entry(title=info["title"], data=user_input)
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )
+
+
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
diff --git a/homeassistant/components/renson/const.py b/homeassistant/components/renson/const.py
new file mode 100644
index 00000000000000..840e1ce428ae8f
--- /dev/null
+++ b/homeassistant/components/renson/const.py
@@ -0,0 +1,3 @@
+"""Constants for the Renson integration."""
+
+DOMAIN = "renson"
diff --git a/homeassistant/components/renson/entity.py b/homeassistant/components/renson/entity.py
new file mode 100644
index 00000000000000..526077d2d7f37f
--- /dev/null
+++ b/homeassistant/components/renson/entity.py
@@ -0,0 +1,47 @@
+"""Entity class for Renson ventilation unit."""
+from __future__ import annotations
+
+from renson_endura_delta.field_enum import (
+    DEVICE_NAME_FIELD,
+    FIRMWARE_VERSION_FIELD,
+    HARDWARE_VERSION_FIELD,
+    MAC_ADDRESS,
+)
+from renson_endura_delta.renson import RensonVentilation
+
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import RensonCoordinator
+from .const import DOMAIN
+
+
+class RensonEntity(CoordinatorEntity[RensonCoordinator]):
+    """Renson entity."""
+
+    def __init__(
+        self, name: str, api: RensonVentilation, coordinator: RensonCoordinator
+    ) -> None:
+        """Initialize the Renson entity."""
+        super().__init__(coordinator)
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                (DOMAIN, api.get_field_value(coordinator.data, MAC_ADDRESS.name))
+            },
+            manufacturer="Renson",
+            model=api.get_field_value(coordinator.data, DEVICE_NAME_FIELD.name),
+            name="Ventilation",
+            sw_version=api.get_field_value(
+                coordinator.data, FIRMWARE_VERSION_FIELD.name
+            ),
+            hw_version=api.get_field_value(
+                coordinator.data, HARDWARE_VERSION_FIELD.name
+            ),
+        )
+
+        self.api = api
+
+        self._attr_unique_id = (
+            api.get_field_value(coordinator.data, MAC_ADDRESS.name) + f"{name}"
+        )
diff --git a/homeassistant/components/renson/manifest.json b/homeassistant/components/renson/manifest.json
new file mode 100644
index 00000000000000..5ff219cc26c880
--- /dev/null
+++ b/homeassistant/components/renson/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "renson",
+  "name": "Renson",
+  "codeowners": ["@jimmyd-be"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/renson",
+  "iot_class": "local_polling",
+  "requirements": ["renson-endura-delta==1.5.0"]
+}
diff --git a/homeassistant/components/renson/sensor.py b/homeassistant/components/renson/sensor.py
new file mode 100644
index 00000000000000..9817951b094a05
--- /dev/null
+++ b/homeassistant/components/renson/sensor.py
@@ -0,0 +1,314 @@
+"""Sensor data of the Renson ventilation unit."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from renson_endura_delta.field_enum import (
+    AIR_QUALITY_FIELD,
+    BREEZE_LEVEL_FIELD,
+    BREEZE_TEMPERATURE_FIELD,
+    BYPASS_LEVEL_FIELD,
+    BYPASS_TEMPERATURE_FIELD,
+    CO2_FIELD,
+    CO2_HYSTERESIS_FIELD,
+    CO2_QUALITY_FIELD,
+    CO2_THRESHOLD_FIELD,
+    CURRENT_AIRFLOW_EXTRACT_FIELD,
+    CURRENT_AIRFLOW_INGOING_FIELD,
+    CURRENT_LEVEL_FIELD,
+    DAY_POLLUTION_FIELD,
+    DAYTIME_FIELD,
+    FILTER_REMAIN_FIELD,
+    HUMIDITY_FIELD,
+    INDOOR_TEMP_FIELD,
+    MANUAL_LEVEL_FIELD,
+    NIGHT_POLLUTION_FIELD,
+    NIGHTTIME_FIELD,
+    OUTDOOR_TEMP_FIELD,
+    FieldEnum,
+)
+from renson_endura_delta.renson import RensonVentilation
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONCENTRATION_PARTS_PER_MILLION,
+    PERCENTAGE,
+    UnitOfTemperature,
+    UnitOfTime,
+    UnitOfVolumeFlowRate,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import RensonCoordinator, RensonData
+from .const import DOMAIN
+from .entity import RensonEntity
+
+
+@dataclass
+class RensonSensorEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    field: FieldEnum
+    raw_format: bool
+
+
+@dataclass
+class RensonSensorEntityDescription(
+    SensorEntityDescription, RensonSensorEntityDescriptionMixin
+):
+    """Description of sensor."""
+
+
+SENSORS: tuple[RensonSensorEntityDescription, ...] = (
+    RensonSensorEntityDescription(
+        key="CO2_QUALITY_FIELD",
+        name="CO2 quality category",
+        field=CO2_QUALITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "bad", "poor"],
+    ),
+    RensonSensorEntityDescription(
+        key="AIR_QUALITY_FIELD",
+        name="Air quality category",
+        field=AIR_QUALITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "bad", "poor"],
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_FIELD",
+        name="CO2 quality",
+        field=CO2_FIELD,
+        raw_format=True,
+        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.CO2,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    RensonSensorEntityDescription(
+        key="AIR_FIELD",
+        name="Air quality",
+        field=AIR_QUALITY_FIELD,
+        state_class=SensorStateClass.MEASUREMENT,
+        raw_format=True,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_LEVEL_FIELD",
+        name="Ventilation level",
+        field=CURRENT_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze", "Holiday"],
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_AIRFLOW_EXTRACT_FIELD",
+        name="Total airflow out",
+        field=CURRENT_AIRFLOW_EXTRACT_FIELD,
+        raw_format=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+    ),
+    RensonSensorEntityDescription(
+        key="CURRENT_AIRFLOW_INGOING_FIELD",
+        name="Total airflow in",
+        field=CURRENT_AIRFLOW_INGOING_FIELD,
+        raw_format=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR,
+    ),
+    RensonSensorEntityDescription(
+        key="OUTDOOR_TEMP_FIELD",
+        name="Outdoor air temperature",
+        field=OUTDOOR_TEMP_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="INDOOR_TEMP_FIELD",
+        name="Extract air temperature",
+        field=INDOOR_TEMP_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="FILTER_REMAIN_FIELD",
+        name="Filter change",
+        field=FILTER_REMAIN_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTime.DAYS,
+    ),
+    RensonSensorEntityDescription(
+        key="HUMIDITY_FIELD",
+        name="Relative humidity",
+        field=HUMIDITY_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    RensonSensorEntityDescription(
+        key="MANUAL_LEVEL_FIELD",
+        name="Manual level",
+        field=MANUAL_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze", "Holiday"],
+    ),
+    RensonSensorEntityDescription(
+        key="BREEZE_TEMPERATURE_FIELD",
+        name="Breeze temperature",
+        field=BREEZE_TEMPERATURE_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="BREEZE_LEVEL_FIELD",
+        name="Breeze level",
+        field=BREEZE_LEVEL_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=["Off", "Level1", "Level2", "Level3", "Level4", "Breeze"],
+    ),
+    RensonSensorEntityDescription(
+        key="DAYTIME_FIELD",
+        name="Start day time",
+        field=DAYTIME_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="NIGHTTIME_FIELD",
+        name="Start night time",
+        field=NIGHTTIME_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="DAY_POLLUTION_FIELD",
+        name="Day pollution level",
+        field=DAY_POLLUTION_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=[
+            "Level1",
+            "Level2",
+            "Level3",
+            "Level4",
+        ],
+    ),
+    RensonSensorEntityDescription(
+        key="NIGHT_POLLUTION_FIELD",
+        name="Night pollution level",
+        field=NIGHT_POLLUTION_FIELD,
+        raw_format=False,
+        entity_registry_enabled_default=False,
+        device_class=SensorDeviceClass.ENUM,
+        options=[
+            "Level1",
+            "Level2",
+            "Level3",
+            "Level4",
+        ],
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_THRESHOLD_FIELD",
+        name="CO2 threshold",
+        field=CO2_THRESHOLD_FIELD,
+        raw_format=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="CO2_HYSTERESIS_FIELD",
+        name="CO2 hysteresis",
+        field=CO2_HYSTERESIS_FIELD,
+        raw_format=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        entity_registry_enabled_default=False,
+    ),
+    RensonSensorEntityDescription(
+        key="BYPASS_TEMPERATURE_FIELD",
+        name="Bypass activation temperature",
+        field=BYPASS_TEMPERATURE_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
+    RensonSensorEntityDescription(
+        key="BYPASS_LEVEL_FIELD",
+        name="Bypass level",
+        field=BYPASS_LEVEL_FIELD,
+        raw_format=False,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+)
+
+
+class RensonSensor(RensonEntity, SensorEntity):
+    """Get a sensor data from the Renson API and store it in the state of the class."""
+
+    def __init__(
+        self,
+        description: RensonSensorEntityDescription,
+        api: RensonVentilation,
+        coordinator: RensonCoordinator,
+    ) -> None:
+        """Initialize class."""
+        super().__init__(description.key, api, coordinator)
+
+        self.field = description.field
+        self.entity_description = description
+
+        self.data_type = description.field.field_type
+        self.raw_format = description.raw_format
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        all_data = self.coordinator.data
+
+        value = self.api.get_field_value(all_data, self.field.name)
+
+        if self.raw_format:
+            self._attr_native_value = value
+        else:
+            self._attr_native_value = self.api.parse_value(value, self.data_type)
+
+        self.async_write_ha_state()
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Renson sensor platform."""
+
+    data: RensonData = hass.data[DOMAIN][config_entry.entry_id]
+
+    entities = [
+        RensonSensor(description, data.api, data.coordinator) for description in SENSORS
+    ]
+
+    async_add_entities(entities)
diff --git a/homeassistant/components/renson/strings.json b/homeassistant/components/renson/strings.json
new file mode 100644
index 00000000000000..16c5de158a9ae1
--- /dev/null
+++ b/homeassistant/components/renson/strings.json
@@ -0,0 +1,15 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  }
+}
diff --git a/homeassistant/components/reolink/__init__.py b/homeassistant/components/reolink/__init__.py
index 76c0963e2c066f..923df261d843fc 100644
--- a/homeassistant/components/reolink/__init__.py
+++ b/homeassistant/components/reolink/__init__.py
@@ -8,7 +8,6 @@
 import logging
 from typing import Literal
 
-from aiohttp import ClientConnectorError
 import async_timeout
 from reolink_aio.exceptions import CredentialsInvalidError, ReolinkError
 
@@ -58,8 +57,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         await host.stop()
         raise ConfigEntryAuthFailed(err) from err
     except (
-        ClientConnectorError,
-        asyncio.TimeoutError,
         ReolinkException,
         ReolinkError,
     ) as err:
@@ -75,6 +72,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, host.stop)
     )
 
+    starting = True
+
     async def async_device_config_update() -> None:
         """Update the host state cache and renew the ONVIF-subscription."""
         async with async_timeout.timeout(host.api.timeout):
@@ -96,9 +95,19 @@ async def async_check_firmware_update() -> str | Literal[False]:
         async with async_timeout.timeout(host.api.timeout):
             try:
                 return await host.api.check_new_firmware()
-            except ReolinkError as err:
+            except (ReolinkError, asyncio.exceptions.CancelledError) as err:
+                if starting:
+                    _LOGGER.debug(
+                        "Error checking Reolink firmware update at startup "
+                        "from %s, possibly internet access is blocked",
+                        host.api.nvr_name,
+                    )
+                    return False
+
                 raise UpdateFailed(
-                    f"Error checking Reolink firmware update {host.api.nvr_name}"
+                    f"Error checking Reolink firmware update from {host.api.nvr_name}, "
+                    "if the camera is blocked from accessing the internet, "
+                    "disable the update entity"
                 ) from err
 
     device_coordinator = DataUpdateCoordinator(
@@ -120,7 +129,7 @@ async def async_check_firmware_update() -> str | Literal[False]:
         # If camera WAN blocked, firmware check fails, do not prevent setup
         await asyncio.gather(
             device_coordinator.async_config_entry_first_refresh(),
-            firmware_coordinator.async_refresh(),
+            firmware_coordinator.async_config_entry_first_refresh(),
         )
     except ConfigEntryNotReady:
         await host.stop()
@@ -138,6 +147,7 @@ async def async_check_firmware_update() -> str | Literal[False]:
         config_entry.add_update_listener(entry_update_listener)
     )
 
+    starting = False
     return True
 
 
diff --git a/homeassistant/components/reolink/camera.py b/homeassistant/components/reolink/camera.py
index a34f8c85d36c68..b012649ec4c5ce 100644
--- a/homeassistant/components/reolink/camera.py
+++ b/homeassistant/components/reolink/camera.py
@@ -28,13 +28,18 @@ async def async_setup_entry(
 
     cameras = []
     for channel in host.api.stream_channels:
-        streams = ["sub", "main", "snapshots"]
+        streams = ["sub", "main", "snapshots_sub", "snapshots_main"]
         if host.api.protocol in ["rtmp", "flv"]:
             streams.append("ext")
 
+        if host.api.supported(channel, "autotrack_stream"):
+            streams.extend(
+                ["autotrack_sub", "autotrack_snapshots_sub", "autotrack_snapshots_main"]
+            )
+
         for stream in streams:
             stream_url = await host.api.get_stream_source(channel, stream)
-            if stream_url is None and stream != "snapshots":
+            if stream_url is None and "snapshots" not in stream:
                 continue
             cameras.append(ReolinkCamera(reolink_data, channel, stream))
 
@@ -58,12 +63,16 @@ def __init__(
 
         self._stream = stream
 
+        stream_name = self._stream.replace("_", " ")
         if self._host.api.model in DUAL_LENS_MODELS:
-            self._attr_name = f"{self._stream} lens {self._channel}"
+            self._attr_name = f"{stream_name} lens {self._channel}"
         else:
-            self._attr_name = self._stream
-        self._attr_unique_id = f"{self._host.unique_id}_{self._channel}_{self._stream}"
-        self._attr_entity_registry_enabled_default = stream == "sub"
+            self._attr_name = stream_name
+        stream_id = self._stream
+        if stream_id == "snapshots_main":
+            stream_id = "snapshots"
+        self._attr_unique_id = f"{self._host.unique_id}_{self._channel}_{stream_id}"
+        self._attr_entity_registry_enabled_default = stream in ["sub", "autotrack_sub"]
 
     async def stream_source(self) -> str | None:
         """Return the source of the stream."""
@@ -73,4 +82,4 @@ async def async_camera_image(
         self, width: int | None = None, height: int | None = None
     ) -> bytes | None:
         """Return a still image response from the camera."""
-        return await self._host.api.get_snapshot(self._channel)
+        return await self._host.api.get_snapshot(self._channel, self._stream)
diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py
index df5bf968ae13ee..75ad26665c3bd8 100644
--- a/homeassistant/components/reolink/config_flow.py
+++ b/homeassistant/components/reolink/config_flow.py
@@ -79,6 +79,10 @@ async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
         self._username = entry_data[CONF_USERNAME]
         self._password = entry_data[CONF_PASSWORD]
         self._reauth = True
+        self.context["title_placeholders"]["ip_address"] = entry_data[CONF_HOST]
+        self.context["title_placeholders"]["hostname"] = self.context[
+            "title_placeholders"
+        ]["name"]
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
diff --git a/homeassistant/components/reolink/host.py b/homeassistant/components/reolink/host.py
index 5ff79029bd1c61..81fbda63fef00c 100644
--- a/homeassistant/components/reolink/host.py
+++ b/homeassistant/components/reolink/host.py
@@ -8,8 +8,8 @@
 
 import aiohttp
 from aiohttp.web import Request
-import async_timeout
 from reolink_aio.api import Host
+from reolink_aio.enums import SubType
 from reolink_aio.exceptions import ReolinkError, SubscriptionError
 
 from homeassistant.components import webhook
@@ -25,9 +25,11 @@
 from .exceptions import ReolinkSetupException, ReolinkWebhookException, UserNotAdmin
 
 DEFAULT_TIMEOUT = 60
-FIRST_ONVIF_TIMEOUT = 15
+FIRST_ONVIF_TIMEOUT = 10
 SUBSCRIPTION_RENEW_THRESHOLD = 300
 POLL_INTERVAL_NO_PUSH = 5
+LONG_POLL_COOLDOWN = 0.75
+LONG_POLL_ERROR_COOLDOWN = 30
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,9 +62,14 @@ def __init__(
         self.webhook_id: str | None = None
         self._base_url: str = ""
         self._webhook_url: str = ""
-        self._webhook_reachable: asyncio.Event = asyncio.Event()
+        self._webhook_reachable: bool = False
+        self._long_poll_received: bool = False
+        self._long_poll_error: bool = False
         self._cancel_poll: CALLBACK_TYPE | None = None
+        self._cancel_onvif_check: CALLBACK_TYPE | None = None
+        self._cancel_long_poll_check: CALLBACK_TYPE | None = None
         self._poll_job = HassJob(self._async_poll_all_motion, cancel_on_shutdown=True)
+        self._long_poll_task: asyncio.Task | None = None
         self._lost_subscription: bool = False
 
     @property
@@ -148,54 +155,88 @@ async def async_init(self) -> None:
 
         await self.subscribe()
 
-        _LOGGER.debug(
-            "Waiting for initial ONVIF state on webhook '%s'", self._webhook_url
-        )
-        try:
-            async with async_timeout.timeout(FIRST_ONVIF_TIMEOUT):
-                await self._webhook_reachable.wait()
-        except asyncio.TimeoutError:
+        if self._api.supported(None, "initial_ONVIF_state"):
             _LOGGER.debug(
-                "Did not receive initial ONVIF state on webhook '%s' after %i seconds",
-                self._webhook_url,
-                FIRST_ONVIF_TIMEOUT,
+                "Waiting for initial ONVIF state on webhook '%s'", self._webhook_url
+            )
+        else:
+            _LOGGER.debug(
+                "Camera model %s most likely does not push its initial state"
+                "upon ONVIF subscription, do not check",
+                self._api.model,
             )
+        self._cancel_onvif_check = async_call_later(
+            self._hass, FIRST_ONVIF_TIMEOUT, self._async_check_onvif
+        )
+
+        if self._api.sw_version_update_required:
             ir.async_create_issue(
                 self._hass,
                 DOMAIN,
-                "webhook_url",
+                "firmware_update",
                 is_fixable=False,
                 severity=ir.IssueSeverity.WARNING,
-                translation_key="webhook_url",
+                translation_key="firmware_update",
                 translation_placeholders={
+                    "required_firmware": self._api.sw_version_required.version_string,
+                    "current_firmware": self._api.sw_version,
+                    "model": self._api.model,
+                    "hw_version": self._api.hardware_version,
                     "name": self._api.nvr_name,
-                    "base_url": self._base_url,
-                    "network_link": "https://my.home-assistant.io/redirect/network/",
+                    "download_link": "https://reolink.com/download-center/",
                 },
             )
-            await self._async_poll_all_motion()
         else:
+            ir.async_delete_issue(self._hass, DOMAIN, "firmware_update")
+
+    async def _async_check_onvif(self, *_) -> None:
+        """Check the ONVIF subscription."""
+        if self._webhook_reachable:
             ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
+            self._cancel_onvif_check = None
+            return
+        if self._api.supported(None, "initial_ONVIF_state"):
+            _LOGGER.debug(
+                "Did not receive initial ONVIF state on webhook '%s' after %i seconds",
+                self._webhook_url,
+                FIRST_ONVIF_TIMEOUT,
+            )
 
-        if self._api.sw_version_update_required:
+        # ONVIF push is not received, start long polling and schedule check
+        await self._async_start_long_polling()
+        self._cancel_long_poll_check = async_call_later(
+            self._hass, FIRST_ONVIF_TIMEOUT, self._async_check_onvif_long_poll
+        )
+
+        self._cancel_onvif_check = None
+
+    async def _async_check_onvif_long_poll(self, *_) -> None:
+        """Check if ONVIF long polling is working."""
+        if not self._long_poll_received:
+            _LOGGER.debug(
+                "Did not receive state through ONVIF long polling after %i seconds",
+                FIRST_ONVIF_TIMEOUT,
+            )
             ir.async_create_issue(
                 self._hass,
                 DOMAIN,
-                "firmware_update",
+                "webhook_url",
                 is_fixable=False,
                 severity=ir.IssueSeverity.WARNING,
-                translation_key="firmware_update",
+                translation_key="webhook_url",
                 translation_placeholders={
-                    "required_firmware": self._api.sw_version_required.version_string,
-                    "current_firmware": self._api.sw_version,
-                    "model": self._api.model,
-                    "hw_version": self._api.hardware_version,
                     "name": self._api.nvr_name,
-                    "download_link": "https://reolink.com/download-center/",
+                    "base_url": self._base_url,
+                    "network_link": "https://my.home-assistant.io/redirect/network/",
                 },
             )
         else:
-            ir.async_delete_issue(self._hass, DOMAIN, "firmware_update")
+            ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
+
+        # If no ONVIF push or long polling state is received, start fast polling
+        await self._async_poll_all_motion()
+
+        self._cancel_long_poll_check = None
 
     async def update_states(self) -> None:
         """Call the API of the camera device to update the internal states."""
@@ -205,11 +246,7 @@ async def disconnect(self):
         """Disconnect from the API, so the connection will be released."""
         try:
             await self._api.unsubscribe()
-        except (
-            aiohttp.ClientConnectorError,
-            asyncio.TimeoutError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while unsubscribing from host %s:%s: %s",
                 self._api.host,
@@ -219,11 +256,7 @@ async def disconnect(self):
 
         try:
             await self._api.logout()
-        except (
-            aiohttp.ClientConnectorError,
-            asyncio.TimeoutError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while logging out for host %s:%s: %s",
                 self._api.host,
@@ -231,11 +264,32 @@ async def disconnect(self):
                 str(err),
             )
 
+    async def _async_start_long_polling(self):
+        """Start ONVIF long polling task."""
+        if self._long_poll_task is None:
+            await self._api.subscribe(sub_type=SubType.long_poll)
+            self._long_poll_task = asyncio.create_task(self._async_long_polling())
+
+    async def _async_stop_long_polling(self):
+        """Stop ONVIF long polling task."""
+        if self._long_poll_task is not None:
+            self._long_poll_task.cancel()
+            self._long_poll_task = None
+
+        await self._api.unsubscribe(sub_type=SubType.long_poll)
+
     async def stop(self, event=None):
         """Disconnect the API."""
         if self._cancel_poll is not None:
             self._cancel_poll()
             self._cancel_poll = None
+        if self._cancel_onvif_check is not None:
+            self._cancel_onvif_check()
+            self._cancel_onvif_check = None
+        if self._cancel_long_poll_check is not None:
+            self._cancel_long_poll_check()
+            self._cancel_long_poll_check = None
+        await self._async_stop_long_polling()
         self.unregister_webhook()
         await self.disconnect()
 
@@ -244,7 +298,7 @@ async def subscribe(self) -> None:
         if self.webhook_id is None:
             self.register_webhook()
 
-        if self._api.subscribed:
+        if self._api.subscribed(SubType.push):
             _LOGGER.debug(
                 "Host %s: is already subscribed to webhook %s",
                 self._api.host,
@@ -263,7 +317,9 @@ async def subscribe(self) -> None:
     async def renew(self) -> None:
         """Renew the subscription of motion events (lease time is 15 minutes)."""
         try:
-            await self._renew()
+            await self._renew(SubType.push)
+            if self._long_poll_task is not None:
+                await self._renew(SubType.long_poll)
         except SubscriptionError as err:
             if not self._lost_subscription:
                 self._lost_subscription = True
@@ -275,22 +331,27 @@ async def renew(self) -> None:
         else:
             self._lost_subscription = False
 
-    async def _renew(self) -> None:
+    async def _renew(self, sub_type: SubType) -> None:
         """Execute the renew of the subscription."""
-        if not self._api.subscribed:
+        if not self._api.subscribed(sub_type):
             _LOGGER.debug(
-                "Host %s: requested to renew a non-existing Reolink subscription, "
+                "Host %s: requested to renew a non-existing Reolink %s subscription, "
                 "trying to subscribe from scratch",
                 self._api.host,
+                sub_type,
             )
-            await self.subscribe()
+            if sub_type == SubType.push:
+                await self.subscribe()
+            else:
+                await self._api.subscribe(self._webhook_url, sub_type)
             return
 
-        timer = self._api.renewtimer
+        timer = self._api.renewtimer(sub_type)
         _LOGGER.debug(
-            "Host %s:%s should renew subscription in: %i seconds",
+            "Host %s:%s should renew %s subscription in: %i seconds",
             self._api.host,
             self._api.port,
+            sub_type,
             timer,
         )
         if timer > SUBSCRIPTION_RENEW_THRESHOLD:
@@ -298,25 +359,29 @@ async def _renew(self) -> None:
 
         if timer > 0:
             try:
-                await self._api.renew()
+                await self._api.renew(sub_type)
             except SubscriptionError as err:
                 _LOGGER.debug(
-                    "Host %s: error renewing Reolink subscription, "
+                    "Host %s: error renewing Reolink %s subscription, "
                     "trying to subscribe again: %s",
                     self._api.host,
+                    sub_type,
                     err,
                 )
             else:
                 _LOGGER.debug(
-                    "Host %s successfully renewed Reolink subscription", self._api.host
+                    "Host %s successfully renewed Reolink %s subscription",
+                    self._api.host,
+                    sub_type,
                 )
                 return
 
-        await self._api.subscribe(self._webhook_url)
+        await self._api.subscribe(self._webhook_url, sub_type)
 
         _LOGGER.debug(
-            "Host %s: Reolink re-subscription successful after it was expired",
+            "Host %s: Reolink %s re-subscription successful after it was expired",
             self._api.host,
+            sub_type,
         )
 
     def register_webhook(self) -> None:
@@ -367,31 +432,56 @@ def unregister_webhook(self):
         webhook.async_unregister(self._hass, self.webhook_id)
         self.webhook_id = None
 
+    async def _async_long_polling(self, *_) -> None:
+        """Use ONVIF long polling to immediately receive events."""
+        # This task will be cancelled once _async_stop_long_polling is called
+        while True:
+            if self._webhook_reachable:
+                self._long_poll_task = None
+                await self._async_stop_long_polling()
+                return
+
+            try:
+                channels = await self._api.pull_point_request()
+            except ReolinkError as ex:
+                if not self._long_poll_error:
+                    _LOGGER.error("Error while requesting ONVIF pull point: %s", ex)
+                    await self._api.unsubscribe(sub_type=SubType.long_poll)
+                self._long_poll_error = True
+                await asyncio.sleep(LONG_POLL_ERROR_COOLDOWN)
+                continue
+            except Exception as ex:
+                _LOGGER.exception("Error while requesting ONVIF pull point: %s", ex)
+                await self._api.unsubscribe(sub_type=SubType.long_poll)
+                raise ex
+
+            self._long_poll_error = False
+
+            if not self._long_poll_received and channels != []:
+                self._long_poll_received = True
+                ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
+
+            self._signal_write_ha_state(channels)
+
+            # Cooldown to prevent CPU over usage on camera freezes
+            await asyncio.sleep(LONG_POLL_COOLDOWN)
+
     async def _async_poll_all_motion(self, *_) -> None:
         """Poll motion and AI states until the first ONVIF push is received."""
-        if self._webhook_reachable.is_set():
-            # ONVIF push is working, stop polling
+        if self._webhook_reachable or self._long_poll_received:
+            # ONVIF push or long polling is working, stop fast polling
             self._cancel_poll = None
             return
 
         try:
             await self._api.get_motion_state_all_ch()
-        except (
-            aiohttp.ClientConnectorError,
-            ReolinkError,
-        ) as err:
+        except ReolinkError as err:
             _LOGGER.error(
                 "Reolink error while polling motion state for host %s:%s: %s",
                 self._api.host,
                 self._api.port,
                 str(err),
             )
-        except asyncio.TimeoutError:
-            _LOGGER.error(
-                "Reolink timeout error while polling motion state for host %s:%s",
-                self._api.host,
-                self._api.port,
-            )
         finally:
             # schedule next poll
             if not self._hass.is_stopping:
@@ -399,10 +489,7 @@ async def _async_poll_all_motion(self, *_) -> None:
                     self._hass, POLL_INTERVAL_NO_PUSH, self._poll_job
                 )
 
-        # After receiving the new motion states in the upstream lib,
-        # update the binary sensors with async_write_ha_state
-        # The same dispatch as for the webhook can be used
-        async_dispatcher_send(self._hass, f"{self.webhook_id}_all", {})
+        self._signal_write_ha_state(None)
 
     async def handle_webhook(
         self, hass: HomeAssistant, webhook_id: str, request: Request
@@ -450,8 +537,8 @@ async def _process_webhook_data(
         """Process the data from the Reolink webhook."""
         # This task is executed in the background so we need to catch exceptions
         # and log them
-        if not self._webhook_reachable.is_set():
-            self._webhook_reachable.set()
+        if not self._webhook_reachable:
+            self._webhook_reachable = True
             ir.async_delete_issue(self._hass, DOMAIN, "webhook_url")
 
         try:
@@ -474,9 +561,13 @@ async def _process_webhook_data(
             )
             return
 
+        self._signal_write_ha_state(channels)
+
+    def _signal_write_ha_state(self, channels: list[int] | None) -> None:
+        """Update the binary sensors with async_write_ha_state."""
         if channels is None:
-            async_dispatcher_send(hass, f"{webhook_id}_all", {})
+            async_dispatcher_send(self._hass, f"{self.webhook_id}_all", {})
             return
 
         for channel in channels:
-            async_dispatcher_send(hass, f"{webhook_id}_{channel}", {})
+            async_dispatcher_send(self._hass, f"{self.webhook_id}_{channel}", {})
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index 6a4ae98a1546e7..69b3d5db6f7ed1 100644
--- a/homeassistant/components/reolink/manifest.json
+++ b/homeassistant/components/reolink/manifest.json
@@ -18,5 +18,5 @@
   "documentation": "https://www.home-assistant.io/integrations/reolink",
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
-  "requirements": ["reolink-aio==0.5.15"]
+  "requirements": ["reolink-aio==0.7.1"]
 }
diff --git a/homeassistant/components/reolink/strings.json b/homeassistant/components/reolink/strings.json
index f208e3e4035f59..7dc89ddbaf3f55 100644
--- a/homeassistant/components/reolink/strings.json
+++ b/homeassistant/components/reolink/strings.json
@@ -60,7 +60,7 @@
     "select": {
       "floodlight_mode": {
         "state": {
-          "off": "Off",
+          "off": "[%key:common::state::off%]",
           "auto": "Auto",
           "schedule": "Schedule"
         }
@@ -74,7 +74,7 @@
       },
       "auto_quick_reply_message": {
         "state": {
-          "off": "Off"
+          "off": "[%key:common::state::off%]"
         }
       },
       "auto_track_method": {
diff --git a/homeassistant/components/reolink/switch.py b/homeassistant/components/reolink/switch.py
index 1a4deda17e3f1e..aa121911758018 100644
--- a/homeassistant/components/reolink/switch.py
+++ b/homeassistant/components/reolink/switch.py
@@ -98,6 +98,50 @@ class ReolinkNVRSwitchEntityDescription(
         value=lambda api, ch: api.ptz_guard_enabled(ch),
         method=lambda api, ch, value: api.set_ptz_guard(ch, enable=value),
     ),
+    ReolinkSwitchEntityDescription(
+        key="email",
+        name="Email on event",
+        icon="mdi:email",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "email") and api.is_nvr,
+        value=lambda api, ch: api.email_enabled(ch),
+        method=lambda api, ch, value: api.set_email(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="ftp_upload",
+        name="FTP upload",
+        icon="mdi:swap-horizontal",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "ftp") and api.is_nvr,
+        value=lambda api, ch: api.ftp_enabled(ch),
+        method=lambda api, ch, value: api.set_ftp(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="push_notifications",
+        name="Push notifications",
+        icon="mdi:message-badge",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "push") and api.is_nvr,
+        value=lambda api, ch: api.push_enabled(ch),
+        method=lambda api, ch, value: api.set_push(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="record",
+        name="Record",
+        icon="mdi:record-rec",
+        supported=lambda api, ch: api.supported(ch, "recording") and api.is_nvr,
+        value=lambda api, ch: api.recording_enabled(ch),
+        method=lambda api, ch, value: api.set_recording(ch, value),
+    ),
+    ReolinkSwitchEntityDescription(
+        key="buzzer",
+        name="Buzzer on event",
+        icon="mdi:room-service",
+        entity_category=EntityCategory.CONFIG,
+        supported=lambda api, ch: api.supported(ch, "buzzer") and api.is_nvr,
+        value=lambda api, ch: api.buzzer_enabled(ch),
+        method=lambda api, ch, value: api.set_buzzer(ch, value),
+    ),
     ReolinkSwitchEntityDescription(
         key="doorbell_button_sound",
         name="Doorbell button sound",
diff --git a/homeassistant/components/reolink/update.py b/homeassistant/components/reolink/update.py
index aeb44cb7740839..fbbb037080b50e 100644
--- a/homeassistant/components/reolink/update.py
+++ b/homeassistant/components/reolink/update.py
@@ -5,6 +5,7 @@
 from typing import Any, Literal
 
 from reolink_aio.exceptions import ReolinkError
+from reolink_aio.software_version import NewSoftwareVersion
 
 from homeassistant.components.update import (
     UpdateDeviceClass,
@@ -30,8 +31,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up update entities for Reolink component."""
     reolink_data: ReolinkData = hass.data[DOMAIN][config_entry.entry_id]
-    if reolink_data.host.api.supported(None, "update"):
-        async_add_entities([ReolinkUpdateEntity(reolink_data)])
+    async_add_entities([ReolinkUpdateEntity(reolink_data)])
 
 
 class ReolinkUpdateEntity(
@@ -40,7 +40,6 @@ class ReolinkUpdateEntity(
     """Update entity for a Netgear device."""
 
     _attr_device_class = UpdateDeviceClass.FIRMWARE
-    _attr_supported_features = UpdateEntityFeature.INSTALL
     _attr_release_url = "https://reolink.com/download-center/"
     _attr_name = "Update"
 
@@ -64,7 +63,30 @@ def latest_version(self) -> str | None:
         if not self.coordinator.data:
             return self.installed_version
 
-        return self.coordinator.data
+        if isinstance(self.coordinator.data, str):
+            return self.coordinator.data
+
+        return self.coordinator.data.version_string
+
+    @property
+    def supported_features(self) -> UpdateEntityFeature:
+        """Flag supported features."""
+        supported_features = UpdateEntityFeature.INSTALL
+        if isinstance(self.coordinator.data, NewSoftwareVersion):
+            supported_features |= UpdateEntityFeature.RELEASE_NOTES
+        return supported_features
+
+    async def async_release_notes(self) -> str | None:
+        """Return the release notes."""
+        if not isinstance(self.coordinator.data, NewSoftwareVersion):
+            return None
+
+        return (
+            "If the install button fails, download this"
+            f" [firmware zip file]({self.coordinator.data.download_url})."
+            " Then, follow the installation guide (PDF in the zip file).\n\n"
+            f"## Release notes\n\n{self.coordinator.data.release_notes}"
+        )
 
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
diff --git a/homeassistant/components/repairs/__init__.py b/homeassistant/components/repairs/__init__.py
index aa578c098d50dc..228972e8718f8b 100644
--- a/homeassistant/components/repairs/__init__.py
+++ b/homeassistant/components/repairs/__init__.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from . import issue_handler, websocket_api
@@ -16,6 +17,7 @@
     "RepairsFlow",
     "RepairsFlowManager",
 ]
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
 def repairs_flow_manager(hass: HomeAssistant) -> RepairsFlowManager | None:
diff --git a/homeassistant/components/repetier/sensor.py b/homeassistant/components/repetier/sensor.py
index 24c97c74b0f615..784555e6c73640 100644
--- a/homeassistant/components/repetier/sensor.py
+++ b/homeassistant/components/repetier/sensor.py
@@ -9,7 +9,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType
 
 from . import REPETIER_API, SENSOR_TYPES, UPDATE_SIGNAL, RepetierSensorEntityDescription
 
@@ -45,7 +45,8 @@ def setup_platform(
         sensor_type = info["sensor_type"]
         temp_id = info["temp_id"]
         description = SENSOR_TYPES[sensor_type]
-        name = f"{info['name']}{description.name or ''}"
+        name_suffix = "" if description.name is UNDEFINED else description.name
+        name = f"{info['name']}{name_suffix}"
         if temp_id is not None:
             _LOGGER.debug("%s Temp_id: %s", sensor_type, temp_id)
             name = f"{name}{temp_id}"
diff --git a/homeassistant/components/rest/__init__.py b/homeassistant/components/rest/__init__.py
index b249b7536b5291..ee79c45921c107 100644
--- a/homeassistant/components/rest/__init__.py
+++ b/homeassistant/components/rest/__init__.py
@@ -6,7 +6,7 @@
 import contextlib
 from datetime import timedelta
 import logging
-from typing import Any, cast
+from typing import Any
 
 import httpx
 import voluptuous as vol
@@ -160,11 +160,7 @@ def _rest_coordinator(
     if resource_template:
 
         async def _async_refresh_with_resource_template() -> None:
-            rest.set_url(
-                cast(template.Template, resource_template).async_render(
-                    parse_result=False
-                )
-            )
+            rest.set_url(resource_template.async_render(parse_result=False))
             await rest.async_update()
 
         update_method = _async_refresh_with_resource_template
diff --git a/homeassistant/components/rest/const.py b/homeassistant/components/rest/const.py
index 0bf0ea9743decd..8fb08f766faa5c 100644
--- a/homeassistant/components/rest/const.py
+++ b/homeassistant/components/rest/const.py
@@ -26,3 +26,10 @@
 REST_DATA = "rest_data"
 
 METHODS = ["POST", "GET"]
+
+XML_MIME_TYPES = (
+    "application/rss+xml",
+    "application/xhtml+xml",
+    "application/xml",
+    "text/xml",
+)
diff --git a/homeassistant/components/rest/data.py b/homeassistant/components/rest/data.py
index 95086f68d70a6d..1f331651165f5f 100644
--- a/homeassistant/components/rest/data.py
+++ b/homeassistant/components/rest/data.py
@@ -3,14 +3,19 @@
 
 import logging
 import ssl
+from xml.parsers.expat import ExpatError
 
 import httpx
+import xmltodict
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import template
 from homeassistant.helpers.httpx_client import create_async_httpx_client
+from homeassistant.helpers.json import json_dumps
 from homeassistant.util.ssl import SSLCipherList
 
+from .const import XML_MIME_TYPES
+
 DEFAULT_TIMEOUT = 10
 
 _LOGGER = logging.getLogger(__name__)
@@ -59,6 +64,26 @@ def set_url(self, url: str) -> None:
         """Set url."""
         self._resource = url
 
+    def data_without_xml(self) -> str | None:
+        """If the data is an XML string, convert it to a JSON string."""
+        _LOGGER.debug("Data fetched from resource: %s", self.data)
+        if (
+            (value := self.data) is not None
+            # If the http request failed, headers will be None
+            and (headers := self.headers) is not None
+            and (content_type := headers.get("content-type"))
+            and content_type.startswith(XML_MIME_TYPES)
+        ):
+            try:
+                value = json_dumps(xmltodict.parse(value))
+            except ExpatError:
+                _LOGGER.warning(
+                    "REST xml result could not be parsed and converted to JSON"
+                )
+            else:
+                _LOGGER.debug("JSON converted from XML: %s", self.data)
+        return value
+
     async def async_update(self, log_errors: bool = True) -> None:
         """Get the latest data from REST service with provided method."""
         if not self._async_client:
diff --git a/homeassistant/components/rest/sensor.py b/homeassistant/components/rest/sensor.py
index 6fc0b69d1fd225..18d0b6c7e760db 100644
--- a/homeassistant/components/rest/sensor.py
+++ b/homeassistant/components/rest/sensor.py
@@ -3,11 +3,9 @@
 
 import logging
 import ssl
-from xml.parsers.expat import ExpatError
 
 from jsonpath import jsonpath
 import voluptuous as vol
-import xmltodict
 
 from homeassistant.components.sensor import (
     DOMAIN as SENSOR_DOMAIN,
@@ -26,7 +24,6 @@
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.template_entity import TemplateSensor
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -127,26 +124,7 @@ def __init__(
 
     def _update_from_rest_data(self) -> None:
         """Update state from the rest data."""
-        value = self.rest.data
-        _LOGGER.debug("Data fetched from resource: %s", value)
-        if self.rest.headers is not None:
-            # If the http request failed, headers will be None
-            content_type = self.rest.headers.get("content-type")
-
-            if content_type and (
-                content_type.startswith("text/xml")
-                or content_type.startswith("application/xml")
-                or content_type.startswith("application/xhtml+xml")
-                or content_type.startswith("application/rss+xml")
-            ):
-                try:
-                    value = json_dumps(xmltodict.parse(value))
-                    _LOGGER.debug("JSON converted from XML: %s", value)
-                except ExpatError:
-                    _LOGGER.warning(
-                        "REST xml result could not be parsed and converted to JSON"
-                    )
-                    _LOGGER.debug("Erroneous XML: %s", value)
+        value = self.rest.data_without_xml()
 
         if self._json_attrs:
             self._attr_extra_state_attributes = {}
diff --git a/homeassistant/components/rest/switch.py b/homeassistant/components/rest/switch.py
index 89b6529d48384e..342808f32508de 100644
--- a/homeassistant/components/rest/switch.py
+++ b/homeassistant/components/rest/switch.py
@@ -232,12 +232,11 @@ async def get_device_state(self, hass: HomeAssistant) -> httpx.Response:
                 self._attr_is_on = False
             else:
                 self._attr_is_on = None
+        elif text == self._body_on.template:
+            self._attr_is_on = True
+        elif text == self._body_off.template:
+            self._attr_is_on = False
         else:
-            if text == self._body_on.template:
-                self._attr_is_on = True
-            elif text == self._body_off.template:
-                self._attr_is_on = False
-            else:
-                self._attr_is_on = None
+            self._attr_is_on = None
 
         return req
diff --git a/homeassistant/components/rflink/__init__.py b/homeassistant/components/rflink/__init__.py
index b563275297fd9a..8df2d7ec343d51 100644
--- a/homeassistant/components/rflink/__init__.py
+++ b/homeassistant/components/rflink/__init__.py
@@ -323,7 +323,6 @@ class RflinkDevice(Entity):
     Contains the common logic for Rflink entities.
     """
 
-    platform = None
     _state: bool | None = None
     _available = True
     _attr_should_poll = False
diff --git a/homeassistant/components/rfxtrx/__init__.py b/homeassistant/components/rfxtrx/__init__.py
index de8a9fc6b8de20..3544abcfdd1ad5 100644
--- a/homeassistant/components/rfxtrx/__init__.py
+++ b/homeassistant/components/rfxtrx/__init__.py
@@ -8,8 +8,8 @@
 import logging
 from typing import Any, NamedTuple, cast
 
-import RFXtrx as rfxtrxmod
 import async_timeout
+import RFXtrx as rfxtrxmod
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
@@ -548,6 +548,8 @@ class RfxtrxCommandEntity(RfxtrxEntity):
     Contains the common logic for Rfxtrx lights and switches.
     """
 
+    _attr_name = None
+
     def __init__(
         self,
         device: rfxtrxmod.RFXtrxDevice,
diff --git a/homeassistant/components/rfxtrx/binary_sensor.py b/homeassistant/components/rfxtrx/binary_sensor.py
index b729138f73e79c..03cf65a49ffcc0 100644
--- a/homeassistant/components/rfxtrx/binary_sensor.py
+++ b/homeassistant/components/rfxtrx/binary_sensor.py
@@ -130,6 +130,7 @@ class RfxtrxBinarySensor(RfxtrxEntity, BinarySensorEntity):
     """
 
     _attr_force_update = True
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/rfxtrx/config_flow.py b/homeassistant/components/rfxtrx/config_flow.py
index 2aa3bd20b8cc53..8d55208cbb7a35 100644
--- a/homeassistant/components/rfxtrx/config_flow.py
+++ b/homeassistant/components/rfxtrx/config_flow.py
@@ -2,11 +2,13 @@
 from __future__ import annotations
 
 import asyncio
+from contextlib import suppress
 import copy
 import itertools
 import os
 from typing import Any, TypedDict, cast
 
+from async_timeout import timeout
 import RFXtrx as rfxtrxmod
 import serial
 import serial.tools.list_ports
@@ -346,34 +348,57 @@ async def _async_replace_device(self, replace_device: str) -> None:
                 entity_migration_map[new_entity_id] = entry
 
         @callback
-        def _handle_state_change(
+        def _handle_state_removed(
             entity_id: str, old_state: State | None, new_state: State | None
         ) -> None:
             # Wait for entities to finish cleanup
-            if new_state is None and entity_id in pending_entities:
-                pending_entities.remove(entity_id)
-            if not pending_entities:
+            if new_state is None and entity_id in entities_to_be_removed:
+                entities_to_be_removed.remove(entity_id)
+            if not entities_to_be_removed:
                 wait_for_entities.set()
 
         # Create a set with entities to be removed which are currently in the state
         # machine
-        pending_entities = {
+        entities_to_be_removed = {
             entry.entity_id
             for entry in entity_migration_map.values()
             if not self.hass.states.async_available(entry.entity_id)
         }
         wait_for_entities = asyncio.Event()
         remove_track_state_changes = async_track_state_change(
-            self.hass, pending_entities, _handle_state_change
+            self.hass, entities_to_be_removed, _handle_state_removed
         )
 
         for entry in entity_migration_map.values():
             entity_registry.async_remove(entry.entity_id)
 
         # Wait for entities to finish cleanup
-        await wait_for_entities.wait()
+        with suppress(asyncio.TimeoutError):
+            async with timeout(10):
+                await wait_for_entities.wait()
         remove_track_state_changes()
 
+        @callback
+        def _handle_state_added(
+            entity_id: str, old_state: State | None, new_state: State | None
+        ) -> None:
+            # Wait for entities to be added
+            if old_state is None and entity_id in entities_to_be_added:
+                entities_to_be_added.remove(entity_id)
+            if not entities_to_be_added:
+                wait_for_entities.set()
+
+        # Create a set with entities to be added to the state machine
+        entities_to_be_added = {
+            entry.entity_id
+            for entry in entity_migration_map.values()
+            if self.hass.states.async_available(entry.entity_id)
+        }
+        wait_for_entities = asyncio.Event()
+        remove_track_state_changes = async_track_state_change(
+            self.hass, entities_to_be_added, _handle_state_added
+        )
+
         for entity_id, entry in entity_migration_map.items():
             entity_registry.async_update_entity(
                 entity_id,
@@ -382,6 +407,12 @@ def _handle_state_change(
                 icon=entry.icon,
             )
 
+        # Wait for entities to finish renaming
+        with suppress(asyncio.TimeoutError):
+            async with timeout(10):
+                await wait_for_entities.wait()
+        remove_track_state_changes()
+
         device_registry.async_remove_device(old_device)
 
     def _can_add_device(self, new_rfx_obj: rfxtrxmod.RFXtrxEvent) -> bool:
diff --git a/homeassistant/components/rfxtrx/helpers.py b/homeassistant/components/rfxtrx/helpers.py
index 2badc6d4ca5484..cfc16126359d66 100644
--- a/homeassistant/components/rfxtrx/helpers.py
+++ b/homeassistant/components/rfxtrx/helpers.py
@@ -6,6 +6,8 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 
+from . import get_device_tuple_from_identifiers
+
 
 @callback
 def async_get_device_object(hass: HomeAssistant, device_id: str) -> RFXtrxDevice:
@@ -15,7 +17,9 @@ def async_get_device_object(hass: HomeAssistant, device_id: str) -> RFXtrxDevice
     if registry_device is None:
         raise ValueError(f"Device {device_id} not found")
 
-    device_tuple = list(list(registry_device.identifiers)[0])
+    device_tuple = get_device_tuple_from_identifiers(registry_device.identifiers)
+    assert device_tuple
+
     return get_device(
-        int(device_tuple[1], 16), int(device_tuple[2], 16), device_tuple[3]
+        int(device_tuple[0], 16), int(device_tuple[1], 16), device_tuple[2]
     )
diff --git a/homeassistant/components/rfxtrx/sensor.py b/homeassistant/components/rfxtrx/sensor.py
index e594b47c93a551..60f35a93d1a89e 100644
--- a/homeassistant/components/rfxtrx/sensor.py
+++ b/homeassistant/components/rfxtrx/sensor.py
@@ -70,14 +70,12 @@ class RfxtrxSensorEntityDescription(SensorEntityDescription):
 SENSOR_TYPES = (
     RfxtrxSensorEntityDescription(
         key="Barometer",
-        name="Barometer",
         device_class=SensorDeviceClass.PRESSURE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPressure.HPA,
     ),
     RfxtrxSensorEntityDescription(
         key="Battery numeric",
-        name="Battery",
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
@@ -86,49 +84,46 @@ class RfxtrxSensorEntityDescription(SensorEntityDescription):
     ),
     RfxtrxSensorEntityDescription(
         key="Current",
-        name="Current",
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
     ),
     RfxtrxSensorEntityDescription(
         key="Current Ch. 1",
-        name="Current Ch. 1",
+        translation_key="current_ch_1",
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
     ),
     RfxtrxSensorEntityDescription(
         key="Current Ch. 2",
-        name="Current Ch. 2",
+        translation_key="current_ch_2",
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
     ),
     RfxtrxSensorEntityDescription(
         key="Current Ch. 3",
-        name="Current Ch. 3",
+        translation_key="current_ch_3",
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
     ),
     RfxtrxSensorEntityDescription(
         key="Energy usage",
-        name="Instantaneous power",
+        translation_key="instantaneous_power",
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
     ),
     RfxtrxSensorEntityDescription(
         key="Humidity",
-        name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
     ),
     RfxtrxSensorEntityDescription(
         key="Rssi numeric",
-        name="Signal strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -137,108 +132,104 @@ class RfxtrxSensorEntityDescription(SensorEntityDescription):
     ),
     RfxtrxSensorEntityDescription(
         key="Temperature",
-        name="Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     RfxtrxSensorEntityDescription(
         key="Temperature2",
-        name="Temperature 2",
+        translation_key="temperature_2",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     RfxtrxSensorEntityDescription(
         key="Total usage",
-        name="Total energy usage",
+        translation_key="total_energy_usage",
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
     ),
     RfxtrxSensorEntityDescription(
         key="Voltage",
-        name="Voltage",
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
     ),
     RfxtrxSensorEntityDescription(
         key="Wind direction",
-        name="Wind direction",
+        translation_key="wind_direction",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=DEGREE,
     ),
     RfxtrxSensorEntityDescription(
         key="Rain rate",
-        name="Rain rate",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
     ),
     RfxtrxSensorEntityDescription(
         key="Sound",
-        name="Sound",
+        translation_key="sound",
     ),
     RfxtrxSensorEntityDescription(
         key="Sensor Status",
-        name="Sensor status",
+        translation_key="sensor_status",
     ),
     RfxtrxSensorEntityDescription(
         key="Count",
-        name="Count",
+        translation_key="count",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement="count",
     ),
     RfxtrxSensorEntityDescription(
         key="Counter value",
-        name="Counter value",
+        translation_key="counter_value",
         state_class=SensorStateClass.TOTAL_INCREASING,
         native_unit_of_measurement="count",
     ),
     RfxtrxSensorEntityDescription(
         key="Chill",
-        name="Chill",
+        translation_key="chill",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     RfxtrxSensorEntityDescription(
         key="Wind average speed",
-        name="Wind average speed",
+        translation_key="wind_average_speed",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfSpeed.METERS_PER_SECOND,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     RfxtrxSensorEntityDescription(
         key="Wind gust",
-        name="Wind gust",
+        translation_key="wind_gust",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfSpeed.METERS_PER_SECOND,
         device_class=SensorDeviceClass.WIND_SPEED,
     ),
     RfxtrxSensorEntityDescription(
         key="Rain total",
-        name="Rain total",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPrecipitationDepth.MILLIMETERS,
         device_class=SensorDeviceClass.PRECIPITATION,
     ),
     RfxtrxSensorEntityDescription(
         key="Forecast",
-        name="Forecast status",
+        translation_key="forecast_status",
     ),
     RfxtrxSensorEntityDescription(
         key="Forecast numeric",
-        name="Forecast",
+        translation_key="forecast",
     ),
     RfxtrxSensorEntityDescription(
         key="Humidity status",
-        name="Humidity status",
+        translation_key="humidity_status",
     ),
     RfxtrxSensorEntityDescription(
         key="UV",
-        name="UV index",
+        translation_key="uv_index",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UV_INDEX,
     ),
@@ -281,6 +272,7 @@ def _constructor(
     )
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class RfxtrxSensor(RfxtrxEntity, SensorEntity):
     """Representation of a RFXtrx sensor.
 
diff --git a/homeassistant/components/rfxtrx/strings.json b/homeassistant/components/rfxtrx/strings.json
index 4469fd59801f41..7e68f960fca6db 100644
--- a/homeassistant/components/rfxtrx/strings.json
+++ b/homeassistant/components/rfxtrx/strings.json
@@ -78,5 +78,63 @@
       "status": "Received status: {subtype}",
       "command": "Received command: {subtype}"
     }
+  },
+  "entity": {
+    "sensor": {
+      "current_ch_1": {
+        "name": "Current Ch. 1"
+      },
+      "current_ch_2": {
+        "name": "Current Ch. 2"
+      },
+      "current_ch_3": {
+        "name": "Current Ch. 3"
+      },
+      "instantaneous_power": {
+        "name": "Instantaneous power"
+      },
+      "temperature_2": {
+        "name": "Temperature 2"
+      },
+      "total_energy_usage": {
+        "name": "Total energy usage"
+      },
+      "wind_direction": {
+        "name": "Wind direction"
+      },
+      "sound": {
+        "name": "Sound"
+      },
+      "sensor_status": {
+        "name": "Sensor status"
+      },
+      "count": {
+        "name": "Count"
+      },
+      "counter_value": {
+        "name": "Counter value"
+      },
+      "chill": {
+        "name": "Chill"
+      },
+      "wind_average_speed": {
+        "name": "Wind average speed"
+      },
+      "wind_gust": {
+        "name": "Wind gust"
+      },
+      "forecast_status": {
+        "name": "Forecast status"
+      },
+      "forecast": {
+        "name": "Forecast"
+      },
+      "humidity_status": {
+        "name": "Humidity status"
+      },
+      "uv_index": {
+        "name": "UV index"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/ridwell/calendar.py b/homeassistant/components/ridwell/calendar.py
index 57919ed1feba6b..3ef3bbdc5ae626 100644
--- a/homeassistant/components/ridwell/calendar.py
+++ b/homeassistant/components/ridwell/calendar.py
@@ -50,6 +50,7 @@ class RidwellCalendar(RidwellEntity, CalendarEntity):
     """Define a Ridwell calendar."""
 
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self, coordinator: RidwellDataUpdateCoordinator, account: RidwellAccount
diff --git a/homeassistant/components/ring/__init__.py b/homeassistant/components/ring/__init__.py
index fb037eca05d024..56aad1a845b4b5 100644
--- a/homeassistant/components/ring/__init__.py
+++ b/homeassistant/components/ring/__init__.py
@@ -6,7 +6,6 @@
 from datetime import timedelta
 from functools import partial
 import logging
-from pathlib import Path
 from typing import Any
 
 from oauthlib.oauth2 import AccessDeniedError
@@ -18,7 +17,6 @@
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
@@ -41,22 +39,6 @@
 ]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Ring component."""
-    if DOMAIN not in config:
-        return True
-
-    def legacy_cleanup():
-        """Clean up old tokens."""
-        old_cache = Path(hass.config.path(".ring_cache.pickle"))
-        if old_cache.is_file():
-            old_cache.unlink()
-
-    await hass.async_add_executor_job(legacy_cleanup)
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
 
diff --git a/homeassistant/components/ring/manifest.json b/homeassistant/components/ring/manifest.json
index 7cb34b4d71fafe..355c630272e111 100644
--- a/homeassistant/components/ring/manifest.json
+++ b/homeassistant/components/ring/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ring",
   "iot_class": "cloud_polling",
   "loggers": ["ring_doorbell"],
-  "requirements": ["ring_doorbell==0.7.2"]
+  "requirements": ["ring-doorbell==0.7.2"]
 }
diff --git a/homeassistant/components/rituals_perfume_genie/binary_sensor.py b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
index 3c49dc14f516a4..73499fb5cccc8d 100644
--- a/homeassistant/components/rituals_perfume_genie/binary_sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/binary_sensor.py
@@ -39,7 +39,6 @@ class RitualsBinarySensorEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsBinarySensorEntityDescription(
         key="charging",
-        name="Battery Charging",
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
         entity_category=EntityCategory.DIAGNOSTIC,
         is_on_fn=lambda diffuser: diffuser.charging,
@@ -71,15 +70,6 @@ class RitualsBinarySensorEntity(DiffuserEntity, BinarySensorEntity):
 
     entity_description: RitualsBinarySensorEntityDescription
 
-    def __init__(
-        self,
-        coordinator: RitualsDataUpdateCoordinator,
-        description: RitualsBinarySensorEntityDescription,
-    ) -> None:
-        """Initialize Rituals binary sensor entity."""
-        super().__init__(coordinator, description)
-        self._attr_name = f"{coordinator.diffuser.name} {description.name}"
-
     @property
     def is_on(self) -> bool:
         """Return the state of the binary sensor."""
diff --git a/homeassistant/components/rituals_perfume_genie/diagnostics.py b/homeassistant/components/rituals_perfume_genie/diagnostics.py
new file mode 100644
index 00000000000000..75b622b48b11a0
--- /dev/null
+++ b/homeassistant/components/rituals_perfume_genie/diagnostics.py
@@ -0,0 +1,31 @@
+"""Diagnostics support for Rituals Perfume Genie."""
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
+
+TO_REDACT = {
+    "hublot",
+    "hash",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
+    return {
+        "diffusers": [
+            async_redact_data(coordinator.diffuser.data, TO_REDACT)
+            for coordinator in coordinators.values()
+        ]
+    }
diff --git a/homeassistant/components/rituals_perfume_genie/entity.py b/homeassistant/components/rituals_perfume_genie/entity.py
index e5b9f3ebd6fede..713c3905f05c42 100644
--- a/homeassistant/components/rituals_perfume_genie/entity.py
+++ b/homeassistant/components/rituals_perfume_genie/entity.py
@@ -15,6 +15,8 @@
 class DiffuserEntity(CoordinatorEntity[RitualsDataUpdateCoordinator]):
     """Representation of a diffuser entity."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: RitualsDataUpdateCoordinator,
diff --git a/homeassistant/components/rituals_perfume_genie/number.py b/homeassistant/components/rituals_perfume_genie/number.py
index 8049e53fa0d42f..3e6af33315f658 100644
--- a/homeassistant/components/rituals_perfume_genie/number.py
+++ b/homeassistant/components/rituals_perfume_genie/number.py
@@ -35,7 +35,7 @@ class RitualsNumberEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsNumberEntityDescription(
         key="perfume_amount",
-        name="Perfume Amount",
+        translation_key="perfume_amount",
         icon="mdi:gauge",
         native_min_value=1,
         native_max_value=3,
@@ -66,15 +66,6 @@ class RitualsNumberEntity(DiffuserEntity, NumberEntity):
 
     entity_description: RitualsNumberEntityDescription
 
-    def __init__(
-        self,
-        coordinator: RitualsDataUpdateCoordinator,
-        description: RitualsNumberEntityDescription,
-    ) -> None:
-        """Initialize the diffuser perfume amount number."""
-        super().__init__(coordinator, description)
-        self._attr_name = f"{coordinator.diffuser.name} {description.name}"
-
     @property
     def native_value(self) -> int:
         """Return the number value."""
diff --git a/homeassistant/components/rituals_perfume_genie/select.py b/homeassistant/components/rituals_perfume_genie/select.py
index 10ad5dbf3bbb61..42e18624d13b5a 100644
--- a/homeassistant/components/rituals_perfume_genie/select.py
+++ b/homeassistant/components/rituals_perfume_genie/select.py
@@ -35,7 +35,7 @@ class RitualsSelectEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsSelectEntityDescription(
         key="room_size_square_meter",
-        name="Room Size",
+        translation_key="room_size_square_meter",
         icon="mdi:ruler-square",
         unit_of_measurement=AREA_SQUARE_METERS,
         entity_category=EntityCategory.CONFIG,
@@ -80,7 +80,6 @@ def __init__(
         self._attr_entity_registry_enabled_default = (
             self.coordinator.diffuser.has_battery
         )
-        self._attr_name = f"{coordinator.diffuser.name} {description.name}"
 
     @property
     def current_option(self) -> str:
diff --git a/homeassistant/components/rituals_perfume_genie/sensor.py b/homeassistant/components/rituals_perfume_genie/sensor.py
index e48bf4de2193a1..09189dabfad62a 100644
--- a/homeassistant/components/rituals_perfume_genie/sensor.py
+++ b/homeassistant/components/rituals_perfume_genie/sensor.py
@@ -40,7 +40,6 @@ class RitualsSensorEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsSensorEntityDescription(
         key="battery_percentage",
-        name="Battery",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         value_fn=lambda diffuser: diffuser.battery_percentage,
@@ -48,19 +47,19 @@ class RitualsSensorEntityDescription(
     ),
     RitualsSensorEntityDescription(
         key="fill",
-        name="Fill",
+        translation_key="fill",
         icon="mdi:beaker",
         value_fn=lambda diffuser: diffuser.fill,
     ),
     RitualsSensorEntityDescription(
         key="perfume",
-        name="Perfume",
+        translation_key="perfume",
         icon="mdi:tag",
         value_fn=lambda diffuser: diffuser.perfume,
     ),
     RitualsSensorEntityDescription(
         key="wifi_percentage",
-        name="Wifi",
+        translation_key="wifi_percentage",
         icon="mdi:wifi",
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda diffuser: diffuser.wifi_percentage,
@@ -92,15 +91,6 @@ class RitualsSensorEntity(DiffuserEntity, SensorEntity):
     entity_description: RitualsSensorEntityDescription
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self,
-        coordinator: RitualsDataUpdateCoordinator,
-        description: RitualsSensorEntityDescription,
-    ) -> None:
-        """Initialize the diffuser sensor."""
-        super().__init__(coordinator, description)
-        self._attr_name = f"{coordinator.diffuser.name} {description.name}"
-
     @property
     def native_value(self) -> str | int:
         """Return the sensor value."""
diff --git a/homeassistant/components/rituals_perfume_genie/strings.json b/homeassistant/components/rituals_perfume_genie/strings.json
index 8824923c3138bf..48e9be670ecd26 100644
--- a/homeassistant/components/rituals_perfume_genie/strings.json
+++ b/homeassistant/components/rituals_perfume_genie/strings.json
@@ -17,5 +17,28 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "number": {
+      "perfume_amount": {
+        "name": "Perfume amount"
+      }
+    },
+    "select": {
+      "room_size_square_meter": {
+        "name": "Room size"
+      }
+    },
+    "sensor": {
+      "fill": {
+        "name": "Fill"
+      },
+      "perfume": {
+        "name": "Perfume"
+      },
+      "wifi_percentage": {
+        "name": "Wi-Fi signal"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/rituals_perfume_genie/switch.py b/homeassistant/components/rituals_perfume_genie/switch.py
index 44ff951f532696..77776704a6053e 100644
--- a/homeassistant/components/rituals_perfume_genie/switch.py
+++ b/homeassistant/components/rituals_perfume_genie/switch.py
@@ -36,6 +36,7 @@ class RitualsSwitchEntityDescription(
 ENTITY_DESCRIPTIONS = (
     RitualsSwitchEntityDescription(
         key="is_on",
+        name=None,
         icon="mdi:fan",
         is_on_fn=lambda diffuser: diffuser.is_on,
         turn_on_fn=lambda diffuser: diffuser.turn_on(),
@@ -73,7 +74,6 @@ def __init__(
     ) -> None:
         """Initialize the diffuser switch."""
         super().__init__(coordinator, description)
-        self._attr_name = coordinator.diffuser.name
         self._attr_is_on = description.is_on_fn(coordinator.diffuser)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
diff --git a/homeassistant/components/roborock/const.py b/homeassistant/components/roborock/const.py
index 61a9a70dd207c4..287229c9fd1d74 100644
--- a/homeassistant/components/roborock/const.py
+++ b/homeassistant/components/roborock/const.py
@@ -6,4 +6,4 @@
 CONF_BASE_URL = "base_url"
 CONF_USER_DATA = "user_data"
 
-PLATFORMS = [Platform.VACUUM, Platform.SELECT]
+PLATFORMS = [Platform.VACUUM, Platform.SELECT, Platform.SENSOR, Platform.SWITCH]
diff --git a/homeassistant/components/roborock/coordinator.py b/homeassistant/components/roborock/coordinator.py
index acaa2bfa3f25cf..ba9571a95f5d4a 100644
--- a/homeassistant/components/roborock/coordinator.py
+++ b/homeassistant/components/roborock/coordinator.py
@@ -10,6 +10,7 @@
 from roborock.roborock_typing import DeviceProp
 
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
@@ -32,14 +33,21 @@ def __init__(
     ) -> None:
         """Initialize."""
         super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
-        self.device_info = RoborockHassDeviceInfo(
+        self.roborock_device_info = RoborockHassDeviceInfo(
             device,
             device_networking,
             product_info,
             DeviceProp(),
         )
-        device_info = DeviceData(device, product_info.model, device_networking.ip)
-        self.api = RoborockLocalClient(device_info)
+        device_data = DeviceData(device, product_info.model, device_networking.ip)
+        self.api = RoborockLocalClient(device_data)
+        self.device_info = DeviceInfo(
+            name=self.roborock_device_info.device.name,
+            identifiers={(DOMAIN, self.roborock_device_info.device.duid)},
+            manufacturer="Roborock",
+            model=self.roborock_device_info.product.model,
+            sw_version=self.roborock_device_info.device.fv,
+        )
 
     async def release(self) -> None:
         """Disconnect from API."""
@@ -49,10 +57,10 @@ async def _update_device_prop(self) -> None:
         """Update device properties."""
         device_prop = await self.api.get_prop()
         if device_prop:
-            if self.device_info.props:
-                self.device_info.props.update(device_prop)
+            if self.roborock_device_info.props:
+                self.roborock_device_info.props.update(device_prop)
             else:
-                self.device_info.props = device_prop
+                self.roborock_device_info.props = device_prop
 
     async def _async_update_data(self) -> DeviceProp:
         """Update data via library."""
@@ -60,4 +68,4 @@ async def _async_update_data(self) -> DeviceProp:
             await self._update_device_prop()
         except RoborockException as ex:
             raise UpdateFailed(ex) from ex
-        return self.device_info.props
+        return self.roborock_device_info.props
diff --git a/homeassistant/components/roborock/device.py b/homeassistant/components/roborock/device.py
index 39a9524226df93..90ca13c5146ebe 100644
--- a/homeassistant/components/roborock/device.py
+++ b/homeassistant/components/roborock/device.py
@@ -2,19 +2,59 @@
 
 from typing import Any
 
+from roborock.api import AttributeCache
+from roborock.command_cache import CacheableAttribute
 from roborock.containers import Status
 from roborock.exceptions import RoborockException
+from roborock.local_api import RoborockLocalClient
 from roborock.roborock_typing import RoborockCommand
 
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity import DeviceInfo, Entity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import RoborockDataUpdateCoordinator
-from .const import DOMAIN
 
 
-class RoborockCoordinatedEntity(CoordinatorEntity[RoborockDataUpdateCoordinator]):
+class RoborockEntity(Entity):
+    """Representation of a base Roborock Entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self, unique_id: str, device_info: DeviceInfo, api: RoborockLocalClient
+    ) -> None:
+        """Initialize the coordinated Roborock Device."""
+        self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
+        self._api = api
+
+    @property
+    def api(self) -> RoborockLocalClient:
+        """Returns the api."""
+        return self._api
+
+    def get_cache(self, attribute: CacheableAttribute) -> AttributeCache:
+        """Get an item from the api cache."""
+        return self._api.cache.get(attribute)
+
+    async def send(
+        self, command: RoborockCommand, params: dict[str, Any] | list[Any] | None = None
+    ) -> dict:
+        """Send a command to a vacuum cleaner."""
+        try:
+            response = await self._api.send_command(command, params)
+        except RoborockException as err:
+            raise HomeAssistantError(
+                f"Error while calling {command.name} with {params}"
+            ) from err
+
+        return response
+
+
+class RoborockCoordinatedEntity(
+    RoborockEntity, CoordinatorEntity[RoborockDataUpdateCoordinator]
+):
     """Representation of a base a coordinated Roborock Entity."""
 
     _attr_has_entity_name = True
@@ -25,7 +65,13 @@ def __init__(
         coordinator: RoborockDataUpdateCoordinator,
     ) -> None:
         """Initialize the coordinated Roborock Device."""
-        super().__init__(coordinator)
+        RoborockEntity.__init__(
+            self,
+            unique_id=unique_id,
+            device_info=coordinator.device_info,
+            api=coordinator.api,
+        )
+        CoordinatorEntity.__init__(self, coordinator=coordinator)
         self._attr_unique_id = unique_id
 
     @property
@@ -38,27 +84,12 @@ def _device_status(self) -> Status:
                 return status
         return Status({})
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return the device info."""
-        return DeviceInfo(
-            name=self.coordinator.device_info.device.name,
-            identifiers={(DOMAIN, self.coordinator.device_info.device.duid)},
-            manufacturer="Roborock",
-            model=self.coordinator.device_info.product.model,
-            sw_version=self.coordinator.device_info.device.fv,
-        )
-
     async def send(
-        self, command: RoborockCommand, params: dict[str, Any] | list[Any] | None = None
+        self,
+        command: RoborockCommand,
+        params: dict[str, Any] | list[Any] | None = None,
     ) -> dict:
-        """Send a command to a vacuum cleaner."""
-        try:
-            response = await self.coordinator.api.send_command(command, params)
-        except RoborockException as err:
-            raise HomeAssistantError(
-                f"Error while calling {command.name} with {params}"
-            ) from err
-
-        await self.coordinator.async_request_refresh()
-        return response
+        """Overloads normal send command but refreshes coordinator."""
+        res = await super().send(command, params)
+        await self.coordinator.async_refresh()
+        return res
diff --git a/homeassistant/components/roborock/diagnostics.py b/homeassistant/components/roborock/diagnostics.py
new file mode 100644
index 00000000000000..e5fcc834267796
--- /dev/null
+++ b/homeassistant/components/roborock/diagnostics.py
@@ -0,0 +1,38 @@
+"""Support for the Airzone diagnostics."""
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics.util import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_UNIQUE_ID
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import RoborockDataUpdateCoordinator
+
+TO_REDACT_CONFIG = ["token", "sn", "rruid", CONF_UNIQUE_ID, "username", "uid"]
+
+TO_REDACT_COORD = ["duid", "localKey", "mac", "bssid"]
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinators: dict[str, RoborockDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
+
+    return {
+        "config_entry": async_redact_data(config_entry.data, TO_REDACT_CONFIG),
+        "coordinators": {
+            f"**REDACTED-{i}**": {
+                "roborock_device_info": async_redact_data(
+                    coordinator.roborock_device_info.as_dict(), TO_REDACT_COORD
+                ),
+                "api": coordinator.api.diagnostic_data,
+            }
+            for i, coordinator in enumerate(coordinators.values())
+        },
+    }
diff --git a/homeassistant/components/roborock/manifest.json b/homeassistant/components/roborock/manifest.json
index 44a4cba89c98f8..baab687e64a3cd 100644
--- a/homeassistant/components/roborock/manifest.json
+++ b/homeassistant/components/roborock/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/roborock",
   "iot_class": "local_polling",
   "loggers": ["roborock"],
-  "requirements": ["python-roborock==0.17.0"]
+  "requirements": ["python-roborock==0.29.2"]
 }
diff --git a/homeassistant/components/roborock/models.py b/homeassistant/components/roborock/models.py
index a30c84ce1da4da..c1d32df2d6d346 100644
--- a/homeassistant/components/roborock/models.py
+++ b/homeassistant/components/roborock/models.py
@@ -1,5 +1,6 @@
 """Roborock Models."""
 from dataclasses import dataclass
+from typing import Any
 
 from roborock.containers import HomeDataDevice, HomeDataProduct, NetworkInfo
 from roborock.roborock_typing import DeviceProp
@@ -13,3 +14,12 @@ class RoborockHassDeviceInfo:
     network_info: NetworkInfo
     product: HomeDataProduct
     props: DeviceProp
+
+    def as_dict(self) -> dict[str, dict[str, Any]]:
+        """Turn RoborockHassDeviceInfo into a dictionary."""
+        return {
+            "device": self.device.as_dict(),
+            "network_info": self.network_info.as_dict(),
+            "product": self.product.as_dict(),
+            "props": self.props.as_dict(),
+        }
diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py
index d27888a17793c2..2d76aac33d3b34 100644
--- a/homeassistant/components/roborock/select.py
+++ b/homeassistant/components/roborock/select.py
@@ -77,7 +77,8 @@ async def async_setup_entry(
         )
         for device_id, coordinator in coordinators.items()
         for description in SELECT_DESCRIPTIONS
-        if description.options_lambda(coordinator.device_info.props.status) is not None
+        if description.options_lambda(coordinator.roborock_device_info.props.status)
+        is not None
     )
 
 
diff --git a/homeassistant/components/roborock/sensor.py b/homeassistant/components/roborock/sensor.py
new file mode 100644
index 00000000000000..8398995462ff73
--- /dev/null
+++ b/homeassistant/components/roborock/sensor.py
@@ -0,0 +1,160 @@
+"""Support for Roborock sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from roborock.containers import RoborockStateCode
+from roborock.roborock_typing import DeviceProp
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import AREA_SQUARE_METERS, EntityCategory, UnitOfTime
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+from homeassistant.util import slugify
+
+from .const import DOMAIN
+from .coordinator import RoborockDataUpdateCoordinator
+from .device import RoborockCoordinatedEntity
+
+
+@dataclass
+class RoborockSensorDescriptionMixin:
+    """A class that describes sensor entities."""
+
+    value_fn: Callable[[DeviceProp], int]
+
+
+@dataclass
+class RoborockSensorDescription(
+    SensorEntityDescription, RoborockSensorDescriptionMixin
+):
+    """A class that describes Roborock sensors."""
+
+
+SENSOR_DESCRIPTIONS = [
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="main_brush_time_left",
+        icon="mdi:brush",
+        device_class=SensorDeviceClass.DURATION,
+        translation_key="main_brush_time_left",
+        value_fn=lambda data: data.consumable.main_brush_time_left,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="side_brush_time_left",
+        icon="mdi:brush",
+        device_class=SensorDeviceClass.DURATION,
+        translation_key="side_brush_time_left",
+        value_fn=lambda data: data.consumable.side_brush_time_left,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="filter_time_left",
+        icon="mdi:air-filter",
+        device_class=SensorDeviceClass.DURATION,
+        translation_key="filter_time_left",
+        value_fn=lambda data: data.consumable.filter_time_left,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="sensor_time_left",
+        icon="mdi:eye-outline",
+        device_class=SensorDeviceClass.DURATION,
+        translation_key="sensor_time_left",
+        value_fn=lambda data: data.consumable.sensor_time_left,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="cleaning_time",
+        translation_key="cleaning_time",
+        device_class=SensorDeviceClass.DURATION,
+        value_fn=lambda data: data.status.clean_time,
+    ),
+    RoborockSensorDescription(
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        key="total_cleaning_time",
+        translation_key="total_cleaning_time",
+        icon="mdi:history",
+        device_class=SensorDeviceClass.DURATION,
+        value_fn=lambda data: data.clean_summary.clean_time,
+    ),
+    RoborockSensorDescription(
+        key="status",
+        icon="mdi:information-outline",
+        device_class=SensorDeviceClass.ENUM,
+        translation_key="status",
+        value_fn=lambda data: data.status.state.name,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        options=RoborockStateCode.keys(),
+    ),
+    RoborockSensorDescription(
+        key="cleaning_area",
+        icon="mdi:texture-box",
+        translation_key="cleaning_area",
+        value_fn=lambda data: data.status.square_meter_clean_area,
+        native_unit_of_measurement=AREA_SQUARE_METERS,
+    ),
+    RoborockSensorDescription(
+        key="total_cleaning_area",
+        icon="mdi:texture-box",
+        translation_key="total_cleaning_area",
+        value_fn=lambda data: data.clean_summary.square_meter_clean_area,
+        native_unit_of_measurement=AREA_SQUARE_METERS,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Roborock vacuum sensors."""
+    coordinators: dict[str, RoborockDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
+    async_add_entities(
+        RoborockSensorEntity(
+            f"{description.key}_{slugify(device_id)}",
+            coordinator,
+            description,
+        )
+        for device_id, coordinator in coordinators.items()
+        for description in SENSOR_DESCRIPTIONS
+        if description.value_fn(coordinator.roborock_device_info.props) is not None
+    )
+
+
+class RoborockSensorEntity(RoborockCoordinatedEntity, SensorEntity):
+    """Representation of a Roborock sensor."""
+
+    entity_description: RoborockSensorDescription
+
+    def __init__(
+        self,
+        unique_id: str,
+        coordinator: RoborockDataUpdateCoordinator,
+        description: RoborockSensorDescription,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(unique_id, coordinator)
+        self.entity_description = description
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the value reported by the sensor."""
+        return self.entity_description.value_fn(
+            self.coordinator.roborock_device_info.props
+        )
diff --git a/homeassistant/components/roborock/strings.json b/homeassistant/components/roborock/strings.json
index 64c9d268e56cd6..e595b7abff4e8a 100644
--- a/homeassistant/components/roborock/strings.json
+++ b/homeassistant/components/roborock/strings.json
@@ -27,6 +27,60 @@
     }
   },
   "entity": {
+    "sensor": {
+      "cleaning_area": {
+        "name": "Cleaning area"
+      },
+      "cleaning_time": {
+        "name": "Cleaning time"
+      },
+      "main_brush_time_left": {
+        "name": "Main brush time left"
+      },
+      "side_brush_time_left": {
+        "name": "Side brush time left"
+      },
+      "filter_time_left": {
+        "name": "Filter time left"
+      },
+      "sensor_time_left": {
+        "name": "Sensor time left"
+      },
+      "status": {
+        "name": "Status",
+        "state": {
+          "starting": "Starting",
+          "charger_disconnected": "Charger disconnected",
+          "idle": "Idle",
+          "remote_control_active": "Remote control active",
+          "cleaning": "Cleaning",
+          "returning_home": "Returning home",
+          "manual_mode": "Manual mode",
+          "charging": "Charging",
+          "charging_problem": "Charging problem",
+          "paused": "Paused",
+          "spot_cleaning": "Spot cleaning",
+          "error": "Error",
+          "shutting_down": "Shutting down",
+          "updating": "Updating",
+          "docking": "Docking",
+          "going_to_target": "Going to target",
+          "zoned_cleaning": "Zoned cleaning",
+          "segment_cleaning": "Segment cleaning",
+          "emptying_the_bin": "Emptying the bin",
+          "washing_the_mop": "Washing the mop",
+          "going_to_wash_the_mop": "Going to wash the mop",
+          "charging_complete": "Charging complete",
+          "device_offline": "Device offline"
+        }
+      },
+      "total_cleaning_time": {
+        "name": "Total cleaning time"
+      },
+      "total_cleaning_area": {
+        "name": "Total cleaning area"
+      }
+    },
     "select": {
       "mop_mode": {
         "name": "Mop mode",
@@ -41,13 +95,55 @@
       "mop_intensity": {
         "name": "Mop intensity",
         "state": {
-          "off": "Off",
+          "off": "[%key:common::state::off%]",
+          "low": "Low",
           "mild": "Mild",
+          "medium": "Medium",
           "moderate": "Moderate",
+          "high": "High",
           "intense": "Intense",
           "custom": "Custom"
         }
       }
+    },
+    "switch": {
+      "child_lock": {
+        "name": "Child lock"
+      },
+      "dnd_switch": {
+        "name": "Do not disturb"
+      },
+      "status_indicator": {
+        "name": "Status indicator light"
+      }
+    },
+    "vacuum": {
+      "roborock": {
+        "state_attributes": {
+          "fan_speed": {
+            "state": {
+              "auto": "Auto",
+              "balanced": "Balanced",
+              "custom": "Custom",
+              "gentle": "Gentle",
+              "off": "[%key:common::state::off%]",
+              "max": "Max",
+              "max_plus": "Max plus",
+              "medium": "Medium",
+              "quiet": "Quiet",
+              "silent": "Silent",
+              "standard": "Standard",
+              "turbo": "Turbo"
+            }
+          }
+        }
+      }
+    }
+  },
+  "issues": {
+    "service_deprecation_start_pause": {
+      "title": "Roborock vacuum support for vacuum.start_pause is being removed",
+      "description": "Roborock vacuum support for the vacuum.start_pause service is deprecated and will be removed in Home Assistant 2024.2; Please adjust any automation or script that uses the service to instead call vacuum.pause or vacuum.start and select submit below to mark this issue as resolved."
     }
   }
 }
diff --git a/homeassistant/components/roborock/switch.py b/homeassistant/components/roborock/switch.py
new file mode 100644
index 00000000000000..a0b3d5be29597a
--- /dev/null
+++ b/homeassistant/components/roborock/switch.py
@@ -0,0 +1,168 @@
+"""Support for Roborock switch."""
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
+import logging
+from typing import Any
+
+from roborock.api import AttributeCache
+from roborock.command_cache import CacheableAttribute
+from roborock.local_api import RoborockLocalClient
+
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import slugify
+
+from .const import DOMAIN
+from .coordinator import RoborockDataUpdateCoordinator
+from .device import RoborockEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass
+class RoborockSwitchDescriptionMixin:
+    """Define an entity description mixin for switch entities."""
+
+    # Gets the status of the switch
+    cache_key: CacheableAttribute
+    # Sets the status of the switch
+    update_value: Callable[[AttributeCache, bool], Coroutine[Any, Any, dict]]
+    # Attribute from cache
+    attribute: str
+
+
+@dataclass
+class RoborockSwitchDescription(
+    SwitchEntityDescription, RoborockSwitchDescriptionMixin
+):
+    """Class to describe an Roborock switch entity."""
+
+
+SWITCH_DESCRIPTIONS: list[RoborockSwitchDescription] = [
+    RoborockSwitchDescription(
+        cache_key=CacheableAttribute.child_lock_status,
+        update_value=lambda cache, value: cache.update_value(
+            {"lock_status": 1 if value else 0}
+        ),
+        attribute="lock_status",
+        key="child_lock",
+        translation_key="child_lock",
+        icon="mdi:account-lock",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    RoborockSwitchDescription(
+        cache_key=CacheableAttribute.flow_led_status,
+        update_value=lambda cache, value: cache.update_value(
+            {"status": 1 if value else 0}
+        ),
+        attribute="status",
+        key="status_indicator",
+        translation_key="status_indicator",
+        icon="mdi:alarm-light-outline",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    RoborockSwitchDescription(
+        cache_key=CacheableAttribute.dnd_timer,
+        update_value=lambda cache, value: cache.update_value(
+            [
+                cache.value.get("start_hour"),
+                cache.value.get("start_minute"),
+                cache.value.get("end_hour"),
+                cache.value.get("end_minute"),
+            ]
+        )
+        if value
+        else cache.close_value(),
+        attribute="enabled",
+        key="dnd_switch",
+        translation_key="dnd_switch",
+        icon="mdi:bell-cancel",
+        entity_category=EntityCategory.CONFIG,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Roborock switch platform."""
+    coordinators: dict[str, RoborockDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
+    possible_entities: list[
+        tuple[RoborockDataUpdateCoordinator, RoborockSwitchDescription]
+    ] = [
+        (coordinator, description)
+        for coordinator in coordinators.values()
+        for description in SWITCH_DESCRIPTIONS
+    ]
+    # We need to check if this function is supported by the device.
+    results = await asyncio.gather(
+        *(
+            coordinator.api.cache.get(description.cache_key).async_value()
+            for coordinator, description in possible_entities
+        ),
+        return_exceptions=True,
+    )
+    valid_entities: list[RoborockSwitch] = []
+    for (coordinator, description), result in zip(possible_entities, results):
+        if result is None or isinstance(result, Exception):
+            _LOGGER.debug("Not adding entity because of %s", result)
+        else:
+            valid_entities.append(
+                RoborockSwitch(
+                    f"{description.key}_{slugify(coordinator.roborock_device_info.device.duid)}",
+                    coordinator.device_info,
+                    description,
+                    coordinator.api,
+                )
+            )
+    async_add_entities(valid_entities)
+
+
+class RoborockSwitch(RoborockEntity, SwitchEntity):
+    """A class to let you turn functionality on Roborock devices on and off that does need a coordinator."""
+
+    entity_description: RoborockSwitchDescription
+
+    def __init__(
+        self,
+        unique_id: str,
+        device_info: DeviceInfo,
+        description: RoborockSwitchDescription,
+        api: RoborockLocalClient,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(unique_id, device_info, api)
+        self.entity_description = description
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn off the switch."""
+        await self.entity_description.update_value(
+            self.get_cache(self.entity_description.cache_key), False
+        )
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn on the switch."""
+        await self.entity_description.update_value(
+            self.get_cache(self.entity_description.cache_key), True
+        )
+
+    @property
+    def is_on(self) -> bool | None:
+        """Return True if entity is on."""
+        return (
+            self.get_cache(self.entity_description.cache_key).value.get(
+                self.entity_description.attribute
+            )
+            == 1
+        )
diff --git a/homeassistant/components/roborock/vacuum.py b/homeassistant/components/roborock/vacuum.py
index 666b8488d80333..804c082657882a 100644
--- a/homeassistant/components/roborock/vacuum.py
+++ b/homeassistant/components/roborock/vacuum.py
@@ -16,6 +16,7 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import slugify
 
@@ -75,13 +76,14 @@ class RoborockVacuum(RoborockCoordinatedEntity, StateVacuumEntity):
         | VacuumEntityFeature.RETURN_HOME
         | VacuumEntityFeature.FAN_SPEED
         | VacuumEntityFeature.BATTERY
-        | VacuumEntityFeature.STATUS
         | VacuumEntityFeature.SEND_COMMAND
         | VacuumEntityFeature.LOCATE
         | VacuumEntityFeature.CLEAN_SPOT
         | VacuumEntityFeature.STATE
         | VacuumEntityFeature.START
     )
+    _attr_translation_key = DOMAIN
+    _attr_name = None
 
     def __init__(
         self,
@@ -108,11 +110,6 @@ def fan_speed(self) -> str | None:
         """Return the fan speed of the vacuum cleaner."""
         return self._device_status.fan_power.name
 
-    @property
-    def status(self) -> str | None:
-        """Return the status of the vacuum cleaner."""
-        return self._device_status.state.name
-
     async def async_start(self) -> None:
         """Start the vacuum."""
         await self.send(RoborockCommand.APP_START)
@@ -143,7 +140,6 @@ async def async_set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:
             RoborockCommand.SET_CUSTOM_MODE,
             [self._device_status.fan_power.as_dict().get(fan_speed)],
         )
-        await self.coordinator.async_request_refresh()
 
     async def async_start_pause(self) -> None:
         """Start, pause or resume the cleaning task."""
@@ -151,6 +147,16 @@ async def async_start_pause(self) -> None:
             await self.async_pause()
         else:
             await self.async_start()
+        ir.async_create_issue(
+            self.hass,
+            DOMAIN,
+            "service_deprecation_start_pause",
+            breaks_in_ha_version="2024.2.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="service_deprecation_start_pause",
+        )
 
     async def async_send_command(
         self,
diff --git a/homeassistant/components/roku/__init__.py b/homeassistant/components/roku/__init__.py
index 7f922c2eea520f..583d26a4a5b684 100644
--- a/homeassistant/components/roku/__init__.py
+++ b/homeassistant/components/roku/__init__.py
@@ -22,13 +22,11 @@
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Roku from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
-    if not (coordinator := hass.data[DOMAIN].get(entry.entry_id)):
-        coordinator = RokuDataUpdateCoordinator(hass, host=entry.data[CONF_HOST])
-        hass.data[DOMAIN][entry.entry_id] = coordinator
-
+    coordinator = RokuDataUpdateCoordinator(hass, host=entry.data[CONF_HOST])
     await coordinator.async_config_entry_first_refresh()
 
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -36,7 +34,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         hass.data[DOMAIN].pop(entry.entry_id)
     return unload_ok
diff --git a/homeassistant/components/roku/manifest.json b/homeassistant/components/roku/manifest.json
index 944304aa6453d8..f9b81dc8ddd160 100644
--- a/homeassistant/components/roku/manifest.json
+++ b/homeassistant/components/roku/manifest.json
@@ -11,7 +11,7 @@
   "iot_class": "local_polling",
   "loggers": ["rokuecp"],
   "quality_scale": "silver",
-  "requirements": ["rokuecp==0.17.1"],
+  "requirements": ["rokuecp==0.18.0"],
   "ssdp": [
     {
       "st": "roku:ecp",
diff --git a/homeassistant/components/roku/media_player.py b/homeassistant/components/roku/media_player.py
index 877e58233d5b00..a8c1cf4698c447 100644
--- a/homeassistant/components/roku/media_player.py
+++ b/homeassistant/components/roku/media_player.py
@@ -108,6 +108,7 @@ async def async_setup_entry(
 class RokuMediaPlayer(RokuEntity, MediaPlayerEntity):
     """Representation of a Roku media player on the network."""
 
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.PREVIOUS_TRACK
         | MediaPlayerEntityFeature.NEXT_TRACK
diff --git a/homeassistant/components/roku/remote.py b/homeassistant/components/roku/remote.py
index fceac67a477696..0271e4a0f730f0 100644
--- a/homeassistant/components/roku/remote.py
+++ b/homeassistant/components/roku/remote.py
@@ -37,6 +37,8 @@ async def async_setup_entry(
 class RokuRemote(RokuEntity, RemoteEntity):
     """Device that sends commands to an Roku."""
 
+    _attr_name = None
+
     @property
     def is_on(self) -> bool:
         """Return true if device is on."""
diff --git a/homeassistant/components/roomba/irobot_base.py b/homeassistant/components/roomba/irobot_base.py
index 8ec91acf96540c..317209886bd2b6 100644
--- a/homeassistant/components/roomba/irobot_base.py
+++ b/homeassistant/components/roomba/irobot_base.py
@@ -39,7 +39,6 @@
     | VacuumEntityFeature.SEND_COMMAND
     | VacuumEntityFeature.START
     | VacuumEntityFeature.STATE
-    | VacuumEntityFeature.STATUS
     | VacuumEntityFeature.STOP
     | VacuumEntityFeature.LOCATE
 )
diff --git a/homeassistant/components/roon/media_player.py b/homeassistant/components/roon/media_player.py
index 3bcafe4ba9a2df..6d096ea8b1a309 100644
--- a/homeassistant/components/roon/media_player.py
+++ b/homeassistant/components/roon/media_player.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, cast
 
 from roonapi import split_media_path
 import voluptuous as vol
@@ -159,7 +159,10 @@ def device_info(self) -> DeviceInfo | None:
             dev_model = self.player_data["source_controls"][0].get("display_name")
         return DeviceInfo(
             identifiers={(DOMAIN, self.unique_id)},
-            name=self.name,
+            # Instead of setting the device name to the entity name, roon
+            # should be updated to set has_entity_name = True, and set the entity
+            # name to None
+            name=cast(str | None, self.name),
             manufacturer="RoonLabs",
             model=dev_model,
             via_device=(DOMAIN, self._server.roon_id),
diff --git a/homeassistant/components/russound_rio/manifest.json b/homeassistant/components/russound_rio/manifest.json
index 728c40121e0c40..4f35bf697363dc 100644
--- a/homeassistant/components/russound_rio/manifest.json
+++ b/homeassistant/components/russound_rio/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/russound_rio",
   "iot_class": "local_push",
   "loggers": ["russound_rio"],
-  "requirements": ["russound_rio==0.1.8"]
+  "requirements": ["russound-rio==1.0.0"]
 }
diff --git a/homeassistant/components/ruuvi_gateway/bluetooth.py b/homeassistant/components/ruuvi_gateway/bluetooth.py
index 4dd973155a9c53..47a9bbfdde0b65 100644
--- a/homeassistant/components/ruuvi_gateway/bluetooth.py
+++ b/homeassistant/components/ruuvi_gateway/bluetooth.py
@@ -9,6 +9,7 @@
 
 from homeassistant.components.bluetooth import (
     FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS,
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     async_get_advertisement_callback,
     async_register_scanner,
@@ -47,6 +48,7 @@ def __init__(
     @callback
     def _async_handle_new_data(self) -> None:
         now = time.time()
+        monotonic_now = MONOTONIC_TIME()
         for tag_data in self.coordinator.data:
             data_age_seconds = now - tag_data.timestamp  # Both are Unix time
             if data_age_seconds > FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS:
@@ -62,6 +64,7 @@ def _async_handle_new_data(self) -> None:
                 manufacturer_data=anno.manufacturer_data,
                 tx_power=anno.tx_power,
                 details={},
+                advertisement_monotonic_time=monotonic_now - data_age_seconds,
             )
 
     @callback
diff --git a/homeassistant/components/ruuvitag_ble/manifest.json b/homeassistant/components/ruuvitag_ble/manifest.json
index 6cabecb7912cea..fa8ec80423c47b 100644
--- a/homeassistant/components/ruuvitag_ble/manifest.json
+++ b/homeassistant/components/ruuvitag_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/ruuvitag_ble",
   "iot_class": "local_push",
-  "requirements": ["ruuvitag-ble==0.1.1"]
+  "requirements": ["ruuvitag-ble==0.1.2"]
 }
diff --git a/homeassistant/components/rympro/sensor.py b/homeassistant/components/rympro/sensor.py
index 80675d9dec8cf9..2c1a3ecee118e8 100644
--- a/homeassistant/components/rympro/sensor.py
+++ b/homeassistant/components/rympro/sensor.py
@@ -34,7 +34,7 @@ class RymProSensor(CoordinatorEntity[RymProDataUpdateCoordinator], SensorEntity)
     """Sensor for RymPro meters."""
 
     _attr_has_entity_name = True
-    _attr_name = "Total consumption"
+    _attr_translation_key = "total_consumption"
     _attr_device_class = SensorDeviceClass.WATER
     _attr_native_unit_of_measurement = UnitOfVolume.CUBIC_METERS
     _attr_state_class = SensorStateClass.TOTAL_INCREASING
diff --git a/homeassistant/components/rympro/strings.json b/homeassistant/components/rympro/strings.json
index b6e7adc9631e99..2909d6c1b9b848 100644
--- a/homeassistant/components/rympro/strings.json
+++ b/homeassistant/components/rympro/strings.json
@@ -16,5 +16,12 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
+  },
+  "entity": {
+    "sensor": {
+      "total_consumption": {
+        "name": "Total consumption"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/safe_mode/__init__.py b/homeassistant/components/safe_mode/__init__.py
index 2f010fe79c9dff..3ed2d4476af96a 100644
--- a/homeassistant/components/safe_mode/__init__.py
+++ b/homeassistant/components/safe_mode/__init__.py
@@ -1,10 +1,13 @@
 """The Safe Mode integration."""
 from homeassistant.components import persistent_notification
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "safe_mode"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Safe Mode component."""
diff --git a/homeassistant/components/samsungtv/__init__.py b/homeassistant/components/samsungtv/__init__.py
index a5deb3ca629e87..b7d400ce8316f4 100644
--- a/homeassistant/components/samsungtv/__init__.py
+++ b/homeassistant/components/samsungtv/__init__.py
@@ -49,7 +49,7 @@
     UPNP_SVC_RENDERING_CONTROL,
 )
 
-PLATFORMS = [Platform.MEDIA_PLAYER]
+PLATFORMS = [Platform.MEDIA_PLAYER, Platform.REMOTE]
 
 CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
diff --git a/homeassistant/components/samsungtv/bridge.py b/homeassistant/components/samsungtv/bridge.py
index a2558367995a6f..0cc4dd556d5542 100644
--- a/homeassistant/components/samsungtv/bridge.py
+++ b/homeassistant/components/samsungtv/bridge.py
@@ -6,6 +6,7 @@
 from asyncio.exceptions import TimeoutError as AsyncioTimeoutError
 from collections.abc import Callable, Iterable, Mapping
 import contextlib
+from datetime import datetime, timedelta
 from typing import Any, Generic, TypeVar, cast
 
 from samsungctl import Remote
@@ -43,8 +44,10 @@
     CONF_TOKEN,
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
+from homeassistant.helpers import entity_component
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_DESCRIPTION,
@@ -67,6 +70,13 @@
     WEBSOCKET_PORTS,
 )
 
+# Since the TV will take a few seconds to go to sleep
+# and actually be seen as off, we need to wait just a bit
+# more than the next scan interval
+SCAN_INTERVAL_PLUS_OFF_TIME = entity_component.DEFAULT_SCAN_INTERVAL + timedelta(
+    seconds=5
+)
+
 KEY_PRESS_TIMEOUT = 1.2
 
 ENCRYPTED_MODEL_USES_POWER_OFF = {"H6400", "H6410"}
@@ -161,6 +171,10 @@ def __init__(
         self._update_config_entry: Callable[[Mapping[str, Any]], None] | None = None
         self._app_list_callback: Callable[[dict[str, str]], None] | None = None
 
+        # Mark the end of a shutdown command (need to wait 15 seconds before
+        # sending the next command to avoid turning the TV back ON).
+        self._end_of_power_off: datetime | None = None
+
     def register_reauth_callback(self, func: CALLBACK_TYPE) -> None:
         """Register a callback function."""
         self._reauth_callback = func
@@ -203,8 +217,17 @@ async def async_is_on(self) -> bool:
     async def async_send_keys(self, keys: list[str]) -> None:
         """Send a list of keys to the tv."""
 
+    @property
+    def power_off_in_progress(self) -> bool:
+        """Return if power off has been recently requested."""
+        return (
+            self._end_of_power_off is not None
+            and self._end_of_power_off > dt_util.utcnow()
+        )
+
     async def async_power_off(self) -> None:
         """Send power off command to remote and close."""
+        self._end_of_power_off = dt_util.utcnow() + SCAN_INTERVAL_PLUS_OFF_TIME
         await self._async_send_power_off()
         # Force closing of remote session to provide instant UI feedback
         await self.async_close_remote()
@@ -526,7 +549,7 @@ async def async_try_connect(self) -> str:
             except (ConnectionFailure, OSError, AsyncioTimeoutError) as err:
                 LOGGER.debug("Failing config: %s, %s error: %s", config, type(err), err)
         # pylint: disable-next=useless-else-on-loop
-        else:
+        else:  # noqa: PLW0120
             if result:
                 return result
 
diff --git a/homeassistant/components/samsungtv/config_flow.py b/homeassistant/components/samsungtv/config_flow.py
index f98e3667b592ba..124dab73004e63 100644
--- a/homeassistant/components/samsungtv/config_flow.py
+++ b/homeassistant/components/samsungtv/config_flow.py
@@ -184,7 +184,6 @@ async def _async_create_bridge(self) -> None:
             raise AbortFlow(result)
         assert method is not None
         self._bridge = SamsungTVBridge.get_bridge(self.hass, method, self._host)
-        return
 
     async def _async_get_device_info_and_method(
         self,
diff --git a/homeassistant/components/samsungtv/entity.py b/homeassistant/components/samsungtv/entity.py
new file mode 100644
index 00000000000000..4d5ea3d5fab068
--- /dev/null
+++ b/homeassistant/components/samsungtv/entity.py
@@ -0,0 +1,36 @@
+"""Base SamsungTV Entity."""
+from __future__ import annotations
+
+from typing import cast
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_MAC, CONF_MODEL, CONF_NAME
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo, Entity
+
+from .bridge import SamsungTVBridge
+from .const import CONF_MANUFACTURER, DOMAIN
+
+
+class SamsungTVEntity(Entity):
+    """Defines a base SamsungTV entity."""
+
+    def __init__(self, *, bridge: SamsungTVBridge, config_entry: ConfigEntry) -> None:
+        """Initialize the SamsungTV entity."""
+        self._bridge = bridge
+        self._mac = config_entry.data.get(CONF_MAC)
+        self._attr_name = config_entry.data.get(CONF_NAME)
+        self._attr_unique_id = config_entry.unique_id
+        self._attr_device_info = DeviceInfo(
+            # Instead of setting the device name to the entity name, samsungtv
+            # should be updated to set has_entity_name = True
+            name=cast(str | None, self.name),
+            manufacturer=config_entry.data.get(CONF_MANUFACTURER),
+            model=config_entry.data.get(CONF_MODEL),
+        )
+        if self.unique_id:
+            self._attr_device_info["identifiers"] = {(DOMAIN, self.unique_id)}
+        if self._mac:
+            self._attr_device_info["connections"] = {
+                (dr.CONNECTION_NETWORK_MAC, self._mac)
+            }
diff --git a/homeassistant/components/samsungtv/media_player.py b/homeassistant/components/samsungtv/media_player.py
index d4c04942e63c91..2f82c979b9405b 100644
--- a/homeassistant/components/samsungtv/media_player.py
+++ b/homeassistant/components/samsungtv/media_player.py
@@ -3,7 +3,6 @@
 
 import asyncio
 from collections.abc import Coroutine, Sequence
-from datetime import datetime, timedelta
 from typing import Any
 
 import async_timeout
@@ -31,26 +30,16 @@
     MediaType,
 )
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_MAC, CONF_MODEL, CONF_NAME
+from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import (
-    config_validation as cv,
-    device_registry as dr,
-    entity_component,
-)
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.trigger import PluggableAction
-from homeassistant.util import dt as dt_util
 
 from .bridge import SamsungTVBridge, SamsungTVWSBridge
-from .const import (
-    CONF_MANUFACTURER,
-    CONF_SSDP_RENDERING_CONTROL_LOCATION,
-    DOMAIN,
-    LOGGER,
-)
+from .const import CONF_SSDP_RENDERING_CONTROL_LOCATION, DOMAIN, LOGGER
+from .entity import SamsungTVEntity
 from .triggers.turn_on import async_get_turn_on_trigger
 
 SOURCES = {"TV": "KEY_TV", "HDMI": "KEY_HDMI"}
@@ -67,12 +56,6 @@
     | MediaPlayerEntityFeature.PLAY_MEDIA
 )
 
-# Since the TV will take a few seconds to go to sleep
-# and actually be seen as off, we need to wait just a bit
-# more than the next scan interval
-SCAN_INTERVAL_PLUS_OFF_TIME = entity_component.DEFAULT_SCAN_INTERVAL + timedelta(
-    seconds=5
-)
 
 # Max delay waiting for app_list to return, as some TVs simply ignore the request
 APP_LIST_DELAY = 3
@@ -86,7 +69,7 @@ async def async_setup_entry(
     async_add_entities([SamsungTVDevice(bridge, entry)], True)
 
 
-class SamsungTVDevice(MediaPlayerEntity):
+class SamsungTVDevice(SamsungTVEntity, MediaPlayerEntity):
     """Representation of a Samsung TV."""
 
     _attr_source_list: list[str]
@@ -97,9 +80,9 @@ def __init__(
         config_entry: ConfigEntry,
     ) -> None:
         """Initialize the Samsung device."""
+        super().__init__(bridge=bridge, config_entry=config_entry)
         self._config_entry = config_entry
         self._host: str | None = config_entry.data[CONF_HOST]
-        self._mac: str | None = config_entry.data.get(CONF_MAC)
         self._ssdp_rendering_control_location: str | None = config_entry.data.get(
             CONF_SSDP_RENDERING_CONTROL_LOCATION
         )
@@ -107,8 +90,6 @@ def __init__(
         # Assume that the TV is in Play mode
         self._playing: bool = True
 
-        self._attr_name: str | None = config_entry.data.get(CONF_NAME)
-        self._attr_unique_id = config_entry.unique_id
         self._attr_is_volume_muted: bool = False
         self._attr_device_class = MediaPlayerDeviceClass.TV
         self._attr_source_list = list(SOURCES)
@@ -123,22 +104,6 @@ def __init__(
         if self._ssdp_rendering_control_location:
             self._attr_supported_features |= MediaPlayerEntityFeature.VOLUME_SET
 
-        self._attr_device_info = DeviceInfo(
-            name=self.name,
-            manufacturer=config_entry.data.get(CONF_MANUFACTURER),
-            model=config_entry.data.get(CONF_MODEL),
-        )
-        if self.unique_id:
-            self._attr_device_info["identifiers"] = {(DOMAIN, self.unique_id)}
-        if self._mac:
-            self._attr_device_info["connections"] = {
-                (dr.CONNECTION_NETWORK_MAC, self._mac)
-            }
-
-        # Mark the end of a shutdown command (need to wait 15 seconds before
-        # sending the next command to avoid turning the TV back ON).
-        self._end_of_power_off: datetime | None = None
-        self._bridge = bridge
         self._auth_failed = False
         self._bridge.register_reauth_callback(self.access_denied)
         self._bridge.register_app_list_callback(self._app_list_callback)
@@ -190,7 +155,7 @@ async def async_update(self) -> None:
         if self._auth_failed or self.hass.is_stopping:
             return
         old_state = self._attr_state
-        if self._power_off_in_progress():
+        if self._bridge.power_off_in_progress:
             self._attr_state = MediaPlayerState.OFF
         else:
             self._attr_state = (
@@ -333,7 +298,7 @@ def _on_upnp_event(
 
     async def _async_launch_app(self, app_id: str) -> None:
         """Send launch_app to the tv."""
-        if self._power_off_in_progress():
+        if self._bridge.power_off_in_progress:
             LOGGER.info("TV is powering off, not sending launch_app command")
             return
         assert isinstance(self._bridge, SamsungTVWSBridge)
@@ -342,17 +307,11 @@ async def _async_launch_app(self, app_id: str) -> None:
     async def _async_send_keys(self, keys: list[str]) -> None:
         """Send a key to the tv and handles exceptions."""
         assert keys
-        if self._power_off_in_progress() and keys[0] != "KEY_POWEROFF":
+        if self._bridge.power_off_in_progress and keys[0] != "KEY_POWEROFF":
             LOGGER.info("TV is powering off, not sending keys: %s", keys)
             return
         await self._bridge.async_send_keys(keys)
 
-    def _power_off_in_progress(self) -> bool:
-        return (
-            self._end_of_power_off is not None
-            and self._end_of_power_off > dt_util.utcnow()
-        )
-
     @property
     def available(self) -> bool:
         """Return the availability of the device."""
@@ -362,7 +321,7 @@ def available(self) -> bool:
             self.state == MediaPlayerState.ON
             or bool(self._turn_on)
             or self._mac is not None
-            or self._power_off_in_progress()
+            or self._bridge.power_off_in_progress
         )
 
     async def async_added_to_hass(self) -> None:
@@ -378,7 +337,6 @@ async def async_added_to_hass(self) -> None:
 
     async def async_turn_off(self) -> None:
         """Turn off media player."""
-        self._end_of_power_off = dt_util.utcnow() + SCAN_INTERVAL_PLUS_OFF_TIME
         await self._bridge.async_power_off()
 
     async def async_set_volume_level(self, volume: float) -> None:
diff --git a/homeassistant/components/samsungtv/remote.py b/homeassistant/components/samsungtv/remote.py
new file mode 100644
index 00000000000000..22857d96659638
--- /dev/null
+++ b/homeassistant/components/samsungtv/remote.py
@@ -0,0 +1,47 @@
+"""Support for the SamsungTV remote."""
+from __future__ import annotations
+
+from collections.abc import Iterable
+from typing import Any
+
+from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN, LOGGER
+from .entity import SamsungTVEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the Samsung TV from a config entry."""
+    bridge = hass.data[DOMAIN][entry.entry_id]
+    async_add_entities([SamsungTVRemote(bridge=bridge, config_entry=entry)])
+
+
+class SamsungTVRemote(SamsungTVEntity, RemoteEntity):
+    """Device that sends commands to a SamsungTV."""
+
+    _attr_should_poll = False
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the device off."""
+        await self._bridge.async_power_off()
+
+    async def async_send_command(self, command: Iterable[str], **kwargs: Any) -> None:
+        """Send a command to a device.
+
+        Supported keys vary between models.
+        See https://github.com/jaruba/ha-samsungtv-tizen/blob/master/Key_codes.md
+        """
+        if self._bridge.power_off_in_progress:
+            LOGGER.info("TV is powering off, not sending keys: %s", command)
+            return
+
+        num_repeats = kwargs[ATTR_NUM_REPEATS]
+        command_list = list(command)
+
+        for _ in range(num_repeats):
+            await self._bridge.async_send_keys(command_list)
diff --git a/homeassistant/components/satel_integra/binary_sensor.py b/homeassistant/components/satel_integra/binary_sensor.py
index 389bde884ef62e..5d2ce2c193c348 100644
--- a/homeassistant/components/satel_integra/binary_sensor.py
+++ b/homeassistant/components/satel_integra/binary_sensor.py
@@ -80,11 +80,10 @@ async def async_added_to_hass(self) -> None:
                 self._state = 1
             else:
                 self._state = 0
+        elif self._device_number in self._satel.violated_zones:
+            self._state = 1
         else:
-            if self._device_number in self._satel.violated_zones:
-                self._state = 1
-            else:
-                self._state = 0
+            self._state = 0
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass, self._react_to_signal, self._devices_updated
diff --git a/homeassistant/components/satel_integra/manifest.json b/homeassistant/components/satel_integra/manifest.json
index ffb2c1a3af2d15..828261aa466eea 100644
--- a/homeassistant/components/satel_integra/manifest.json
+++ b/homeassistant/components/satel_integra/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/satel_integra",
   "iot_class": "local_push",
   "loggers": ["satel_integra"],
-  "requirements": ["satel_integra==0.3.7"]
+  "requirements": ["satel-integra==0.3.7"]
 }
diff --git a/homeassistant/components/scrape/strings.json b/homeassistant/components/scrape/strings.json
index 857d53eb5276ff..e5ed8613fc48fb 100644
--- a/homeassistant/components/scrape/strings.json
+++ b/homeassistant/components/scrape/strings.json
@@ -171,6 +171,7 @@
         "temperature": "[%key:component::sensor::entity_component::temperature::name%]",
         "timestamp": "[%key:component::sensor::entity_component::timestamp::name%]",
         "volatile_organic_compounds": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]",
+        "volatile_organic_compounds_parts": "[%key:component::sensor::entity_component::volatile_organic_compounds_parts::name%]",
         "voltage": "[%key:component::sensor::entity_component::voltage::name%]",
         "volume": "[%key:component::sensor::entity_component::volume::name%]",
         "volume_storage": "[%key:component::sensor::entity_component::volume_storage::name%]",
diff --git a/homeassistant/components/screenlogic/__init__.py b/homeassistant/components/screenlogic/__init__.py
index 6662c20ad4f6f1..3370c196c3c902 100644
--- a/homeassistant/components/screenlogic/__init__.py
+++ b/homeassistant/components/screenlogic/__init__.py
@@ -168,4 +168,3 @@ async def _async_update_data(self) -> None:
             if self.gateway.is_connected:
                 await self.gateway.async_disconnect()
             raise UpdateFailed(ex.msg) from ex
-        return None
diff --git a/homeassistant/components/script/__init__.py b/homeassistant/components/script/__init__.py
index 9c4137c1beac2d..8530aa3b04c143 100644
--- a/homeassistant/components/script/__init__.py
+++ b/homeassistant/components/script/__init__.py
@@ -1,6 +1,7 @@
 """Support for scripts."""
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 import asyncio
 from dataclasses import dataclass
 import logging
@@ -28,7 +29,14 @@
     SERVICE_TURN_ON,
     STATE_ON,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Context,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.helpers import entity_registry as er
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import make_entity_service_schema
@@ -87,12 +95,12 @@ def _scripts_with_x(
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     return [
         script_entity.entity_id
         for script_entity in component.entities
-        if referenced_id in getattr(script_entity.script, property_name)
+        if referenced_id in getattr(script_entity, property_name)
     ]
 
 
@@ -101,12 +109,12 @@ def _x_in_script(hass: HomeAssistant, entity_id: str, property_name: str) -> lis
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     if (script_entity := component.get_entity(entity_id)) is None:
         return []
 
-    return list(getattr(script_entity.script, property_name))
+    return list(getattr(script_entity, property_name))
 
 
 @callback
@@ -151,7 +159,7 @@ def scripts_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list[str
     if DOMAIN not in hass.data:
         return []
 
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     return [
         script_entity.entity_id
@@ -160,9 +168,25 @@ def scripts_with_blueprint(hass: HomeAssistant, blueprint_path: str) -> list[str
     ]
 
 
+@callback
+def blueprint_in_script(hass: HomeAssistant, entity_id: str) -> str | None:
+    """Return the blueprint the script is based on or None."""
+    if DOMAIN not in hass.data:
+        return None
+
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
+
+    if (script_entity := component.get_entity(entity_id)) is None:
+        return None
+
+    return script_entity.referenced_blueprint
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Load the scripts from the configuration."""
-    hass.data[DOMAIN] = component = EntityComponent[ScriptEntity](LOGGER, DOMAIN, hass)
+    hass.data[DOMAIN] = component = EntityComponent[BaseScriptEntity](
+        LOGGER, DOMAIN, hass
+    )
 
     # Process integration platforms right away since
     # we will create entities before firing EVENT_COMPONENT_LOADED
@@ -239,6 +263,7 @@ class ScriptEntityConfig:
     key: str
     raw_blueprint_inputs: ConfigType | None
     raw_config: ConfigType | None
+    validation_failed: bool
 
 
 async def _prepare_script_config(
@@ -253,9 +278,12 @@ async def _prepare_script_config(
     for key, config_block in conf.items():
         raw_config = cast(ScriptConfig, config_block).raw_config
         raw_blueprint_inputs = cast(ScriptConfig, config_block).raw_blueprint_inputs
+        validation_failed = cast(ScriptConfig, config_block).validation_failed
 
         script_configs.append(
-            ScriptEntityConfig(config_block, key, raw_blueprint_inputs, raw_config)
+            ScriptEntityConfig(
+                config_block, key, raw_blueprint_inputs, raw_config, validation_failed
+            )
         )
 
     return script_configs
@@ -263,11 +291,20 @@ async def _prepare_script_config(
 
 async def _create_script_entities(
     hass: HomeAssistant, script_configs: list[ScriptEntityConfig]
-) -> list[ScriptEntity]:
+) -> list[BaseScriptEntity]:
     """Create script entities from prepared configuration."""
-    entities: list[ScriptEntity] = []
+    entities: list[BaseScriptEntity] = []
 
     for script_config in script_configs:
+        if script_config.validation_failed:
+            entities.append(
+                UnavailableScriptEntity(
+                    script_config.key,
+                    script_config.raw_config,
+                )
+            )
+            continue
+
         entity = ScriptEntity(
             hass,
             script_config.key,
@@ -281,16 +318,20 @@ async def _create_script_entities(
 
 
 async def _async_process_config(
-    hass: HomeAssistant, config: ConfigType, component: EntityComponent[ScriptEntity]
+    hass: HomeAssistant,
+    config: ConfigType,
+    component: EntityComponent[BaseScriptEntity],
 ) -> None:
     """Process script configuration."""
     entities = []
 
-    def script_matches_config(script: ScriptEntity, config: ScriptEntityConfig) -> bool:
+    def script_matches_config(
+        script: BaseScriptEntity, config: ScriptEntityConfig
+    ) -> bool:
         return script.unique_id == config.key and script.raw_config == config.raw_config
 
     def find_matches(
-        scripts: list[ScriptEntity],
+        scripts: list[BaseScriptEntity],
         script_configs: list[ScriptEntityConfig],
     ) -> tuple[set[int], set[int]]:
         """Find matches between a list of script entities and a list of configurations.
@@ -317,7 +358,7 @@ def find_matches(
         return script_matches, config_matches
 
     script_configs = await _prepare_script_config(hass, config)
-    scripts: list[ScriptEntity] = list(component.entities)
+    scripts: list[BaseScriptEntity] = list(component.entities)
 
     # Find scripts and configurations which have matches
     script_matches, config_matches = find_matches(scripts, script_configs)
@@ -338,7 +379,78 @@ def find_matches(
     await component.async_add_entities(entities)
 
 
-class ScriptEntity(ToggleEntity, RestoreEntity):
+class BaseScriptEntity(ToggleEntity, ABC):
+    """Base class for script entities."""
+
+    raw_config: ConfigType | None
+
+    @property
+    @abstractmethod
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+
+    @property
+    @abstractmethod
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+
+    @property
+    @abstractmethod
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+
+    @property
+    @abstractmethod
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+
+
+class UnavailableScriptEntity(BaseScriptEntity):
+    """A non-functional script entity with its state set to unavailable.
+
+    This class is instatiated when an script fails to validate.
+    """
+
+    _attr_should_poll = False
+    _attr_available = False
+
+    def __init__(
+        self,
+        key: str,
+        raw_config: ConfigType | None,
+    ) -> None:
+        """Initialize a script entity."""
+        self._name = raw_config.get(CONF_ALIAS, key) if raw_config else key
+        self._attr_unique_id = key
+        self.raw_config = raw_config
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return set()
+
+    @property
+    def referenced_blueprint(self) -> str | None:
+        """Return referenced blueprint or None."""
+        return None
+
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return set()
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return set()
+
+
+class ScriptEntity(BaseScriptEntity, RestoreEntity):
     """Representation of a script entity."""
 
     icon = None
@@ -400,6 +512,11 @@ def is_on(self):
         """Return true if script is on."""
         return self.script.is_running
 
+    @property
+    def referenced_areas(self) -> set[str]:
+        """Return a set of referenced areas."""
+        return self.script.referenced_areas
+
     @property
     def referenced_blueprint(self):
         """Return referenced blueprint or None."""
@@ -407,6 +524,16 @@ def referenced_blueprint(self):
             return None
         return self._blueprint_inputs[CONF_USE_BLUEPRINT][CONF_PATH]
 
+    @property
+    def referenced_devices(self) -> set[str]:
+        """Return a set of referenced devices."""
+        return self.script.referenced_devices
+
+    @property
+    def referenced_entities(self) -> set[str]:
+        """Return a set of referenced entities."""
+        return self.script.referenced_entities
+
     @callback
     def async_change_listener(self):
         """Update state."""
@@ -422,6 +549,12 @@ async def async_turn_on(self, **kwargs):
         variables = kwargs.get("variables")
         context = kwargs.get("context")
         wait = kwargs.get("wait", True)
+        await self._async_start_run(variables, context, wait)
+
+    async def _async_start_run(
+        self, variables: dict, context: Context, wait: bool
+    ) -> ServiceResponse:
+        """Start the run of a script."""
         self.async_set_context(context)
         self.hass.bus.async_fire(
             EVENT_SCRIPT_STARTED,
@@ -430,8 +563,7 @@ async def async_turn_on(self, **kwargs):
         )
         coro = self._async_run(variables, context)
         if wait:
-            await coro
-            return
+            return await coro
 
         # Caller does not want to wait for called script to finish so let script run in
         # separate Task. Make a new empty script stack; scripts are allowed to
@@ -443,6 +575,7 @@ async def async_turn_on(self, **kwargs):
         # Wait for first state change so we can guarantee that
         # it is written to the State Machine before we return.
         await self._changed.wait()
+        return None
 
     async def _async_run(self, variables, context):
         with trace_script(
@@ -469,16 +602,25 @@ async def async_turn_off(self, **kwargs):
         """
         await self.script.async_stop()
 
-    async def _service_handler(self, service: ServiceCall) -> None:
+    async def _service_handler(self, service: ServiceCall) -> ServiceResponse:
         """Execute a service call to script.<script name>."""
-        await self.async_turn_on(variables=service.data, context=service.context)
+        response = await self._async_start_run(
+            variables=service.data, context=service.context, wait=True
+        )
+        if service.return_response:
+            return response or {}
+        return None
 
     async def async_added_to_hass(self) -> None:
         """Restore last triggered on startup and register service."""
 
         unique_id = cast(str, self.unique_id)
         self.hass.services.async_register(
-            DOMAIN, unique_id, self._service_handler, schema=SCRIPT_SERVICE_SCHEMA
+            DOMAIN,
+            unique_id,
+            self._service_handler,
+            schema=SCRIPT_SERVICE_SCHEMA,
+            supports_response=SupportsResponse.OPTIONAL,
         )
 
         # Register the service description
@@ -508,7 +650,7 @@ def websocket_config(
     msg: dict[str, Any],
 ) -> None:
     """Get script config."""
-    component: EntityComponent[ScriptEntity] = hass.data[DOMAIN]
+    component: EntityComponent[BaseScriptEntity] = hass.data[DOMAIN]
 
     script = component.get_entity(msg["entity_id"])
 
diff --git a/homeassistant/components/script/config.py b/homeassistant/components/script/config.py
index 193a010671e969..10c7f08484b8cf 100644
--- a/homeassistant/components/script/config.py
+++ b/homeassistant/components/script/config.py
@@ -49,6 +49,15 @@
 
 PACKAGE_MERGE_HINT = "dict"
 
+_MINIMAL_SCRIPT_ENTITY_SCHEMA = vol.Schema(
+    {
+        CONF_ALIAS: cv.string,
+        vol.Optional(CONF_DESCRIPTION): cv.string,
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
 SCRIPT_ENTITY_SCHEMA = make_script_schema(
     {
         vol.Optional(CONF_ALIAS): cv.string,
@@ -74,7 +83,11 @@
 
 
 async def _async_validate_config_item(
-    hass: HomeAssistant, object_id: str, config: ConfigType, warn_on_errors: bool
+    hass: HomeAssistant,
+    object_id: str,
+    config: ConfigType,
+    raise_on_errors: bool,
+    warn_on_errors: bool,
 ) -> ScriptConfig:
     """Validate config item."""
     raw_config = None
@@ -110,6 +123,15 @@ def _log_invalid_script(
         )
         return
 
+    def _minimal_config() -> ScriptConfig:
+        """Try validating id, alias and description."""
+        minimal_config = _MINIMAL_SCRIPT_ENTITY_SCHEMA(config)
+        script_config = ScriptConfig(minimal_config)
+        script_config.raw_blueprint_inputs = raw_blueprint_inputs
+        script_config.raw_config = raw_config
+        script_config.validation_failed = True
+        return script_config
+
     if is_blueprint_instance_config(config):
         uses_blueprint = True
         blueprints = async_get_blueprints(hass)
@@ -121,7 +143,9 @@ def _log_invalid_script(
                     "Failed to generate script from blueprint: %s",
                     err,
                 )
-            raise
+            if raise_on_errors:
+                raise
+            return _minimal_config()
 
         raw_blueprint_inputs = blueprint_inputs.config_with_inputs
 
@@ -136,7 +160,9 @@ def _log_invalid_script(
                     blueprint_inputs.inputs,
                     err,
                 )
-            raise HomeAssistantError from err
+            if raise_on_errors:
+                raise HomeAssistantError(err) from err
+            return _minimal_config()
 
     script_name = f"Script with object id '{object_id}'"
     if isinstance(config, Mapping):
@@ -152,10 +178,16 @@ def _log_invalid_script(
         validated_config = SCRIPT_ENTITY_SCHEMA(config)
     except vol.Invalid as err:
         _log_invalid_script(err, script_name, "could not be validated", config)
-        raise
+        if raise_on_errors:
+            raise
+        return _minimal_config()
+
+    script_config = ScriptConfig(validated_config)
+    script_config.raw_blueprint_inputs = raw_blueprint_inputs
+    script_config.raw_config = raw_config
 
     try:
-        validated_config[CONF_SEQUENCE] = await async_validate_actions_config(
+        script_config[CONF_SEQUENCE] = await async_validate_actions_config(
             hass, validated_config[CONF_SEQUENCE]
         )
     except (
@@ -165,11 +197,11 @@ def _log_invalid_script(
         _log_invalid_script(
             err, script_name, "failed to setup actions", validated_config
         )
-        raise
+        if raise_on_errors:
+            raise
+        script_config.validation_failed = True
+        return script_config
 
-    script_config = ScriptConfig(validated_config)
-    script_config.raw_blueprint_inputs = raw_blueprint_inputs
-    script_config.raw_config = raw_config
     return script_config
 
 
@@ -178,6 +210,7 @@ class ScriptConfig(dict):
 
     raw_config: ConfigType | None = None
     raw_blueprint_inputs: ConfigType | None = None
+    validation_failed: bool = False
 
 
 async def _try_async_validate_config_item(
@@ -187,7 +220,7 @@ async def _try_async_validate_config_item(
 ) -> ScriptConfig | None:
     """Validate config item."""
     try:
-        return await _async_validate_config_item(hass, object_id, config, True)
+        return await _async_validate_config_item(hass, object_id, config, False, True)
     except (vol.Invalid, HomeAssistantError):
         return None
 
@@ -198,7 +231,7 @@ async def async_validate_config_item(
     config: dict[str, Any],
 ) -> ScriptConfig | None:
     """Validate config item, called by EditScriptConfigView."""
-    return await _async_validate_config_item(hass, object_id, config, False)
+    return await _async_validate_config_item(hass, object_id, config, True, False)
 
 
 async def async_validate_config(hass, config):
diff --git a/homeassistant/components/scsgate/__init__.py b/homeassistant/components/scsgate/__init__.py
index 5810f12bca25e4..af5921e2c3b54a 100644
--- a/homeassistant/components/scsgate/__init__.py
+++ b/homeassistant/components/scsgate/__init__.py
@@ -74,7 +74,7 @@ def __init__(self, device, logger):
     def handle_message(self, message):
         """Handle a messages seen on the bus."""
 
-        self._logger.debug(f"Received message {message}")
+        self._logger.debug("Received message %s", message)
         if not isinstance(message, StateMessage) and not isinstance(
             message, ScenarioTriggeredMessage
         ):
@@ -98,9 +98,7 @@ def handle_message(self, message):
                 self._logger.error(msg)
         else:
             self._logger.info(
-                "Ignoring state message for device {} because unknown".format(
-                    message.entity
-                )
+                "Ignoring state message for device %s because unknown", message.entity
             )
 
     @property
diff --git a/homeassistant/components/search/__init__.py b/homeassistant/components/search/__init__.py
index b574081d5d4232..69796800e61562 100644
--- a/homeassistant/components/search/__init__.py
+++ b/homeassistant/components/search/__init__.py
@@ -10,13 +10,19 @@
 from homeassistant.components import automation, group, person, script, websocket_api
 from homeassistant.components.homeassistant import scene
 from homeassistant.core import HomeAssistant, callback, split_entity_id
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.entity import entity_sources as get_entity_sources
 from homeassistant.helpers.typing import ConfigType
 
 DOMAIN = "search"
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Search component."""
@@ -31,7 +37,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             (
                 "area",
                 "automation",
-                "blueprint",
+                "automation_blueprint",
                 "config_entry",
                 "device",
                 "entity",
@@ -39,6 +45,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 "person",
                 "scene",
                 "script",
+                "script_blueprint",
             )
         ),
         vol.Required("item_id"): str,
@@ -75,10 +82,12 @@ class Searcher:
     DONT_RESOLVE = {
         "area",
         "automation",
+        "automation_blueprint",
         "config_entry",
         "group",
         "scene",
         "script",
+        "script_blueprint",
     }
     # These types exist as an entity and so need cleanup in results
     EXIST_AS_ENTITY = {"automation", "group", "person", "scene", "script"}
@@ -170,6 +179,22 @@ def _resolve_automation(self, automation_entity_id) -> None:
         for area in automation.areas_in_automation(self.hass, automation_entity_id):
             self._add_or_resolve("area", area)
 
+        if blueprint := automation.blueprint_in_automation(
+            self.hass, automation_entity_id
+        ):
+            self._add_or_resolve("automation_blueprint", blueprint)
+
+    @callback
+    def _resolve_automation_blueprint(self, blueprint_path) -> None:
+        """Resolve an automation blueprint.
+
+        Will only be called if blueprint is an entry point.
+        """
+        for entity_id in automation.automations_with_blueprint(
+            self.hass, blueprint_path
+        ):
+            self._add_or_resolve("automation", entity_id)
+
     @callback
     def _resolve_config_entry(self, config_entry_id) -> None:
         """Resolve a config entry.
@@ -289,3 +314,15 @@ def _resolve_script(self, script_entity_id) -> None:
 
         for area in script.areas_in_script(self.hass, script_entity_id):
             self._add_or_resolve("area", area)
+
+        if blueprint := script.blueprint_in_script(self.hass, script_entity_id):
+            self._add_or_resolve("script_blueprint", blueprint)
+
+    @callback
+    def _resolve_script_blueprint(self, blueprint_path) -> None:
+        """Resolve a script blueprint.
+
+        Will only be called if blueprint is an entry point.
+        """
+        for entity_id in script.scripts_with_blueprint(self.hass, blueprint_path):
+            self._add_or_resolve("script", entity_id)
diff --git a/homeassistant/components/season/sensor.py b/homeassistant/components/season/sensor.py
index 27a46943bb3af3..4d78e60db0f566 100644
--- a/homeassistant/components/season/sensor.py
+++ b/homeassistant/components/season/sensor.py
@@ -94,6 +94,7 @@ class SeasonSensorEntity(SensorEntity):
 
     _attr_device_class = SensorDeviceClass.ENUM
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_options = ["spring", "summer", "autumn", "winter"]
     _attr_translation_key = "season"
 
diff --git a/homeassistant/components/season/strings.json b/homeassistant/components/season/strings.json
index bff02df5c6c226..d53d6a0890f1da 100644
--- a/homeassistant/components/season/strings.json
+++ b/homeassistant/components/season/strings.json
@@ -1,4 +1,5 @@
 {
+  "title": "Season",
   "config": {
     "step": {
       "user": {
diff --git a/homeassistant/components/select/device_action.py b/homeassistant/components/select/device_action.py
index d553cdf30439d8..a7d47d8c83304d 100644
--- a/homeassistant/components/select/device_action.py
+++ b/homeassistant/components/select/device_action.py
@@ -5,6 +5,10 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+    async_validate_entity_schema,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -33,43 +37,50 @@
     SERVICE_SELECT_PREVIOUS,
 )
 
-ACTION_SCHEMA = vol.Any(
+_ACTION_SCHEMA = vol.Any(
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_FIRST,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_LAST,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_NEXT,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Optional(CONF_CYCLE, default=True): cv.boolean,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_PREVIOUS,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Optional(CONF_CYCLE, default=True): cv.boolean,
         }
     ),
     cv.DEVICE_ACTION_BASE_SCHEMA.extend(
         {
             vol.Required(CONF_TYPE): SERVICE_SELECT_OPTION,
-            vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_OPTION): cv.string,
         }
     ),
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -79,7 +90,7 @@ async def async_get_actions(
         {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: service_conf_type,
         }
         for service_conf_type in (
@@ -130,7 +141,10 @@ async def async_get_action_capabilities(
     if config[CONF_TYPE] == SERVICE_SELECT_OPTION:
         options: list[str] = []
         with suppress(HomeAssistantError):
-            options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+            entry = async_get_entity_registry_entry_or_raise(
+                hass, config[CONF_ENTITY_ID]
+            )
+            options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
         return {
             "extra_fields": vol.Schema({vol.Required(CONF_OPTION): vol.In(options)})
         }
diff --git a/homeassistant/components/select/device_condition.py b/homeassistant/components/select/device_condition.py
index 13280ba4f0e243..712e7bf78b6099 100644
--- a/homeassistant/components/select/device_condition.py
+++ b/homeassistant/components/select/device_condition.py
@@ -3,6 +3,9 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.const import (
     CONF_CONDITION,
     CONF_DEVICE_ID,
@@ -30,7 +33,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
         vol.Required(CONF_OPTION): str,
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
@@ -48,7 +51,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "selected_option",
         }
         for entry in er.async_entries_for_device(registry, device_id)
@@ -62,11 +65,14 @@ def async_condition_from_config(
 ) -> condition.ConditionCheckerType:
     """Create a function to test a device condition."""
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     @callback
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
         return condition.state(
-            hass, config[CONF_ENTITY_ID], config[CONF_OPTION], config.get(CONF_FOR)
+            hass, entity_id, config[CONF_OPTION], config.get(CONF_FOR)
         )
 
     return test_is_state
@@ -76,8 +82,10 @@ async def async_get_condition_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List condition capabilities."""
+
     try:
-        options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
     except HomeAssistantError:
         options = []
 
diff --git a/homeassistant/components/select/device_trigger.py b/homeassistant/components/select/device_trigger.py
index 8e8267cb5e0f4a..2cd2da0e1a6f84 100644
--- a/homeassistant/components/select/device_trigger.py
+++ b/homeassistant/components/select/device_trigger.py
@@ -3,7 +3,10 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.homeassistant.triggers.state import (
     CONF_FOR,
     CONF_FROM,
@@ -31,7 +34,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_TO): vol.Any(vol.Coerce(str)),
         vol.Optional(CONF_FROM): vol.Any(vol.Coerce(str)),
@@ -50,7 +53,7 @@ async def async_get_triggers(
             CONF_PLATFORM: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
             CONF_TYPE: "current_option_changed",
         }
         for entry in er.async_entries_for_device(registry, device_id)
@@ -89,8 +92,10 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
+
     try:
-        options = get_capability(hass, config[CONF_ENTITY_ID], ATTR_OPTIONS) or []
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        options = get_capability(hass, entry.entity_id, ATTR_OPTIONS) or []
     except HomeAssistantError:
         options = []
 
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index 72072d36031af4..8c20db2e422466 100644
--- a/homeassistant/components/sense/manifest.json
+++ b/homeassistant/components/sense/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sense",
   "iot_class": "cloud_polling",
   "loggers": ["sense_energy"],
-  "requirements": ["sense_energy==0.11.2"]
+  "requirements": ["sense-energy==0.12.0"]
 }
diff --git a/homeassistant/components/senseme/__init__.py b/homeassistant/components/senseme/__init__.py
deleted file mode 100644
index a744dd0d0b8b4d..00000000000000
--- a/homeassistant/components/senseme/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""The SenseME integration."""
-from __future__ import annotations
-
-from aiosenseme import async_get_device_by_device_info
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-from .const import CONF_INFO, DOMAIN, PLATFORMS, UPDATE_RATE
-from .discovery import async_start_discovery
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up SenseME from a config entry."""
-    async_start_discovery(hass)
-
-    status, device = await async_get_device_by_device_info(
-        info=entry.data[CONF_INFO], start_first=True, refresh_minutes=UPDATE_RATE
-    )
-    if not status:
-        device.stop()
-        raise ConfigEntryNotReady(f"Connect to address {device.address} failed")
-
-    await device.async_update(not status)
-
-    hass.data[DOMAIN][entry.entry_id] = device
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    hass.data[DOMAIN][entry.entry_id].stop()
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/senseme/binary_sensor.py b/homeassistant/components/senseme/binary_sensor.py
deleted file mode 100644
index d6c9e193ece4e4..00000000000000
--- a/homeassistant/components/senseme/binary_sensor.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""Support for Big Ass Fans SenseME occupancy sensor."""
-from __future__ import annotations
-
-from aiosenseme import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME occupancy sensors."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.has_sensor:
-        async_add_entities([HASensemeOccupancySensor(device)])
-
-
-class HASensemeOccupancySensor(SensemeEntity, BinarySensorEntity):
-    """Representation of a Big Ass Fans SenseME occupancy sensor."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(device, f"{device.name} Occupancy")
-        self._attr_unique_id = f"{self._device.uuid}-SENSOR"
-        self._attr_device_class = BinarySensorDeviceClass.OCCUPANCY
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.motion_detected
diff --git a/homeassistant/components/senseme/config_flow.py b/homeassistant/components/senseme/config_flow.py
deleted file mode 100644
index 6e2f10c1b36e28..00000000000000
--- a/homeassistant/components/senseme/config_flow.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Config flow for SenseME."""
-from __future__ import annotations
-
-import ipaddress
-from typing import Any
-
-from aiosenseme import SensemeDevice, async_get_device_by_ip_address
-import voluptuous as vol
-
-from homeassistant import config_entries
-from homeassistant.components import dhcp
-from homeassistant.const import CONF_DEVICE, CONF_HOST, CONF_ID
-from homeassistant.data_entry_flow import FlowResult
-from homeassistant.helpers.typing import DiscoveryInfoType
-
-from .const import CONF_HOST_MANUAL, CONF_INFO, DOMAIN
-from .discovery import async_discover, async_get_discovered_device
-
-DISCOVER_TIMEOUT = 5
-
-
-class SensemeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
-    """Handle SenseME discovery config flow."""
-
-    VERSION = 1
-
-    def __init__(self) -> None:
-        """Initialize the SenseME config flow."""
-        self._discovered_devices: list[SensemeDevice] | None = None
-        self._discovered_device: SensemeDevice | None = None
-
-    async def async_step_dhcp(self, discovery_info: dhcp.DhcpServiceInfo) -> FlowResult:
-        """Handle discovery via dhcp."""
-        # If discovery is already running, it takes precedence since its more efficient
-        if self._async_current_entries():
-            return self.async_abort(reason="already_configured")
-        if device := await async_get_device_by_ip_address(discovery_info.ip):
-            device.stop()
-        if device is None or not device.uuid:
-            return self.async_abort(reason="cannot_connect")
-        await self.async_set_unique_id(device.uuid)
-        self._discovered_device = device
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_integration_discovery(
-        self, discovery_info: DiscoveryInfoType
-    ) -> FlowResult:
-        """Handle integration discovery."""
-        uuid = discovery_info[CONF_ID]
-        device = async_get_discovered_device(self.hass, discovery_info[CONF_ID])
-        host = device.address
-        await self.async_set_unique_id(uuid)
-        for entry in self._async_current_entries(include_ignore=False):
-            if entry.data[CONF_INFO]["address"] == host:
-                return self.async_abort(reason="already_configured")
-            if entry.unique_id != uuid:
-                continue
-            self.hass.config_entries.async_update_entry(
-                entry, data={CONF_INFO: {**entry.data[CONF_INFO], "address": host}}
-            )
-            return self.async_abort(reason="already_configured")
-        self._discovered_device = device
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Confirm discovery."""
-        device = self._discovered_device
-        assert device is not None
-
-        if user_input is not None:
-            return await self._async_entry_for_device(device)
-        placeholders = {
-            "name": device.name,
-            "model": device.model,
-            "host": device.address,
-        }
-        self.context["title_placeholders"] = placeholders
-        return self.async_show_form(
-            step_id="discovery_confirm", description_placeholders=placeholders
-        )
-
-    async def _async_entry_for_device(self, device: SensemeDevice) -> FlowResult:
-        """Create a config entry for a device."""
-        await self.async_set_unique_id(device.uuid, raise_on_progress=False)
-        self._abort_if_unique_id_configured()
-        return self.async_create_entry(
-            title=device.name,
-            data={CONF_INFO: device.get_device_info},
-        )
-
-    async def async_step_manual(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle manual entry of an ip address."""
-        errors = {}
-        if user_input is not None:
-            host = user_input[CONF_HOST]
-            try:
-                ipaddress.ip_address(host)
-            except ValueError:
-                errors[CONF_HOST] = "invalid_host"
-            else:
-                if device := await async_get_device_by_ip_address(host):
-                    device.stop()
-                    return await self._async_entry_for_device(device)
-
-                errors[CONF_HOST] = "cannot_connect"
-
-        return self.async_show_form(
-            step_id="manual",
-            data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
-            errors=errors,
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle a flow initialized by the user."""
-        if self._discovered_devices is None:
-            self._discovered_devices = await async_discover(self.hass, DISCOVER_TIMEOUT)
-        current_ids = self._async_current_ids()
-        device_selection = {
-            device.uuid: device.name
-            for device in self._discovered_devices
-            if device.uuid not in current_ids
-        }
-
-        if not device_selection:
-            return await self.async_step_manual(user_input=None)
-
-        device_selection[None] = CONF_HOST_MANUAL
-
-        if user_input is not None:
-            if user_input[CONF_DEVICE] is None:
-                return await self.async_step_manual()
-
-            for device in self._discovered_devices:
-                if device.uuid == user_input[CONF_DEVICE]:
-                    return await self._async_entry_for_device(device)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {vol.Required(CONF_DEVICE): vol.In(device_selection)}
-            ),
-        )
diff --git a/homeassistant/components/senseme/const.py b/homeassistant/components/senseme/const.py
deleted file mode 100644
index 5660fc1d1779d9..00000000000000
--- a/homeassistant/components/senseme/const.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Constants for the SenseME integration."""
-
-
-from homeassistant.const import Platform
-
-DOMAIN = "senseme"
-
-# Periodic fan update rate in minutes
-UPDATE_RATE = 1
-
-# data storage
-CONF_INFO = "info"
-CONF_HOST_MANUAL = "IP Address"
-DISCOVERY = "discovery"
-
-# Fan Preset Modes
-PRESET_MODE_WHOOSH = "Whoosh"
-
-# Fan Directions
-SENSEME_DIRECTION_FORWARD = "FWD"
-SENSEME_DIRECTION_REVERSE = "REV"
-
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.FAN,
-    Platform.LIGHT,
-    Platform.SELECT,
-    Platform.SWITCH,
-]
diff --git a/homeassistant/components/senseme/discovery.py b/homeassistant/components/senseme/discovery.py
deleted file mode 100644
index d3924ef16c0eaa..00000000000000
--- a/homeassistant/components/senseme/discovery.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""The SenseME integration discovery."""
-from __future__ import annotations
-
-import asyncio
-
-from aiosenseme import SensemeDevice, SensemeDiscovery
-
-from homeassistant import config_entries
-from homeassistant.const import CONF_ID
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import discovery_flow
-
-from .const import DISCOVERY, DOMAIN
-
-
-@callback
-def async_start_discovery(hass: HomeAssistant) -> bool:
-    """Start discovery if its not already running."""
-    domain_data = hass.data.setdefault(DOMAIN, {})
-    if DISCOVERY in domain_data:
-        return False  # already running
-    discovery = domain_data[DISCOVERY] = SensemeDiscovery(False)
-    discovery.add_callback(lambda devices: async_trigger_discovery(hass, devices))
-    discovery.start()
-    return True  # started
-
-
-@callback
-def async_get_discovered_device(hass: HomeAssistant, uuid: str) -> SensemeDevice:
-    """Return a discovered device."""
-    discovery: SensemeDiscovery = hass.data[DOMAIN][DISCOVERY]
-    devices: list[SensemeDevice] = discovery.devices
-    for discovered_device in devices:
-        if discovered_device.uuid == uuid:
-            return discovered_device
-    raise RuntimeError("Discovered device unexpectedly disappeared")
-
-
-async def async_discover(hass: HomeAssistant, timeout: float) -> list[SensemeDevice]:
-    """Discover devices or restart it if its already running."""
-    started = async_start_discovery(hass)
-    discovery: SensemeDiscovery = hass.data[DOMAIN][DISCOVERY]
-    if not started:  # already running
-        discovery.stop()
-        discovery.start()
-    await asyncio.sleep(timeout)
-    devices: list[SensemeDevice] = discovery.devices
-    return devices
-
-
-@callback
-def async_trigger_discovery(
-    hass: HomeAssistant,
-    discovered_devices: list[SensemeDevice],
-) -> None:
-    """Trigger config flows for discovered devices."""
-    for device in discovered_devices:
-        if device.uuid:
-            discovery_flow.async_create_flow(
-                hass,
-                DOMAIN,
-                context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-                data={CONF_ID: device.uuid},
-            )
diff --git a/homeassistant/components/senseme/entity.py b/homeassistant/components/senseme/entity.py
deleted file mode 100644
index 9e0ca412628f34..00000000000000
--- a/homeassistant/components/senseme/entity.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""The SenseME integration entities."""
-from __future__ import annotations
-
-from aiosenseme import SensemeDevice
-
-from homeassistant.core import callback
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity import DeviceInfo, Entity
-
-
-class SensemeEntity(Entity):
-    """Base class for senseme entities."""
-
-    _attr_should_poll = False
-
-    def __init__(self, device: SensemeDevice, name: str) -> None:
-        """Initialize the entity."""
-        self._device = device
-        self._attr_name = name
-        self._attr_device_info = DeviceInfo(
-            connections={(dr.CONNECTION_NETWORK_MAC, self._device.mac)},
-            name=self._device.name,
-            manufacturer="Big Ass Fans",
-            model=self._device.model,
-            sw_version=self._device.fw_version,
-            suggested_area=self._device.room_name,
-        )
-        self._async_update_attrs()
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_available = self._device.available
-
-    @callback
-    def _async_update_from_device(self) -> None:
-        """Process an update from the device."""
-        self._async_update_attrs()
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Add data updated listener after this object has been initialized."""
-        self._device.add_callback(self._async_update_from_device)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Remove data updated listener after this object has been initialized."""
-        self._device.remove_callback(self._async_update_from_device)
diff --git a/homeassistant/components/senseme/fan.py b/homeassistant/components/senseme/fan.py
deleted file mode 100644
index 63c64a11632c75..00000000000000
--- a/homeassistant/components/senseme/fan.py
+++ /dev/null
@@ -1,113 +0,0 @@
-"""Support for Big Ass Fans SenseME fan."""
-from __future__ import annotations
-
-import math
-from typing import Any
-
-from aiosenseme import SensemeFan
-
-from homeassistant import config_entries
-from homeassistant.components.fan import (
-    DIRECTION_FORWARD,
-    DIRECTION_REVERSE,
-    FanEntity,
-    FanEntityFeature,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.percentage import (
-    percentage_to_ranged_value,
-    ranged_value_to_percentage,
-)
-
-from .const import (
-    DOMAIN,
-    PRESET_MODE_WHOOSH,
-    SENSEME_DIRECTION_FORWARD,
-    SENSEME_DIRECTION_REVERSE,
-)
-from .entity import SensemeEntity
-
-SENSEME_DIRECTION_TO_HASS = {
-    SENSEME_DIRECTION_FORWARD: DIRECTION_FORWARD,
-    SENSEME_DIRECTION_REVERSE: DIRECTION_REVERSE,
-}
-HASS_DIRECTION_TO_SENSEME = {v: k for k, v in SENSEME_DIRECTION_TO_HASS.items()}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fans."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.is_fan:
-        async_add_entities([HASensemeFan(device)])
-
-
-class HASensemeFan(SensemeEntity, FanEntity):
-    """SenseME ceiling fan component."""
-
-    _attr_supported_features = FanEntityFeature.SET_SPEED | FanEntityFeature.DIRECTION
-    _attr_preset_modes = [PRESET_MODE_WHOOSH]
-
-    def __init__(self, device: SensemeFan) -> None:
-        """Initialize the entity."""
-        super().__init__(device, device.name)
-        self._attr_speed_count = self._device.fan_speed_max
-        self._attr_unique_id = f"{self._device.uuid}-FAN"  # for legacy compat
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.fan_on
-        self._attr_current_direction = SENSEME_DIRECTION_TO_HASS.get(
-            self._device.fan_dir, DIRECTION_FORWARD  # None also means forward
-        )
-        if self._device.fan_speed is not None:
-            self._attr_percentage = ranged_value_to_percentage(
-                self._device.fan_speed_limits, self._device.fan_speed
-            )
-        else:
-            self._attr_percentage = None
-        whoosh = self._device.fan_whoosh_mode
-        self._attr_preset_mode = PRESET_MODE_WHOOSH if whoosh else None
-        super()._async_update_attrs()
-
-    async def async_set_percentage(self, percentage: int) -> None:
-        """Set the speed of the fan, as a percentage."""
-        self._device.fan_speed = math.ceil(
-            percentage_to_ranged_value(self._device.fan_speed_limits, percentage)
-        )
-
-    async def async_turn_on(
-        self,
-        percentage: int | None = None,
-        preset_mode: str | None = None,
-        **kwargs: Any,
-    ) -> None:
-        """Turn the fan on with a percentage or preset mode."""
-        if preset_mode is not None:
-            await self.async_set_preset_mode(preset_mode)
-        elif percentage is None:
-            self._device.fan_on = True
-        else:
-            await self.async_set_percentage(percentage)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the fan off."""
-        self._device.fan_on = False
-
-    async def async_set_preset_mode(self, preset_mode: str) -> None:
-        """Set the preset mode of the fan."""
-        if preset_mode != PRESET_MODE_WHOOSH:
-            raise ValueError(f"Invalid preset mode: {preset_mode}")
-        # Sleep mode must be off for Whoosh to work.
-        if self._device.sleep_mode:
-            self._device.sleep_mode = False
-        self._device.fan_whoosh_mode = True
-
-    async def async_set_direction(self, direction: str) -> None:
-        """Set the direction of the fan."""
-        self._device.fan_dir = HASS_DIRECTION_TO_SENSEME[direction]
diff --git a/homeassistant/components/senseme/light.py b/homeassistant/components/senseme/light.py
deleted file mode 100644
index f1150260f384e7..00000000000000
--- a/homeassistant/components/senseme/light.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""Support for Big Ass Fans SenseME light."""
-from __future__ import annotations
-
-from typing import Any
-
-from aiosenseme import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_COLOR_TEMP,
-    ColorMode,
-    LightEntity,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.color import (
-    color_temperature_kelvin_to_mired,
-    color_temperature_mired_to_kelvin,
-)
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME lights."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if not device.has_light:
-        return
-    if device.is_light:
-        async_add_entities([HASensemeStandaloneLight(device)])
-    else:
-        async_add_entities([HASensemeFanLight(device)])
-
-
-class HASensemeLight(SensemeEntity, LightEntity):
-    """Representation of a Big Ass Fans SenseME light."""
-
-    def __init__(self, device: SensemeDevice, name: str) -> None:
-        """Initialize the entity."""
-        super().__init__(device, name)
-        self._attr_unique_id = f"{device.uuid}-LIGHT"  # for legacy compat
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self._device.light_on
-        if self._device.light_brightness is not None:
-            self._attr_brightness = int(min(255, self._device.light_brightness * 16))
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        if (brightness := kwargs.get(ATTR_BRIGHTNESS)) is not None:
-            # set the brightness, which will also turn on/off light
-            if brightness == 255:
-                brightness = 256  # this will end up as 16 which is max
-            self._device.light_brightness = int(brightness / 16)
-        else:
-            self._device.light_on = True
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the light."""
-        self._device.light_on = False
-
-
-class HASensemeFanLight(HASensemeLight):
-    """Representation of a Big Ass Fans SenseME light on a fan."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Init a fan light."""
-        super().__init__(device, device.name)
-        self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-        self._attr_color_mode = ColorMode.BRIGHTNESS
-
-
-class HASensemeStandaloneLight(HASensemeLight):
-    """Representation of a Big Ass Fans SenseME light."""
-
-    def __init__(self, device: SensemeDevice) -> None:
-        """Init a standalone light."""
-        super().__init__(device, f"{device.name} Light")
-        self._attr_supported_color_modes = {ColorMode.COLOR_TEMP}
-        self._attr_color_mode = ColorMode.COLOR_TEMP
-        self._attr_min_mireds = color_temperature_kelvin_to_mired(
-            device.light_color_temp_max
-        )
-        self._attr_max_mireds = color_temperature_kelvin_to_mired(
-            device.light_color_temp_min
-        )
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        super()._async_update_attrs()
-        self._attr_color_temp = color_temperature_kelvin_to_mired(
-            self._device.light_color_temp
-        )
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the light."""
-        if (color_temp := kwargs.get(ATTR_COLOR_TEMP)) is not None:
-            self._device.light_color_temp = color_temperature_mired_to_kelvin(
-                color_temp
-            )
-        await super().async_turn_on(**kwargs)
diff --git a/homeassistant/components/senseme/manifest.json b/homeassistant/components/senseme/manifest.json
deleted file mode 100644
index b5a36609c6af2c..00000000000000
--- a/homeassistant/components/senseme/manifest.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "domain": "senseme",
-  "name": "SenseME",
-  "codeowners": ["@mikelawrence", "@bdraco"],
-  "config_flow": true,
-  "dhcp": [
-    {
-      "registered_devices": true
-    },
-    {
-      "macaddress": "20F85E*"
-    }
-  ],
-  "documentation": "https://www.home-assistant.io/integrations/senseme",
-  "iot_class": "local_push",
-  "loggers": ["aiosenseme"],
-  "requirements": ["aiosenseme==0.6.1"]
-}
diff --git a/homeassistant/components/senseme/select.py b/homeassistant/components/senseme/select.py
deleted file mode 100644
index 251e6c385d8890..00000000000000
--- a/homeassistant/components/senseme/select.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Support for Big Ass Fans SenseME selects."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from aiosenseme import SensemeFan
-from aiosenseme.device import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-SMART_MODE_TO_HASS = {
-    "OFF": "Off",
-    "COOLING": "Cooling",
-    "HEATING": "Heating",
-    "FOLLOWTSTAT": "Follow Thermostat",
-}
-HASS_TO_SMART_MODE = {v: k for k, v in SMART_MODE_TO_HASS.items()}
-
-
-@dataclass
-class SenseMESelectEntityDescriptionMixin:
-    """Mixin for required keys."""
-
-    value_fn: Callable[[SensemeFan], str]
-    set_fn: Callable[[SensemeFan, str], None]
-
-
-@dataclass
-class SenseMESelectEntityDescription(
-    SelectEntityDescription, SenseMESelectEntityDescriptionMixin
-):
-    """Describes SenseME select entity."""
-
-
-def _set_smart_mode(device: SensemeDevice, value: str) -> None:
-    device.fan_smartmode = HASS_TO_SMART_MODE[value]
-
-
-FAN_SELECTS = [
-    SenseMESelectEntityDescription(
-        key="smart_mode",
-        name="Smart Mode",
-        value_fn=lambda device: SMART_MODE_TO_HASS[device.fan_smartmode],
-        set_fn=_set_smart_mode,
-        options=list(SMART_MODE_TO_HASS.values()),
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fan selects."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    if device.is_fan:
-        async_add_entities(
-            HASensemeSelect(device, description) for description in FAN_SELECTS
-        )
-
-
-class HASensemeSelect(SensemeEntity, SelectEntity):
-    """SenseME select component."""
-
-    entity_description: SenseMESelectEntityDescription
-
-    def __init__(
-        self, device: SensemeFan, description: SenseMESelectEntityDescription
-    ) -> None:
-        """Initialize the entity."""
-        self.entity_description = description
-        super().__init__(device, f"{device.name} {description.name}")
-        self._attr_unique_id = f"{self._device.uuid}-{description.key}"
-
-    @property
-    def current_option(self) -> str:
-        """Return the current value."""
-        return self.entity_description.value_fn(self._device)
-
-    async def async_select_option(self, option: str) -> None:
-        """Set the option."""
-        self.entity_description.set_fn(self._device, option)
diff --git a/homeassistant/components/senseme/strings.json b/homeassistant/components/senseme/strings.json
deleted file mode 100644
index 2de35bc7fed842..00000000000000
--- a/homeassistant/components/senseme/strings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "config": {
-    "flow_title": "{name} - {model} ({host})",
-    "step": {
-      "user": {
-        "description": "Select a device, or choose 'IP Address' to manually enter an IP Address.",
-        "data": {
-          "device": "Device"
-        }
-      },
-      "discovery_confirm": {
-        "description": "Do you want to set up {name} - {model} ({host})?"
-      },
-      "manual": {
-        "description": "Enter an IP Address.",
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]"
-        }
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "error": {
-      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
-    }
-  }
-}
diff --git a/homeassistant/components/senseme/switch.py b/homeassistant/components/senseme/switch.py
deleted file mode 100644
index 8ffc90752481d1..00000000000000
--- a/homeassistant/components/senseme/switch.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""Support for Big Ass Fans SenseME switch."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any, cast
-
-from aiosenseme import SensemeFan
-from aiosenseme.device import SensemeDevice
-
-from homeassistant import config_entries
-from homeassistant.components.switch import (
-    SwitchDeviceClass,
-    SwitchEntity,
-    SwitchEntityDescription,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .entity import SensemeEntity
-
-
-@dataclass
-class SenseMESwitchEntityDescriptionMixin:
-    """Mixin for required keys."""
-
-    value_fn: Callable[[SensemeFan], bool]
-    set_fn: Callable[[SensemeFan, bool], None]
-
-
-@dataclass
-class SenseMESwitchEntityDescription(
-    SwitchEntityDescription, SenseMESwitchEntityDescriptionMixin
-):
-    """Describes SenseME switch entity."""
-
-
-def _set_sleep_mode(device: SensemeDevice, value: bool) -> None:
-    device.sleep_mode = value
-
-
-def _set_motion_fan_auto(device: SensemeDevice, value: bool) -> None:
-    device.motion_fan_auto = value
-
-
-def _set_motion_light_auto(device: SensemeDevice, value: bool) -> None:
-    device.motion_light_auto = value
-
-
-FAN_SWITCHES = [
-    # Turning on sleep mode will disable Whoosh
-    SenseMESwitchEntityDescription(
-        key="sleep_mode",
-        name="Sleep Mode",
-        value_fn=lambda device: cast(bool, device.sleep_mode),
-        set_fn=_set_sleep_mode,
-    ),
-    SenseMESwitchEntityDescription(
-        key="motion_fan_auto",
-        name="Motion",
-        value_fn=lambda device: cast(bool, device.motion_fan_auto),
-        set_fn=_set_motion_fan_auto,
-    ),
-]
-
-FAN_LIGHT_SWITCHES = [
-    SenseMESwitchEntityDescription(
-        key="motion_light_auto",
-        name="Light Motion",
-        value_fn=lambda device: cast(bool, device.motion_light_auto),
-        set_fn=_set_motion_light_auto,
-    ),
-]
-
-LIGHT_SWITCHES = [
-    SenseMESwitchEntityDescription(
-        key="sleep_mode",
-        name="Sleep Mode",
-        value_fn=lambda device: cast(bool, device.sleep_mode),
-        set_fn=_set_sleep_mode,
-    ),
-    SenseMESwitchEntityDescription(
-        key="motion_light_auto",
-        name="Motion",
-        value_fn=lambda device: cast(bool, device.motion_light_auto),
-        set_fn=_set_motion_light_auto,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up SenseME fans."""
-    device = hass.data[DOMAIN][entry.entry_id]
-    descriptions: list[SenseMESwitchEntityDescription] = []
-
-    if device.is_fan:
-        descriptions.extend(FAN_SWITCHES)
-        if device.has_light:
-            descriptions.extend(FAN_LIGHT_SWITCHES)
-    elif device.is_light:
-        descriptions.extend(LIGHT_SWITCHES)
-
-    async_add_entities(
-        HASensemeSwitch(device, description) for description in descriptions
-    )
-
-
-class HASensemeSwitch(SensemeEntity, SwitchEntity):
-    """SenseME switch component."""
-
-    entity_description: SenseMESwitchEntityDescription
-
-    def __init__(
-        self, device: SensemeFan, description: SenseMESwitchEntityDescription
-    ) -> None:
-        """Initialize the entity."""
-        self.entity_description = description
-        self._attr_device_class = SwitchDeviceClass.SWITCH
-        super().__init__(device, f"{device.name} {description.name}")
-        self._attr_unique_id = f"{self._device.uuid}-SWITCH-{description.key}"
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update attrs from device."""
-        self._attr_is_on = self.entity_description.value_fn(self._device)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the switch."""
-        self.entity_description.set_fn(self._device, True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the switch."""
-        self.entity_description.set_fn(self._device, False)
diff --git a/homeassistant/components/sensibo/climate.py b/homeassistant/components/sensibo/climate.py
index 9afdff43ef0c85..4ff63a254553f4 100644
--- a/homeassistant/components/sensibo/climate.py
+++ b/homeassistant/components/sensibo/climate.py
@@ -163,6 +163,8 @@ async def async_setup_entry(
 class SensiboClimate(SensiboDeviceBaseEntity, ClimateEntity):
     """Representation of a Sensibo device."""
 
+    _attr_name = None
+
     def __init__(
         self, coordinator: SensiboDataUpdateCoordinator, device_id: str
     ) -> None:
diff --git a/homeassistant/components/sensibo/strings.json b/homeassistant/components/sensibo/strings.json
index fb3559de91a18f..b00c4200836905 100644
--- a/homeassistant/components/sensibo/strings.json
+++ b/homeassistant/components/sensibo/strings.json
@@ -62,9 +62,9 @@
       },
       "light": {
         "state": {
-          "on": "On",
+          "on": "[%key:common::state::on%]",
           "dim": "Dim",
-          "off": "Off"
+          "off": "[%key:common::state::off%]"
         }
       }
     }
diff --git a/homeassistant/components/sensibo/switch.py b/homeassistant/components/sensibo/switch.py
index 8d0dc5fba2f60c..ee9c946268fee8 100644
--- a/homeassistant/components/sensibo/switch.py
+++ b/homeassistant/components/sensibo/switch.py
@@ -138,7 +138,7 @@ async def async_turn_off(self, **kwargs: Any) -> None:
         await func(
             self,
             key=self.entity_description.data_key,
-            value=True,
+            value=False,
         )
 
     @property
@@ -149,27 +149,25 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
         return None
 
     @async_handle_api_call
-    async def async_turn_on_timer(self, key: str, value: Any) -> bool:
+    async def async_turn_on_timer(self, key: str, value: bool) -> bool:
         """Make service call to api for setting timer."""
-        new_state = bool(self.device_data.ac_states["on"] is False)
         data = {
             "minutesFromNow": 60,
-            "acState": {**self.device_data.ac_states, "on": new_state},
+            "acState": {**self.device_data.ac_states, "on": value},
         }
         result = await self._client.async_set_timer(self._device_id, data)
         return bool(result.get("status") == "success")
 
     @async_handle_api_call
-    async def async_turn_off_timer(self, key: str, value: Any) -> bool:
+    async def async_turn_off_timer(self, key: str, value: bool) -> bool:
         """Make service call to api for deleting timer."""
         result = await self._client.async_del_timer(self._device_id)
         return bool(result.get("status") == "success")
 
     @async_handle_api_call
-    async def async_turn_on_off_pure_boost(self, key: str, value: Any) -> bool:
+    async def async_turn_on_off_pure_boost(self, key: str, value: bool) -> bool:
         """Make service call to api for setting Pure Boost."""
-        new_state = bool(self.device_data.pure_boost_enabled is False)
-        data: dict[str, Any] = {"enabled": new_state}
+        data: dict[str, Any] = {"enabled": value}
         if self.device_data.pure_measure_integration is None:
             data["sensitivity"] = "N"
             data["measurementsIntegration"] = True
@@ -180,14 +178,13 @@ async def async_turn_on_off_pure_boost(self, key: str, value: Any) -> bool:
         return bool(result.get("status") == "success")
 
     @async_handle_api_call
-    async def async_turn_on_off_smart(self, key: str, value: Any) -> bool:
+    async def async_turn_on_off_smart(self, key: str, value: bool) -> bool:
         """Make service call to api for setting Climate React."""
         if self.device_data.smart_type is None:
             raise HomeAssistantError(
                 "Use Sensibo Enable Climate React Service once to enable switch or the"
                 " Sensibo app"
             )
-        new_state = bool(self.device_data.smart_on is False)
-        data: dict[str, Any] = {"enabled": new_state}
+        data: dict[str, Any] = {"enabled": value}
         result = await self._client.async_enable_climate_react(self._device_id, data)
         return bool(result.get("status") == "success")
diff --git a/homeassistant/components/sensirion_ble/manifest.json b/homeassistant/components/sensirion_ble/manifest.json
index 372f40ac9a8d1d..38f66a88e8e06d 100644
--- a/homeassistant/components/sensirion_ble/manifest.json
+++ b/homeassistant/components/sensirion_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/sensirion_ble",
   "iot_class": "local_push",
-  "requirements": ["sensirion-ble==0.0.1"]
+  "requirements": ["sensirion-ble==0.1.0"]
 }
diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py
index f21f57d9d36d51..2477e849666008 100644
--- a/homeassistant/components/sensor/__init__.py
+++ b/homeassistant/components/sensor/__init__.py
@@ -10,6 +10,7 @@
 import logging
 from math import ceil, floor, log10
 import re
+import sys
 from typing import Any, Final, cast, final
 
 from typing_extensions import Self
@@ -92,6 +93,8 @@
 
 NEGATIVE_ZERO_PATTERN = re.compile(r"^-(0\.?0*)$")
 
+PY_311 = sys.version_info >= (3, 11, 0)
+
 SCAN_INTERVAL: Final = timedelta(seconds=30)
 
 __all__ = [
@@ -257,6 +260,13 @@ async def async_internal_added_to_hass(self) -> None:
         self._async_read_entity_options()
         self._update_suggested_precision()
 
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class.
+
+        For sensors this is True if the entity has a device class.
+        """
+        return self.device_class not in (None, SensorDeviceClass.ENUM)
+
     @property
     def device_class(self) -> SensorDeviceClass | None:
         """Return the class of this entity."""
@@ -443,8 +453,10 @@ def unit_of_measurement(self) -> str | None:
             return self._sensor_option_unit_of_measurement
 
         # Second priority, for non registered entities: unit suggested by integration
-        if not self.unique_id and self.suggested_unit_of_measurement:
-            return self.suggested_unit_of_measurement
+        if not self.unique_id and (
+            suggested_unit_of_measurement := self.suggested_unit_of_measurement
+        ):
+            return suggested_unit_of_measurement
 
         # Third priority: Legacy temperature conversion, which applies
         # to both registered and non registered entities
@@ -629,10 +641,12 @@ def state(self) -> Any:
                 )
                 precision = precision + floor(ratio_log)
 
-                value = f"{converted_numerical_value:.{precision}f}"
-                # This can be replaced with adding the z option when we drop support for
-                # Python 3.10
-                value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value)
+                if PY_311:
+                    value = f"{converted_numerical_value:z.{precision}f}"
+                else:
+                    value = f"{converted_numerical_value:.{precision}f}"
+                    if value.startswith("-0") and NEGATIVE_ZERO_PATTERN.match(value):
+                        value = value[1:]
             else:
                 value = converted_numerical_value
 
@@ -874,29 +888,31 @@ def async_update_suggested_units(hass: HomeAssistant) -> None:
         )
 
 
+def _display_precision(hass: HomeAssistant, entity_id: str) -> int | None:
+    """Return the display precision."""
+    if not (entry := er.async_get(hass).async_get(entity_id)) or not (
+        sensor_options := entry.options.get(DOMAIN)
+    ):
+        return None
+    if (display_precision := sensor_options.get("display_precision")) is not None:
+        return cast(int, display_precision)
+    return sensor_options.get("suggested_display_precision")
+
+
 @callback
 def async_rounded_state(hass: HomeAssistant, entity_id: str, state: State) -> str:
     """Return the state rounded for presentation."""
-
-    def display_precision() -> int | None:
-        """Return the display precision."""
-        if not (entry := er.async_get(hass).async_get(entity_id)) or not (
-            sensor_options := entry.options.get(DOMAIN)
-        ):
-            return None
-        if (display_precision := sensor_options.get("display_precision")) is not None:
-            return cast(int, display_precision)
-        return sensor_options.get("suggested_display_precision")
-
     value = state.state
-    if (precision := display_precision()) is None:
+    if (precision := _display_precision(hass, entity_id)) is None:
         return value
 
     with suppress(TypeError, ValueError):
         numerical_value = float(value)
-        value = f"{numerical_value:.{precision}f}"
-        # This can be replaced with adding the z option when we drop support for
-        # Python 3.10
-        value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value)
+        if PY_311:
+            value = f"{numerical_value:z.{precision}f}"
+        else:
+            value = f"{numerical_value:.{precision}f}"
+            if value.startswith("-0") and NEGATIVE_ZERO_PATTERN.match(value):
+                value = value[1:]
 
     return value
diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index c52e076e51ea5a..7d6c57de2963e4 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -3,6 +3,9 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import (
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.device_automation.exceptions import (
     InvalidDeviceAutomationConfig,
 )
@@ -136,7 +139,7 @@
 CONDITION_SCHEMA = vol.All(
     cv.DEVICE_CONDITION_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 [
                     CONF_IS_APPARENT_POWER,
@@ -223,7 +226,7 @@ async def async_get_conditions(
                 **template,
                 "condition": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for template in templates
@@ -257,8 +260,10 @@ async def async_get_condition_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List condition capabilities."""
+
     try:
-        unit_of_measurement = get_unit_of_measurement(hass, config[CONF_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        unit_of_measurement = get_unit_of_measurement(hass, entry.entity_id)
     except HomeAssistantError:
         unit_of_measurement = None
 
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index 0d594e1b7c3a57..1bb41eb2d30b72 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -1,7 +1,10 @@
 """Provides device triggers for sensors."""
 import voluptuous as vol
 
-from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
+from homeassistant.components.device_automation import (
+    DEVICE_TRIGGER_BASE_SCHEMA,
+    async_get_entity_registry_entry_or_raise,
+)
 from homeassistant.components.device_automation.exceptions import (
     InvalidDeviceAutomationConfig,
 )
@@ -136,7 +139,7 @@
 TRIGGER_SCHEMA = vol.All(
     DEVICE_TRIGGER_BASE_SCHEMA.extend(
         {
-            vol.Required(CONF_ENTITY_ID): cv.entity_id,
+            vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
             vol.Required(CONF_TYPE): vol.In(
                 [
                     CONF_APPARENT_POWER,
@@ -251,7 +254,7 @@ async def async_get_triggers(
                 **automation,
                 "platform": "device",
                 "device_id": device_id,
-                "entity_id": entry.entity_id,
+                "entity_id": entry.id,
                 "domain": DOMAIN,
             }
             for automation in templates
@@ -264,8 +267,10 @@ async def async_get_trigger_capabilities(
     hass: HomeAssistant, config: ConfigType
 ) -> dict[str, vol.Schema]:
     """List trigger capabilities."""
+
     try:
-        unit_of_measurement = get_unit_of_measurement(hass, config[CONF_ENTITY_ID])
+        entry = async_get_entity_registry_entry_or_raise(hass, config[CONF_ENTITY_ID])
+        unit_of_measurement = get_unit_of_measurement(hass, entry.entity_id)
     except HomeAssistantError:
         unit_of_measurement = None
 
diff --git a/homeassistant/components/sensor/recorder.py b/homeassistant/components/sensor/recorder.py
index f9fdc2525371c8..2b75c1114cecc4 100644
--- a/homeassistant/components/sensor/recorder.py
+++ b/homeassistant/components/sensor/recorder.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from collections.abc import Iterable, MutableMapping
+from collections.abc import Callable, Iterable, MutableMapping
 import datetime
 import itertools
 import logging
@@ -224,6 +224,8 @@ def _normalize_states(
 
     converter = statistics.STATISTIC_UNIT_TO_UNIT_CONVERTER[statistics_unit]
     valid_fstates: list[tuple[float, State]] = []
+    convert: Callable[[float], float]
+    last_unit: str | None | object = object()
 
     for fstate, state in fstates:
         state_unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
@@ -247,15 +249,13 @@ def _normalize_states(
                     LINK_DEV_STATISTICS,
                 )
             continue
+        if state_unit != last_unit:
+            # The unit of measurement has changed since the last state change
+            # recreate the converter factory
+            convert = converter.converter_factory(state_unit, statistics_unit)
+            last_unit = state_unit
 
-        valid_fstates.append(
-            (
-                converter.convert(
-                    fstate, from_unit=state_unit, to_unit=statistics_unit
-                ),
-                state,
-            )
-        )
+        valid_fstates.append((convert(fstate), state))
 
     return statistics_unit, valid_fstates
 
diff --git a/homeassistant/components/sentry/__init__.py b/homeassistant/components/sentry/__init__.py
index 092358e82f6df9..8815986d36829c 100644
--- a/homeassistant/components/sentry/__init__.py
+++ b/homeassistant/components/sentry/__init__.py
@@ -206,7 +206,7 @@ def process_before_send(
                 "channel": channel,
                 "custom_components": "\n".join(sorted(custom_components)),
                 "integrations": "\n".join(sorted(integrations)),
-                **system_info,  # type: ignore[arg-type]
+                **system_info,
             },
         }
     )
diff --git a/homeassistant/components/sentry/manifest.json b/homeassistant/components/sentry/manifest.json
index d684ee345b1b0a..c3d0852e17ae9b 100644
--- a/homeassistant/components/sentry/manifest.json
+++ b/homeassistant/components/sentry/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sentry",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["sentry-sdk==1.23.1"]
+  "requirements": ["sentry-sdk==1.27.1"]
 }
diff --git a/homeassistant/components/senz/__init__.py b/homeassistant/components/senz/__init__.py
index e6ded8e0355594..559760ec52d310 100644
--- a/homeassistant/components/senz/__init__.py
+++ b/homeassistant/components/senz/__init__.py
@@ -16,8 +16,6 @@
     config_validation as cv,
     httpx_client,
 )
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .api import SENZConfigEntryAuth
@@ -27,29 +25,13 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS = [Platform.CLIMATE]
 
 SENZDataUpdateCoordinator = DataUpdateCoordinator[dict[str, Thermostat]]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the SENZ integration."""
-    if DOMAIN in config:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.8.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up SENZ from a config entry."""
     implementation = (
diff --git a/homeassistant/components/senz/strings.json b/homeassistant/components/senz/strings.json
index 74ca9f5e3bfa09..316f7234f9b465 100644
--- a/homeassistant/components/senz/strings.json
+++ b/homeassistant/components/senz/strings.json
@@ -16,11 +16,5 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
-  },
-  "issues": {
-    "removed_yaml": {
-      "title": "The nVent RAYCHEM SENZ YAML configuration has been removed",
-      "description": "Configuring nVent RAYCHEM SENZ using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/seven_segments/manifest.json b/homeassistant/components/seven_segments/manifest.json
index 90c5bf59fa3a91..e9b2e9e2e9c8ef 100644
--- a/homeassistant/components/seven_segments/manifest.json
+++ b/homeassistant/components/seven_segments/manifest.json
@@ -4,5 +4,5 @@
   "codeowners": ["@fabaff"],
   "documentation": "https://www.home-assistant.io/integrations/seven_segments",
   "iot_class": "local_polling",
-  "requirements": ["pillow==9.5.0"]
+  "requirements": ["Pillow==9.5.0"]
 }
diff --git a/homeassistant/components/sharkiq/vacuum.py b/homeassistant/components/sharkiq/vacuum.py
index 5eafbc1e1e298d..ca24212a96c741 100644
--- a/homeassistant/components/sharkiq/vacuum.py
+++ b/homeassistant/components/sharkiq/vacuum.py
@@ -68,6 +68,8 @@ class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuum
     """Shark IQ vacuum entity."""
 
     _attr_fan_speed_list = list(FAN_SPEEDS_MAP)
+    _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         VacuumEntityFeature.BATTERY
         | VacuumEntityFeature.FAN_SPEED
@@ -75,7 +77,6 @@ class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuum
         | VacuumEntityFeature.RETURN_HOME
         | VacuumEntityFeature.START
         | VacuumEntityFeature.STATE
-        | VacuumEntityFeature.STATUS
         | VacuumEntityFeature.STOP
         | VacuumEntityFeature.LOCATE
     )
@@ -86,7 +87,6 @@ def __init__(
         """Create a new SharkVacuumEntity."""
         super().__init__(coordinator)
         self.sharkiq = sharkiq
-        self._attr_name = sharkiq.name
         self._attr_unique_id = sharkiq.serial_number
         self._serial_number = sharkiq.serial_number
 
@@ -122,7 +122,7 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, self._serial_number)},
             manufacturer=SHARK,
             model=self.model,
-            name=self.name,
+            name=self.sharkiq.name,
             sw_version=self.sharkiq.get_property_value(
                 Properties.ROBOT_FIRMWARE_VERSION
             ),
diff --git a/homeassistant/components/shelly/__init__.py b/homeassistant/components/shelly/__init__.py
index 7cb1f6977656b0..69959453a78403 100644
--- a/homeassistant/components/shelly/__init__.py
+++ b/homeassistant/components/shelly/__init__.py
@@ -44,6 +44,7 @@
     get_coap_context,
     get_device_entry_gen,
     get_rpc_device_sleep_period,
+    get_rpc_device_wakeup_period,
     get_ws_context,
 )
 
@@ -258,7 +259,9 @@ def _async_device_online(_: Any, update_type: UpdateType) -> None:
 
         if sleep_period is None:
             data = {**entry.data}
-            data[CONF_SLEEP_PERIOD] = get_rpc_device_sleep_period(device.config)
+            data[CONF_SLEEP_PERIOD] = get_rpc_device_sleep_period(
+                device.config
+            ) or get_rpc_device_wakeup_period(device.status)
             hass.config_entries.async_update_entry(entry, data=data)
 
         hass.async_create_task(_async_rpc_device_setup())
diff --git a/homeassistant/components/shelly/binary_sensor.py b/homeassistant/components/shelly/binary_sensor.py
index 449fc14221829a..1474906cacb1fe 100644
--- a/homeassistant/components/shelly/binary_sensor.py
+++ b/homeassistant/components/shelly/binary_sensor.py
@@ -14,6 +14,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import CONF_SLEEP_PERIOD
 from .entity import (
@@ -290,11 +291,18 @@ def is_on(self) -> bool:
         return bool(self.attribute_value)
 
 
-class BlockSleepingBinarySensor(ShellySleepingBlockAttributeEntity, BinarySensorEntity):
+class BlockSleepingBinarySensor(
+    ShellySleepingBlockAttributeEntity, BinarySensorEntity, RestoreEntity
+):
     """Represent a block sleeping binary sensor."""
 
     entity_description: BlockBinarySensorDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def is_on(self) -> bool | None:
         """Return true if sensor state is on."""
@@ -307,11 +315,18 @@ def is_on(self) -> bool | None:
         return self.last_state.state == STATE_ON
 
 
-class RpcSleepingBinarySensor(ShellySleepingRpcAttributeEntity, BinarySensorEntity):
+class RpcSleepingBinarySensor(
+    ShellySleepingRpcAttributeEntity, BinarySensorEntity, RestoreEntity
+):
     """Represent a RPC sleeping binary sensor entity."""
 
     entity_description: RpcBinarySensorDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def is_on(self) -> bool | None:
         """Return true if RPC sensor state is on."""
diff --git a/homeassistant/components/shelly/bluetooth/scanner.py b/homeassistant/components/shelly/bluetooth/scanner.py
index 5b302e0da62d7e..7c0dc3c792ad98 100644
--- a/homeassistant/components/shelly/bluetooth/scanner.py
+++ b/homeassistant/components/shelly/bluetooth/scanner.py
@@ -6,7 +6,7 @@
 from aioshelly.ble import parse_ble_scan_result_event
 from aioshelly.ble.const import BLE_SCAN_RESULT_EVENT, BLE_SCAN_RESULT_VERSION
 
-from homeassistant.components.bluetooth import BaseHaRemoteScanner
+from homeassistant.components.bluetooth import MONOTONIC_TIME, BaseHaRemoteScanner
 from homeassistant.core import callback
 
 from ..const import LOGGER
@@ -44,4 +44,5 @@ def async_on_event(self, event: dict[str, Any]) -> None:
             parsed.manufacturer_data,
             parsed.tx_power,
             {},
+            MONOTONIC_TIME(),
         )
diff --git a/homeassistant/components/shelly/button.py b/homeassistant/components/shelly/button.py
index 15a055736560ee..ac01033f2c73ff 100644
--- a/homeassistant/components/shelly/button.py
+++ b/homeassistant/components/shelly/button.py
@@ -3,7 +3,7 @@
 
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
-from typing import Any, Final, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, Final, Generic, TypeVar
 
 from homeassistant.components.button import (
     ButtonDeviceClass,
@@ -12,14 +12,15 @@
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
 
-from .const import SHELLY_GAS_MODELS
+from .const import LOGGER, SHELLY_GAS_MODELS
 from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator, get_entry_data
 from .utils import get_device_entry_gen
 
@@ -79,12 +80,52 @@ class ShellyButtonDescription(
 ]
 
 
+@callback
+def async_migrate_unique_ids(
+    entity_entry: er.RegistryEntry,
+    coordinator: ShellyRpcCoordinator | ShellyBlockCoordinator,
+) -> dict[str, Any] | None:
+    """Migrate button unique IDs."""
+    if not entity_entry.entity_id.startswith("button"):
+        return None
+
+    device_name = slugify(coordinator.device.name)
+
+    for key in ("reboot", "self_test", "mute", "unmute"):
+        old_unique_id = f"{device_name}_{key}"
+        if entity_entry.unique_id == old_unique_id:
+            new_unique_id = f"{coordinator.mac}_{key}"
+            LOGGER.debug(
+                "Migrating unique_id for %s entity from [%s] to [%s]",
+                entity_entry.entity_id,
+                old_unique_id,
+                new_unique_id,
+            )
+            return {
+                "new_unique_id": entity_entry.unique_id.replace(
+                    old_unique_id, new_unique_id
+                )
+            }
+
+    return None
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set buttons for device."""
+
+    @callback
+    def _async_migrate_unique_ids(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, Any] | None:
+        """Migrate button unique IDs."""
+        if TYPE_CHECKING:
+            assert coordinator is not None
+        return async_migrate_unique_ids(entity_entry, coordinator)
+
     coordinator: ShellyRpcCoordinator | ShellyBlockCoordinator | None = None
     if get_device_entry_gen(config_entry) == 2:
         coordinator = get_entry_data(hass)[config_entry.entry_id].rpc
@@ -92,6 +133,10 @@ async def async_setup_entry(
         coordinator = get_entry_data(hass)[config_entry.entry_id].block
 
     if coordinator is not None:
+        await er.async_migrate_entries(
+            hass, config_entry.entry_id, _async_migrate_unique_ids
+        )
+
         entities: list[ShellyButton] = []
 
         for button in BUTTONS:
@@ -123,7 +168,7 @@ def __init__(
         self.entity_description = description
 
         self._attr_name = f"{coordinator.device.name} {description.name}"
-        self._attr_unique_id = slugify(self._attr_name)
+        self._attr_unique_id = f"{coordinator.mac}_{description.key}"
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, coordinator.mac)}
         )
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index 43e9f9b8fe7be7..bad13fde006b02 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -39,6 +39,7 @@
     get_info_gen,
     get_model_name,
     get_rpc_device_sleep_period,
+    get_rpc_device_wakeup_period,
     get_ws_context,
     mac_address_from_name,
 )
@@ -76,9 +77,13 @@ async def validate_input(
         )
         await rpc_device.shutdown()
 
+        sleep_period = get_rpc_device_sleep_period(
+            rpc_device.config
+        ) or get_rpc_device_wakeup_period(rpc_device.status)
+
         return {
             "title": rpc_device.name,
-            CONF_SLEEP_PERIOD: get_rpc_device_sleep_period(rpc_device.config),
+            CONF_SLEEP_PERIOD: sleep_period,
             "model": rpc_device.shelly.get("model"),
             "gen": 2,
         }
diff --git a/homeassistant/components/shelly/coordinator.py b/homeassistant/components/shelly/coordinator.py
index 85207ee4475db0..6d7b3496880224 100644
--- a/homeassistant/components/shelly/coordinator.py
+++ b/homeassistant/components/shelly/coordinator.py
@@ -535,7 +535,10 @@ def async_setup(self) -> None:
     async def shutdown(self) -> None:
         """Shutdown the coordinator."""
         if self.device.connected:
-            await async_stop_scanner(self.device)
+            try:
+                await async_stop_scanner(self.device)
+            except InvalidAuthError:
+                self.entry.async_start_reauth(self.hass)
         await self.device.shutdown()
         await self._async_disconnected()
 
diff --git a/homeassistant/components/shelly/entity.py b/homeassistant/components/shelly/entity.py
index 1f18a5f8e18caf..9f95ea5ac2117b 100644
--- a/homeassistant/components/shelly/entity.py
+++ b/homeassistant/components/shelly/entity.py
@@ -19,7 +19,6 @@
     async_entries_for_config_entry,
     async_get as er_async_get,
 )
-from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -201,18 +200,13 @@ def async_setup_rpc_attribute_entities(
                 domain = sensor_class.__module__.split(".")[-1]
                 unique_id = f"{coordinator.mac}-{key}-{sensor_id}"
                 async_remove_shelly_entity(hass, domain, unique_id)
-            else:
-                if description.use_polling_coordinator:
-                    if not sleep_period:
-                        entities.append(
-                            sensor_class(
-                                polling_coordinator, key, sensor_id, description
-                            )
-                        )
-                else:
+            elif description.use_polling_coordinator:
+                if not sleep_period:
                     entities.append(
-                        sensor_class(coordinator, key, sensor_id, description)
+                        sensor_class(polling_coordinator, key, sensor_id, description)
                     )
+            else:
+                entities.append(sensor_class(coordinator, key, sensor_id, description))
     if not entities:
         return
 
@@ -276,6 +270,10 @@ def async_setup_entry_rest(
 class BlockEntityDescription(EntityDescription):
     """Class to describe a BLOCK entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     icon_fn: Callable[[dict], str] | None = None
     unit_fn: Callable[[dict], str] | None = None
     value: Callable[[Any], Any] = lambda val: val
@@ -296,6 +294,10 @@ class RpcEntityRequiredKeysMixin:
 class RpcEntityDescription(EntityDescription, RpcEntityRequiredKeysMixin):
     """Class to describe a RPC entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable[[Any, Any], Any] | None = None
     available: Callable[[dict], bool] | None = None
     removal_condition: Callable[[dict, dict, str], bool] | None = None
@@ -308,6 +310,10 @@ class RpcEntityDescription(EntityDescription, RpcEntityRequiredKeysMixin):
 class RestEntityDescription(EntityDescription):
     """Class to describe a REST entity."""
 
+    # BlockEntity does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable[[dict, Any], Any] | None = None
     extra_state_attributes: Callable[[dict], dict | None] | None = None
 
@@ -552,7 +558,7 @@ def available(self) -> bool:
         return self.entity_description.available(self.sub_status)
 
 
-class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity, RestoreEntity):
+class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity):
     """Represent a shelly sleeping block attribute entity."""
 
     # pylint: disable=super-init-not-called
@@ -589,11 +595,6 @@ def __init__(
             self._attr_unique_id = entry.unique_id
             self._attr_name = cast(str, entry.original_name)
 
-    async def async_added_to_hass(self) -> None:
-        """Handle entity which will be added."""
-        await super().async_added_to_hass()
-        self.last_state = await self.async_get_last_state()
-
     @callback
     def _update_callback(self) -> None:
         """Handle device update."""
@@ -629,7 +630,7 @@ def _update_callback(self) -> None:
                 return
 
 
-class ShellySleepingRpcAttributeEntity(ShellyRpcAttributeEntity, RestoreEntity):
+class ShellySleepingRpcAttributeEntity(ShellyRpcAttributeEntity):
     """Helper class to represent a sleeping rpc attribute."""
 
     entity_description: RpcEntityDescription
@@ -665,8 +666,3 @@ def __init__(
             )
         elif entry is not None:
             self._attr_name = cast(str, entry.original_name)
-
-    async def async_added_to_hass(self) -> None:
-        """Handle entity which will be added."""
-        await super().async_added_to_hass()
-        self.last_state = await self.async_get_last_state()
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index 39a1427346dac7..6031b2dcc82acb 100644
--- a/homeassistant/components/shelly/manifest.json
+++ b/homeassistant/components/shelly/manifest.json
@@ -9,7 +9,7 @@
   "iot_class": "local_push",
   "loggers": ["aioshelly"],
   "quality_scale": "platinum",
-  "requirements": ["aioshelly==5.3.2"],
+  "requirements": ["aioshelly==5.4.0"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",
diff --git a/homeassistant/components/shelly/number.py b/homeassistant/components/shelly/number.py
index fb95a180e76c43..f2b6bedb443a1f 100644
--- a/homeassistant/components/shelly/number.py
+++ b/homeassistant/components/shelly/number.py
@@ -1,15 +1,18 @@
 """Number for Shelly."""
 from __future__ import annotations
 
+from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any, Final, cast
 
+from aioshelly.block_device import Block
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 
 from homeassistant.components.number import (
-    NumberEntity,
     NumberEntityDescription,
+    NumberExtraStoredData,
     NumberMode,
+    RestoreNumber,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
@@ -19,6 +22,7 @@
 from homeassistant.helpers.entity_registry import RegistryEntry
 
 from .const import CONF_SLEEP_PERIOD, LOGGER
+from .coordinator import ShellyBlockCoordinator
 from .entity import (
     BlockEntityDescription,
     ShellySleepingBlockAttributeEntity,
@@ -85,21 +89,39 @@ async def async_setup_entry(
         )
 
 
-class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, NumberEntity):
+class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, RestoreNumber):
     """Represent a block sleeping number."""
 
     entity_description: BlockNumberDescription
 
+    def __init__(
+        self,
+        coordinator: ShellyBlockCoordinator,
+        block: Block | None,
+        attribute: str,
+        description: BlockNumberDescription,
+        entry: RegistryEntry | None = None,
+        sensors: Mapping[tuple[str, str], BlockNumberDescription] | None = None,
+    ) -> None:
+        """Initialize the sleeping sensor."""
+        self.restored_data: NumberExtraStoredData | None = None
+        super().__init__(coordinator, block, attribute, description, entry, sensors)
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_number_data()
+
     @property
     def native_value(self) -> float | None:
         """Return value of number."""
         if self.block is not None:
             return cast(float, self.attribute_value)
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return cast(float, self.last_state.state)
+        return cast(float, self.restored_data.native_value)
 
     async def async_set_native_value(self, value: float) -> None:
         """Set value."""
diff --git a/homeassistant/components/shelly/sensor.py b/homeassistant/components/shelly/sensor.py
index b83131a1004c6b..0260a540f0cc6b 100644
--- a/homeassistant/components/shelly/sensor.py
+++ b/homeassistant/components/shelly/sensor.py
@@ -8,14 +8,15 @@
 from aioshelly.block_device import Block
 
 from homeassistant.components.sensor import (
+    RestoreSensor,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorExtraStoredData,
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    ATTR_UNIT_OF_MEASUREMENT,
     CONCENTRATION_PARTS_PER_MILLION,
     DEGREE,
     LIGHT_LUX,
@@ -35,7 +36,7 @@
 from homeassistant.helpers.typing import StateType
 
 from .const import CONF_SLEEP_PERIOD, SHAIR_MAX_WORK_HOURS
-from .coordinator import ShellyBlockCoordinator
+from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator
 from .entity import (
     BlockEntityDescription,
     RestEntityDescription,
@@ -584,6 +585,14 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
         state_class=SensorStateClass.TOTAL_INCREASING,
         entity_registry_enabled_default=False,
     ),
+    "illuminance": RpcSensorDescription(
+        key="illuminance",
+        sub_key="lux",
+        name="Illuminance",
+        native_unit_of_measurement=LIGHT_LUX,
+        device_class=SensorDeviceClass.ILLUMINANCE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     "temperature": RpcSensorDescription(
         key="switch",
         sub_key="temperature",
@@ -768,7 +777,7 @@ def native_value(self) -> StateType:
         return self.attribute_value
 
 
-class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, SensorEntity):
+class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, RestoreSensor):
     """Represent a block sleeping sensor."""
 
     entity_description: BlockSensorDescription
@@ -784,6 +793,12 @@ def __init__(
     ) -> None:
         """Initialize the sleeping sensor."""
         super().__init__(coordinator, block, attribute, description, entry, sensors)
+        self.restored_data: SensorExtraStoredData | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_sensor_data()
 
     @property
     def native_value(self) -> StateType:
@@ -791,10 +806,10 @@ def native_value(self) -> StateType:
         if self.block is not None:
             return self.attribute_value
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.state
+        return cast(StateType, self.restored_data.native_value)
 
     @property
     def native_unit_of_measurement(self) -> str | None:
@@ -802,27 +817,44 @@ def native_unit_of_measurement(self) -> str | None:
         if self.block is not None:
             return self.entity_description.native_unit_of_measurement
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        return self.restored_data.native_unit_of_measurement
 
 
-class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, SensorEntity):
+class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, RestoreSensor):
     """Represent a RPC sleeping sensor."""
 
     entity_description: RpcSensorDescription
 
+    def __init__(
+        self,
+        coordinator: ShellyRpcCoordinator,
+        key: str,
+        attribute: str,
+        description: RpcEntityDescription,
+        entry: RegistryEntry | None = None,
+    ) -> None:
+        """Initialize the sleeping sensor."""
+        super().__init__(coordinator, key, attribute, description, entry)
+        self.restored_data: SensorExtraStoredData | None = None
+
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.restored_data = await self.async_get_last_sensor_data()
+
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
         if self.coordinator.device.initialized:
             return self.attribute_value
 
-        if self.last_state is None:
+        if self.restored_data is None:
             return None
 
-        return self.last_state.state
+        return cast(StateType, self.restored_data.native_value)
 
     @property
     def native_unit_of_measurement(self) -> str | None:
diff --git a/homeassistant/components/shelly/strings.json b/homeassistant/components/shelly/strings.json
index f0d4e1c9bd95ef..265184e622715f 100644
--- a/homeassistant/components/shelly/strings.json
+++ b/homeassistant/components/shelly/strings.json
@@ -103,7 +103,7 @@
         "state": {
           "unknown": "Unknown",
           "warmup": "Warm-up",
-          "normal": "normal",
+          "normal": "Normal",
           "fault": "Fault"
         },
         "state_attributes": {
diff --git a/homeassistant/components/shelly/update.py b/homeassistant/components/shelly/update.py
index 47a39105ac4487..3b2096f0c1a997 100644
--- a/homeassistant/components/shelly/update.py
+++ b/homeassistant/components/shelly/update.py
@@ -21,6 +21,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import CONF_SLEEP_PERIOD
 from .coordinator import ShellyBlockCoordinator, ShellyRpcCoordinator
@@ -282,11 +283,18 @@ async def async_install(
             LOGGER.debug("OTA update call successful")
 
 
-class RpcSleepingUpdateEntity(ShellySleepingRpcAttributeEntity, UpdateEntity):
+class RpcSleepingUpdateEntity(
+    ShellySleepingRpcAttributeEntity, UpdateEntity, RestoreEntity
+):
     """Represent a RPC sleeping update entity."""
 
     entity_description: RpcUpdateDescription
 
+    async def async_added_to_hass(self) -> None:
+        """Handle entity which will be added."""
+        await super().async_added_to_hass()
+        self.last_state = await self.async_get_last_state()
+
     @property
     def installed_version(self) -> str | None:
         """Version currently in use."""
diff --git a/homeassistant/components/shelly/utils.py b/homeassistant/components/shelly/utils.py
index 6b781918b4f62a..03df3da346bdb8 100644
--- a/homeassistant/components/shelly/utils.py
+++ b/homeassistant/components/shelly/utils.py
@@ -19,7 +19,6 @@
     async_get as dr_async_get,
     format_mac,
 )
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME, DeviceClassName
 from homeassistant.helpers.entity_registry import async_get as er_async_get
 from homeassistant.helpers.typing import EventType
 from homeassistant.util.dt import utcnow
@@ -73,16 +72,12 @@ def get_number_of_channels(device: BlockDevice, block: Block) -> int:
 def get_block_entity_name(
     device: BlockDevice,
     block: Block | None,
-    description: str | DeviceClassName | None = None,
+    description: str | None = None,
 ) -> str:
     """Naming for block based switch and sensors."""
     channel_name = get_block_channel_name(device, block)
 
     if description:
-        # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME as description.
-        assert description is not DEVICE_CLASS_NAME
         return f"{channel_name} {description.lower()}"
 
     return channel_name
@@ -260,7 +255,11 @@ def get_block_device_sleep_period(settings: dict[str, Any]) -> int:
 
 
 def get_rpc_device_sleep_period(config: dict[str, Any]) -> int:
-    """Return the device sleep period in seconds or 0 for non sleeping devices."""
+    """Return the device sleep period in seconds or 0 for non sleeping devices.
+
+    sys.sleep.wakeup_period value is deprecated and not available in Shelly
+    firmware 1.0.0 or later.
+    """
     return cast(int, config["sys"].get("sleep", {}).get("wakeup_period", 0))
 
 
@@ -306,16 +305,12 @@ def get_rpc_channel_name(device: RpcDevice, key: str) -> str:
 
 
 def get_rpc_entity_name(
-    device: RpcDevice, key: str, description: str | DeviceClassName | None = None
+    device: RpcDevice, key: str, description: str | None = None
 ) -> str:
     """Naming for RPC based switch and sensors."""
     channel_name = get_rpc_channel_name(device, key)
 
     if description:
-        # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME as description.
-        assert description is not DEVICE_CLASS_NAME
         return f"{channel_name} {description.lower()}"
 
     return channel_name
@@ -357,7 +352,7 @@ def is_block_channel_type_light(settings: dict[str, Any], channel: int) -> bool:
 
 def is_rpc_channel_type_light(config: dict[str, Any], channel: int) -> bool:
     """Return true if rpc channel consumption type is set to light."""
-    con_types = config["sys"]["ui_data"].get("consumption_types")
+    con_types = config["sys"].get("ui_data", {}).get("consumption_types")
     return con_types is not None and con_types[channel].lower().startswith("light")
 
 
diff --git a/homeassistant/components/sighthound/manifest.json b/homeassistant/components/sighthound/manifest.json
index 1b6fbe9548d022..2fdf15a4a10b50 100644
--- a/homeassistant/components/sighthound/manifest.json
+++ b/homeassistant/components/sighthound/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sighthound",
   "iot_class": "cloud_polling",
   "loggers": ["simplehound"],
-  "requirements": ["pillow==9.5.0", "simplehound==0.3"]
+  "requirements": ["Pillow==9.5.0", "simplehound==0.3"]
 }
diff --git a/homeassistant/components/simplepush/__init__.py b/homeassistant/components/simplepush/__init__.py
index c5782258cb7ce6..e39c3cc6ce108e 100644
--- a/homeassistant/components/simplepush/__init__.py
+++ b/homeassistant/components/simplepush/__init__.py
@@ -3,13 +3,15 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
+from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_HASS_CONFIG, DOMAIN
 
 PLATFORMS = [Platform.NOTIFY]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the simplepush component."""
diff --git a/homeassistant/components/simplepush/notify.py b/homeassistant/components/simplepush/notify.py
index 3e7fad8863f8d3..cc6c61ced030f8 100644
--- a/homeassistant/components/simplepush/notify.py
+++ b/homeassistant/components/simplepush/notify.py
@@ -10,18 +10,13 @@
     ATTR_DATA,
     ATTR_TITLE,
     ATTR_TITLE_DEFAULT,
-    PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
     BaseNotificationService,
 )
 from homeassistant.const import CONF_EVENT, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import ATTR_ATTACHMENTS, ATTR_EVENT, CONF_DEVICE_KEY, CONF_SALT, DOMAIN
-
-# Configuring Simplepush under the notify has been removed in 2022.9.0
-PLATFORM_SCHEMA = BASE_PLATFORM_SCHEMA
+from .const import ATTR_ATTACHMENTS, ATTR_EVENT, CONF_DEVICE_KEY, CONF_SALT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,19 +27,9 @@ async def async_get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> SimplePushNotificationService | None:
     """Get the Simplepush notification service."""
-    if discovery_info is None:
-        async_create_issue(
-            hass,
-            DOMAIN,
-            "removed_yaml",
-            breaks_in_ha_version="2022.9.0",
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key="removed_yaml",
-        )
-        return None
-
-    return SimplePushNotificationService(discovery_info)
+    if discovery_info:
+        return SimplePushNotificationService(discovery_info)
+    return None
 
 
 class SimplePushNotificationService(BaseNotificationService):
diff --git a/homeassistant/components/simplepush/strings.json b/homeassistant/components/simplepush/strings.json
index 68ee5c7a9ed8f4..0031dc32340c9a 100644
--- a/homeassistant/components/simplepush/strings.json
+++ b/homeassistant/components/simplepush/strings.json
@@ -17,11 +17,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "removed_yaml": {
-      "title": "The Simplepush YAML configuration has been removed",
-      "description": "Configuring Simplepush using YAML has been removed.\n\nYour existing YAML configuration is not used by Home Assistant.\n\nRemove the Simplepush YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py
index 6a3523f07c9269..17fc6f3cc4de4e 100644
--- a/homeassistant/components/simplisafe/__init__.py
+++ b/homeassistant/components/simplisafe/__init__.py
@@ -71,7 +71,6 @@
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.service import (
     async_register_admin_service,
     verify_domain_control,
@@ -252,45 +251,6 @@ def _async_get_system_for_service_call(
     raise ValueError(f"No system for device ID: {device_id}")
 
 
-@callback
-def _async_log_deprecated_service_call(
-    hass: HomeAssistant,
-    call: ServiceCall,
-    alternate_service: str,
-    alternate_target: str,
-    breaks_in_ha_version: str,
-) -> None:
-    """Log a warning about a deprecated service call."""
-    deprecated_service = f"{call.domain}.{call.service}"
-
-    async_create_issue(
-        hass,
-        DOMAIN,
-        f"deprecated_service_{deprecated_service}",
-        breaks_in_ha_version=breaks_in_ha_version,
-        is_fixable=True,
-        is_persistent=True,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_service",
-        translation_placeholders={
-            "alternate_service": alternate_service,
-            "alternate_target": alternate_target,
-            "deprecated_service": deprecated_service,
-        },
-    )
-
-    LOGGER.warning(
-        (
-            'The "%s" service is deprecated and will be removed in %s; use the "%s" '
-            'service and pass it a target entity ID of "%s"'
-        ),
-        deprecated_service,
-        breaks_in_ha_version,
-        alternate_service,
-        alternate_target,
-    )
-
-
 @callback
 def _async_register_base_station(
     hass: HomeAssistant, entry: ConfigEntry, system: SystemType
diff --git a/homeassistant/components/simplisafe/alarm_control_panel.py b/homeassistant/components/simplisafe/alarm_control_panel.py
index 4913d76c0c9712..b895be83f2edf2 100644
--- a/homeassistant/components/simplisafe/alarm_control_panel.py
+++ b/homeassistant/components/simplisafe/alarm_control_panel.py
@@ -127,6 +127,7 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
     )
+    _attr_name = None
 
     def __init__(self, simplisafe: SimpliSafe, system: SystemType) -> None:
         """Initialize the SimpliSafe alarm."""
diff --git a/homeassistant/components/simplisafe/binary_sensor.py b/homeassistant/components/simplisafe/binary_sensor.py
index d31dc5da2828de..34c0ea5ea95b43 100644
--- a/homeassistant/components/simplisafe/binary_sensor.py
+++ b/homeassistant/components/simplisafe/binary_sensor.py
@@ -111,7 +111,6 @@ def __init__(
         """Initialize."""
         super().__init__(simplisafe, system, device=device)
 
-        self._attr_name = "Battery"
         self._attr_unique_id = f"{super().unique_id}-battery"
         self._device: DeviceV3
 
diff --git a/homeassistant/components/simplisafe/button.py b/homeassistant/components/simplisafe/button.py
index d8da8bc75927e7..bd60c040f5695d 100644
--- a/homeassistant/components/simplisafe/button.py
+++ b/homeassistant/components/simplisafe/button.py
@@ -44,7 +44,7 @@ async def _async_clear_notifications(system: System) -> None:
 BUTTON_DESCRIPTIONS = (
     SimpliSafeButtonDescription(
         key=BUTTON_KIND_CLEAR_NOTIFICATIONS,
-        name="Clear notifications",
+        translation_key=BUTTON_KIND_CLEAR_NOTIFICATIONS,
         push_action=_async_clear_notifications,
     ),
 )
diff --git a/homeassistant/components/simplisafe/lock.py b/homeassistant/components/simplisafe/lock.py
index 1e7be48979b036..9ce59eb3b56ff2 100644
--- a/homeassistant/components/simplisafe/lock.py
+++ b/homeassistant/components/simplisafe/lock.py
@@ -49,6 +49,9 @@ async def async_setup_entry(
 class SimpliSafeLock(SimpliSafeEntity, LockEntity):
     """Define a SimpliSafe lock."""
 
+    _attr_name = None
+    _device: Lock
+
     def __init__(self, simplisafe: SimpliSafe, system: SystemV3, lock: Lock) -> None:
         """Initialize."""
         super().__init__(
@@ -58,8 +61,6 @@ def __init__(self, simplisafe: SimpliSafe, system: SystemV3, lock: Lock) -> None
             additional_websocket_events=WEBSOCKET_EVENTS_TO_LISTEN_FOR,
         )
 
-        self._device: Lock
-
     async def async_lock(self, **kwargs: Any) -> None:
         """Lock the lock."""
         try:
diff --git a/homeassistant/components/simplisafe/strings.json b/homeassistant/components/simplisafe/strings.json
index bc03ab4c5146f4..4f230442f8567a 100644
--- a/homeassistant/components/simplisafe/strings.json
+++ b/homeassistant/components/simplisafe/strings.json
@@ -30,10 +30,11 @@
       }
     }
   },
-  "issues": {
-    "deprecated_service": {
-      "title": "The {deprecated_service} service is being removed",
-      "description": "Update any automations or scripts that use this service to instead use the `{alternate_service}` service with a target entity ID of `{alternate_target}`. Then, click SUBMIT below to mark this issue as resolved."
+  "entity": {
+    "button": {
+      "clear_notifications": {
+        "name": "Clear notifications"
+      }
     }
   }
 }
diff --git a/homeassistant/components/siren/__init__.py b/homeassistant/components/siren/__init__.py
index 0f82918d82a5f3..a8907ba3b687a7 100644
--- a/homeassistant/components/siren/__init__.py
+++ b/homeassistant/components/siren/__init__.py
@@ -131,7 +131,7 @@ async def async_handle_turn_on_service(
         SERVICE_TOGGLE,
         {},
         "async_toggle",
-        [SirenEntityFeature.TURN_ON & SirenEntityFeature.TURN_OFF],
+        [SirenEntityFeature.TURN_ON | SirenEntityFeature.TURN_OFF],
     )
 
     return True
diff --git a/homeassistant/components/sisyphus/manifest.json b/homeassistant/components/sisyphus/manifest.json
index 1a8d9e2e16b7a1..dbb40344d66f3e 100644
--- a/homeassistant/components/sisyphus/manifest.json
+++ b/homeassistant/components/sisyphus/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sisyphus",
   "iot_class": "local_push",
   "loggers": ["sisyphus_control"],
-  "requirements": ["sisyphus-control==3.1.2"]
+  "requirements": ["sisyphus-control==3.1.3"]
 }
diff --git a/homeassistant/components/sky_hub/__init__.py b/homeassistant/components/sky_hub/__init__.py
index 40637d866ff1da..a5b8969018f034 100644
--- a/homeassistant/components/sky_hub/__init__.py
+++ b/homeassistant/components/sky_hub/__init__.py
@@ -1,8 +1 @@
 """The sky_hub component."""
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the sky_hub component."""
-    return True
diff --git a/homeassistant/components/slack/__init__.py b/homeassistant/components/slack/__init__.py
index 36b457b75b7d26..076dcf7e590011 100644
--- a/homeassistant/components/slack/__init__.py
+++ b/homeassistant/components/slack/__init__.py
@@ -7,11 +7,11 @@
 from slack import WebClient
 from slack.errors import SlackApiError
 
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_API_KEY, CONF_PLATFORM, Platform
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client, discovery
+from homeassistant.helpers import aiohttp_client, config_validation as cv, discovery
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo, Entity, EntityDescription
 from homeassistant.helpers.typing import ConfigType
@@ -30,21 +30,12 @@
 
 PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Slack component."""
     hass.data[DATA_HASS_CONFIG] = config
-
-    # Iterate all entries for notify to only get Slack
-    if Platform.NOTIFY in config:
-        for entry in config[Platform.NOTIFY]:
-            if entry[CONF_PLATFORM] == DOMAIN:
-                hass.async_create_task(
-                    hass.config_entries.flow.async_init(
-                        DOMAIN, context={"source": SOURCE_IMPORT}, data=entry
-                    )
-                )
-
     return True
 
 
diff --git a/homeassistant/components/slack/config_flow.py b/homeassistant/components/slack/config_flow.py
index 253750a23108e4..187cef057a05ce 100644
--- a/homeassistant/components/slack/config_flow.py
+++ b/homeassistant/components/slack/config_flow.py
@@ -55,19 +55,6 @@ async def async_step_user(
             errors=errors,
         )
 
-    async def async_step_import(self, import_config: dict[str, str]) -> FlowResult:
-        """Import a config entry from configuration.yaml."""
-        _LOGGER.warning(
-            "Configuration of the Slack integration in YAML is deprecated and "
-            "will be removed in a future release; Your existing configuration "
-            "has been imported into the UI automatically and can be safely removed "
-            "from your configuration.yaml file"
-        )
-        entries = self._async_current_entries()
-        if any(x.data[CONF_API_KEY] == import_config[CONF_API_KEY] for x in entries):
-            return self.async_abort(reason="already_configured")
-        return await self.async_step_user(import_config)
-
     async def _async_try_connect(
         self, token: str
     ) -> tuple[str, None] | tuple[None, dict[str, str]]:
diff --git a/homeassistant/components/slack/manifest.json b/homeassistant/components/slack/manifest.json
index 92816e94bf6f1b..2bd3476cbbe40f 100644
--- a/homeassistant/components/slack/manifest.json
+++ b/homeassistant/components/slack/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "slack",
   "name": "Slack",
-  "codeowners": ["@bachya", "@tkdrob"],
+  "codeowners": ["@tkdrob"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/slack",
   "integration_type": "service",
diff --git a/homeassistant/components/slack/notify.py b/homeassistant/components/slack/notify.py
index d587f960704be6..498eddffa3d88b 100644
--- a/homeassistant/components/slack/notify.py
+++ b/homeassistant/components/slack/notify.py
@@ -17,16 +17,9 @@
     ATTR_DATA,
     ATTR_TARGET,
     ATTR_TITLE,
-    PLATFORM_SCHEMA,
     BaseNotificationService,
 )
-from homeassistant.const import (
-    ATTR_ICON,
-    CONF_API_KEY,
-    CONF_ICON,
-    CONF_PATH,
-    CONF_USERNAME,
-)
+from homeassistant.const import ATTR_ICON, CONF_PATH
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client, config_validation as cv, template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -73,16 +66,6 @@
     cv.ensure_list, [vol.Any(DATA_FILE_SCHEMA, DATA_TEXT_ONLY_SCHEMA)]
 )
 
-# Deprecated in Home Assistant 2022.5
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_API_KEY): cv.string,
-        vol.Required(CONF_DEFAULT_CHANNEL): cv.string,
-        vol.Optional(CONF_ICON): cv.string,
-        vol.Optional(CONF_USERNAME): cv.string,
-    }
-)
-
 
 class AuthDictT(TypedDict, total=False):
     """Type for auth request data."""
@@ -117,14 +100,13 @@ async def async_get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> SlackNotificationService | None:
     """Set up the Slack notification service."""
-    if discovery_info is None:
-        return None
-
-    return SlackNotificationService(
-        hass,
-        discovery_info[SLACK_DATA][DATA_CLIENT],
-        discovery_info,
-    )
+    if discovery_info:
+        return SlackNotificationService(
+            hass,
+            discovery_info[SLACK_DATA][DATA_CLIENT],
+            discovery_info,
+        )
+    return None
 
 
 @callback
diff --git a/homeassistant/components/slimproto/manifest.json b/homeassistant/components/slimproto/manifest.json
index f3008d9f1c1987..1ef87e8493354e 100644
--- a/homeassistant/components/slimproto/manifest.json
+++ b/homeassistant/components/slimproto/manifest.json
@@ -6,5 +6,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/slimproto",
   "iot_class": "local_push",
-  "requirements": ["aioslimproto==2.1.1"]
+  "requirements": ["aioslimproto==2.3.2"]
 }
diff --git a/homeassistant/components/slimproto/media_player.py b/homeassistant/components/slimproto/media_player.py
index 641d3b8ae4d9f7..9bd9f7668c80bd 100644
--- a/homeassistant/components/slimproto/media_player.py
+++ b/homeassistant/components/slimproto/media_player.py
@@ -27,8 +27,10 @@
 from .const import DEFAULT_NAME, DOMAIN, PLAYER_EVENT
 
 STATE_MAPPING = {
-    PlayerState.IDLE: MediaPlayerState.IDLE,
+    PlayerState.STOPPED: MediaPlayerState.IDLE,
     PlayerState.PLAYING: MediaPlayerState.PLAYING,
+    PlayerState.BUFFER_READY: MediaPlayerState.PLAYING,
+    PlayerState.BUFFERING: MediaPlayerState.PLAYING,
     PlayerState.PAUSED: MediaPlayerState.PAUSED,
 }
 
@@ -88,6 +90,7 @@ class SlimProtoPlayer(MediaPlayerEntity):
         | MediaPlayerEntityFeature.BROWSE_MEDIA
     )
     _attr_device_class = MediaPlayerDeviceClass.SPEAKER
+    _attr_name = None
 
     def __init__(self, slimserver: SlimServer, player: SlimClient) -> None:
         """Initialize MediaPlayer entity."""
diff --git a/homeassistant/components/smart_meter_texas/sensor.py b/homeassistant/components/smart_meter_texas/sensor.py
index 57a88f7a409f28..7552f2c0697d29 100644
--- a/homeassistant/components/smart_meter_texas/sensor.py
+++ b/homeassistant/components/smart_meter_texas/sensor.py
@@ -40,6 +40,7 @@ async def async_setup_entry(
     )
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SmartMeterTexasSensor(CoordinatorEntity, RestoreEntity, SensorEntity):
     """Representation of an Smart Meter Texas sensor."""
 
diff --git a/homeassistant/components/smartthings/__init__.py b/homeassistant/components/smartthings/__init__.py
index 4127cd5deb59fe..6606352ffc88e0 100644
--- a/homeassistant/components/smartthings/__init__.py
+++ b/homeassistant/components/smartthings/__init__.py
@@ -16,6 +16,7 @@
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
@@ -51,6 +52,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize the SmartThings platform."""
@@ -449,9 +452,11 @@ def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             configuration_url="https://account.smartthings.com",
             identifiers={(DOMAIN, self._device.device_id)},
-            manufacturer="Unavailable",
-            model=self._device.device_type_name,
+            manufacturer=self._device.status.ocf_manufacturer_name,
+            model=self._device.status.ocf_model_number,
             name=self._device.label,
+            hw_version=self._device.status.ocf_hardware_version,
+            sw_version=self._device.status.ocf_firmware_version,
         )
 
     @property
diff --git a/homeassistant/components/smartthings/sensor.py b/homeassistant/components/smartthings/sensor.py
index 40e236f9185040..823ca793972c31 100644
--- a/homeassistant/components/smartthings/sensor.py
+++ b/homeassistant/components/smartthings/sensor.py
@@ -535,7 +535,11 @@
     ],
 }
 
-UNITS = {"C": UnitOfTemperature.CELSIUS, "F": UnitOfTemperature.FAHRENHEIT}
+UNITS = {
+    "C": UnitOfTemperature.CELSIUS,
+    "F": UnitOfTemperature.FAHRENHEIT,
+    "lux": LIGHT_LUX,
+}
 
 THREE_AXIS_NAMES = ["X Coordinate", "Y Coordinate", "Z Coordinate"]
 POWER_CONSUMPTION_REPORT_NAMES = [
diff --git a/homeassistant/components/smhi/const.py b/homeassistant/components/smhi/const.py
index ad788923c7dd74..cc1c4550723c40 100644
--- a/homeassistant/components/smhi/const.py
+++ b/homeassistant/components/smhi/const.py
@@ -3,8 +3,6 @@
 
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 
-ATTR_SMHI_CLOUDINESS: Final = "cloudiness"
-ATTR_SMHI_WIND_GUST_SPEED: Final = "wind_gust_speed"
 ATTR_SMHI_THUNDER_PROBABILITY: Final = "thunder_probability"
 
 DOMAIN = "smhi"
diff --git a/homeassistant/components/smhi/weather.py b/homeassistant/components/smhi/weather.py
index 12781df68915cf..ece0e4f6d5c8fe 100644
--- a/homeassistant/components/smhi/weather.py
+++ b/homeassistant/components/smhi/weather.py
@@ -27,15 +27,17 @@
     ATTR_CONDITION_SUNNY,
     ATTR_CONDITION_WINDY,
     ATTR_CONDITION_WINDY_VARIANT,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
-    ROUNDING_PRECISION,
     Forecast,
     WeatherEntity,
 )
@@ -58,12 +60,9 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
 from homeassistant.util import Throttle, slugify
-from homeassistant.util.unit_conversion import SpeedConverter
 
 from .const import (
-    ATTR_SMHI_CLOUDINESS,
     ATTR_SMHI_THUNDER_PROBABILITY,
-    ATTR_SMHI_WIND_GUST_SPEED,
     DOMAIN,
     ENTITY_ID_SENSOR_FORMAT,
 )
@@ -128,6 +127,7 @@ class SmhiWeather(WeatherEntity):
     _attr_native_pressure_unit = UnitOfPressure.HPA
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -156,14 +156,7 @@ def __init__(
     def extra_state_attributes(self) -> Mapping[str, Any] | None:
         """Return additional attributes."""
         if self._forecasts:
-            wind_gust = SpeedConverter.convert(
-                self._forecasts[0].wind_gust,
-                UnitOfSpeed.METERS_PER_SECOND,
-                self._wind_speed_unit,
-            )
             return {
-                ATTR_SMHI_CLOUDINESS: self._forecasts[0].cloudiness,
-                ATTR_SMHI_WIND_GUST_SPEED: round(wind_gust, ROUNDING_PRECISION),
                 ATTR_SMHI_THUNDER_PROBABILITY: self._forecasts[0].thunder,
             }
         return None
@@ -189,6 +182,8 @@ async def async_update(self) -> None:
             self._attr_wind_bearing = self._forecasts[0].wind_direction
             self._attr_native_visibility = self._forecasts[0].horizontal_visibility
             self._attr_native_pressure = self._forecasts[0].pressure
+            self._attr_native_wind_gust_speed = self._forecasts[0].wind_gust
+            self._attr_cloud_coverage = self._forecasts[0].cloudiness
             self._attr_condition = next(
                 (
                     k
@@ -227,6 +222,9 @@ def forecast(self) -> list[Forecast] | None:
                     ATTR_FORECAST_NATIVE_PRESSURE: forecast.pressure,
                     ATTR_FORECAST_WIND_BEARING: forecast.wind_direction,
                     ATTR_FORECAST_NATIVE_WIND_SPEED: forecast.wind_speed,
+                    ATTR_FORECAST_HUMIDITY: forecast.humidity,
+                    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: forecast.wind_gust,
+                    ATTR_FORECAST_CLOUD_COVERAGE: forecast.cloudiness,
                 }
             )
 
diff --git a/homeassistant/components/snapcast/__init__.py b/homeassistant/components/snapcast/__init__.py
index 309669a8496826..d8ff55cc17530e 100644
--- a/homeassistant/components/snapcast/__init__.py
+++ b/homeassistant/components/snapcast/__init__.py
@@ -27,7 +27,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             f"Could not connect to Snapcast server at {host}:{port}"
         ) from ex
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = HomeAssistantSnapcast(server)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = HomeAssistantSnapcast(
+        hass, server, f"{host}:{port}", entry.entry_id
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -37,5 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
+        snapcast_data = hass.data[DOMAIN].pop(entry.entry_id)
+        # disconnect from server
+        await snapcast_data.disconnect()
     return unload_ok
diff --git a/homeassistant/components/snapcast/media_player.py b/homeassistant/components/snapcast/media_player.py
index bb54bfabf9f05f..096e3829bc7ba8 100644
--- a/homeassistant/components/snapcast/media_player.py
+++ b/homeassistant/components/snapcast/media_player.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from snapcast.control.server import CONTROL_PORT
+from snapcast.control.server import CONTROL_PORT, Snapserver
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
@@ -34,7 +34,6 @@
     SERVICE_SNAPSHOT,
     SERVICE_UNJOIN,
 )
-from .server import HomeAssistantSnapcast
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -72,7 +71,7 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the snapcast config entry."""
-    snapcast_data: HomeAssistantSnapcast = hass.data[DOMAIN][config_entry.entry_id]
+    snapcast_server: Snapserver = hass.data[DOMAIN][config_entry.entry_id].server
 
     register_services()
 
@@ -80,14 +79,18 @@ async def async_setup_entry(
     port = config_entry.data[CONF_PORT]
     hpid = f"{host}:{port}"
 
-    snapcast_data.groups = [
-        SnapcastGroupDevice(group, hpid) for group in snapcast_data.server.groups
+    groups: list[MediaPlayerEntity] = [
+        SnapcastGroupDevice(group, hpid, config_entry.entry_id)
+        for group in snapcast_server.groups
     ]
-    snapcast_data.clients = [
+    clients: list[MediaPlayerEntity] = [
         SnapcastClientDevice(client, hpid, config_entry.entry_id)
-        for client in snapcast_data.server.clients
+        for client in snapcast_server.clients
     ]
-    async_add_entities(snapcast_data.clients + snapcast_data.groups)
+    async_add_entities(clients + groups)
+    hass.data[DOMAIN][
+        config_entry.entry_id
+    ].hass_async_add_entities = async_add_entities
 
 
 async def async_setup_platform(
@@ -101,7 +104,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.6.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -147,18 +150,27 @@ class SnapcastGroupDevice(MediaPlayerEntity):
         | MediaPlayerEntityFeature.SELECT_SOURCE
     )
 
-    def __init__(self, group, uid_part):
+    def __init__(self, group, uid_part, entry_id):
         """Initialize the Snapcast group device."""
+        self._attr_available = True
         self._group = group
+        self._entry_id = entry_id
         self._uid = f"{GROUP_PREFIX}{uid_part}_{self._group.identifier}"
 
     async def async_added_to_hass(self) -> None:
         """Subscribe to group events."""
         self._group.set_callback(self.schedule_update_ha_state)
+        self.hass.data[DOMAIN][self._entry_id].groups.append(self)
 
     async def async_will_remove_from_hass(self) -> None:
         """Disconnect group object when removed."""
         self._group.set_callback(None)
+        self.hass.data[DOMAIN][self._entry_id].groups.remove(self)
+
+    def set_availability(self, available: bool) -> None:
+        """Set availability of group."""
+        self._attr_available = available
+        self.schedule_update_ha_state()
 
     @property
     def state(self) -> MediaPlayerState | None:
@@ -172,6 +184,11 @@ def unique_id(self):
         """Return the ID of snapcast group."""
         return self._uid
 
+    @property
+    def identifier(self):
+        """Return the snapcast identifier."""
+        return self._group.identifier
+
     @property
     def name(self):
         """Return the name of the device."""
@@ -236,6 +253,7 @@ class SnapcastClientDevice(MediaPlayerEntity):
 
     def __init__(self, client, uid_part, entry_id):
         """Initialize the Snapcast client device."""
+        self._attr_available = True
         self._client = client
         self._uid = f"{CLIENT_PREFIX}{uid_part}_{self._client.identifier}"
         self._entry_id = entry_id
@@ -243,10 +261,17 @@ def __init__(self, client, uid_part, entry_id):
     async def async_added_to_hass(self) -> None:
         """Subscribe to client events."""
         self._client.set_callback(self.schedule_update_ha_state)
+        self.hass.data[DOMAIN][self._entry_id].clients.append(self)
 
     async def async_will_remove_from_hass(self) -> None:
         """Disconnect client object when removed."""
         self._client.set_callback(None)
+        self.hass.data[DOMAIN][self._entry_id].clients.remove(self)
+
+    def set_availability(self, available: bool) -> None:
+        """Set availability of group."""
+        self._attr_available = available
+        self.schedule_update_ha_state()
 
     @property
     def unique_id(self):
diff --git a/homeassistant/components/snapcast/server.py b/homeassistant/components/snapcast/server.py
index 507ad6393a2e42..6a787dd5e88335 100644
--- a/homeassistant/components/snapcast/server.py
+++ b/homeassistant/components/snapcast/server.py
@@ -1,15 +1,141 @@
 """Snapcast Integration."""
-from dataclasses import dataclass, field
+from __future__ import annotations
 
-from snapcast.control import Snapserver
+import logging
+
+import snapcast.control
+from snapcast.control.client import Snapclient
 
 from homeassistant.components.media_player import MediaPlayerEntity
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .media_player import SnapcastClientDevice, SnapcastGroupDevice
+
+_LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
 class HomeAssistantSnapcast:
-    """Snapcast data stored in the Home Assistant data object."""
+    """Snapcast server and data stored in the Home Assistant data object."""
+
+    hass: HomeAssistant
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        server: snapcast.control.Snapserver,
+        hpid: str,
+        entry_id: str,
+    ) -> None:
+        """Initialize the HomeAssistantSnapcast object.
+
+        Parameters
+        ----------
+        hass: HomeAssistant
+            hass object
+        server : snapcast.control.Snapserver
+            Snapcast server
+        hpid : str
+            host and port
+        entry_id: str
+            ConfigEntry entry_id
+
+        Returns
+        -------
+        None
+
+        """
+        self.hass: HomeAssistant = hass
+        self.server: snapcast.control.Snapserver = server
+        self.hpid: str = hpid
+        self._entry_id = entry_id
+        self.clients: list[SnapcastClientDevice] = []
+        self.groups: list[SnapcastGroupDevice] = []
+        self.hass_async_add_entities: AddEntitiesCallback
+        # connect callbacks
+        self.server.set_on_update_callback(self.on_update)
+        self.server.set_on_connect_callback(self.on_connect)
+        self.server.set_on_disconnect_callback(self.on_disconnect)
+        self.server.set_new_client_callback(self.on_add_client)
+
+    async def disconnect(self) -> None:
+        """Disconnect from server."""
+        self.server.set_on_update_callback(None)
+        self.server.set_on_connect_callback(None)
+        self.server.set_on_disconnect_callback(None)
+        self.server.set_new_client_callback(None)
+        await self.server.stop()
+
+    def on_update(self) -> None:
+        """Update all entities.
+
+        Retrieve all groups/clients from server and add/update/delete entities.
+        """
+        if not self.hass_async_add_entities:
+            return
+        new_groups: list[MediaPlayerEntity] = []
+        groups: list[MediaPlayerEntity] = []
+        hass_groups = {g.identifier: g for g in self.groups}
+        for group in self.server.groups:
+            if group.identifier in hass_groups:
+                groups.append(hass_groups[group.identifier])
+                hass_groups[group.identifier].async_schedule_update_ha_state()
+            else:
+                new_groups.append(SnapcastGroupDevice(group, self.hpid, self._entry_id))
+        new_clients: list[MediaPlayerEntity] = []
+        clients: list[MediaPlayerEntity] = []
+        hass_clients = {c.identifier: c for c in self.clients}
+        for client in self.server.clients:
+            if client.identifier in hass_clients:
+                clients.append(hass_clients[client.identifier])
+                hass_clients[client.identifier].async_schedule_update_ha_state()
+            else:
+                new_clients.append(
+                    SnapcastClientDevice(client, self.hpid, self._entry_id)
+                )
+        del_entities: list[MediaPlayerEntity] = [
+            x for x in self.groups if x not in groups
+        ]
+        del_entities.extend([x for x in self.clients if x not in clients])
+
+        _LOGGER.debug("New clients: %s", str(new_clients))
+        _LOGGER.debug("New groups: %s", str(new_groups))
+        _LOGGER.debug("Delete: %s", str(del_entities))
+
+        ent_reg = er.async_get(self.hass)
+        for entity in del_entities:
+            ent_reg.async_remove(entity.entity_id)
+        self.hass_async_add_entities(new_clients + new_groups)
+
+    def on_connect(self) -> None:
+        """Activate all entities and update."""
+        for client in self.clients:
+            client.set_availability(True)
+        for group in self.groups:
+            group.set_availability(True)
+        _LOGGER.info("Server connected: %s", self.hpid)
+        self.on_update()
+
+    def on_disconnect(self, ex: Exception | None) -> None:
+        """Deactivate all entities."""
+        for client in self.clients:
+            client.set_availability(False)
+        for group in self.groups:
+            group.set_availability(False)
+        _LOGGER.warning(
+            "Server disconnected: %s. Trying to reconnect. %s", self.hpid, str(ex or "")
+        )
+
+    def on_add_client(self, client: Snapclient) -> None:
+        """Add a Snapcast client.
 
-    server: Snapserver
-    clients: list[MediaPlayerEntity] = field(default_factory=list)
-    groups: list[MediaPlayerEntity] = field(default_factory=list)
+        Parameters
+        ----------
+        client : Snapclient
+            Snapcast client to be added to HA.
+        """
+        if not self.hass_async_add_entities:
+            return
+        clients = [SnapcastClientDevice(client, self.hpid, self._entry_id)]
+        self.hass_async_add_entities(clients)
diff --git a/homeassistant/components/snips/__init__.py b/homeassistant/components/snips/__init__.py
index 3d19de74f91f62..33500217397246 100644
--- a/homeassistant/components/snips/__init__.py
+++ b/homeassistant/components/snips/__init__.py
@@ -176,7 +176,6 @@ async def snips_say(call: ServiceCall) -> None:
         await mqtt.async_publish(
             hass, "hermes/dialogueManager/startSession", json.dumps(notification)
         )
-        return
 
     async def snips_say_action(call: ServiceCall) -> None:
         """Send a Snips action message."""
@@ -193,7 +192,6 @@ async def snips_say_action(call: ServiceCall) -> None:
         await mqtt.async_publish(
             hass, "hermes/dialogueManager/startSession", json.dumps(notification)
         )
-        return
 
     async def feedback_on(call: ServiceCall) -> None:
         """Turn feedback sounds on."""
diff --git a/homeassistant/components/solaredge/__init__.py b/homeassistant/components/solaredge/__init__.py
index dca129c7a70f67..0b685661ac389f 100644
--- a/homeassistant/components/solaredge/__init__.py
+++ b/homeassistant/components/solaredge/__init__.py
@@ -1,6 +1,8 @@
 """The SolarEdge integration."""
 from __future__ import annotations
 
+import socket
+
 from requests.exceptions import ConnectTimeout, HTTPError
 from solaredge import Solaredge
 
@@ -25,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         response = await hass.async_add_executor_job(
             api.get_details, entry.data[CONF_SITE_ID]
         )
-    except (ConnectTimeout, HTTPError) as ex:
+    except (ConnectTimeout, HTTPError, socket.gaierror) as ex:
         LOGGER.error("Could not retrieve details from SolarEdge API")
         raise ConfigEntryNotReady from ex
 
diff --git a/homeassistant/components/solarlog/__init__.py b/homeassistant/components/solarlog/__init__.py
index d35da5b8a90a6e..e0ab838922b66c 100644
--- a/homeassistant/components/solarlog/__init__.py
+++ b/homeassistant/components/solarlog/__init__.py
@@ -56,7 +56,7 @@ async def _async_update_data(self):
         try:
             data = await self.hass.async_add_executor_job(SolarLog, self.host)
         except (OSError, Timeout, HTTPError) as err:
-            raise update_coordinator.UpdateFailed(err)
+            raise update_coordinator.UpdateFailed(err) from err
 
         if data.time.year == 1999:
             raise update_coordinator.UpdateFailed(
diff --git a/homeassistant/components/solarlog/config_flow.py b/homeassistant/components/solarlog/config_flow.py
index 4267502e3ca981..86fc0607bf3c7c 100644
--- a/homeassistant/components/solarlog/config_flow.py
+++ b/homeassistant/components/solarlog/config_flow.py
@@ -68,9 +68,8 @@ async def async_step_user(self, user_input=None):
 
             if self._host_in_configuration_exists(host):
                 self._errors[CONF_HOST] = "already_configured"
-            else:
-                if await self._test_connection(host):
-                    return self.async_create_entry(title=name, data={CONF_HOST: host})
+            elif await self._test_connection(host):
+                return self.async_create_entry(title=name, data={CONF_HOST: host})
         else:
             user_input = {}
             user_input[CONF_NAME] = DEFAULT_NAME
diff --git a/homeassistant/components/solarlog/const.py b/homeassistant/components/solarlog/const.py
index 059dab3da78fb1..d8ba49adbec2cb 100644
--- a/homeassistant/components/solarlog/const.py
+++ b/homeassistant/components/solarlog/const.py
@@ -1,204 +1,8 @@
 """Constants for the Solar-Log integration."""
 from __future__ import annotations
 
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    PERCENTAGE,
-    UnitOfElectricPotential,
-    UnitOfEnergy,
-    UnitOfPower,
-)
-from homeassistant.util.dt import as_local
-
 DOMAIN = "solarlog"
 
 # Default config for solarlog.
 DEFAULT_HOST = "http://solar-log"
 DEFAULT_NAME = "solarlog"
-
-
-@dataclass
-class SolarLogSensorEntityDescription(SensorEntityDescription):
-    """Describes Solarlog sensor entity."""
-
-    value: Callable[[float | int], float] | Callable[[datetime], datetime] | None = None
-
-
-SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
-    SolarLogSensorEntityDescription(
-        key="time",
-        name="last update",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value=as_local,
-    ),
-    SolarLogSensorEntityDescription(
-        key="power_ac",
-        name="power AC",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="power_dc",
-        name="power DC",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="voltage_ac",
-        name="voltage AC",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="voltage_dc",
-        name="voltage DC",
-        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
-        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="yield_day",
-        name="yield day",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="yield_yesterday",
-        name="yield yesterday",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="yield_month",
-        name="yield month",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="yield_year",
-        name="yield year",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="yield_total",
-        name="yield total",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_ac",
-        name="consumption AC",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_day",
-        name="consumption day",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_yesterday",
-        name="consumption yesterday",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_month",
-        name="consumption month",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_year",
-        name="consumption year",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="consumption_total",
-        name="consumption total",
-        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL,
-        value=lambda value: round(value / 1000, 3),
-    ),
-    SolarLogSensorEntityDescription(
-        key="total_power",
-        name="installed peak power",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-    ),
-    SolarLogSensorEntityDescription(
-        key="alternator_loss",
-        name="alternator loss",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="capacity",
-        name="capacity",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda value: round(value * 100, 1),
-    ),
-    SolarLogSensorEntityDescription(
-        key="efficiency",
-        name="efficiency",
-        native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda value: round(value * 100, 1),
-    ),
-    SolarLogSensorEntityDescription(
-        key="power_available",
-        name="power available",
-        icon="mdi:solar-power",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SolarLogSensorEntityDescription(
-        key="usage",
-        name="usage",
-        native_unit_of_measurement=PERCENTAGE,
-        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda value: round(value * 100, 1),
-    ),
-)
diff --git a/homeassistant/components/solarlog/sensor.py b/homeassistant/components/solarlog/sensor.py
index 4180d48cdef28c..906d9aee629a85 100644
--- a/homeassistant/components/solarlog/sensor.py
+++ b/homeassistant/components/solarlog/sensor.py
@@ -1,13 +1,208 @@
 """Platform for solarlog sensors."""
-from homeassistant.components.sensor import SensorEntity
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    UnitOfElectricPotential,
+    UnitOfEnergy,
+    UnitOfPower,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util.dt import as_local
 
 from . import SolarlogData
-from .const import DOMAIN, SENSOR_TYPES, SolarLogSensorEntityDescription
+from .const import DOMAIN
+
+
+@dataclass
+class SolarLogSensorEntityDescription(SensorEntityDescription):
+    """Describes Solarlog sensor entity."""
+
+    value: Callable[[float | int], float] | Callable[[datetime], datetime] | None = None
+
+
+SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
+    SolarLogSensorEntityDescription(
+        key="time",
+        name="last update",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        value=as_local,
+    ),
+    SolarLogSensorEntityDescription(
+        key="power_ac",
+        name="power AC",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="power_dc",
+        name="power DC",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="voltage_ac",
+        name="voltage AC",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="voltage_dc",
+        name="voltage DC",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="yield_day",
+        name="yield day",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="yield_yesterday",
+        name="yield yesterday",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="yield_month",
+        name="yield month",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="yield_year",
+        name="yield year",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="yield_total",
+        name="yield total",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_ac",
+        name="consumption AC",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_day",
+        name="consumption day",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_yesterday",
+        name="consumption yesterday",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_month",
+        name="consumption month",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_year",
+        name="consumption year",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="consumption_total",
+        name="consumption total",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL,
+        value=lambda value: round(value / 1000, 3),
+    ),
+    SolarLogSensorEntityDescription(
+        key="total_power",
+        name="installed peak power",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+    ),
+    SolarLogSensorEntityDescription(
+        key="alternator_loss",
+        name="alternator loss",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="capacity",
+        name="capacity",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        value=lambda value: round(value * 100, 1),
+    ),
+    SolarLogSensorEntityDescription(
+        key="efficiency",
+        name="efficiency",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        value=lambda value: round(value * 100, 1),
+    ),
+    SolarLogSensorEntityDescription(
+        key="power_available",
+        name="power available",
+        icon="mdi:solar-power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SolarLogSensorEntityDescription(
+        key="usage",
+        name="usage",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=SensorDeviceClass.POWER_FACTOR,
+        state_class=SensorStateClass.MEASUREMENT,
+        value=lambda value: round(value * 100, 1),
+    ),
+)
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/solax/manifest.json b/homeassistant/components/solax/manifest.json
index 5ce87c825322dc..d3f677fa89401c 100644
--- a/homeassistant/components/solax/manifest.json
+++ b/homeassistant/components/solax/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/solax",
   "iot_class": "local_polling",
   "loggers": ["solax"],
-  "requirements": ["solax==0.3.0"]
+  "requirements": ["solax==0.3.2"]
 }
diff --git a/homeassistant/components/solax/sensor.py b/homeassistant/components/solax/sensor.py
index 2a923c3b725249..fd0db1be054f2b 100644
--- a/homeassistant/components/solax/sensor.py
+++ b/homeassistant/components/solax/sensor.py
@@ -87,7 +87,6 @@
     ),
     (Units.NONE, False): SensorEntityDescription(
         key=f"{Units.NONE}_{False}",
-        state_class=SensorStateClass.MEASUREMENT,
     ),
 }
 
diff --git a/homeassistant/components/songpal/const.py b/homeassistant/components/songpal/const.py
index f12b77800a9d9e..496618f35f03ce 100644
--- a/homeassistant/components/songpal/const.py
+++ b/homeassistant/components/songpal/const.py
@@ -3,3 +3,5 @@
 SET_SOUND_SETTING = "set_sound_setting"
 
 CONF_ENDPOINT = "endpoint"
+
+ERROR_REQUEST_RETRY = 40000
diff --git a/homeassistant/components/songpal/media_player.py b/homeassistant/components/songpal/media_player.py
index 6b7cf73b28b842..0d41aec699b717 100644
--- a/homeassistant/components/songpal/media_player.py
+++ b/homeassistant/components/songpal/media_player.py
@@ -34,7 +34,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import CONF_ENDPOINT, DOMAIN, SET_SOUND_SETTING
+from .const import CONF_ENDPOINT, DOMAIN, ERROR_REQUEST_RETRY, SET_SOUND_SETTING
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -332,11 +332,27 @@ async def async_volume_down(self) -> None:
 
     async def async_turn_on(self) -> None:
         """Turn the device on."""
-        return await self._dev.set_power(True)
+        try:
+            return await self._dev.set_power(True)
+        except SongpalException as ex:
+            if ex.code == ERROR_REQUEST_RETRY:
+                _LOGGER.debug(
+                    "Swallowing %s, the device might be already in the wanted state", ex
+                )
+                return
+            raise
 
     async def async_turn_off(self) -> None:
         """Turn the device off."""
-        return await self._dev.set_power(False)
+        try:
+            return await self._dev.set_power(False)
+        except SongpalException as ex:
+            if ex.code == ERROR_REQUEST_RETRY:
+                _LOGGER.debug(
+                    "Swallowing %s, the device might be already in the wanted state", ex
+                )
+                return
+            raise
 
     async def async_mute_volume(self, mute: bool) -> None:
         """Mute or unmute the device."""
diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index ea0a16229c1455..e6b328cbcb0fc9 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -368,7 +368,9 @@ async def async_poll_manual_hosts(
         self, now: datetime.datetime | None = None
     ) -> None:
         """Add and maintain Sonos devices from a manual configuration."""
-        for host in self.hosts:
+
+        # Loop through each configured host and verify that Soco attributes are available for it.
+        for host in self.hosts.copy():
             ip_addr = await self.hass.async_add_executor_job(socket.gethostbyname, host)
             soco = SoCo(ip_addr)
             try:
@@ -376,7 +378,12 @@ async def async_poll_manual_hosts(
                     sync_get_visible_zones,
                     soco,
                 )
-            except (OSError, SoCoException, Timeout) as ex:
+            except (
+                OSError,
+                SoCoException,
+                Timeout,
+                asyncio.TimeoutError,
+            ) as ex:
                 if not self.hosts_in_error.get(ip_addr):
                     _LOGGER.warning(
                         "Could not get visible Sonos devices from %s: %s", ip_addr, ex
@@ -386,31 +393,30 @@ async def async_poll_manual_hosts(
                     _LOGGER.debug(
                         "Could not get visible Sonos devices from %s: %s", ip_addr, ex
                     )
+                continue
 
-            else:
-                if self.hosts_in_error.pop(ip_addr, None):
-                    _LOGGER.info("Connection restablished to Sonos device %s", ip_addr)
-                if new_hosts := {
-                    x.ip_address
-                    for x in visible_zones
-                    if x.ip_address not in self.hosts
-                }:
-                    _LOGGER.debug("Adding to manual hosts: %s", new_hosts)
-                    self.hosts.update(new_hosts)
-                async_dispatcher_send(
-                    self.hass,
-                    f"{SONOS_SPEAKER_ACTIVITY}-{soco.uid}",
-                    "manual zone scan",
-                )
-                break
+            if self.hosts_in_error.pop(ip_addr, None):
+                _LOGGER.info("Connection reestablished to Sonos device %s", ip_addr)
+            # Each speaker has the topology for other online speakers, so add them in here if they were not
+            # configured. The metadata is already in Soco for these.
+            if new_hosts := {
+                x.ip_address for x in visible_zones if x.ip_address not in self.hosts
+            }:
+                _LOGGER.debug("Adding to manual hosts: %s", new_hosts)
+                self.hosts.update(new_hosts)
 
-        for host in self.hosts.copy():
-            ip_addr = await self.hass.async_add_executor_job(socket.gethostbyname, host)
             if self.is_device_invisible(ip_addr):
                 _LOGGER.debug("Discarding %s from manual hosts", ip_addr)
                 self.hosts.discard(ip_addr)
-                continue
 
+        # Loop through each configured host that is not in error.  Send a discovery message
+        # if a speaker does not already exist, or ping the speaker if it is unavailable.
+        for host in self.hosts.copy():
+            ip_addr = await self.hass.async_add_executor_job(socket.gethostbyname, host)
+            soco = SoCo(ip_addr)
+            # Skip hosts that are in error to avoid blocking call on soco.uuid in event loop
+            if self.hosts_in_error.get(ip_addr):
+                continue
             known_speaker = next(
                 (
                     speaker
@@ -420,12 +426,28 @@ async def async_poll_manual_hosts(
                 None,
             )
             if not known_speaker:
-                await self._async_handle_discovery_message(
-                    soco.uid, ip_addr, "manual zone scan"
-                )
+                try:
+                    await self._async_handle_discovery_message(
+                        soco.uid,
+                        ip_addr,
+                        "manual zone scan",
+                    )
+                except (
+                    OSError,
+                    SoCoException,
+                    Timeout,
+                    asyncio.TimeoutError,
+                ) as ex:
+                    _LOGGER.warning("Discovery message failed to %s : %s", ip_addr, ex)
             elif not known_speaker.available:
                 try:
                     await self.hass.async_add_executor_job(known_speaker.ping)
+                    # Only send the message if the ping was successful.
+                    async_dispatcher_send(
+                        self.hass,
+                        f"{SONOS_SPEAKER_ACTIVITY}-{soco.uid}",
+                        "manual zone scan",
+                    )
                 except SonosUpdateError:
                     _LOGGER.debug(
                         "Manual poll to %s failed, keeping unavailable", ip_addr
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index 087c636f1ed867..fce34bde80a647 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -8,7 +8,7 @@
   "documentation": "https://www.home-assistant.io/integrations/sonos",
   "iot_class": "local_push",
   "loggers": ["soco"],
-  "requirements": ["soco==0.29.1", "sonos-websocket==0.1.1"],
+  "requirements": ["soco==0.29.1", "sonos-websocket==0.1.2"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:ZonePlayer:1"
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index 7e6c210a1646b7..526ddd2bcc7483 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -190,6 +190,7 @@ async def async_service_handle(service_call: ServiceCall) -> None:
 class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
     """Representation of a Sonos entity."""
 
+    _attr_name = None
     _attr_supported_features = (
         MediaPlayerEntityFeature.BROWSE_MEDIA
         | MediaPlayerEntityFeature.CLEAR_PLAYLIST
diff --git a/homeassistant/components/sony_projector/manifest.json b/homeassistant/components/sony_projector/manifest.json
index d6637b4232bfdb..5cf5df4c96f875 100644
--- a/homeassistant/components/sony_projector/manifest.json
+++ b/homeassistant/components/sony_projector/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sony_projector",
   "iot_class": "local_polling",
   "loggers": ["pysdcp"],
-  "requirements": ["pysdcp==1"]
+  "requirements": ["pySDCP==1"]
 }
diff --git a/homeassistant/components/soundtouch/__init__.py b/homeassistant/components/soundtouch/__init__.py
index f3fa221db7f963..b021604af4a11a 100644
--- a/homeassistant/components/soundtouch/__init__.py
+++ b/homeassistant/components/soundtouch/__init__.py
@@ -43,6 +43,8 @@
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 class SoundTouchData:
     """SoundTouch data stored in the Home Assistant data object."""
diff --git a/homeassistant/components/soundtouch/config_flow.py b/homeassistant/components/soundtouch/config_flow.py
index 489dfff6feb846..8f9b993d0d858c 100644
--- a/homeassistant/components/soundtouch/config_flow.py
+++ b/homeassistant/components/soundtouch/config_flow.py
@@ -26,17 +26,6 @@ def __init__(self):
         self.host = None
         self.name = None
 
-    async def async_step_import(self, import_data):
-        """Handle a flow initiated by configuration file."""
-        self.host = import_data[CONF_HOST]
-
-        try:
-            await self._async_get_device_id()
-        except RequestException:
-            return self.async_abort(reason="cannot_connect")
-
-        return await self._async_create_soundtouch_entry()
-
     async def async_step_user(self, user_input=None):
         """Handle a flow initiated by the user."""
         errors = {}
diff --git a/homeassistant/components/soundtouch/media_player.py b/homeassistant/components/soundtouch/media_player.py
index 721184313309ef..9cd94330812f72 100644
--- a/homeassistant/components/soundtouch/media_player.py
+++ b/homeassistant/components/soundtouch/media_player.py
@@ -8,11 +8,9 @@
 
 from libsoundtouch.device import SoundTouchDevice
 from libsoundtouch.utils import Source
-import voluptuous as vol
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA,
     BrowseMedia,
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
@@ -21,20 +19,12 @@
     MediaType,
     async_process_play_media_url,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_NAME,
-    CONF_PORT,
-    EVENT_HOMEASSISTANT_START,
-)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EVENT_HOMEASSISTANT_START
 from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
 
@@ -50,47 +40,6 @@
 ATTR_SOUNDTOUCH_GROUP = "soundtouch_group"
 ATTR_SOUNDTOUCH_ZONE = "soundtouch_zone"
 
-PLATFORM_SCHEMA = vol.All(
-    PLATFORM_SCHEMA.extend(
-        {
-            vol.Required(CONF_HOST): cv.string,
-            vol.Optional(CONF_PORT): cv.port,
-            vol.Optional(CONF_NAME, default=""): cv.string,
-        }
-    ),
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Bose SoundTouch platform."""
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2022.10.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-    )
-    _LOGGER.warning(
-        "Configuration of the Bose SoundTouch integration in YAML is "
-        "deprecated and will be removed in Home Assistant 2022.10; Your "
-        "existing configuration has been imported into the UI automatically "
-        "and can be safely removed from your configuration.yaml file"
-    )
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=config,
-        )
-    )
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/soundtouch/strings.json b/homeassistant/components/soundtouch/strings.json
index 6a8896c8f56353..7ebcd4c528572c 100644
--- a/homeassistant/components/soundtouch/strings.json
+++ b/homeassistant/components/soundtouch/strings.json
@@ -17,11 +17,5 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Bose SoundTouch YAML configuration is being removed",
-      "description": "Configuring Bose SoundTouch using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the Bose SoundTouch YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/speedtestdotnet/sensor.py b/homeassistant/components/speedtestdotnet/sensor.py
index c3773802650394..d44d66bbd4772b 100644
--- a/homeassistant/components/speedtestdotnet/sensor.py
+++ b/homeassistant/components/speedtestdotnet/sensor.py
@@ -78,6 +78,7 @@ async def async_setup_entry(
     )
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SpeedtestSensor(
     CoordinatorEntity[SpeedTestDataCoordinator], RestoreEntity, SensorEntity
 ):
diff --git a/homeassistant/components/splunk/manifest.json b/homeassistant/components/splunk/manifest.json
index d889c1437d0531..947af317b35fb1 100644
--- a/homeassistant/components/splunk/manifest.json
+++ b/homeassistant/components/splunk/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/splunk",
   "iot_class": "local_push",
   "loggers": ["hass_splunk"],
-  "requirements": ["hass_splunk==0.1.1"]
+  "requirements": ["hass-splunk==0.1.1"]
 }
diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index a738952d2ca123..0145d6f0906082 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -106,6 +106,7 @@ class SpotifyMediaPlayer(MediaPlayerEntity):
     _attr_has_entity_name = True
     _attr_icon = "mdi:spotify"
     _attr_media_image_remotely_accessible = False
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/sql/manifest.json b/homeassistant/components/sql/manifest.json
index 4d3e95d6b309c7..44de8fc6923611 100644
--- a/homeassistant/components/sql/manifest.json
+++ b/homeassistant/components/sql/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sql",
   "iot_class": "local_polling",
-  "requirements": ["sqlalchemy==2.0.15"]
+  "requirements": ["SQLAlchemy==2.0.15"]
 }
diff --git a/homeassistant/components/squeezebox/manifest.json b/homeassistant/components/squeezebox/manifest.json
index a2efc90d517bb5..43c2868dd69a43 100644
--- a/homeassistant/components/squeezebox/manifest.json
+++ b/homeassistant/components/squeezebox/manifest.json
@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/squeezebox",
   "iot_class": "local_polling",
   "loggers": ["pysqueezebox"],
-  "requirements": ["pysqueezebox==0.6.1"]
+  "requirements": ["pysqueezebox==0.6.3"]
 }
diff --git a/homeassistant/components/ssdp/__init__.py b/homeassistant/components/ssdp/__init__.py
index 570e79e49931bc..e448fe066c48d6 100644
--- a/homeassistant/components/ssdp/__init__.py
+++ b/homeassistant/components/ssdp/__init__.py
@@ -48,7 +48,7 @@
 )
 from homeassistant.core import HomeAssistant, callback as core_callback
 from homeassistant.data_entry_flow import BaseServiceInfo
-from homeassistant.helpers import discovery_flow
+from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.instance_id import async_get as async_get_instance_id
@@ -106,6 +106,9 @@
 _LOGGER = logging.getLogger(__name__)
 
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
 @dataclass(slots=True)
 class SsdpServiceInfo(BaseServiceInfo):
     """Prepared info from ssdp/upnp entries."""
diff --git a/homeassistant/components/statsd/__init__.py b/homeassistant/components/statsd/__init__.py
index bfc972a17a1c90..046c01cba325a2 100644
--- a/homeassistant/components/statsd/__init__.py
+++ b/homeassistant/components/statsd/__init__.py
@@ -82,9 +82,8 @@ def statsd_event_listener(event):
                     stat = "{}.{}".format(state.entity_id, key.replace(" ", "_"))
                     statsd_client.gauge(stat, value, sample_rate)
 
-        else:
-            if isinstance(_state, (float, int)):
-                statsd_client.gauge(state.entity_id, _state, sample_rate)
+        elif isinstance(_state, (float, int)):
+            statsd_client.gauge(state.entity_id, _state, sample_rate)
 
         # Increment the count
         statsd_client.incr(state.entity_id, rate=sample_rate)
diff --git a/homeassistant/components/steam_online/config_flow.py b/homeassistant/components/steam_online/config_flow.py
index 8356ad8bbc6668..094db9ba2079d7 100644
--- a/homeassistant/components/steam_online/config_flow.py
+++ b/homeassistant/components/steam_online/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow for Steam integration."""
 from __future__ import annotations
 
-from collections.abc import Mapping
+from collections.abc import Iterator, Mapping
 from typing import Any
 
 import steam
@@ -15,6 +15,9 @@
 
 from .const import CONF_ACCOUNT, CONF_ACCOUNTS, DOMAIN, LOGGER, PLACEHOLDERS
 
+# To avoid too long request URIs, the amount of ids to request is limited
+MAX_IDS_TO_REQUEST = 275
+
 
 def validate_input(user_input: dict[str, str]) -> dict[str, str | int]:
     """Handle common flow input validation."""
@@ -108,6 +111,11 @@ async def async_step_reauth_confirm(
         )
 
 
+def _batch_ids(ids: list[str]) -> Iterator[list[str]]:
+    for i in range(0, len(ids), MAX_IDS_TO_REQUEST):
+        yield ids[i : i + MAX_IDS_TO_REQUEST]
+
+
 class SteamOptionsFlowHandler(config_entries.OptionsFlow):
     """Handle Steam client options."""
 
@@ -170,5 +178,11 @@ def get_accounts(self) -> list[dict[str, str | int]]:
             _users_str = [user["steamid"] for user in friends["friendslist"]["friends"]]
         except steam.api.HTTPError:
             return []
-        names = interface.GetPlayerSummaries(steamids=_users_str)
-        return names["response"]["players"]["player"]
+        names = []
+        for id_batch in _batch_ids(_users_str):
+            names.extend(
+                interface.GetPlayerSummaries(steamids=id_batch)["response"]["players"][
+                    "player"
+                ]
+            )
+        return names
diff --git a/homeassistant/components/steamist/__init__.py b/homeassistant/components/steamist/__init__.py
index 0a363f77e8247c..ee46d644847d86 100644
--- a/homeassistant/components/steamist/__init__.py
+++ b/homeassistant/components/steamist/__init__.py
@@ -9,6 +9,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
@@ -25,10 +26,11 @@
 
 PLATFORMS: list[str] = [Platform.SENSOR, Platform.SWITCH]
 DISCOVERY_INTERVAL = timedelta(minutes=15)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the flux_led component."""
+    """Set up the steamist component."""
     domain_data = hass.data.setdefault(DOMAIN, {})
     domain_data[DISCOVERY] = await async_discover_devices(hass, STARTUP_SCAN_TIMEOUT)
 
diff --git a/homeassistant/components/stream/manifest.json b/homeassistant/components/stream/manifest.json
index ef7a96e526ba13..c07a083ac52c62 100644
--- a/homeassistant/components/stream/manifest.json
+++ b/homeassistant/components/stream/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["PyTurboJPEG==1.6.7", "ha-av==10.0.0", "numpy==1.23.2"]
+  "requirements": ["PyTurboJPEG==1.7.1", "ha-av==10.1.0", "numpy==1.23.2"]
 }
diff --git a/homeassistant/components/stt/__init__.py b/homeassistant/components/stt/__init__.py
index 5e34a567c9ef06..679f9b29e41430 100644
--- a/homeassistant/components/stt/__init__.py
+++ b/homeassistant/components/stt/__init__.py
@@ -22,6 +22,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
@@ -65,6 +66,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @callback
 def async_default_engine(hass: HomeAssistant) -> str | None:
@@ -413,7 +416,7 @@ def _metadata_from_header(request: web.Request) -> SpeechMetadata:
 def websocket_list_engines(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict
 ) -> None:
-    """List speech to text engines and, optionally, if they support a given language."""
+    """List speech-to-text engines and, optionally, if they support a given language."""
     component: EntityComponent[SpeechToTextEntity] = hass.data[DOMAIN]
     legacy_providers: dict[str, Provider] = hass.data[DATA_PROVIDERS]
 
diff --git a/homeassistant/components/stt/legacy.py b/homeassistant/components/stt/legacy.py
index f2a5854e56787b..f14eed467db2e7 100644
--- a/homeassistant/components/stt/legacy.py
+++ b/homeassistant/components/stt/legacy.py
@@ -1,4 +1,4 @@
-"""Handle legacy speech to text platforms."""
+"""Handle legacy speech-to-text platforms."""
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
@@ -51,17 +51,17 @@ def async_get_provider(
 def async_setup_legacy(
     hass: HomeAssistant, config: ConfigType
 ) -> list[Coroutine[Any, Any, None]]:
-    """Set up legacy speech to text providers."""
+    """Set up legacy speech-to-text providers."""
     providers = hass.data[DATA_PROVIDERS] = {}
 
     async def async_setup_platform(p_type, p_config=None, discovery_info=None):
-        """Set up a TTS platform."""
+        """Set up an STT platform."""
         if p_config is None:
             p_config = {}
 
         platform = await async_prepare_setup_platform(hass, config, DOMAIN, p_type)
         if platform is None:
-            _LOGGER.error("Unknown speech to text platform specified")
+            _LOGGER.error("Unknown speech-to-text platform specified")
             return
 
         try:
diff --git a/homeassistant/components/stt/manifest.json b/homeassistant/components/stt/manifest.json
index 73eb0fa4c07942..53bb7fa19379e2 100644
--- a/homeassistant/components/stt/manifest.json
+++ b/homeassistant/components/stt/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "stt",
-  "name": "Speech-to-Text (STT)",
+  "name": "Speech-to-text (STT)",
   "codeowners": ["@home-assistant/core", "@pvizeli"],
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/stt",
diff --git a/homeassistant/components/sun/__init__.py b/homeassistant/components/sun/__init__.py
index a43bf4fd808277..de1c545739f3f0 100644
--- a/homeassistant/components/sun/__init__.py
+++ b/homeassistant/components/sun/__init__.py
@@ -15,7 +15,7 @@
     Platform,
 )
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
-from homeassistant.helpers import event
+from homeassistant.helpers import config_validation as cv, event
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.integration_platform import (
     async_process_integration_platform_for_component,
@@ -80,6 +80,9 @@
 }
 
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Track the state of the sun."""
     hass.async_create_task(
@@ -118,6 +121,9 @@ class Sun(Entity):
 
     _attr_name = "Sun"
     entity_id = ENTITY_ID
+    # This entity is legacy and does not have a platform.
+    # We can't fix this easily without breaking changes.
+    _no_platform_reported = True
 
     location: Location
     elevation: Elevation
diff --git a/homeassistant/components/supla/__init__.py b/homeassistant/components/supla/__init__.py
index 541b31eb0a3d8d..0d1308ca5a643e 100644
--- a/homeassistant/components/supla/__init__.py
+++ b/homeassistant/components/supla/__init__.py
@@ -102,7 +102,8 @@ async def _fetch_channels():
             async with async_timeout.timeout(SCAN_INTERVAL.total_seconds()):
                 channels = {
                     channel["id"]: channel
-                    for channel in await server.get_channels(  # pylint: disable=cell-var-from-loop
+                    # pylint: disable-next=cell-var-from-loop
+                    for channel in await server.get_channels(  # noqa: B023
                         include=["iodevice", "state", "connected"]
                     )
                 }
diff --git a/homeassistant/components/swiss_public_transport/manifest.json b/homeassistant/components/swiss_public_transport/manifest.json
index 189e93d36505fe..fd9908bffeb407 100644
--- a/homeassistant/components/swiss_public_transport/manifest.json
+++ b/homeassistant/components/swiss_public_transport/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/swiss_public_transport",
   "iot_class": "cloud_polling",
   "loggers": ["opendata_transport"],
-  "requirements": ["python_opendata_transport==0.3.0"]
+  "requirements": ["python-opendata-transport==0.3.0"]
 }
diff --git a/homeassistant/components/switch/device_action.py b/homeassistant/components/switch/device_action.py
index 1aed2fa2467fd8..ce9f0a36117a3a 100644
--- a/homeassistant/components/switch/device_action.py
+++ b/homeassistant/components/switch/device_action.py
@@ -3,7 +3,10 @@
 
 import voluptuous as vol
 
-from homeassistant.components.device_automation import toggle_entity
+from homeassistant.components.device_automation import (
+    async_validate_entity_schema,
+    toggle_entity,
+)
 from homeassistant.const import CONF_DOMAIN
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers.typing import ConfigType, TemplateVarsType
@@ -12,7 +15,14 @@
 
 # mypy: disallow-any-generics
 
-ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+_ACTION_SCHEMA = toggle_entity.ACTION_SCHEMA.extend({vol.Required(CONF_DOMAIN): DOMAIN})
+
+
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
 
 
 async def async_call_action_from_config(
diff --git a/homeassistant/components/switch_as_x/manifest.json b/homeassistant/components/switch_as_x/manifest.json
index b54509ea5e3103..d14a6bcb390ffa 100644
--- a/homeassistant/components/switch_as_x/manifest.json
+++ b/homeassistant/components/switch_as_x/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "switch_as_x",
-  "name": "Switch as X",
+  "name": "Change device type of a switch",
   "codeowners": ["@home-assistant/core"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/switch_as_x",
diff --git a/homeassistant/components/switchbee/__init__.py b/homeassistant/components/switchbee/__init__.py
index 352f191588ac87..dee1fe5cd8f5f8 100644
--- a/homeassistant/components/switchbee/__init__.py
+++ b/homeassistant/components/switchbee/__init__.py
@@ -2,18 +2,27 @@
 
 from __future__ import annotations
 
+import logging
+import re
+
+from aiohttp import ClientSession
 from switchbee.api import CentralUnitPolling, CentralUnitWsRPC, is_wsrpc_api
 from switchbee.api.central_unit import SwitchBeeError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.device_registry as dr
+import homeassistant.helpers.entity_registry as er
 
 from .const import DOMAIN
 from .coordinator import SwitchBeeCoordinator
 
+_LOGGER = logging.getLogger(__name__)
+
+
 PLATFORMS: list[Platform] = [
     Platform.BUTTON,
     Platform.CLIMATE,
@@ -23,18 +32,14 @@
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up SwitchBee Smart Home from a config entry."""
+async def get_api_object(
+    central_unit: str, user: str, password: str, websession: ClientSession
+) -> CentralUnitPolling | CentralUnitWsRPC:
+    """Return SwitchBee API object."""
 
-    hass.data.setdefault(DOMAIN, {})
-    central_unit = entry.data[CONF_HOST]
-    user = entry.data[CONF_USERNAME]
-    password = entry.data[CONF_PASSWORD]
-    websession = async_get_clientsession(hass, verify_ssl=False)
     api: CentralUnitPolling | CentralUnitWsRPC = CentralUnitPolling(
         central_unit, user, password, websession
     )
-
     # First try to connect and fetch the version
     try:
         await api.connect()
@@ -46,6 +51,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         api = CentralUnitWsRPC(central_unit, user, password, websession)
         await api.connect()
 
+    return api
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up SwitchBee Smart Home from a config entry."""
+
+    hass.data.setdefault(DOMAIN, {})
+    central_unit = entry.data[CONF_HOST]
+    user = entry.data[CONF_USERNAME]
+    password = entry.data[CONF_PASSWORD]
+    websession = async_get_clientsession(hass, verify_ssl=False)
+    api = await get_api_object(central_unit, user, password, websession)
+
     coordinator = SwitchBeeCoordinator(
         hass,
         api,
@@ -71,3 +89,75 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def update_listener(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
     """Update listener."""
     await hass.config_entries.async_reload(config_entry.entry_id)
+
+
+async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+    """Migrate old entry."""
+    _LOGGER.debug("Migrating from version %s", config_entry.version)
+
+    if config_entry.version == 1:
+        dev_reg = dr.async_get(hass)
+        websession = async_get_clientsession(hass, verify_ssl=False)
+        old_unique_id = config_entry.unique_id
+        assert isinstance(old_unique_id, str)
+        api = await get_api_object(
+            config_entry.data[CONF_HOST],
+            config_entry.data[CONF_USERNAME],
+            config_entry.data[CONF_PASSWORD],
+            websession,
+        )
+        new_unique_id = api.unique_id
+
+        @callback
+        def update_unique_id(entity_entry: er.RegistryEntry) -> dict[str, str] | None:
+            """Update unique ID of entity entry."""
+            if match := re.match(
+                rf"(?:{old_unique_id})-(?P<id>\d+)", entity_entry.unique_id
+            ):
+                entity_new_unique_id = f'{new_unique_id}-{match.group("id")}'
+                _LOGGER.info(
+                    "Migrating entity %s from %s to new id %s",
+                    entity_entry.entity_id,
+                    entity_entry.unique_id,
+                    entity_new_unique_id,
+                )
+                return {"new_unique_id": entity_new_unique_id}
+
+            return None
+
+        if new_unique_id:
+            # Migrate devices
+            for device_entry in dr.async_entries_for_config_entry(
+                dev_reg, config_entry.entry_id
+            ):
+                assert isinstance(device_entry, dr.DeviceEntry)
+                for identifier in device_entry.identifiers:
+                    if match := re.match(
+                        rf"(?P<id>.+)-{old_unique_id}$", identifier[1]
+                    ):
+                        new_identifiers = {
+                            (
+                                DOMAIN,
+                                f"{match.group('id')}-{new_unique_id}",
+                            )
+                        }
+                        _LOGGER.info(
+                            "Migrating device %s identifiers from %s to %s",
+                            device_entry.name,
+                            device_entry.identifiers,
+                            new_identifiers,
+                        )
+                        dev_reg.async_update_device(
+                            device_entry.id, new_identifiers=new_identifiers
+                        )
+
+            # Migrate entities
+            await er.async_migrate_entries(
+                hass, config_entry.entry_id, update_unique_id
+            )
+
+            config_entry.version = 2
+
+        _LOGGER.info("Migration to version %s successful", config_entry.version)
+
+    return True
diff --git a/homeassistant/components/switchbee/climate.py b/homeassistant/components/switchbee/climate.py
index bf780e76eb0c13..8dd740262f9a9c 100644
--- a/homeassistant/components/switchbee/climate.py
+++ b/homeassistant/components/switchbee/climate.py
@@ -103,7 +103,7 @@ def __init__(
         # set HVAC capabilities
         self._attr_max_temp = device.max_temperature
         self._attr_min_temp = device.min_temperature
-        self._attr_temperature_unit = HVAC_UNIT_SB_TO_HASS[device.unit]
+        self._attr_temperature_unit = HVAC_UNIT_SB_TO_HASS[device.temperature_unit]
         self._attr_hvac_modes = [HVAC_MODE_SB_TO_HASS[mode] for mode in device.modes]
         self._attr_hvac_modes.append(HVACMode.OFF)
         self._update_attrs_from_coordinator()
diff --git a/homeassistant/components/switchbee/config_flow.py b/homeassistant/components/switchbee/config_flow.py
index cb9cc27c1d0504..8f109c7bf26773 100644
--- a/homeassistant/components/switchbee/config_flow.py
+++ b/homeassistant/components/switchbee/config_flow.py
@@ -46,6 +46,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> str:
 
         raise CannotConnect from exp
 
+    if api.unique_id:
+        return api.unique_id
+
     assert api.mac is not None
     return format_mac(api.mac)
 
@@ -53,7 +56,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> str:
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for SwitchBee Smart Home."""
 
-    VERSION = 1
+    VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -67,7 +70,7 @@ async def async_step_user(
             )
 
         try:
-            mac_formatted = await validate_input(self.hass, user_input)
+            unique_id = await validate_input(self.hass, user_input)
         except CannotConnect:
             errors["base"] = "cannot_connect"
         except InvalidAuth:
@@ -77,7 +80,7 @@ async def async_step_user(
             errors["base"] = "unknown"
 
         else:
-            await self.async_set_unique_id(mac_formatted)
+            await self.async_set_unique_id(unique_id)
             self._abort_if_unique_id_configured()
             return self.async_create_entry(title=user_input[CONF_HOST], data=user_input)
 
diff --git a/homeassistant/components/switchbee/coordinator.py b/homeassistant/components/switchbee/coordinator.py
index b1b606615dd56d..49400e3c28d643 100644
--- a/homeassistant/components/switchbee/coordinator.py
+++ b/homeassistant/components/switchbee/coordinator.py
@@ -30,10 +30,12 @@ def __init__(
         """Initialize."""
         self.api: CentralUnitPolling | CentralUnitWsRPC = swb_api
         self._reconnect_counts: int = 0
-        self.mac_formatted: str | None = (
-            None if self.api.mac is None else format_mac(self.api.mac)
+        assert self.api.mac is not None
+        self.unique_id = (
+            self.api.unique_id
+            if self.api.unique_id is not None
+            else format_mac(self.api.mac)
         )
-
         super().__init__(
             hass,
             _LOGGER,
@@ -77,6 +79,7 @@ async def _async_update_data(self) -> Mapping[int, SwitchBeeBaseDevice]:
                         DeviceType.Shutter,
                         DeviceType.Somfy,
                         DeviceType.Thermostat,
+                        DeviceType.VRFAC,
                     ]
                 )
             except SwitchBeeError as exp:
diff --git a/homeassistant/components/switchbee/entity.py b/homeassistant/components/switchbee/entity.py
index 7e5df69fb6db8d..4f6a056202cb08 100644
--- a/homeassistant/components/switchbee/entity.py
+++ b/homeassistant/components/switchbee/entity.py
@@ -3,7 +3,6 @@
 from typing import Generic, TypeVar, cast
 
 from switchbee import SWITCHBEE_BRAND
-from switchbee.api.central_unit import SwitchBeeDeviceOfflineError, SwitchBeeError
 from switchbee.device import DeviceType, SwitchBeeBaseDevice
 
 from homeassistant.helpers.entity import DeviceInfo
@@ -32,7 +31,7 @@ def __init__(
         super().__init__(coordinator)
         self._device = device
         self._attr_name = device.name
-        self._attr_unique_id = f"{coordinator.mac_formatted}-{device.id}"
+        self._attr_unique_id = f"{coordinator.unique_id}-{device.id}"
 
 
 class SwitchBeeDeviceEntity(SwitchBeeEntity[_DeviceTypeT]):
@@ -54,7 +53,7 @@ def __init__(
             identifiers={
                 (
                     DOMAIN,
-                    f"{identifier}-{coordinator.mac_formatted}",
+                    f"{identifier}-{coordinator.unique_id}",
                 )
             },
             manufacturer=SWITCHBEE_BRAND,
@@ -62,7 +61,7 @@ def __init__(
             suggested_area=device.zone,
             via_device=(
                 DOMAIN,
-                f"{coordinator.api.name} ({coordinator.api.mac})",
+                f"{coordinator.api.name} ({coordinator.api.unique_id})",
             ),
         )
 
@@ -71,30 +70,8 @@ def available(self) -> bool:
         """Return True if entity is available."""
         return self._is_online and super().available
 
-    async def async_refresh_state(self) -> None:
-        """Refresh the device state in the Central Unit.
-
-        This function addresses issue of a device that came online back but still report
-        unavailable state (-1).
-        Such device (offline device) will keep reporting unavailable state (-1)
-        until it has been actuated by the user (state changed to on/off).
-
-        With this code we keep trying setting dummy state for the device
-        in order for it to start reporting its real state back (assuming it came back online)
-
-        """
-
-        try:
-            await self.coordinator.api.set_state(self._device.id, "dummy")
-        except SwitchBeeDeviceOfflineError:
-            return
-        except SwitchBeeError:
-            return
-
     def _check_if_became_offline(self) -> None:
         """Check if the device was online (now offline), log message and mark it as Unavailable."""
-        # This specific call will refresh the state of the device in the CU
-        self.hass.async_create_task(self.async_refresh_state())
 
         if self._is_online:
             _LOGGER.warning(
diff --git a/homeassistant/components/switchbee/manifest.json b/homeassistant/components/switchbee/manifest.json
index 3862539cb89dc1..2175f28eedec2d 100644
--- a/homeassistant/components/switchbee/manifest.json
+++ b/homeassistant/components/switchbee/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/switchbee",
   "iot_class": "local_push",
-  "requirements": ["pyswitchbee==1.7.19"]
+  "requirements": ["pyswitchbee==1.8.0"]
 }
diff --git a/homeassistant/components/switchbot/binary_sensor.py b/homeassistant/components/switchbot/binary_sensor.py
index 0a0cf40ca8b00b..237a2d9766825d 100644
--- a/homeassistant/components/switchbot/binary_sensor.py
+++ b/homeassistant/components/switchbot/binary_sensor.py
@@ -25,12 +25,12 @@
     ),
     "motion_detected": BinarySensorEntityDescription(
         key="pir_state",
-        translation_key="motion",
+        name=None,
         device_class=BinarySensorDeviceClass.MOTION,
     ),
     "contact_open": BinarySensorEntityDescription(
         key="contact_open",
-        translation_key="door_open",
+        name=None,
         device_class=BinarySensorDeviceClass.DOOR,
     ),
     "contact_timeout": BinarySensorEntityDescription(
@@ -46,7 +46,7 @@
     ),
     "door_open": BinarySensorEntityDescription(
         key="door_status",
-        translation_key="door_open",
+        name=None,
         device_class=BinarySensorDeviceClass.DOOR,
     ),
     "unclosed_alarm": BinarySensorEntityDescription(
@@ -94,7 +94,6 @@ def __init__(
         self._sensor = binary_sensor
         self._attr_unique_id = f"{coordinator.base_unique_id}-{binary_sensor}"
         self.entity_description = BINARY_SENSOR_TYPES[binary_sensor]
-        self._attr_name = self.entity_description.name
 
     @property
     def is_on(self) -> bool:
diff --git a/homeassistant/components/switchbot/const.py b/homeassistant/components/switchbot/const.py
index a21bd859efc9ad..17e95486298579 100644
--- a/homeassistant/components/switchbot/const.py
+++ b/homeassistant/components/switchbot/const.py
@@ -42,6 +42,7 @@ class SupportedModels(StrEnum):
 
 NON_CONNECTABLE_SUPPORTED_MODEL_TYPES = {
     SwitchbotModel.METER: SupportedModels.HYGROMETER,
+    SwitchbotModel.IO_METER: SupportedModels.HYGROMETER,
     SwitchbotModel.CONTACT_SENSOR: SupportedModels.CONTACT,
     SwitchbotModel.MOTION_SENSOR: SupportedModels.MOTION,
 }
diff --git a/homeassistant/components/switchbot/cover.py b/homeassistant/components/switchbot/cover.py
index 495ce0468a0557..35083c4b0897c6 100644
--- a/homeassistant/components/switchbot/cover.py
+++ b/homeassistant/components/switchbot/cover.py
@@ -51,6 +51,8 @@ class SwitchBotCurtainEntity(SwitchbotEntity, CoverEntity, RestoreEntity):
         | CoverEntityFeature.STOP
         | CoverEntityFeature.SET_POSITION
     )
+    _attr_translation_key = "cover"
+    _attr_name = None
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
         """Initialize the Switchbot."""
@@ -120,6 +122,8 @@ class SwitchBotBlindTiltEntity(SwitchbotEntity, CoverEntity, RestoreEntity):
         | CoverEntityFeature.STOP_TILT
         | CoverEntityFeature.SET_TILT_POSITION
     )
+    _attr_name = None
+    _attr_translation_key = "cover"
     CLOSED_UP_THRESHOLD = 80
     CLOSED_DOWN_THRESHOLD = 20
 
diff --git a/homeassistant/components/switchbot/humidifier.py b/homeassistant/components/switchbot/humidifier.py
index 148e4c3545f5c5..5b53b410208269 100644
--- a/homeassistant/components/switchbot/humidifier.py
+++ b/homeassistant/components/switchbot/humidifier.py
@@ -40,6 +40,8 @@ class SwitchBotHumidifier(SwitchbotSwitchedEntity, HumidifierEntity):
     _attr_available_modes = [MODE_NORMAL, MODE_AUTO]
     _device: switchbot.SwitchbotHumidifier
     _attr_min_humidity = 1
+    _attr_translation_key = "humidifier"
+    _attr_name = None
 
     @property
     def is_on(self) -> bool | None:
diff --git a/homeassistant/components/switchbot/light.py b/homeassistant/components/switchbot/light.py
index 5dc99c5d6f1f3e..53b40bbf780968 100644
--- a/homeassistant/components/switchbot/light.py
+++ b/homeassistant/components/switchbot/light.py
@@ -46,6 +46,7 @@ class SwitchbotLightEntity(SwitchbotEntity, LightEntity):
     """Representation of switchbot light bulb."""
 
     _device: SwitchbotBaseLight
+    _attr_name = None
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
         """Initialize the Switchbot light."""
diff --git a/homeassistant/components/switchbot/lock.py b/homeassistant/components/switchbot/lock.py
index 738755ae636705..7710cde12a9da7 100644
--- a/homeassistant/components/switchbot/lock.py
+++ b/homeassistant/components/switchbot/lock.py
@@ -26,6 +26,8 @@ async def async_setup_entry(
 class SwitchBotLock(SwitchbotEntity, LockEntity):
     """Representation of a Switchbot lock."""
 
+    _attr_translation_key = "lock"
+    _attr_name = None
     _device: switchbot.SwitchbotLock
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
diff --git a/homeassistant/components/switchbot/manifest.json b/homeassistant/components/switchbot/manifest.json
index c90a1a6428936a..e45ea1f893e42a 100644
--- a/homeassistant/components/switchbot/manifest.json
+++ b/homeassistant/components/switchbot/manifest.json
@@ -40,5 +40,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchbot",
   "iot_class": "local_push",
   "loggers": ["switchbot"],
-  "requirements": ["PySwitchbot==0.37.6"]
+  "requirements": ["PySwitchbot==0.38.0"]
 }
diff --git a/homeassistant/components/switchbot/sensor.py b/homeassistant/components/switchbot/sensor.py
index b5b34bf54ec81f..e9e434bc51ca76 100644
--- a/homeassistant/components/switchbot/sensor.py
+++ b/homeassistant/components/switchbot/sensor.py
@@ -67,7 +67,7 @@
     ),
     "temperature": SensorEntityDescription(
         key="temperature",
-        translation_key="temperature",
+        name=None,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.TEMPERATURE,
diff --git a/homeassistant/components/switchbot/strings.json b/homeassistant/components/switchbot/strings.json
index 74226583420c27..c00f2fe79e4e79 100644
--- a/homeassistant/components/switchbot/strings.json
+++ b/homeassistant/components/switchbot/strings.json
@@ -44,7 +44,7 @@
     },
     "abort": {
       "already_configured_device": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "no_devices_found": "No supported SwitchBot devices found in range; If the device is in range, ensure the scanner has active scanning enabled, as SwitchBot devices cannot be discovered with passive scans. Active scans can be disabled once the device is configured. If you need clarification on whether the device is in-range, download the diagnostics for the integration that provides your Bluetooth adapter or proxy and check if the MAC address of the SwitchBot device is present.",
       "unknown": "[%key:common::config_flow::error::unknown%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "switchbot_unsupported_type": "Unsupported Switchbot Type."
@@ -64,12 +64,6 @@
       "calibration": {
         "name": "Calibration"
       },
-      "motion": {
-        "name": "[%key:component::binary_sensor::entity_component::motion::name%]"
-      },
-      "door_open": {
-        "name": "[%key:component::binary_sensor::entity_component::door::name%]"
-      },
       "door_timeout": {
         "name": "Timeout"
       },
@@ -102,12 +96,63 @@
       "humidity": {
         "name": "[%key:component::sensor::entity_component::humidity::name%]"
       },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      },
       "power": {
         "name": "[%key:component::sensor::entity_component::power::name%]"
       }
+    },
+    "cover": {
+      "cover": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "humidifier": {
+      "humidifier": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "lock": {
+      "lock": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          }
+        }
+      }
+    },
+    "switch": {
+      "bot": {
+        "state_attributes": {
+          "last_run_success": {
+            "state": {
+              "true": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
+              "false": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
+            }
+          },
+          "switch_mode": {
+            "state": {
+              "true": "Pull/Retract",
+              "false": "Momentary"
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/homeassistant/components/switchbot/switch.py b/homeassistant/components/switchbot/switch.py
index befbf00f8be817..f62e4d3f918a40 100644
--- a/homeassistant/components/switchbot/switch.py
+++ b/homeassistant/components/switchbot/switch.py
@@ -34,6 +34,8 @@ class SwitchBotSwitch(SwitchbotSwitchedEntity, SwitchEntity, RestoreEntity):
     """Representation of a Switchbot switch."""
 
     _attr_device_class = SwitchDeviceClass.SWITCH
+    _attr_translation_key = "bot"
+    _attr_name = None
     _device: switchbot.Switchbot
 
     def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
diff --git a/homeassistant/components/switcher_kis/__init__.py b/homeassistant/components/switcher_kis/__init__.py
index abb18a19ed32c7..fb6ded993467eb 100644
--- a/homeassistant/components/switcher_kis/__init__.py
+++ b/homeassistant/components/switcher_kis/__init__.py
@@ -39,7 +39,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-CCONFIG_SCHEMA = vol.Schema(
+CONFIG_SCHEMA = vol.Schema(
     vol.All(
         cv.deprecated(DOMAIN),
         {
diff --git a/homeassistant/components/switchmate/manifest.json b/homeassistant/components/switchmate/manifest.json
index 7f4d3de5b0ea12..5467dc512c3bc7 100644
--- a/homeassistant/components/switchmate/manifest.json
+++ b/homeassistant/components/switchmate/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchmate",
   "iot_class": "local_polling",
   "loggers": ["switchmate"],
-  "requirements": ["pySwitchmate==0.5.1"]
+  "requirements": ["PySwitchmate==0.5.1"]
 }
diff --git a/homeassistant/components/syncthru/manifest.json b/homeassistant/components/syncthru/manifest.json
index d67e93aa9626a8..a93e02a51c7236 100644
--- a/homeassistant/components/syncthru/manifest.json
+++ b/homeassistant/components/syncthru/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/syncthru",
   "iot_class": "local_polling",
   "loggers": ["pysyncthru"],
-  "requirements": ["pysyncthru==0.7.10", "url-normalize==1.4.3"],
+  "requirements": ["PySyncThru==0.7.10", "url-normalize==1.4.3"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:Printer:1",
diff --git a/homeassistant/components/synology_dsm/camera.py b/homeassistant/components/synology_dsm/camera.py
index b85ef5f2e3a2dc..425475dc0d0f55 100644
--- a/homeassistant/components/synology_dsm/camera.py
+++ b/homeassistant/components/synology_dsm/camera.py
@@ -128,7 +128,6 @@ def _handle_signal(url: str) -> None:
                 _LOGGER.debug("Update stream URL for camera %s", self.camera_data.name)
                 self.stream.update_source(url)
 
-        assert self.platform
         assert self.platform.config_entry
         self.async_on_remove(
             async_dispatcher_connect(
diff --git a/homeassistant/components/synology_dsm/coordinator.py b/homeassistant/components/synology_dsm/coordinator.py
index 3b25d93154a3e2..9d0ccfd86d211b 100644
--- a/homeassistant/components/synology_dsm/coordinator.py
+++ b/homeassistant/components/synology_dsm/coordinator.py
@@ -99,7 +99,6 @@ async def _async_update_data(self) -> None:
             await self.api.async_update()
         except SYNOLOGY_CONNECTION_EXCEPTIONS as err:
             raise UpdateFailed(f"Error communicating with API: {err}") from err
-        return None
 
 
 class SynologyDSMCameraUpdateCoordinator(
diff --git a/homeassistant/components/system_bridge/__init__.py b/homeassistant/components/system_bridge/__init__.py
index 1c5d4a4204e18b..05e607d56edb02 100644
--- a/homeassistant/components/system_bridge/__init__.py
+++ b/homeassistant/components/system_bridge/__init__.py
@@ -30,7 +30,7 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME, DeviceClassName, DeviceInfo
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MODULES
@@ -279,17 +279,13 @@ def __init__(
         coordinator: SystemBridgeDataUpdateCoordinator,
         api_port: int,
         key: str,
-        name: str | DeviceClassName | None,
+        name: str | None,
     ) -> None:
         """Initialize the System Bridge entity."""
         super().__init__(coordinator)
 
         self._hostname = coordinator.data.system.hostname
         self._key = f"{self._hostname}_{key}"
-        # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME as name.
-        assert name is not DEVICE_CLASS_NAME
         self._name = f"{self._hostname} {name}"
         self._configuration_url = (
             f"http://{self._hostname}:{api_port}/app/settings.html"
diff --git a/homeassistant/components/system_bridge/binary_sensor.py b/homeassistant/components/system_bridge/binary_sensor.py
index bb83d90235fced..5c23c3110d81a9 100644
--- a/homeassistant/components/system_bridge/binary_sensor.py
+++ b/homeassistant/components/system_bridge/binary_sensor.py
@@ -23,6 +23,10 @@
 class SystemBridgeBinarySensorEntityDescription(BinarySensorEntityDescription):
     """Class describing System Bridge binary sensor entities."""
 
+    # SystemBridgeBinarySensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable = round
 
 
diff --git a/homeassistant/components/system_bridge/manifest.json b/homeassistant/components/system_bridge/manifest.json
index 7462966ae3947d..c0f89c16339888 100644
--- a/homeassistant/components/system_bridge/manifest.json
+++ b/homeassistant/components/system_bridge/manifest.json
@@ -10,6 +10,6 @@
   "iot_class": "local_push",
   "loggers": ["systembridgeconnector"],
   "quality_scale": "silver",
-  "requirements": ["systembridgeconnector==3.4.8"],
+  "requirements": ["systembridgeconnector==3.4.9"],
   "zeroconf": ["_system-bridge._tcp.local."]
 }
diff --git a/homeassistant/components/system_bridge/sensor.py b/homeassistant/components/system_bridge/sensor.py
index a6bf29ac5460ed..9290ebeacd5da4 100644
--- a/homeassistant/components/system_bridge/sensor.py
+++ b/homeassistant/components/system_bridge/sensor.py
@@ -46,6 +46,10 @@
 class SystemBridgeSensorEntityDescription(SensorEntityDescription):
     """Class describing System Bridge sensor entities."""
 
+    # SystemBridgeSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     value: Callable = round
 
 
@@ -56,6 +60,23 @@ def battery_time_remaining(data: SystemBridgeCoordinatorData) -> datetime | None
     return None
 
 
+def cpu_power_package(data: SystemBridgeCoordinatorData) -> float | None:
+    """Return the CPU package power."""
+    if data.cpu.power_package is not None:
+        return data.cpu.power_package
+    return None
+
+
+def cpu_power_per_cpu(
+    data: SystemBridgeCoordinatorData,
+    cpu: int,
+) -> float | None:
+    """Return CPU power per CPU."""
+    if (value := getattr(data.cpu, f"power_per_cpu_{cpu}", None)) is not None:
+        return value
+    return None
+
+
 def cpu_speed(data: SystemBridgeCoordinatorData) -> float | None:
     """Return the CPU speed."""
     if data.cpu.frequency_current is not None:
@@ -129,6 +150,15 @@ def memory_used(data: SystemBridgeCoordinatorData) -> float | None:
             data.system.boot_time, tz=timezone.utc
         ),
     ),
+    SystemBridgeSensorEntityDescription(
+        key="cpu_power_package",
+        name="CPU Package Power",
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=2,
+        icon="mdi:chip",
+        value=cpu_power_package,
+    ),
     SystemBridgeSensorEntityDescription(
         key="cpu_speed",
         name="CPU speed",
@@ -498,8 +528,7 @@ async def async_setup_entry(
         ]
 
     for index in range(coordinator.data.cpu.count):
-        entities = [
-            *entities,
+        entities.append(
             SystemBridgeSensor(
                 coordinator,
                 SystemBridgeSensorEntityDescription(
@@ -512,8 +541,25 @@ async def async_setup_entry(
                     value=lambda data, k=index: getattr(data.cpu, f"usage_{k}", None),
                 ),
                 entry.data[CONF_PORT],
-            ),
-        ]
+            )
+        )
+        if hasattr(coordinator.data.cpu, f"power_per_cpu_{index}"):
+            entities.append(
+                SystemBridgeSensor(
+                    coordinator,
+                    SystemBridgeSensorEntityDescription(
+                        key=f"cpu_power_core_{index}",
+                        name=f"CPU Core {index} Power",
+                        entity_registry_enabled_default=False,
+                        native_unit_of_measurement=UnitOfPower.WATT,
+                        state_class=SensorStateClass.MEASUREMENT,
+                        suggested_display_precision=2,
+                        icon="mdi:chip",
+                        value=lambda data, k=index: cpu_power_per_cpu(data, k),
+                    ),
+                    entry.data[CONF_PORT],
+                )
+            )
 
     async_add_entities(entities)
 
diff --git a/homeassistant/components/system_health/__init__.py b/homeassistant/components/system_health/__init__.py
index 3d149b3a40dee1..9a222d7096ca3b 100644
--- a/homeassistant/components/system_health/__init__.py
+++ b/homeassistant/components/system_health/__init__.py
@@ -14,7 +14,11 @@
 
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import aiohttp_client, integration_platform
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_validation as cv,
+    integration_platform,
+)
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 
@@ -24,6 +28,8 @@
 
 INFO_CALLBACK_TIMEOUT = 5
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @bind_hass
 @callback
diff --git a/homeassistant/components/tado/__init__.py b/homeassistant/components/tado/__init__.py
index 691ca639656ce6..1cd21634c8e174 100644
--- a/homeassistant/components/tado/__init__.py
+++ b/homeassistant/components/tado/__init__.py
@@ -25,6 +25,7 @@
     DATA,
     DOMAIN,
     INSIDE_TEMPERATURE_MEASUREMENT,
+    PRESET_AUTO,
     SIGNAL_TADO_UPDATE_RECEIVED,
     TEMP_OFFSET,
     UPDATE_LISTENER,
@@ -151,6 +152,7 @@ def __init__(self, hass, username, password, fallback):
         self.data = {
             "device": {},
             "weather": {},
+            "geofence": {},
             "zone": {},
         }
 
@@ -175,11 +177,7 @@ def update(self):
         """Update the registered zones."""
         self.update_devices()
         self.update_zones()
-        self.data["weather"] = self.tado.getWeather()
-        dispatcher_send(
-            self.hass,
-            SIGNAL_TADO_UPDATE_RECEIVED.format(self.home_id, "weather", "data"),
-        )
+        self.update_home()
 
     def update_devices(self):
         """Update the device data from Tado."""
@@ -250,10 +248,29 @@ def update_zone(self, zone_id):
             SIGNAL_TADO_UPDATE_RECEIVED.format(self.home_id, "zone", zone_id),
         )
 
+    def update_home(self):
+        """Update the home data from Tado."""
+        try:
+            self.data["weather"] = self.tado.getWeather()
+            self.data["geofence"] = self.tado.getHomeState()
+            dispatcher_send(
+                self.hass,
+                SIGNAL_TADO_UPDATE_RECEIVED.format(self.home_id, "home", "data"),
+            )
+        except RuntimeError:
+            _LOGGER.error(
+                "Unable to connect to Tado while updating weather and geofence data"
+            )
+            return
+
     def get_capabilities(self, zone_id):
         """Return the capabilities of the devices."""
         return self.tado.getCapabilities(zone_id)
 
+    def get_auto_geofencing_supported(self):
+        """Return whether the Tado Home supports auto geofencing."""
+        return self.tado.getAutoGeofencingSupported()
+
     def reset_zone_overlay(self, zone_id):
         """Reset the zone back to the default operation."""
         self.tado.resetZoneOverlay(zone_id)
@@ -263,12 +280,17 @@ def set_presence(
         self,
         presence=PRESET_HOME,
     ):
-        """Set the presence to home or away."""
+        """Set the presence to home, away or auto."""
         if presence == PRESET_AWAY:
             self.tado.setAway()
         elif presence == PRESET_HOME:
             self.tado.setHome()
+        elif presence == PRESET_AUTO:
+            self.tado.setAuto()
+
+        # Update everything when changing modes
         self.update_zones()
+        self.update_home()
 
     def set_zone_overlay(
         self,
diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py
index cab3c42184e016..2b8bc4060d67f3 100644
--- a/homeassistant/components/tado/climate.py
+++ b/homeassistant/components/tado/climate.py
@@ -44,8 +44,10 @@
     HA_TO_TADO_HVAC_MODE_MAP,
     HA_TO_TADO_SWING_MODE_MAP,
     ORDERED_KNOWN_TADO_MODES,
+    PRESET_AUTO,
     SIGNAL_TADO_UPDATE_RECEIVED,
-    SUPPORT_PRESET,
+    SUPPORT_PRESET_AUTO,
+    SUPPORT_PRESET_MANUAL,
     TADO_HVAC_ACTION_TO_HA_HVAC_ACTION,
     TADO_MODES_WITH_NO_TEMP_SETTING,
     TADO_SWING_OFF,
@@ -245,6 +247,8 @@ def __init__(
         self._attr_name = zone_name
         self._attr_temperature_unit = UnitOfTemperature.CELSIUS
 
+        self._attr_translation_key = DOMAIN
+
         self._device_info = device_info
         self._device_id = self._device_info["shortSerialNo"]
 
@@ -274,21 +278,31 @@ def __init__(
         self._current_tado_swing_mode = TADO_SWING_OFF
 
         self._tado_zone_data = None
+        self._tado_geofence_data = None
 
         self._tado_zone_temp_offset = {}
 
+        self._async_update_home_data()
         self._async_update_zone_data()
 
     async def async_added_to_hass(self) -> None:
         """Register for sensor updates."""
 
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                SIGNAL_TADO_UPDATE_RECEIVED.format(self._tado.home_id, "home", "data"),
+                self._async_update_home_callback,
+            )
+        )
+
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
                 SIGNAL_TADO_UPDATE_RECEIVED.format(
                     self._tado.home_id, "zone", self.zone_id
                 ),
-                self._async_update_callback,
+                self._async_update_zone_callback,
             )
         )
 
@@ -346,7 +360,11 @@ def set_fan_mode(self, fan_mode: str) -> None:
 
     @property
     def preset_mode(self):
-        """Return the current preset mode (home, away)."""
+        """Return the current preset mode (home, away or auto)."""
+
+        if "presenceLocked" in self._tado_geofence_data:
+            if not self._tado_geofence_data["presenceLocked"]:
+                return PRESET_AUTO
         if self._tado_zone_data.is_away:
             return PRESET_AWAY
         return PRESET_HOME
@@ -354,7 +372,9 @@ def preset_mode(self):
     @property
     def preset_modes(self):
         """Return a list of available preset modes."""
-        return SUPPORT_PRESET
+        if self._tado.get_auto_geofencing_supported():
+            return SUPPORT_PRESET_AUTO
+        return SUPPORT_PRESET_MANUAL
 
     def set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
@@ -501,11 +521,22 @@ def _async_update_zone_data(self):
         self._current_tado_swing_mode = self._tado_zone_data.current_swing_mode
 
     @callback
-    def _async_update_callback(self):
+    def _async_update_zone_callback(self):
         """Load tado data and update state."""
         self._async_update_zone_data()
         self.async_write_ha_state()
 
+    @callback
+    def _async_update_home_data(self):
+        """Load tado geofencing data into zone."""
+        self._tado_geofence_data = self._tado.data["geofence"]
+
+    @callback
+    def _async_update_home_callback(self):
+        """Load tado data and update state."""
+        self._async_update_home_data()
+        self.async_write_ha_state()
+
     def _normalize_target_temp_for_hvac_mode(self):
         # Set a target temperature if we don't have any
         # This can happen when we switch from Off to On
diff --git a/homeassistant/components/tado/const.py b/homeassistant/components/tado/const.py
index 94d074c4066260..9366a18b6fef47 100644
--- a/homeassistant/components/tado/const.py
+++ b/homeassistant/components/tado/const.py
@@ -153,8 +153,14 @@
 
 DEFAULT_TADO_PRECISION = 0.1
 
-SUPPORT_PRESET = [PRESET_AWAY, PRESET_HOME]
+# Constant for Auto Geolocation mode
+PRESET_AUTO = "auto"
 
+SUPPORT_PRESET_AUTO = [PRESET_AWAY, PRESET_HOME, PRESET_AUTO]
+SUPPORT_PRESET_MANUAL = [PRESET_AWAY, PRESET_HOME]
+
+SENSOR_DATA_CATEGORY_WEATHER = "weather"
+SENSOR_DATA_CATEGORY_GEOFENCE = "geofence"
 
 TADO_SWING_OFF = "OFF"
 TADO_SWING_ON = "ON"
diff --git a/homeassistant/components/tado/manifest.json b/homeassistant/components/tado/manifest.json
index 86ace76c849222..62f7a377239efb 100644
--- a/homeassistant/components/tado/manifest.json
+++ b/homeassistant/components/tado/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "tado",
   "name": "Tado",
-  "codeowners": ["@michaelarnauts"],
+  "codeowners": ["@michaelarnauts", "@chiefdragon"],
   "config_flow": true,
   "dhcp": [
     {
@@ -14,5 +14,5 @@
   },
   "iot_class": "cloud_polling",
   "loggers": ["PyTado"],
-  "requirements": ["python-tado==0.12.0"]
+  "requirements": ["python-tado==0.15.0"]
 }
diff --git a/homeassistant/components/tado/sensor.py b/homeassistant/components/tado/sensor.py
index d218e9ca933728..7742f6b0dca3cd 100644
--- a/homeassistant/components/tado/sensor.py
+++ b/homeassistant/components/tado/sensor.py
@@ -23,6 +23,8 @@
     CONDITIONS_MAP,
     DATA,
     DOMAIN,
+    SENSOR_DATA_CATEGORY_GEOFENCE,
+    SENSOR_DATA_CATEGORY_WEATHER,
     SIGNAL_TADO_UPDATE_RECEIVED,
     TYPE_AIR_CONDITIONING,
     TYPE_HEATING,
@@ -47,6 +49,7 @@ class TadoSensorEntityDescription(
     """Describes Tado sensor entity."""
 
     attributes_fn: Callable[[Any], dict[Any, StateType]] | None = None
+    data_category: str | None = None
 
 
 HOME_SENSORS = [
@@ -60,6 +63,7 @@ class TadoSensorEntityDescription(
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
+        data_category=SENSOR_DATA_CATEGORY_WEATHER,
     ),
     TadoSensorEntityDescription(
         key="solar percentage",
@@ -70,12 +74,35 @@ class TadoSensorEntityDescription(
         },
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
+        data_category=SENSOR_DATA_CATEGORY_WEATHER,
     ),
     TadoSensorEntityDescription(
         key="weather condition",
         name="Weather condition",
         state_fn=lambda data: format_condition(data["weatherState"]["value"]),
         attributes_fn=lambda data: {"time": data["weatherState"]["timestamp"]},
+        data_category=SENSOR_DATA_CATEGORY_WEATHER,
+    ),
+    TadoSensorEntityDescription(
+        key="tado mode",
+        name="Tado mode",
+        # pylint: disable=unnecessary-lambda
+        state_fn=lambda data: get_tado_mode(data),
+        data_category=SENSOR_DATA_CATEGORY_GEOFENCE,
+    ),
+    TadoSensorEntityDescription(
+        key="geofencing mode",
+        name="Geofencing mode",
+        # pylint: disable=unnecessary-lambda
+        state_fn=lambda data: get_geofencing_mode(data),
+        data_category=SENSOR_DATA_CATEGORY_GEOFENCE,
+    ),
+    TadoSensorEntityDescription(
+        key="automatic geofencing",
+        name="Automatic geofencing",
+        # pylint: disable=unnecessary-lambda
+        state_fn=lambda data: get_automatic_geofencing(data),
+        data_category=SENSOR_DATA_CATEGORY_GEOFENCE,
     ),
 ]
 
@@ -145,6 +172,39 @@ def format_condition(condition: str) -> str:
     return condition
 
 
+def get_tado_mode(data) -> str | None:
+    """Return Tado Mode based on Presence attribute."""
+    if "presence" in data:
+        return data["presence"]
+    return None
+
+
+def get_automatic_geofencing(data) -> bool:
+    """Return whether Automatic Geofencing is enabled based on Presence Locked attribute."""
+    if "presenceLocked" in data:
+        if data["presenceLocked"]:
+            return False
+        return True
+    return False
+
+
+def get_geofencing_mode(data) -> str:
+    """Return Geofencing Mode based on Presence and Presence Locked attributes."""
+    tado_mode = ""
+    tado_mode = data.get("presence", "unknown")
+
+    geofencing_switch_mode = ""
+    if "presenceLocked" in data:
+        if data["presenceLocked"]:
+            geofencing_switch_mode = "manual"
+        else:
+            geofencing_switch_mode = "auto"
+    else:
+        geofencing_switch_mode = "manual"
+
+    return f"{tado_mode.capitalize()} ({geofencing_switch_mode.capitalize()})"
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
@@ -200,9 +260,7 @@ async def async_added_to_hass(self) -> None:
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                SIGNAL_TADO_UPDATE_RECEIVED.format(
-                    self._tado.home_id, "weather", "data"
-                ),
+                SIGNAL_TADO_UPDATE_RECEIVED.format(self._tado.home_id, "home", "data"),
                 self._async_update_callback,
             )
         )
@@ -219,13 +277,19 @@ def _async_update_home_data(self):
         """Handle update callbacks."""
         try:
             tado_weather_data = self._tado.data["weather"]
+            tado_geofence_data = self._tado.data["geofence"]
         except KeyError:
             return
 
-        self._attr_native_value = self.entity_description.state_fn(tado_weather_data)
+        if self.entity_description.data_category is not None:
+            if self.entity_description.data_category == SENSOR_DATA_CATEGORY_WEATHER:
+                tado_sensor_data = tado_weather_data
+            else:
+                tado_sensor_data = tado_geofence_data
+        self._attr_native_value = self.entity_description.state_fn(tado_sensor_data)
         if self.entity_description.attributes_fn is not None:
             self._attr_extra_state_attributes = self.entity_description.attributes_fn(
-                tado_weather_data
+                tado_sensor_data
             )
 
 
diff --git a/homeassistant/components/tado/strings.json b/homeassistant/components/tado/strings.json
index e1bf1a1406d60c..3decfe3cd0c925 100644
--- a/homeassistant/components/tado/strings.json
+++ b/homeassistant/components/tado/strings.json
@@ -29,5 +29,18 @@
         "title": "Adjust Tado options."
       }
     }
+  },
+  "entity": {
+    "climate": {
+      "tado": {
+        "state_attributes": {
+          "preset_mode": {
+            "state": {
+              "auto": "Auto"
+            }
+          }
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/tag/__init__.py b/homeassistant/components/tag/__init__.py
index cd0dd00afe599f..e82083f73ec13b 100644
--- a/homeassistant/components/tag/__init__.py
+++ b/homeassistant/components/tag/__init__.py
@@ -38,6 +38,8 @@
     vol.Optional(LAST_SCANNED): cv.datetime,
 }
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 class TagIDExistsError(HomeAssistantError):
     """Raised when an item is not found."""
diff --git a/homeassistant/components/tank_utility/manifest.json b/homeassistant/components/tank_utility/manifest.json
index dcd206e0c1c796..3f4d7bbaa15cdd 100644
--- a/homeassistant/components/tank_utility/manifest.json
+++ b/homeassistant/components/tank_utility/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tank_utility",
   "iot_class": "cloud_polling",
   "loggers": ["tank_utility"],
-  "requirements": ["tank_utility==1.4.1"]
+  "requirements": ["tank-utility==1.4.1"]
 }
diff --git a/homeassistant/components/tankerkoenig/strings.json b/homeassistant/components/tankerkoenig/strings.json
index e0b9b3d53e84dc..b68359a51760aa 100644
--- a/homeassistant/components/tankerkoenig/strings.json
+++ b/homeassistant/components/tankerkoenig/strings.json
@@ -18,7 +18,7 @@
       },
       "select_station": {
         "title": "Select stations to add",
-        "description": "found {stations_count} stations in radius",
+        "description": "Found {stations_count} stations in radius",
         "data": {
           "stations": "Stations"
         }
diff --git a/homeassistant/components/tasmota/device_automation.py b/homeassistant/components/tasmota/device_automation.py
index 9b190855ad2da7..98c7d1355c3211 100644
--- a/homeassistant/components/tasmota/device_automation.py
+++ b/homeassistant/components/tasmota/device_automation.py
@@ -5,7 +5,7 @@
 from hatasmota.trigger import TasmotaTrigger
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import Event, HomeAssistant
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -24,10 +24,13 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> N
 
     async def async_device_removed(event: Event) -> None:
         """Handle the removal of a device."""
-        if event.data["action"] != "remove":
-            return
         await async_remove_automations(hass, event.data["device_id"])
 
+    @callback
+    def _async_device_removed_filter(event: Event) -> bool:
+        """Filter device registry events."""
+        return event.data["action"] == "remove"
+
     async def async_discover(
         tasmota_automation: TasmotaTrigger, discovery_hash: DiscoveryHashType
     ) -> None:
@@ -45,5 +48,9 @@ async def async_discover(
         async_discover,
     )
     hass.data[DATA_UNSUB].append(
-        hass.bus.async_listen(EVENT_DEVICE_REGISTRY_UPDATED, async_device_removed)
+        hass.bus.async_listen(
+            EVENT_DEVICE_REGISTRY_UPDATED,
+            async_device_removed,
+            event_filter=_async_device_removed_filter,
+        )
     )
diff --git a/homeassistant/components/tasmota/manifest.json b/homeassistant/components/tasmota/manifest.json
index a5a8ed2f0d23a9..f235256f7726a4 100644
--- a/homeassistant/components/tasmota/manifest.json
+++ b/homeassistant/components/tasmota/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["hatasmota"],
   "mqtt": ["tasmota/discovery/#"],
-  "requirements": ["hatasmota==0.6.5"]
+  "requirements": ["HATasmota==0.6.5"]
 }
diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index a453a4611bf62d..3d56cc7ed33265 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -62,6 +62,8 @@
 ATTR_FROM_FIRST = "from_first"
 ATTR_FROM_LAST = "from_last"
 ATTR_KEYBOARD = "keyboard"
+ATTR_RESIZE_KEYBOARD = "resize_keyboard"
+ATTR_ONE_TIME_KEYBOARD = "one_time_keyboard"
 ATTR_KEYBOARD_INLINE = "inline_keyboard"
 ATTR_MESSAGEID = "message_id"
 ATTR_MSG = "message"
@@ -157,6 +159,8 @@
         vol.Optional(ATTR_PARSER): cv.string,
         vol.Optional(ATTR_DISABLE_NOTIF): cv.boolean,
         vol.Optional(ATTR_DISABLE_WEB_PREV): cv.boolean,
+        vol.Optional(ATTR_RESIZE_KEYBOARD): cv.boolean,
+        vol.Optional(ATTR_ONE_TIME_KEYBOARD): cv.boolean,
         vol.Optional(ATTR_KEYBOARD): vol.All(cv.ensure_list, [cv.string]),
         vol.Optional(ATTR_KEYBOARD_INLINE): cv.ensure_list,
         vol.Optional(ATTR_TIMEOUT): cv.positive_int,
@@ -525,17 +529,24 @@ def _make_row_inline_keyboard(row_keyboard):
                 (text_b2, data_callback_b2), ...]
               - a string like: `/cmd1, /cmd2, /cmd3`
               - or a string like: `text_b1:/cmd1, text_b2:/cmd2`
+              - also supports urls instead of callback commands
             """
             buttons = []
             if isinstance(row_keyboard, str):
                 for key in row_keyboard.split(","):
                     if ":/" in key:
-                        # commands like: 'Label:/cmd' become ('Label', '/cmd')
-                        label = key.split(":/")[0]
-                        command = key[len(label) + 1 :]
-                        buttons.append(
-                            InlineKeyboardButton(label, callback_data=command)
-                        )
+                        # check if command or URL
+                        if key.startswith("https://"):
+                            label = key.split(",")[0]
+                            url = key[len(label) + 1 :]
+                            buttons.append(InlineKeyboardButton(label, url=url))
+                        else:
+                            # commands like: 'Label:/cmd' become ('Label', '/cmd')
+                            label = key.split(":/")[0]
+                            command = key[len(label) + 1 :]
+                            buttons.append(
+                                InlineKeyboardButton(label, callback_data=command)
+                            )
                     else:
                         # commands like: '/cmd' become ('CMD', '/cmd')
                         label = key.strip()[1:].upper()
@@ -543,9 +554,12 @@ def _make_row_inline_keyboard(row_keyboard):
             elif isinstance(row_keyboard, list):
                 for entry in row_keyboard:
                     text_btn, data_btn = entry
-                    buttons.append(
-                        InlineKeyboardButton(text_btn, callback_data=data_btn)
-                    )
+                    if data_btn.startswith("https://"):
+                        buttons.append(InlineKeyboardButton(text_btn, url=data_btn))
+                    else:
+                        buttons.append(
+                            InlineKeyboardButton(text_btn, callback_data=data_btn)
+                        )
             else:
                 raise TypeError(str(row_keyboard))
             return buttons
@@ -581,7 +595,13 @@ def _make_row_inline_keyboard(row_keyboard):
                 keys = keys if isinstance(keys, list) else [keys]
                 if keys:
                     params[ATTR_REPLYMARKUP] = ReplyKeyboardMarkup(
-                        [[key.strip() for key in row.split(",")] for row in keys]
+                        [[key.strip() for key in row.split(",")] for row in keys],
+                        resize_keyboard=data[ATTR_RESIZE_KEYBOARD]
+                        if ATTR_RESIZE_KEYBOARD in data
+                        else False,
+                        one_time_keyboard=data[ATTR_ONE_TIME_KEYBOARD]
+                        if ATTR_ONE_TIME_KEYBOARD in data
+                        else False,
                     )
                 else:
                     params[ATTR_REPLYMARKUP] = ReplyKeyboardRemove(True)
diff --git a/homeassistant/components/tellduslive/cover.py b/homeassistant/components/tellduslive/cover.py
index 57da852a3561df..4934bf811aff3c 100644
--- a/homeassistant/components/tellduslive/cover.py
+++ b/homeassistant/components/tellduslive/cover.py
@@ -8,8 +8,8 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import TelldusLiveClient
 from .. import tellduslive
+from . import TelldusLiveClient
 from .entry import TelldusLiveEntity
 
 
diff --git a/homeassistant/components/template/config.py b/homeassistant/components/template/config.py
index 77eaec13da546c..2261bde265950c 100644
--- a/homeassistant/components/template/config.py
+++ b/homeassistant/components/template/config.py
@@ -5,6 +5,7 @@
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN
+from homeassistant.components.image import DOMAIN as IMAGE_DOMAIN
 from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
@@ -16,6 +17,7 @@
 from . import (
     binary_sensor as binary_sensor_platform,
     button as button_platform,
+    image as image_platform,
     number as number_platform,
     select as select_platform,
     sensor as sensor_platform,
@@ -49,6 +51,9 @@
         vol.Optional(BUTTON_DOMAIN): vol.All(
             cv.ensure_list, [button_platform.BUTTON_SCHEMA]
         ),
+        vol.Optional(IMAGE_DOMAIN): vol.All(
+            cv.ensure_list, [image_platform.IMAGE_SCHEMA]
+        ),
     }
 )
 
diff --git a/homeassistant/components/template/const.py b/homeassistant/components/template/const.py
index 15a4b430190319..9b371125750f76 100644
--- a/homeassistant/components/template/const.py
+++ b/homeassistant/components/template/const.py
@@ -16,6 +16,7 @@
     Platform.BUTTON,
     Platform.COVER,
     Platform.FAN,
+    Platform.IMAGE,
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NUMBER,
diff --git a/homeassistant/components/template/image.py b/homeassistant/components/template/image.py
new file mode 100644
index 00000000000000..95bbac576ad85b
--- /dev/null
+++ b/homeassistant/components/template/image.py
@@ -0,0 +1,155 @@
+"""Support for image which integrates with other components."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components.image import (
+    DOMAIN as IMAGE_DOMAIN,
+    ImageEntity,
+)
+from homeassistant.const import CONF_UNIQUE_ID, CONF_URL, CONF_VERIFY_SSL
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import TemplateError
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
+
+from . import TriggerUpdateCoordinator
+from .const import CONF_PICTURE
+from .template_entity import (
+    TemplateEntity,
+    make_template_entity_common_schema,
+)
+from .trigger_entity import TriggerEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "Template Image"
+
+GET_IMAGE_TIMEOUT = 10
+
+IMAGE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_URL): cv.template,
+        vol.Optional(CONF_VERIFY_SSL, default=True): bool,
+    }
+).extend(make_template_entity_common_schema(DEFAULT_NAME).schema)
+
+
+async def _async_create_entities(
+    hass: HomeAssistant, definitions: list[dict[str, Any]], unique_id_prefix: str | None
+) -> list[StateImageEntity]:
+    """Create the template image."""
+    entities = []
+    for definition in definitions:
+        unique_id = definition.get(CONF_UNIQUE_ID)
+        if unique_id and unique_id_prefix:
+            unique_id = f"{unique_id_prefix}-{unique_id}"
+        entities.append(StateImageEntity(hass, definition, unique_id))
+    return entities
+
+
+async def async_setup_platform(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+    """Set up the template image."""
+    if discovery_info is None:
+        _LOGGER.warning(
+            "Template image entities can only be configured under template:"
+        )
+        return
+
+    if "coordinator" in discovery_info:
+        async_add_entities(
+            TriggerImageEntity(hass, discovery_info["coordinator"], config)
+            for config in discovery_info["entities"]
+        )
+        return
+
+    async_add_entities(
+        await _async_create_entities(
+            hass, discovery_info["entities"], discovery_info["unique_id"]
+        )
+    )
+
+
+class StateImageEntity(TemplateEntity, ImageEntity):
+    """Representation of a template image."""
+
+    _attr_should_poll = False
+    _attr_image_url: str | None = None
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config: dict[str, Any],
+        unique_id: str | None,
+    ) -> None:
+        """Initialize the image."""
+        TemplateEntity.__init__(self, hass, config=config, unique_id=unique_id)
+        ImageEntity.__init__(self, hass, config[CONF_VERIFY_SSL])
+        self._url_template = config[CONF_URL]
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return entity picture."""
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if self._entity_picture_template:
+            return TemplateEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+        return ImageEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+
+    @callback
+    def _update_url(self, result):
+        if isinstance(result, TemplateError):
+            self._attr_image_url = None
+            return
+        self._attr_image_last_updated = dt_util.utcnow()
+        self._cached_image = None
+        self._attr_image_url = result
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self.add_template_attribute("_url", self._url_template, None, self._update_url)
+        await super().async_added_to_hass()
+
+
+class TriggerImageEntity(TriggerEntity, ImageEntity):
+    """Image entity based on trigger data."""
+
+    _attr_image_url: str | None = None
+
+    domain = IMAGE_DOMAIN
+    extra_template_keys = (CONF_URL,)
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        coordinator: TriggerUpdateCoordinator,
+        config: dict,
+    ) -> None:
+        """Initialize the entity."""
+        TriggerEntity.__init__(self, hass, coordinator, config)
+        ImageEntity.__init__(self, hass, config[CONF_VERIFY_SSL])
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return entity picture."""
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if CONF_PICTURE in self._config:
+            return TriggerEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+        return ImageEntity.entity_picture.fget(self)  # type: ignore[attr-defined]
+
+    @callback
+    def _process_data(self) -> None:
+        """Process new data."""
+        super()._process_data()
+        self._attr_image_last_updated = dt_util.utcnow()
+        self._cached_image = None
+        self._attr_image_url = self._rendered.get(CONF_URL)
diff --git a/homeassistant/components/template/template_entity.py b/homeassistant/components/template/template_entity.py
index 87c8ec651d236c..0d6d5a99748b8a 100644
--- a/homeassistant/components/template/template_entity.py
+++ b/homeassistant/components/template/template_entity.py
@@ -18,6 +18,7 @@
 from homeassistant.helpers.template_entity import (  # noqa: F401 pylint: disable=unused-import
     TEMPLATE_ENTITY_BASE_SCHEMA,
     TemplateEntity,
+    make_template_entity_base_schema,
 )
 
 from .const import (
@@ -47,6 +48,17 @@
     }
 ).extend(TEMPLATE_ENTITY_BASE_SCHEMA.schema)
 
+
+def make_template_entity_common_schema(default_name: str) -> vol.Schema:
+    """Return a schema with default name."""
+    return vol.Schema(
+        {
+            vol.Optional(CONF_ATTRIBUTES): vol.Schema({cv.string: cv.template}),
+            vol.Optional(CONF_AVAILABILITY): cv.template,
+        }
+    ).extend(make_template_entity_base_schema(default_name).schema)
+
+
 TEMPLATE_ENTITY_ATTRIBUTES_SCHEMA_LEGACY = vol.Schema(
     {
         vol.Optional(CONF_ATTRIBUTE_TEMPLATES, default={}): vol.Schema(
diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 72165ddbf59e9a..7d1a844fb3d8e7 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -18,13 +18,13 @@ def __init__(
         config: dict,
     ) -> None:
         """Initialize the entity."""
-        super(CoordinatorEntity, self).__init__(coordinator)
-        super().__init__(hass, config)
+        CoordinatorEntity.__init__(self, coordinator)
+        TriggerBaseEntity.__init__(self, hass, config)
 
     async def async_added_to_hass(self) -> None:
         """Handle being added to Home Assistant."""
-        await super().async_added_to_hass()
-        await super(CoordinatorEntity, self).async_added_to_hass()
+        await TriggerBaseEntity.async_added_to_hass(self)
+        await CoordinatorEntity.async_added_to_hass(self)  # type: ignore[arg-type]
         if self.coordinator.data is not None:
             self._process_data()
 
diff --git a/homeassistant/components/template/weather.py b/homeassistant/components/template/weather.py
index 9c1680d1a5dbb8..81a6badfc34aca 100644
--- a/homeassistant/components/template/weather.py
+++ b/homeassistant/components/template/weather.py
@@ -72,6 +72,10 @@
 CONF_WIND_SPEED_UNIT = "wind_speed_unit"
 CONF_VISIBILITY_UNIT = "visibility_unit"
 CONF_PRECIPITATION_UNIT = "precipitation_unit"
+CONF_WIND_GUST_SPEED_TEMPLATE = "wind_gust_speed_template"
+CONF_CLOUD_COVERAGE_TEMPLATE = "cloud_coverage_template"
+CONF_DEW_POINT_TEMPLATE = "dew_point_template"
+CONF_APPARENT_TEMPERATURE_TEMPLATE = "apparent_temperature_template"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
@@ -92,6 +96,10 @@
         vol.Optional(CONF_WIND_SPEED_UNIT): vol.In(SpeedConverter.VALID_UNITS),
         vol.Optional(CONF_VISIBILITY_UNIT): vol.In(DistanceConverter.VALID_UNITS),
         vol.Optional(CONF_PRECIPITATION_UNIT): vol.In(DistanceConverter.VALID_UNITS),
+        vol.Optional(CONF_WIND_GUST_SPEED_TEMPLATE): cv.template,
+        vol.Optional(CONF_CLOUD_COVERAGE_TEMPLATE): cv.template,
+        vol.Optional(CONF_DEW_POINT_TEMPLATE): cv.template,
+        vol.Optional(CONF_APPARENT_TEMPERATURE_TEMPLATE): cv.template,
     }
 )
 
@@ -143,6 +151,12 @@ def __init__(
         self._ozone_template = config.get(CONF_OZONE_TEMPLATE)
         self._visibility_template = config.get(CONF_VISIBILITY_TEMPLATE)
         self._forecast_template = config.get(CONF_FORECAST_TEMPLATE)
+        self._wind_gust_speed_template = config.get(CONF_WIND_GUST_SPEED_TEMPLATE)
+        self._cloud_coverage_template = config.get(CONF_CLOUD_COVERAGE_TEMPLATE)
+        self._dew_point_template = config.get(CONF_DEW_POINT_TEMPLATE)
+        self._apparent_temperature_template = config.get(
+            CONF_APPARENT_TEMPERATURE_TEMPLATE
+        )
 
         self._attr_native_precipitation_unit = config.get(CONF_PRECIPITATION_UNIT)
         self._attr_native_pressure_unit = config.get(CONF_PRESSURE_UNIT)
@@ -161,6 +175,10 @@ def __init__(
         self._wind_bearing = None
         self._ozone = None
         self._visibility = None
+        self._wind_gust_speed = None
+        self._cloud_coverage = None
+        self._dew_point = None
+        self._apparent_temperature = None
         self._forecast: list[Forecast] = []
 
     @property
@@ -203,6 +221,26 @@ def native_pressure(self) -> float | None:
         """Return the air pressure."""
         return self._pressure
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed."""
+        return self._wind_gust_speed
+
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage."""
+        return self._cloud_coverage
+
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point."""
+        return self._dew_point
+
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature."""
+        return self._apparent_temperature
+
     @property
     def forecast(self) -> list[Forecast]:
         """Return the forecast."""
@@ -264,6 +302,26 @@ async def async_added_to_hass(self) -> None:
                 "_visibility",
                 self._visibility_template,
             )
+        if self._wind_gust_speed_template:
+            self.add_template_attribute(
+                "_wind_gust_speed",
+                self._wind_gust_speed_template,
+            )
+        if self._cloud_coverage_template:
+            self.add_template_attribute(
+                "_cloud_coverage",
+                self._cloud_coverage_template,
+            )
+        if self._dew_point_template:
+            self.add_template_attribute(
+                "_dew_point",
+                self._dew_point_template,
+            )
+        if self._apparent_temperature_template:
+            self.add_template_attribute(
+                "_apparent_temperature",
+                self._apparent_temperature_template,
+            )
         if self._forecast_template:
             self.add_template_attribute(
                 "_forecast",
diff --git a/homeassistant/components/tensorflow/image_processing.py b/homeassistant/components/tensorflow/image_processing.py
index 60e9dc54b80a98..a149ea92371d13 100644
--- a/homeassistant/components/tensorflow/image_processing.py
+++ b/homeassistant/components/tensorflow/image_processing.py
@@ -7,8 +7,8 @@
 import sys
 import time
 
-from PIL import Image, ImageDraw, UnidentifiedImageError
 import numpy as np
+from PIL import Image, ImageDraw, UnidentifiedImageError
 import tensorflow as tf  # pylint: disable=import-error
 import voluptuous as vol
 
diff --git a/homeassistant/components/tensorflow/manifest.json b/homeassistant/components/tensorflow/manifest.json
index 2178930199d971..672bd899962dd4 100644
--- a/homeassistant/components/tensorflow/manifest.json
+++ b/homeassistant/components/tensorflow/manifest.json
@@ -10,6 +10,6 @@
     "tf-models-official==2.5.0",
     "pycocotools==2.0.1",
     "numpy==1.23.2",
-    "pillow==9.5.0"
+    "Pillow==9.5.0"
   ]
 }
diff --git a/homeassistant/components/tesla_wall_connector/__init__.py b/homeassistant/components/tesla_wall_connector/__init__.py
index 179576334a97e2..dfb439133f6b23 100644
--- a/homeassistant/components/tesla_wall_connector/__init__.py
+++ b/homeassistant/components/tesla_wall_connector/__init__.py
@@ -148,10 +148,10 @@ def device_info(self) -> DeviceInfo:
         """Return information about the device."""
         return DeviceInfo(
             identifiers={(DOMAIN, self.wall_connector_data.serial_number)},
-            default_name=WALLCONNECTOR_DEVICE_NAME,
+            name=WALLCONNECTOR_DEVICE_NAME,
             model=self.wall_connector_data.part_number,
             sw_version=self.wall_connector_data.firmware_version,
-            default_manufacturer="Tesla",
+            manufacturer="Tesla",
         )
 
 
diff --git a/homeassistant/components/text/device_action.py b/homeassistant/components/text/device_action.py
index 89fbbc7fbc7225..9d06d4b74418e1 100644
--- a/homeassistant/components/text/device_action.py
+++ b/homeassistant/components/text/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,15 +20,22 @@
 
 ATYP_SET_VALUE = "set_value"
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): ATYP_SET_VALUE,
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(ATTR_VALUE): cv.string,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -44,7 +52,7 @@ async def async_get_actions(
             {
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: ATYP_SET_VALUE,
             }
         )
diff --git a/homeassistant/components/thermoworks_smoke/manifest.json b/homeassistant/components/thermoworks_smoke/manifest.json
index 6e112d78e4843e..43ce96dd012d76 100644
--- a/homeassistant/components/thermoworks_smoke/manifest.json
+++ b/homeassistant/components/thermoworks_smoke/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/thermoworks_smoke",
   "iot_class": "cloud_polling",
   "loggers": ["thermoworks_smoke"],
-  "requirements": ["stringcase==1.2.0", "thermoworks_smoke==0.1.8"]
+  "requirements": ["stringcase==1.2.0", "thermoworks-smoke==0.1.8"]
 }
diff --git a/homeassistant/components/thread/__init__.py b/homeassistant/components/thread/__init__.py
index 4fc88479818dcd..dd2527763ad67e 100644
--- a/homeassistant/components/thread/__init__.py
+++ b/homeassistant/components/thread/__init__.py
@@ -3,6 +3,7 @@
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -22,6 +23,8 @@
     "async_get_preferred_dataset",
 ]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Thread integration."""
diff --git a/homeassistant/components/thread/dataset_store.py b/homeassistant/components/thread/dataset_store.py
index bcadf3ca5fbecc..55623f7e3a450c 100644
--- a/homeassistant/components/thread/dataset_store.py
+++ b/homeassistant/components/thread/dataset_store.py
@@ -1,14 +1,15 @@
 """Persistently store thread datasets."""
 from __future__ import annotations
 
-from contextlib import suppress
 import dataclasses
 from datetime import datetime
-from functools import cached_property
+import logging
 from typing import Any, cast
 
 from python_otbr_api import tlv_parser
+from python_otbr_api.tlv_parser import MeshcopTLVType
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.singleton import singleton
@@ -18,9 +19,11 @@
 DATA_STORE = "thread.datasets"
 STORAGE_KEY = "thread.datasets"
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 1
+STORAGE_VERSION_MINOR = 2
 SAVE_DELAY = 10
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class DatasetPreferredError(HomeAssistantError):
     """Raised when attempting to delete the preferred dataset."""
@@ -39,31 +42,31 @@ class DatasetEntry:
     @property
     def channel(self) -> int | None:
         """Return channel as an integer."""
-        if (channel := self.dataset.get(tlv_parser.MeshcopTLVType.CHANNEL)) is None:
+        if (channel := self.dataset.get(MeshcopTLVType.CHANNEL)) is None:
             return None
-        with suppress(ValueError):
-            return int(channel, 16)
-        return None
+        return cast(tlv_parser.Channel, channel).channel
 
     @cached_property
-    def dataset(self) -> dict[tlv_parser.MeshcopTLVType, str]:
+    def dataset(self) -> dict[MeshcopTLVType, tlv_parser.MeshcopTLVItem]:
         """Return the dataset in dict format."""
         return tlv_parser.parse_tlv(self.tlv)
 
     @property
-    def extended_pan_id(self) -> str | None:
+    def extended_pan_id(self) -> str:
         """Return extended PAN ID as a hex string."""
-        return self.dataset.get(tlv_parser.MeshcopTLVType.EXTPANID)
+        return str(self.dataset[MeshcopTLVType.EXTPANID])
 
     @property
     def network_name(self) -> str | None:
         """Return network name as a string."""
-        return self.dataset.get(tlv_parser.MeshcopTLVType.NETWORKNAME)
+        if (name := self.dataset.get(MeshcopTLVType.NETWORKNAME)) is None:
+            return None
+        return cast(tlv_parser.NetworkName, name).name
 
     @property
     def pan_id(self) -> str | None:
         """Return PAN ID as a hex string."""
-        return self.dataset.get(tlv_parser.MeshcopTLVType.PANID)
+        return str(self.dataset.get(MeshcopTLVType.PANID))
 
     def to_json(self) -> dict[str, Any]:
         """Return a JSON serializable representation for storage."""
@@ -75,6 +78,88 @@ def to_json(self) -> dict[str, Any]:
         }
 
 
+class DatasetStoreStore(Store):
+    """Store Thread datasets."""
+
+    async def _async_migrate_func(
+        self, old_major_version: int, old_minor_version: int, old_data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Migrate to the new version."""
+        if old_major_version == 1:
+            if old_minor_version < 2:
+                datasets: dict[str, DatasetEntry] = {}
+                preferred_dataset = old_data["preferred_dataset"]
+
+                for dataset in old_data["datasets"]:
+                    created = cast(datetime, dt_util.parse_datetime(dataset["created"]))
+                    entry = DatasetEntry(
+                        created=created,
+                        id=dataset["id"],
+                        source=dataset["source"],
+                        tlv=dataset["tlv"],
+                    )
+                    if (
+                        MeshcopTLVType.EXTPANID not in entry.dataset
+                        or MeshcopTLVType.ACTIVETIMESTAMP not in entry.dataset
+                    ):
+                        _LOGGER.warning(
+                            "Dropped invalid Thread dataset '%s'", entry.tlv
+                        )
+                        if entry.id == preferred_dataset:
+                            preferred_dataset = None
+                        continue
+
+                    if entry.extended_pan_id in datasets:
+                        if datasets[entry.extended_pan_id].id == preferred_dataset:
+                            _LOGGER.warning(
+                                (
+                                    "Dropped duplicated Thread dataset '%s' "
+                                    "(duplicate of preferred dataset '%s')"
+                                ),
+                                entry.tlv,
+                                datasets[entry.extended_pan_id].tlv,
+                            )
+                            continue
+                        new_timestamp = cast(
+                            tlv_parser.Timestamp,
+                            entry.dataset[MeshcopTLVType.ACTIVETIMESTAMP],
+                        )
+                        old_timestamp = cast(
+                            tlv_parser.Timestamp,
+                            datasets[entry.extended_pan_id].dataset[
+                                MeshcopTLVType.ACTIVETIMESTAMP
+                            ],
+                        )
+                        if old_timestamp.seconds >= new_timestamp.seconds or (
+                            old_timestamp.seconds == new_timestamp.seconds
+                            and old_timestamp.ticks >= new_timestamp.ticks
+                        ):
+                            _LOGGER.warning(
+                                (
+                                    "Dropped duplicated Thread dataset '%s' "
+                                    "(duplicate of '%s')"
+                                ),
+                                entry.tlv,
+                                datasets[entry.extended_pan_id].tlv,
+                            )
+                            continue
+                        _LOGGER.warning(
+                            (
+                                "Dropped duplicated Thread dataset '%s' "
+                                "(duplicate of '%s')"
+                            ),
+                            datasets[entry.extended_pan_id].tlv,
+                            entry.tlv,
+                        )
+                    datasets[entry.extended_pan_id] = entry
+                data = {
+                    "preferred_dataset": preferred_dataset,
+                    "datasets": [dataset.to_json() for dataset in datasets.values()],
+                }
+
+        return data
+
+
 class DatasetStore:
     """Class to hold a collection of thread datasets."""
 
@@ -83,7 +168,7 @@ def __init__(self, hass: HomeAssistant) -> None:
         self.hass = hass
         self.datasets: dict[str, DatasetEntry] = {}
         self._preferred_dataset: str | None = None
-        self._store: Store[dict[str, Any]] = Store(
+        self._store: Store[dict[str, Any]] = DatasetStoreStore(
             hass,
             STORAGE_VERSION_MAJOR,
             STORAGE_KEY,
@@ -96,10 +181,64 @@ def async_add(self, source: str, tlv: str) -> None:
         """Add dataset, does nothing if it already exists."""
         # Make sure the tlv is valid
         dataset = tlv_parser.parse_tlv(tlv)
+
+        # Don't allow adding a dataset which does not have an extended pan id or
+        # timestamp
+        if (
+            MeshcopTLVType.EXTPANID not in dataset
+            or MeshcopTLVType.ACTIVETIMESTAMP not in dataset
+        ):
+            raise HomeAssistantError("Invalid dataset")
+
         # Bail out if the dataset already exists
         if any(entry for entry in self.datasets.values() if entry.dataset == dataset):
             return
 
+        # Update if dataset with same extended pan id exists and the timestamp
+        # is newer
+        if entry := next(
+            (
+                entry
+                for entry in self.datasets.values()
+                if entry.dataset[MeshcopTLVType.EXTPANID]
+                == dataset[MeshcopTLVType.EXTPANID]
+            ),
+            None,
+        ):
+            new_timestamp = cast(
+                tlv_parser.Timestamp, dataset[MeshcopTLVType.ACTIVETIMESTAMP]
+            )
+            old_timestamp = cast(
+                tlv_parser.Timestamp,
+                entry.dataset[MeshcopTLVType.ACTIVETIMESTAMP],
+            )
+            if old_timestamp.seconds >= new_timestamp.seconds or (
+                old_timestamp.seconds == new_timestamp.seconds
+                and old_timestamp.ticks >= new_timestamp.ticks
+            ):
+                _LOGGER.warning(
+                    (
+                        "Got dataset with same extended PAN ID and same or older active"
+                        " timestamp, old dataset: '%s', new dataset: '%s'"
+                    ),
+                    entry.tlv,
+                    tlv,
+                )
+                return
+            _LOGGER.debug(
+                (
+                    "Updating dataset with same extended PAN ID and newer active "
+                    "timestamp, old dataset: '%s', new dataset: '%s'"
+                ),
+                entry.tlv,
+                tlv,
+            )
+            self.datasets[entry.id] = dataclasses.replace(
+                self.datasets[entry.id], tlv=tlv
+            )
+            self.async_schedule_save()
+            return
+
         entry = DatasetEntry(source=source, tlv=tlv)
         self.datasets[entry.id] = entry
         # Set to preferred if there is no preferred dataset
diff --git a/homeassistant/components/thread/diagnostics.py b/homeassistant/components/thread/diagnostics.py
index 8dc5dd43041e5f..e6149214af4d32 100644
--- a/homeassistant/components/thread/diagnostics.py
+++ b/homeassistant/components/thread/diagnostics.py
@@ -148,7 +148,8 @@ async def async_get_config_entry_diagnostics(
                 "unexpected_routers": set(),
             },
         )
-        if mlp := record.dataset.get(MeshcopTLVType.MESHLOCALPREFIX):
+        if mlp_item := record.dataset.get(MeshcopTLVType.MESHLOCALPREFIX):
+            mlp = str(mlp_item)
             network["prefixes"].add(f"{mlp[0:4]}:{mlp[4:8]}:{mlp[8:12]}:{mlp[12:16]}")
 
     # Find all routes currently act that might be thread related, so we can match them to
diff --git a/homeassistant/components/thread/manifest.json b/homeassistant/components/thread/manifest.json
index 3d61315f3d17d1..0ce54496539637 100644
--- a/homeassistant/components/thread/manifest.json
+++ b/homeassistant/components/thread/manifest.json
@@ -7,6 +7,6 @@
   "documentation": "https://www.home-assistant.io/integrations/thread",
   "integration_type": "service",
   "iot_class": "local_polling",
-  "requirements": ["python-otbr-api==1.0.9", "pyroute2==0.7.5"],
+  "requirements": ["python-otbr-api==2.2.0", "pyroute2==0.7.5"],
   "zeroconf": ["_meshcop._udp.local."]
 }
diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 538655ec0ce3b6..09f928303bf383 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -22,7 +22,12 @@
     STATE_UNKNOWN,
 )
 from homeassistant.core import Event, HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -73,6 +78,29 @@ async def async_setup_entry(
     entity_id = er.async_validate_entity_id(
         registry, config_entry.options[CONF_ENTITY_ID]
     )
+
+    source_entity = registry.async_get(entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     hysteresis = config_entry.options[CONF_HYSTERESIS]
     lower = config_entry.options[CONF_LOWER]
     name = config_entry.title
@@ -82,7 +110,15 @@ async def async_setup_entry(
     async_add_entities(
         [
             ThresholdSensor(
-                hass, entity_id, name, lower, upper, hysteresis, device_class, unique_id
+                hass,
+                entity_id,
+                name,
+                lower,
+                upper,
+                hysteresis,
+                device_class,
+                unique_id,
+                device_info=device_info,
             )
         ]
     )
@@ -138,9 +174,11 @@ def __init__(
         hysteresis: float,
         device_class: BinarySensorDeviceClass | None,
         unique_id: str | None,
+        device_info: DeviceInfo | None = None,
     ) -> None:
         """Initialize the Threshold sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._entity_id = entity_id
         self._name = name
         if lower is not None:
diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py
index a2f1db7536fa7a..242c2179a05cc8 100644
--- a/homeassistant/components/tibber/sensor.py
+++ b/homeassistant/components/tibber/sensor.py
@@ -606,7 +606,7 @@ async def _insert_statistics(self) -> None:
                 )
 
                 last_stats = await get_instance(self.hass).async_add_executor_job(
-                    get_last_statistics, self.hass, 1, statistic_id, True, {}
+                    get_last_statistics, self.hass, 1, statistic_id, True, set()
                 )
 
                 if not last_stats:
diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py
index 90ad5e0491b840..3752f9c9cb5bcb 100644
--- a/homeassistant/components/timer/__init__.py
+++ b/homeassistant/components/timer/__init__.py
@@ -336,11 +336,17 @@ def async_change(self, duration: timedelta) -> None:
             raise HomeAssistantError(
                 f"Timer {self.entity_id} is not running, only active timers can be changed"
             )
+        if self._remaining and (self._remaining + duration) > self._duration:
+            raise HomeAssistantError(
+                f"Not possible to change timer {self.entity_id} beyond configured duration"
+            )
+        if self._remaining and (self._remaining + duration) < timedelta():
+            raise HomeAssistantError(
+                f"Not possible to change timer {self.entity_id} to negative time remaining"
+            )
 
         self._listener()
-        self._listener = None
         self._end += duration
-        self._duration += duration
         self._remaining = self._end - dt_util.utcnow().replace(microsecond=0)
         self.hass.bus.async_fire(EVENT_TIMER_CHANGED, {ATTR_ENTITY_ID: self.entity_id})
         self._listener = async_track_point_in_utc_time(
diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py
index 98910d7af38e54..544144018dd9d6 100644
--- a/homeassistant/components/todoist/calendar.py
+++ b/homeassistant/components/todoist/calendar.py
@@ -18,13 +18,13 @@
     CalendarEvent,
 )
 from homeassistant.const import CONF_ID, CONF_NAME, CONF_TOKEN, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import Event, HomeAssistant, ServiceCall
+from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ALL_DAY,
@@ -120,7 +120,7 @@ async def async_setup_platform(
 
     api = TodoistAPIAsync(token)
     coordinator = TodoistCoordinator(hass, _LOGGER, SCAN_INTERVAL, api)
-    await coordinator.async_config_entry_first_refresh()
+    await coordinator.async_refresh()
 
     async def _shutdown_coordinator(_: Event) -> None:
         await coordinator.async_shutdown()
@@ -175,7 +175,7 @@ async def _shutdown_coordinator(_: Event) -> None:
             )
         )
 
-    async_add_entities(project_devices)
+    async_add_entities(project_devices, update_before_add=True)
 
     session = async_get_clientsession(hass)
 
@@ -214,14 +214,14 @@ async def handle_new_task(call: ServiceCall) -> None:
             data["due_lang"] = call.data[DUE_DATE_LANG]
 
         if DUE_DATE in call.data:
-            due_date = dt.parse_datetime(call.data[DUE_DATE])
+            due_date = dt_util.parse_datetime(call.data[DUE_DATE])
             if due_date is None:
-                due = dt.parse_date(call.data[DUE_DATE])
+                due = dt_util.parse_date(call.data[DUE_DATE])
                 if due is None:
                     raise ValueError(f"Invalid due_date: {call.data[DUE_DATE]}")
                 due_date = datetime(due.year, due.month, due.day)
             # Format it in the manner Todoist expects
-            due_date = dt.as_utc(due_date)
+            due_date = dt_util.as_utc(due_date)
             date_format = "%Y-%m-%dT%H:%M:%S"
             data["due_datetime"] = datetime.strftime(due_date, date_format)
 
@@ -239,16 +239,16 @@ async def handle_new_task(call: ServiceCall) -> None:
             _reminder_due["lang"] = call.data[REMINDER_DATE_LANG]
 
         if REMINDER_DATE in call.data:
-            due_date = dt.parse_datetime(call.data[REMINDER_DATE])
+            due_date = dt_util.parse_datetime(call.data[REMINDER_DATE])
             if due_date is None:
-                due = dt.parse_date(call.data[REMINDER_DATE])
+                due = dt_util.parse_date(call.data[REMINDER_DATE])
                 if due is None:
                     raise ValueError(
                         f"Invalid reminder_date: {call.data[REMINDER_DATE]}"
                     )
                 due_date = datetime(due.year, due.month, due.day)
             # Format it in the manner Todoist expects
-            due_date = dt.as_utc(due_date)
+            due_date = dt_util.as_utc(due_date)
             date_format = "%Y-%m-%dT%H:%M:%S"
             _reminder_due["date"] = datetime.strftime(due_date, date_format)
 
@@ -304,6 +304,12 @@ def __init__(
             str(data[CONF_ID]) if data.get(CONF_ID) is not None else None
         )
 
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self.data.update()
+        super()._handle_coordinator_update()
+
     @property
     def event(self) -> CalendarEvent | None:
         """Return the next upcoming event."""
@@ -317,11 +323,7 @@ def name(self) -> str:
     async def async_update(self) -> None:
         """Update all Todoist Calendars."""
         await super().async_update()
-        await self.data.async_update()
-        # Set Todoist-specific data that can't easily be grabbed
-        self._cal_data["all_tasks"] = [
-            task[SUMMARY] for task in self.data.all_project_tasks
-        ]
+        self.data.update()
 
     async def async_get_events(
         self,
@@ -342,7 +344,7 @@ def extra_state_attributes(self) -> dict[str, Any] | None:
         return {
             DUE_TODAY: self.data.event[DUE_TODAY],
             OVERDUE: self.data.event[OVERDUE],
-            ALL_TASKS: self._cal_data[ALL_TASKS],
+            ALL_TASKS: [task[SUMMARY] for task in self.data.all_project_tasks],
             PRIORITY: self.data.event[PRIORITY],
             LABELS: self.data.event[LABELS],
         }
@@ -451,7 +453,7 @@ def create_todoist_task(self, data: Task):
             LABELS: [],
             OVERDUE: False,
             PRIORITY: data.priority,
-            START: dt.now(),
+            START: dt_util.now(),
             SUMMARY: data.content,
         }
 
@@ -472,19 +474,19 @@ def create_todoist_task(self, data: Task):
         # complete the task.
         # Generally speaking, that means right now.
         if data.due is not None:
-            end = dt.parse_datetime(
+            end = dt_util.parse_datetime(
                 data.due.datetime if data.due.datetime else data.due.date
             )
-            task[END] = dt.as_utc(end) if end is not None else end
+            task[END] = dt_util.as_local(end) if end is not None else end
             if task[END] is not None:
                 if self._due_date_days is not None and (
-                    task[END] > dt.utcnow() + self._due_date_days
+                    task[END] > dt_util.now() + self._due_date_days
                 ):
                     # This task is out of range of our due date;
                     # it shouldn't be counted.
                     return None
 
-                task[DUE_TODAY] = task[END].date() == dt.utcnow().date()
+                task[DUE_TODAY] = task[END].date() == dt_util.now().date()
 
                 # Special case: Task is overdue.
                 if task[END] <= task[START]:
@@ -610,7 +612,7 @@ async def async_get_events(
             events.append(event)
         return events
 
-    async def async_update(self) -> None:
+    def update(self) -> None:
         """Get the latest data."""
         tasks = self._coordinator.data
         if self._id is None:
@@ -667,10 +669,10 @@ async def async_update(self) -> None:
 def get_start(due: Due) -> datetime | date | None:
     """Return the task due date as a start date or date time."""
     if due.datetime:
-        start = dt.parse_datetime(due.datetime)
+        start = dt_util.parse_datetime(due.datetime)
         if not start:
             return None
-        return dt.as_local(start)
+        return dt_util.as_local(start)
     if due.date:
-        return dt.parse_date(due.date)
+        return dt_util.parse_date(due.date)
     return None
diff --git a/homeassistant/components/tomorrowio/sensor.py b/homeassistant/components/tomorrowio/sensor.py
index 23218543744df6..046dc79f2c6d7e 100644
--- a/homeassistant/components/tomorrowio/sensor.py
+++ b/homeassistant/components/tomorrowio/sensor.py
@@ -32,7 +32,6 @@
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import slugify
 from homeassistant.util.unit_conversion import DistanceConverter, SpeedConverter
@@ -73,6 +72,10 @@
 class TomorrowioSensorEntityDescription(SensorEntityDescription):
     """Describes a Tomorrow.io sensor entity."""
 
+    # TomorrowioSensor does not support UNDEFINED or None,
+    # restrict the type to str.
+    name: str = ""
+
     unit_imperial: str | None = None
     unit_metric: str | None = None
     multiplication_factor: Callable[[float], float] | float | None = None
@@ -350,10 +353,6 @@ def __init__(
         """Initialize Tomorrow.io Sensor Entity."""
         super().__init__(config_entry, coordinator, api_version)
         self.entity_description = description
-        # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-        # the assert satisfies the type checker and will catch attempts
-        # to use DEVICE_CLASS_NAME in the entity descriptions.
-        assert description.name is not DEVICE_CLASS_NAME
         self._attr_name = f"{self._config_entry.data[CONF_NAME]} - {description.name}"
         self._attr_unique_id = (
             f"{self._config_entry.unique_id}_{slugify(description.name)}"
diff --git a/homeassistant/components/totalconnect/binary_sensor.py b/homeassistant/components/totalconnect/binary_sensor.py
index ef252d54e4e713..9caa642b5f4c13 100644
--- a/homeassistant/components/totalconnect/binary_sensor.py
+++ b/homeassistant/components/totalconnect/binary_sensor.py
@@ -81,15 +81,9 @@ def device_class(self):
             return BinarySensorDeviceClass.MOTION
         if self._zone.is_type_medical():
             return BinarySensorDeviceClass.SAFETY
-        # "security" type is a generic category so test for it last
-        if self._zone.is_type_security():
-            return BinarySensorDeviceClass.DOOR
-
-        _LOGGER.error(
-            "TotalConnect zone %s reported an unexpected device class",
-            self._zone.zoneid,
-        )
-        return None
+        if self._zone.is_type_temperature():
+            return BinarySensorDeviceClass.PROBLEM
+        return BinarySensorDeviceClass.DOOR
 
     def update(self):
         """Return the state of the device."""
diff --git a/homeassistant/components/totalconnect/manifest.json b/homeassistant/components/totalconnect/manifest.json
index 8e0d58b7b7783d..a81e7518132ae0 100644
--- a/homeassistant/components/totalconnect/manifest.json
+++ b/homeassistant/components/totalconnect/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/totalconnect",
   "iot_class": "cloud_polling",
   "loggers": ["total_connect_client"],
-  "requirements": ["total_connect_client==2023.2"]
+  "requirements": ["total-connect-client==2023.2"]
 }
diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py
index 48090d7570692a..2edea30835fb86 100644
--- a/homeassistant/components/tplink/__init__.py
+++ b/homeassistant/components/tplink/__init__.py
@@ -19,7 +19,11 @@
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, discovery_flow
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    discovery_flow,
+)
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
@@ -27,6 +31,7 @@
 from .coordinator import TPLinkDataUpdateCoordinator
 
 DISCOVERY_INTERVAL = timedelta(minutes=15)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
 @callback
diff --git a/homeassistant/components/tplink/manifest.json b/homeassistant/components/tplink/manifest.json
index 6683e7e458308a..eaa1acc11bf4c8 100644
--- a/homeassistant/components/tplink/manifest.json
+++ b/homeassistant/components/tplink/manifest.json
@@ -137,5 +137,5 @@
   "iot_class": "local_polling",
   "loggers": ["kasa"],
   "quality_scale": "platinum",
-  "requirements": ["python-kasa==0.5.1"]
+  "requirements": ["python-kasa[speedups]==0.5.2"]
 }
diff --git a/homeassistant/components/tplink/services.yaml b/homeassistant/components/tplink/services.yaml
index 128c5c3a4937bc..16166278565aed 100644
--- a/homeassistant/components/tplink/services.yaml
+++ b/homeassistant/components/tplink/services.yaml
@@ -1,4 +1,5 @@
 sequence_effect:
+  name: Sequence effect
   description: Set a sequence effect
   target:
     entity:
@@ -6,6 +7,7 @@ sequence_effect:
       domain: light
   fields:
     sequence:
+      name: Sequence
       description: List of HSV sequences (Max 16)
       example: |
         - [340, 20, 50]
@@ -15,6 +17,7 @@ sequence_effect:
       selector:
         object:
     segments:
+      name: Segments
       description: List of Segments (0 for all)
       example: 0, 2, 4, 6, 8
       default: 0
@@ -22,6 +25,7 @@ sequence_effect:
       selector:
         object:
     brightness:
+      name: Brightness
       description: Initial brightness
       example: 80
       default: 100
@@ -33,6 +37,7 @@ sequence_effect:
           max: 100
           unit_of_measurement: "%"
     duration:
+      name: Duration
       description: Duration
       example: 0
       default: 0
@@ -44,6 +49,7 @@ sequence_effect:
           max: 5000
           unit_of_measurement: "ms"
     repeat_times:
+      name: Repetitions
       description: Repetitions (0 for continuous)
       example: 0
       default: 0
@@ -54,6 +60,7 @@ sequence_effect:
           step: 1
           max: 10
     transition:
+      name: Transition
       description: Transition
       example: 2000
       default: 0
@@ -65,6 +72,7 @@ sequence_effect:
           max: 6000
           unit_of_measurement: "ms"
     spread:
+      name: Spread
       description: Speed of spread
       example: 1
       default: 0
@@ -75,6 +83,7 @@ sequence_effect:
           step: 1
           max: 16
     direction:
+      name: Direction
       description: Direction
       example: 1
       default: 4
@@ -85,6 +94,7 @@ sequence_effect:
           step: 1
           max: 4
 random_effect:
+  name: Random effect
   description: Set a random effect
   target:
     entity:
diff --git a/homeassistant/components/tplink_omada/__init__.py b/homeassistant/components/tplink_omada/__init__.py
index 824ea8df423916..1367f8757af6bb 100644
--- a/homeassistant/components/tplink_omada/__init__.py
+++ b/homeassistant/components/tplink_omada/__init__.py
@@ -18,7 +18,7 @@
 from .const import DOMAIN
 from .controller import OmadaSiteController
 
-PLATFORMS: list[Platform] = [Platform.SWITCH, Platform.UPDATE]
+PLATFORMS: list[Platform] = [Platform.SWITCH, Platform.UPDATE, Platform.BINARY_SENSOR]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/homeassistant/components/tplink_omada/binary_sensor.py b/homeassistant/components/tplink_omada/binary_sensor.py
new file mode 100644
index 00000000000000..caaae3465b77e1
--- /dev/null
+++ b/homeassistant/components/tplink_omada/binary_sensor.py
@@ -0,0 +1,120 @@
+"""Support for TPLink Omada binary sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable, Generator
+
+from attr import dataclass
+from tplink_omada_client.definitions import GatewayPortMode, LinkStatus
+from tplink_omada_client.devices import OmadaDevice, OmadaGateway, OmadaGatewayPort
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .controller import OmadaGatewayCoordinator, OmadaSiteController
+from .entity import OmadaDeviceEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up binary sensors."""
+    controller: OmadaSiteController = hass.data[DOMAIN][config_entry.entry_id]
+    omada_client = controller.omada_client
+
+    gateway_coordinator = await controller.get_gateway_coordinator()
+    if not gateway_coordinator:
+        return
+
+    gateway = await omada_client.get_gateway(gateway_coordinator.mac)
+
+    async_add_entities(
+        get_gateway_port_status_sensors(gateway, hass, gateway_coordinator)
+    )
+
+    await gateway_coordinator.async_request_refresh()
+
+
+def get_gateway_port_status_sensors(
+    gateway: OmadaGateway, hass: HomeAssistant, coordinator: OmadaGatewayCoordinator
+) -> Generator[BinarySensorEntity, None, None]:
+    """Generate binary sensors for gateway ports."""
+    for port in gateway.port_status:
+        if port.mode == GatewayPortMode.WAN:
+            yield OmadaGatewayPortBinarySensor(
+                coordinator,
+                gateway,
+                GatewayPortBinarySensorConfig(
+                    port_number=port.port_number,
+                    id_suffix="wan_link",
+                    name_suffix="Internet Link",
+                    device_class=BinarySensorDeviceClass.CONNECTIVITY,
+                    update_func=lambda p: p.wan_connected,
+                ),
+            )
+        if port.mode == GatewayPortMode.LAN:
+            yield OmadaGatewayPortBinarySensor(
+                coordinator,
+                gateway,
+                GatewayPortBinarySensorConfig(
+                    port_number=port.port_number,
+                    id_suffix="lan_status",
+                    name_suffix="LAN Status",
+                    device_class=BinarySensorDeviceClass.CONNECTIVITY,
+                    update_func=lambda p: p.link_status == LinkStatus.LINK_UP,
+                ),
+            )
+
+
+@dataclass
+class GatewayPortBinarySensorConfig:
+    """Config for a binary status derived from a gateway port."""
+
+    port_number: int
+    id_suffix: str
+    name_suffix: str
+    device_class: BinarySensorDeviceClass
+    update_func: Callable[[OmadaGatewayPort], bool]
+
+
+class OmadaGatewayPortBinarySensor(OmadaDeviceEntity[OmadaGateway], BinarySensorEntity):
+    """Binary status of a property on an internet gateway."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: OmadaGatewayCoordinator,
+        device: OmadaDevice,
+        config: GatewayPortBinarySensorConfig,
+    ) -> None:
+        """Initialize the gateway port binary sensor."""
+        super().__init__(coordinator, device)
+        self._config = config
+        self._attr_unique_id = f"{device.mac}_{config.port_number}_{config.id_suffix}"
+        self._attr_device_class = config.device_class
+
+        self._attr_name = f"Port {config.port_number} {config.name_suffix}"
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        gateway = self.coordinator.data[self.device.mac]
+
+        port = next(
+            p for p in gateway.port_status if p.port_number == self._config.port_number
+        )
+        if port:
+            self._attr_is_on = self._config.update_func(port)
+            self._attr_available = True
+        else:
+            self._attr_available = False
+
+        self.async_write_ha_state()
diff --git a/homeassistant/components/tplink_omada/controller.py b/homeassistant/components/tplink_omada/controller.py
index 508a8b914da958..194f18ae9bfc37 100644
--- a/homeassistant/components/tplink_omada/controller.py
+++ b/homeassistant/components/tplink_omada/controller.py
@@ -1,6 +1,10 @@
 """Controller for sharing Omada API coordinators between platforms."""
 
-from tplink_omada_client.devices import OmadaSwitch, OmadaSwitchPortDetails
+from tplink_omada_client.devices import (
+    OmadaGateway,
+    OmadaSwitch,
+    OmadaSwitchPortDetails,
+)
 from tplink_omada_client.omadasiteclient import OmadaSiteClient
 
 from homeassistant.core import HomeAssistant
@@ -8,6 +12,7 @@
 from .coordinator import OmadaCoordinator
 
 POLL_SWITCH_PORT = 300
+POLL_GATEWAY = 300
 
 
 class OmadaSwitchPortCoordinator(OmadaCoordinator[OmadaSwitchPortDetails]):
@@ -31,9 +36,31 @@ async def poll_update(self) -> dict[str, OmadaSwitchPortDetails]:
         return {p.port_id: p for p in ports}
 
 
+class OmadaGatewayCoordinator(OmadaCoordinator[OmadaGateway]):
+    """Coordinator for getting details about the site's gateway."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        omada_client: OmadaSiteClient,
+        mac: str,
+    ) -> None:
+        """Initialize my coordinator."""
+        super().__init__(hass, omada_client, "Gateway", POLL_GATEWAY)
+        self.mac = mac
+
+    async def poll_update(self) -> dict[str, OmadaGateway]:
+        """Poll a the gateway's current state."""
+        gateway = await self.omada_client.get_gateway(self.mac)
+        return {self.mac: gateway}
+
+
 class OmadaSiteController:
     """Controller for the Omada SDN site."""
 
+    _gateway_coordinator: OmadaGatewayCoordinator | None = None
+    _initialized_gateway_coordinator = False
+
     def __init__(self, hass: HomeAssistant, omada_client: OmadaSiteClient) -> None:
         """Create the controller."""
         self._hass = hass
@@ -56,3 +83,18 @@ def get_switch_port_coordinator(
             )
 
         return self._switch_port_coordinators[switch.mac]
+
+    async def get_gateway_coordinator(self) -> OmadaGatewayCoordinator | None:
+        """Get coordinator for site's gateway, or None if there is no gateway."""
+        if not self._initialized_gateway_coordinator:
+            self._initialized_gateway_coordinator = True
+            devices = await self._omada_client.get_devices()
+            gateway = next((d for d in devices if d.type == "gateway"), None)
+            if not gateway:
+                return None
+
+            self._gateway_coordinator = OmadaGatewayCoordinator(
+                self._hass, self._omada_client, gateway.mac
+            )
+
+        return self._gateway_coordinator
diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json
index 280ae56bbd513c..795e6adf5b7d92 100644
--- a/homeassistant/components/tplink_omada/manifest.json
+++ b/homeassistant/components/tplink_omada/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tplink_omada",
   "integration_type": "hub",
   "iot_class": "local_polling",
-  "requirements": ["tplink-omada-client==1.2.4"]
+  "requirements": ["tplink_omada_client==1.2.4"]
 }
diff --git a/homeassistant/components/traccar/__init__.py b/homeassistant/components/traccar/__init__.py
index 1679965b0709f6..c428ce7a5b1bb1 100644
--- a/homeassistant/components/traccar/__init__.py
+++ b/homeassistant/components/traccar/__init__.py
@@ -11,7 +11,6 @@
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     ATTR_ACCURACY,
@@ -55,12 +54,6 @@ def _id(value: str) -> str:
 )
 
 
-async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
-    """Set up the Traccar component."""
-    hass.data[DOMAIN] = {"devices": set(), "unsub_device_tracker": {}}
-    return True
-
-
 async def handle_webhook(hass, webhook_id, request):
     """Handle incoming webhook with Traccar request."""
     try:
@@ -94,6 +87,7 @@ async def handle_webhook(hass, webhook_id, request):
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configure based on config entry."""
+    hass.data.setdefault(DOMAIN, {"devices": set(), "unsub_device_tracker": {}})
     webhook.async_register(
         hass, DOMAIN, "Traccar", entry.data[CONF_WEBHOOK_ID], handle_webhook
     )
diff --git a/homeassistant/components/trace/__init__.py b/homeassistant/components/trace/__init__.py
index 5d0b188f724ae7..84619b7a9830f2 100644
--- a/homeassistant/components/trace/__init__.py
+++ b/homeassistant/components/trace/__init__.py
@@ -37,6 +37,8 @@
     vol.Optional(CONF_STORED_TRACES, default=DEFAULT_STORED_TRACES): cv.positive_int
 }
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 TraceData = dict[str, LimitedSizeDict[str, BaseTrace]]
 
 
diff --git a/homeassistant/components/tradfri/sensor.py b/homeassistant/components/tradfri/sensor.py
index 81cce80aa739d0..1b3839ce2d7d56 100644
--- a/homeassistant/components/tradfri/sensor.py
+++ b/homeassistant/components/tradfri/sensor.py
@@ -24,6 +24,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import UNDEFINED
 
 from .base_class import TradfriBaseEntity
 from .const import (
@@ -202,7 +203,7 @@ def __init__(
 
         self._attr_unique_id = f"{self._attr_unique_id}-{description.key}"
 
-        if description.name:
+        if description.name is not UNDEFINED:
             self._attr_name = f"{self._attr_name}: {description.name}"
 
         self._refresh()  # Set initial state
diff --git a/homeassistant/components/trafikverket_ferry/coordinator.py b/homeassistant/components/trafikverket_ferry/coordinator.py
index 926b57092a72cd..32c97b4fe0a51c 100644
--- a/homeassistant/components/trafikverket_ferry/coordinator.py
+++ b/homeassistant/components/trafikverket_ferry/coordinator.py
@@ -15,7 +15,7 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_FROM, CONF_TIME, CONF_TO, DOMAIN
 
@@ -60,20 +60,22 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         )
         self._from: str = entry.data[CONF_FROM]
         self._to: str = entry.data[CONF_TO]
-        self._time: time | None = dt.parse_time(entry.data[CONF_TIME])
+        self._time: time | None = dt_util.parse_time(entry.data[CONF_TIME])
         self._weekdays: list[str] = entry.data[CONF_WEEKDAY]
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Fetch data from Trafikverket."""
 
         departure_day = next_departuredate(self._weekdays)
-        current_time = dt.now()
+        current_time = dt_util.now()
         when = (
             datetime.combine(
-                departure_day, self._time, dt.get_time_zone(self.hass.config.time_zone)
+                departure_day,
+                self._time,
+                dt_util.get_time_zone(self.hass.config.time_zone),
             )
             if self._time
-            else dt.now()
+            else dt_util.now()
         )
         if current_time > when:
             when = current_time
diff --git a/homeassistant/components/trafikverket_train/sensor.py b/homeassistant/components/trafikverket_train/sensor.py
index f48127b3e977fb..4ea6ff48dc1cb0 100644
--- a/homeassistant/components/trafikverket_train/sensor.py
+++ b/homeassistant/components/trafikverket_train/sensor.py
@@ -19,7 +19,7 @@
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_FROM, CONF_TIME, CONF_TO, DOMAIN
 from .util import create_unique_id
@@ -48,7 +48,7 @@ async def async_setup_entry(
     to_station = hass.data[DOMAIN][entry.entry_id][CONF_TO]
     from_station = hass.data[DOMAIN][entry.entry_id][CONF_FROM]
     get_time: str | None = entry.data.get(CONF_TIME)
-    train_time = dt.parse_time(get_time) if get_time else None
+    train_time = dt_util.parse_time(get_time) if get_time else None
 
     async_add_entities(
         [
@@ -89,7 +89,7 @@ def next_departuredate(departure: list[str]) -> date:
 
 def _to_iso_format(traintime: datetime) -> str:
     """Return isoformatted utc time."""
-    return dt.as_utc(traintime).isoformat()
+    return dt_util.as_utc(traintime).isoformat()
 
 
 class TrainSensor(SensorEntity):
@@ -131,12 +131,14 @@ def __init__(
 
     async def async_update(self) -> None:
         """Retrieve latest state."""
-        when = dt.now()
+        when = dt_util.now()
         _state: TrainStop | None = None
         if self._time:
             departure_day = next_departuredate(self._weekday)
             when = datetime.combine(
-                departure_day, self._time, dt.get_time_zone(self.hass.config.time_zone)
+                departure_day,
+                self._time,
+                dt_util.get_time_zone(self.hass.config.time_zone),
             )
         try:
             if self._time:
@@ -162,11 +164,11 @@ async def async_update(self) -> None:
         # The original datetime doesn't provide a timezone so therefore attaching it here.
         if TYPE_CHECKING:
             assert _state.advertised_time_at_location
-        self._attr_native_value = dt.as_utc(_state.advertised_time_at_location)
+        self._attr_native_value = dt_util.as_utc(_state.advertised_time_at_location)
         if _state.time_at_location:
-            self._attr_native_value = dt.as_utc(_state.time_at_location)
+            self._attr_native_value = dt_util.as_utc(_state.time_at_location)
         if _state.estimated_time_at_location:
-            self._attr_native_value = dt.as_utc(_state.estimated_time_at_location)
+            self._attr_native_value = dt_util.as_utc(_state.estimated_time_at_location)
 
         self._update_attributes(_state)
 
diff --git a/homeassistant/components/trafikverket_weatherstation/sensor.py b/homeassistant/components/trafikverket_weatherstation/sensor.py
index 6dfd6a5e7c4075..8523ded1fffc3f 100644
--- a/homeassistant/components/trafikverket_weatherstation/sensor.py
+++ b/homeassistant/components/trafikverket_weatherstation/sensor.py
@@ -30,6 +30,45 @@
 from .const import ATTRIBUTION, CONF_STATION, DOMAIN, NONE_IS_ZERO_SENSORS
 from .coordinator import TVDataUpdateCoordinator
 
+WIND_DIRECTIONS = [
+    "east",
+    "north_east",
+    "east_south_east",
+    "north",
+    "north_north_east",
+    "north_north_west",
+    "north_west",
+    "south",
+    "south_east",
+    "south_south_west",
+    "south_west",
+    "west",
+]
+PRECIPITATION_AMOUNTNAME = [
+    "error",
+    "mild_rain",
+    "moderate_rain",
+    "heavy_rain",
+    "mild_snow_rain",
+    "moderate_snow_rain",
+    "heavy_snow_rain",
+    "mild_snow",
+    "moderate_snow",
+    "heavy_snow",
+    "other",
+    "none",
+    "error",
+]
+PRECIPITATION_TYPE = [
+    "drizzle",
+    "hail",
+    "none",
+    "rain",
+    "snow",
+    "rain_snow_mixed",
+    "freezing_rain",
+]
+
 
 @dataclass
 class TrafikverketRequiredKeysMixin:
@@ -64,10 +103,13 @@ class TrafikverketSensorEntityDescription(
     ),
     TrafikverketSensorEntityDescription(
         key="precipitation",
-        api_key="precipitationtype",
+        api_key="precipitationtype_translated",
         name="Precipitation type",
         icon="mdi:weather-snowy-rainy",
         entity_registry_enabled_default=False,
+        translation_key="precipitation",
+        options=PRECIPITATION_TYPE,
+        device_class=SensorDeviceClass.ENUM,
     ),
     TrafikverketSensorEntityDescription(
         key="wind_direction",
@@ -79,9 +121,12 @@ class TrafikverketSensorEntityDescription(
     ),
     TrafikverketSensorEntityDescription(
         key="wind_direction_text",
-        api_key="winddirectiontext",
+        api_key="winddirectiontext_translated",
         name="Wind direction text",
         icon="mdi:flag-triangle",
+        translation_key="wind_direction_text",
+        options=WIND_DIRECTIONS,
+        device_class=SensorDeviceClass.ENUM,
     ),
     TrafikverketSensorEntityDescription(
         key="wind_speed",
@@ -121,10 +166,13 @@ class TrafikverketSensorEntityDescription(
     ),
     TrafikverketSensorEntityDescription(
         key="precipitation_amountname",
-        api_key="precipitation_amountname",
+        api_key="precipitation_amountname_translated",
         name="Precipitation name",
         icon="mdi:weather-pouring",
         entity_registry_enabled_default=False,
+        translation_key="precipitation_amountname",
+        options=PRECIPITATION_AMOUNTNAME,
+        device_class=SensorDeviceClass.ENUM,
     ),
     TrafikverketSensorEntityDescription(
         key="measure_time",
diff --git a/homeassistant/components/trafikverket_weatherstation/strings.json b/homeassistant/components/trafikverket_weatherstation/strings.json
index 1ac4bbed01ea51..3680fae6d8c626 100644
--- a/homeassistant/components/trafikverket_weatherstation/strings.json
+++ b/homeassistant/components/trafikverket_weatherstation/strings.json
@@ -17,5 +17,53 @@
         }
       }
     }
+  },
+  "entity": {
+    "sensor": {
+      "wind_direction_text": {
+        "state": {
+          "east": "East",
+          "north_east": "North east",
+          "east_south_east": "East-south east",
+          "north": "North",
+          "north_north_east": "North-north east",
+          "north_north_west": "North-north west",
+          "north_west": "North west",
+          "south": "South",
+          "south_east": "South east",
+          "south_south_west": "South-south west",
+          "south_west": "South west",
+          "west": "West"
+        }
+      },
+      "precipitation_amountname": {
+        "state": {
+          "error": "Error",
+          "mild_rain": "Mild rain",
+          "moderate_rain": "Moderate rain",
+          "heavy_rain": "Heavy rain",
+          "mild_snow_rain": "Mild rain and snow mixed",
+          "moderate_snow_rain": "Moderate rain and snow mixed",
+          "heavy_snow_rain": "Heavy rain and snow mixed",
+          "mild_snow": "Mild snow",
+          "moderate_snow": "Moderate snow",
+          "heavy_snow": "Heavy snow",
+          "other": "Other",
+          "none": "None",
+          "unknown": "Unknown"
+        }
+      },
+      "precipitation": {
+        "state": {
+          "drizzle": "Drizzle",
+          "hail": "Hail",
+          "none": "None",
+          "rain": "Rain",
+          "snow": "Snow",
+          "rain_snow_mixed": "Rain and snow mixed",
+          "freezing_rain": "Freezing rain"
+        }
+      }
+    }
   }
 }
diff --git a/homeassistant/components/transmission/__init__.py b/homeassistant/components/transmission/__init__.py
index d8623e7bbe53d5..43a37179b03efa 100644
--- a/homeassistant/components/transmission/__init__.py
+++ b/homeassistant/components/transmission/__init__.py
@@ -4,6 +4,7 @@
 from datetime import timedelta
 from functools import partial
 import logging
+import re
 from typing import Any
 
 import transmission_rpc
@@ -18,15 +19,20 @@
 from homeassistant.const import (
     CONF_HOST,
     CONF_ID,
+    CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
     CONF_SCAN_INTERVAL,
     CONF_USERNAME,
     Platform,
 )
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, selector
+from homeassistant.helpers import (
+    config_validation as cv,
+    entity_registry as er,
+    selector,
+)
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
 
@@ -91,9 +97,41 @@
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
 
+MIGRATION_NAME_TO_KEY = {
+    # Sensors
+    "Down Speed": "download",
+    "Up Speed": "upload",
+    "Status": "status",
+    "Active Torrents": "active_torrents",
+    "Paused Torrents": "paused_torrents",
+    "Total Torrents": "total_torrents",
+    "Completed Torrents": "completed_torrents",
+    "Started Torrents": "started_torrents",
+    # Switches
+    "Switch": "on_off",
+    "Turtle Mode": "turtle_mode",
+}
+
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up the Transmission Component."""
+
+    @callback
+    def update_unique_id(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, Any] | None:
+        """Update unique ID of entity entry."""
+        match = re.search(
+            f"{config_entry.data[CONF_HOST]}-{config_entry.data[CONF_NAME]} (?P<name>.+)",
+            entity_entry.unique_id,
+        )
+
+        if match and (key := MIGRATION_NAME_TO_KEY.get(match.group("name"))):
+            return {"new_unique_id": f"{config_entry.entry_id}-{key}"}
+        return None
+
+    await er.async_migrate_entries(hass, config_entry.entry_id, update_unique_id)
+
     client = TransmissionClient(hass, config_entry)
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = client
 
diff --git a/homeassistant/components/transmission/const.py b/homeassistant/components/transmission/const.py
index 0e29bbbff5f0f6..da861d2698c08e 100644
--- a/homeassistant/components/transmission/const.py
+++ b/homeassistant/components/transmission/const.py
@@ -1,7 +1,7 @@
 """Constants for the Transmission Bittorent Client component."""
 DOMAIN = "transmission"
 
-SWITCH_TYPES = {"on_off": "Switch", "turtle_mode": "Turtle Mode"}
+SWITCH_TYPES = {"on_off": "Switch", "turtle_mode": "Turtle mode"}
 
 ORDER_NEWEST_FIRST = "newest_first"
 ORDER_OLDEST_FIRST = "oldest_first"
diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py
index 184d05faeb0f2d..3cee556044f122 100644
--- a/homeassistant/components/transmission/sensor.py
+++ b/homeassistant/components/transmission/sensor.py
@@ -38,14 +38,22 @@ async def async_setup_entry(
     name = config_entry.data[CONF_NAME]
 
     dev = [
-        TransmissionSpeedSensor(tm_client, name, "Down Speed", "download"),
-        TransmissionSpeedSensor(tm_client, name, "Up Speed", "upload"),
-        TransmissionStatusSensor(tm_client, name, "Status"),
-        TransmissionTorrentsSensor(tm_client, name, "Active Torrents", "active"),
-        TransmissionTorrentsSensor(tm_client, name, "Paused Torrents", "paused"),
-        TransmissionTorrentsSensor(tm_client, name, "Total Torrents", "total"),
-        TransmissionTorrentsSensor(tm_client, name, "Completed Torrents", "completed"),
-        TransmissionTorrentsSensor(tm_client, name, "Started Torrents", "started"),
+        TransmissionSpeedSensor(tm_client, name, "Down speed", "download"),
+        TransmissionSpeedSensor(tm_client, name, "Up speed", "upload"),
+        TransmissionStatusSensor(tm_client, name, "Status", "status"),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Active torrents", "active_torrents"
+        ),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Paused torrents", "paused_torrents"
+        ),
+        TransmissionTorrentsSensor(tm_client, name, "Total torrents", "total_torrents"),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Completed torrents", "completed_torrents"
+        ),
+        TransmissionTorrentsSensor(
+            tm_client, name, "Started torrents", "started_torrents"
+        ),
     ]
 
     async_add_entities(dev, True)
@@ -54,15 +62,16 @@ async def async_setup_entry(
 class TransmissionSensor(SensorEntity):
     """A base class for all Transmission sensors."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
-    def __init__(self, tm_client, client_name, sensor_name, sub_type=None):
+    def __init__(self, tm_client, client_name, sensor_name, key):
         """Initialize the sensor."""
         self._tm_client: TransmissionClient = tm_client
-        self._client_name = client_name
-        self._name = sensor_name
-        self._sub_type = sub_type
+        self._attr_name = sensor_name
+        self._key = key
         self._state = None
+        self._attr_unique_id = f"{tm_client.config_entry.entry_id}-{key}"
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, tm_client.config_entry.entry_id)},
@@ -70,16 +79,6 @@ def __init__(self, tm_client, client_name, sensor_name, sub_type=None):
             name=client_name,
         )
 
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return f"{self._client_name} {self._name}"
-
-    @property
-    def unique_id(self):
-        """Return the unique id of the entity."""
-        return f"{self._tm_client.api.host}-{self.name}"
-
     @property
     def native_value(self):
         """Return the state of the sensor."""
@@ -118,7 +117,7 @@ def update(self) -> None:
         if data := self._tm_client.api.data:
             b_spd = (
                 float(data.download_speed)
-                if self._sub_type == "download"
+                if self._key == "download"
                 else float(data.upload_speed)
             )
             self._state = b_spd
@@ -151,12 +150,15 @@ def update(self) -> None:
 class TransmissionTorrentsSensor(TransmissionSensor):
     """Representation of a Transmission torrents sensor."""
 
-    SUBTYPE_MODES = {
-        "started": ("downloading"),
-        "completed": ("seeding"),
-        "paused": ("stopped"),
-        "active": ("seeding", "downloading"),
-        "total": None,
+    MODES: dict[str, list[str] | None] = {
+        "started_torrents": ["downloading"],
+        "completed_torrents": ["seeding"],
+        "paused_torrents": ["stopped"],
+        "active_torrents": [
+            "seeding",
+            "downloading",
+        ],
+        "total_torrents": None,
     }
 
     @property
@@ -171,7 +173,7 @@ def extra_state_attributes(self):
             torrents=self._tm_client.api.torrents,
             order=self._tm_client.config_entry.options[CONF_ORDER],
             limit=self._tm_client.config_entry.options[CONF_LIMIT],
-            statuses=self.SUBTYPE_MODES[self._sub_type],
+            statuses=self.MODES[self._key],
         )
         return {
             STATE_ATTR_TORRENT_INFO: info,
@@ -180,7 +182,7 @@ def extra_state_attributes(self):
     def update(self) -> None:
         """Get the latest data from Transmission and updates the state."""
         torrents = _filter_torrents(
-            self._tm_client.api.torrents, statuses=self.SUBTYPE_MODES[self._sub_type]
+            self._tm_client.api.torrents, statuses=self.MODES[self._key]
         )
         self._state = len(torrents)
 
diff --git a/homeassistant/components/transmission/switch.py b/homeassistant/components/transmission/switch.py
index 3af3fe57e3ca6a..89f89e079fa5c0 100644
--- a/homeassistant/components/transmission/switch.py
+++ b/homeassistant/components/transmission/switch.py
@@ -36,17 +36,18 @@ async def async_setup_entry(
 class TransmissionSwitch(SwitchEntity):
     """Representation of a Transmission switch."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
     def __init__(self, switch_type, switch_name, tm_client, client_name):
         """Initialize the Transmission switch."""
-        self._name = switch_name
-        self.client_name = client_name
+        self._attr_name = switch_name
         self.type = switch_type
         self._tm_client = tm_client
         self._state = STATE_OFF
         self._data = None
         self.unsub_update = None
+        self._attr_unique_id = f"{tm_client.config_entry.entry_id}-{switch_type}"
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, tm_client.config_entry.entry_id)},
@@ -54,16 +55,6 @@ def __init__(self, switch_type, switch_name, tm_client, client_name):
             name=client_name,
         )
 
-    @property
-    def name(self):
-        """Return the name of the switch."""
-        return f"{self.client_name} {self._name}"
-
-    @property
-    def unique_id(self):
-        """Return the unique id of the entity."""
-        return f"{self._tm_client.api.host}-{self.name}"
-
     @property
     def is_on(self):
         """Return true if device is on."""
diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index 7a55fb9b77d026..4402722e37fe0b 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -44,7 +44,7 @@
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.network import get_url
 from homeassistant.helpers.restore_state import RestoreEntity
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.typing import UNDEFINED, ConfigType
 from homeassistant.util import dt as dt_util, language as language_util
 
 from .const import (
@@ -52,7 +52,6 @@
     ATTR_LANGUAGE,
     ATTR_MESSAGE,
     ATTR_OPTIONS,
-    CONF_BASE_URL,
     CONF_CACHE,
     CONF_CACHE_DIR,
     CONF_TIME_MEMORY,
@@ -76,7 +75,6 @@
     "CONF_LANG",
     "DEFAULT_CACHE_DIR",
     "generate_media_source_id",
-    "get_base_url",
     "PLATFORM_SCHEMA_BASE",
     "PLATFORM_SCHEMA",
     "Provider",
@@ -93,8 +91,6 @@
 
 CONF_LANG = "language"
 
-BASE_URL_KEY = "tts_base_url"
-
 SERVICE_CLEAR_CACHE = "clear_cache"
 
 _RE_LEGACY_VOICE_FILE = re.compile(
@@ -214,15 +210,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     use_cache: bool = conf.get(CONF_CACHE, DEFAULT_CACHE)
     cache_dir: str = conf.get(CONF_CACHE_DIR, DEFAULT_CACHE_DIR)
     time_memory: int = conf.get(CONF_TIME_MEMORY, DEFAULT_TIME_MEMORY)
-    base_url: str | None = conf.get(CONF_BASE_URL)
-    if base_url is not None:
-        _LOGGER.warning(
-            "TTS base_url option is deprecated. Configure internal/external URL"
-            " instead"
-        )
-    hass.data[BASE_URL_KEY] = base_url
 
-    tts = SpeechManager(hass, use_cache, cache_dir, time_memory, base_url)
+    tts = SpeechManager(hass, use_cache, cache_dir, time_memory)
 
     try:
         await tts.async_init_cache()
@@ -364,7 +353,7 @@ async def async_speak(
 
     @final
     async def internal_async_get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Process an audio stream to TTS service.
 
@@ -377,13 +366,13 @@ async def internal_async_get_tts_audio(
         )
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load tts audio file from the engine."""
         raise NotImplementedError()
 
     async def async_get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load tts audio file from the engine.
 
@@ -413,7 +402,6 @@ def __init__(
         use_cache: bool,
         cache_dir: str,
         time_memory: int,
-        base_url: str | None,
     ) -> None:
         """Initialize a speech store."""
         self.hass = hass
@@ -422,7 +410,6 @@ def __init__(
         self.use_cache = use_cache
         self.cache_dir = cache_dir
         self.time_memory = time_memory
-        self.base_url = base_url
         self.file_cache: dict[str, str] = {}
         self.mem_cache: dict[str, TTSCache] = {}
 
@@ -478,9 +465,9 @@ def async_register_legacy_engine(
     def process_options(
         self,
         engine_instance: TextToSpeechEntity | Provider,
-        language: str | None = None,
-        options: dict | None = None,
-    ) -> tuple[str, dict | None]:
+        language: str | None,
+        options: dict | None,
+    ) -> tuple[str, dict[str, Any]]:
         """Validate and process options."""
         # Languages
         language = language or engine_instance.default_language
@@ -491,23 +478,18 @@ def process_options(
         ):
             raise HomeAssistantError(f"Language '{language}' not supported")
 
-        # Options
-        if (default_options := engine_instance.default_options) and options:
-            merged_options = dict(default_options)
-            merged_options.update(options)
-            options = merged_options
-        if not options:
-            options = None if default_options is None else dict(default_options)
+        # Update default options with provided options
+        merged_options = dict(engine_instance.default_options or {})
+        merged_options.update(options or {})
 
-        if options is not None:
-            supported_options = engine_instance.supported_options or []
-            invalid_opts = [
-                opt_name for opt_name in options if opt_name not in supported_options
-            ]
-            if invalid_opts:
-                raise HomeAssistantError(f"Invalid options found: {invalid_opts}")
+        supported_options = engine_instance.supported_options or []
+        invalid_opts = [
+            opt_name for opt_name in merged_options if opt_name not in supported_options
+        ]
+        if invalid_opts:
+            raise HomeAssistantError(f"Invalid options found: {invalid_opts}")
 
-        return language, options
+        return language, merged_options
 
     async def async_get_url_path(
         self,
@@ -602,7 +584,7 @@ async def _async_get_tts_audio(
         message: str,
         cache: bool,
         language: str,
-        options: dict | None,
+        options: dict[str, Any],
     ) -> str:
         """Receive TTS, store for view in cache and return filename.
 
@@ -615,7 +597,7 @@ async def _async_get_tts_audio(
 
         async def get_tts_data() -> str:
             """Handle data available."""
-            if engine_instance.name is None:
+            if engine_instance.name is None or engine_instance.name is UNDEFINED:
                 raise HomeAssistantError("TTS engine name is not set.")
 
             if isinstance(engine_instance, Provider):
@@ -891,7 +873,7 @@ async def post(self, request: web.Request) -> web.Response:
             _LOGGER.error("Error on init tts: %s", err)
             return self.json({"error": err}, HTTPStatus.BAD_REQUEST)
 
-        base = self.tts.base_url or get_url(self.tts.hass)
+        base = get_url(self.tts.hass)
         url = base + path
 
         return self.json({"url": url, "path": path})
@@ -919,11 +901,6 @@ async def get(self, request: web.Request, filename: str) -> web.Response:
         return web.Response(body=data, content_type=content)
 
 
-def get_base_url(hass: HomeAssistant) -> str:
-    """Get base URL."""
-    return hass.data[BASE_URL_KEY] or get_url(hass)
-
-
 @websocket_api.websocket_command(
     {
         "type": "tts/engine/list",
diff --git a/homeassistant/components/tts/const.py b/homeassistant/components/tts/const.py
index 3427b761fa61ee..f721731330c908 100644
--- a/homeassistant/components/tts/const.py
+++ b/homeassistant/components/tts/const.py
@@ -4,7 +4,6 @@
 ATTR_MESSAGE = "message"
 ATTR_OPTIONS = "options"
 
-CONF_BASE_URL = "base_url"
 CONF_CACHE = "cache"
 CONF_CACHE_DIR = "cache_dir"
 CONF_FIELDS = "fields"
diff --git a/homeassistant/components/tts/legacy.py b/homeassistant/components/tts/legacy.py
index 138c0bf84c99f1..4734c3f22d15f1 100644
--- a/homeassistant/components/tts/legacy.py
+++ b/homeassistant/components/tts/legacy.py
@@ -9,7 +9,6 @@
 from typing import TYPE_CHECKING, Any, cast
 
 import voluptuous as vol
-import yarl
 
 from homeassistant.components.media_player import (
     ATTR_MEDIA_ANNOUNCE,
@@ -31,7 +30,6 @@
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_prepare_setup_platform
-from homeassistant.util.network import normalize_url
 from homeassistant.util.yaml import load_yaml
 
 from .const import (
@@ -39,7 +37,6 @@
     ATTR_LANGUAGE,
     ATTR_MESSAGE,
     ATTR_OPTIONS,
-    CONF_BASE_URL,
     CONF_CACHE,
     CONF_CACHE_DIR,
     CONF_FIELDS,
@@ -72,16 +69,6 @@ def _deprecated_platform(value: str) -> str:
     return value
 
 
-def _valid_base_url(value: str) -> str:
-    """Validate base url, return value."""
-    url = yarl.URL(cv.url(value))
-
-    if url.path != "/":
-        raise vol.Invalid("Path should be empty")
-
-    return normalize_url(value)
-
-
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_PLATFORM): vol.All(cv.string, _deprecated_platform),
@@ -90,7 +77,6 @@ def _valid_base_url(value: str) -> str:
         vol.Optional(CONF_TIME_MEMORY, default=DEFAULT_TIME_MEMORY): vol.All(
             vol.Coerce(int), vol.Range(min=60, max=57600)
         ),
-        vol.Optional(CONF_BASE_URL): _valid_base_url,
         vol.Optional(CONF_SERVICE_NAME): cv.string,
     }
 )
@@ -112,7 +98,7 @@ def _valid_base_url(value: str) -> str:
 async def async_setup_legacy(
     hass: HomeAssistant, config: ConfigType
 ) -> list[Coroutine[Any, Any, None]]:
-    """Set up legacy text to speech providers."""
+    """Set up legacy text-to-speech providers."""
     tts: SpeechManager = hass.data[DATA_TTS_MANAGER]
 
     # Load service descriptions from tts/services.yaml
@@ -132,7 +118,7 @@ async def async_setup_platform(
 
         platform = await async_prepare_setup_platform(hass, config, DOMAIN, p_type)
         if platform is None:
-            _LOGGER.error("Unknown text to speech platform specified")
+            _LOGGER.error("Unknown text-to-speech platform specified")
             return
 
         try:
@@ -240,13 +226,13 @@ def default_options(self) -> Mapping[str, Any] | None:
         return None
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load tts audio file from provider."""
         raise NotImplementedError()
 
     async def async_get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load tts audio file from provider.
 
diff --git a/homeassistant/components/tts/manifest.json b/homeassistant/components/tts/manifest.json
index 741edbc4cefbac..249e427c59132d 100644
--- a/homeassistant/components/tts/manifest.json
+++ b/homeassistant/components/tts/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "tts",
-  "name": "Text-to-Speech (TTS)",
+  "name": "Text-to-speech (TTS)",
   "after_dependencies": ["media_player"],
   "codeowners": ["@home-assistant/core", "@pvizeli"],
   "dependencies": ["http"],
diff --git a/homeassistant/components/tts/media_source.py b/homeassistant/components/tts/media_source.py
index 34dc3822e93c11..837a15a4f883b7 100644
--- a/homeassistant/components/tts/media_source.py
+++ b/homeassistant/components/tts/media_source.py
@@ -18,7 +18,6 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.network import get_url
 
 from .const import DATA_TTS_MANAGER, DOMAIN
 from .helper import get_engine_instance
@@ -104,7 +103,7 @@ def media_source_id_to_kwargs(media_source_id: str) -> MediaSourceOptions:
 class TTSMediaSource(MediaSource):
     """Provide text-to-speech providers as media sources."""
 
-    name: str = "Text to Speech"
+    name: str = "Text-to-speech"
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize TTSMediaSource."""
@@ -124,9 +123,6 @@ async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
 
         mime_type = mimetypes.guess_type(url)[0] or "audio/mpeg"
 
-        if manager.base_url and manager.base_url != get_url(self.hass):
-            url = f"{manager.base_url}{url}"
-
         return PlayMedia(url, mime_type)
 
     async def async_browse_media(
@@ -165,7 +161,6 @@ def _engine_item(self, engine: str, params: str | None = None) -> BrowseMediaSou
             raise BrowseError("Unknown provider")
 
         if isinstance(engine_instance, TextToSpeechEntity):
-            assert engine_instance.platform is not None
             engine_domain = engine_instance.platform.domain
         else:
             engine_domain = engine
diff --git a/homeassistant/components/tuya/alarm_control_panel.py b/homeassistant/components/tuya/alarm_control_panel.py
index d5122862e2c0bf..c2c9c207c02b0e 100644
--- a/homeassistant/components/tuya/alarm_control_panel.py
+++ b/homeassistant/components/tuya/alarm_control_panel.py
@@ -89,6 +89,7 @@ class TuyaAlarmEntity(TuyaEntity, AlarmControlPanelEntity):
     """Tuya Alarm Entity."""
 
     _attr_icon = "mdi:security"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/camera.py b/homeassistant/components/tuya/camera.py
index 182d0dfd85d645..72216057affc8c 100644
--- a/homeassistant/components/tuya/camera.py
+++ b/homeassistant/components/tuya/camera.py
@@ -52,6 +52,7 @@ class TuyaCameraEntity(TuyaEntity, CameraEntity):
 
     _attr_supported_features = CameraEntityFeature.STREAM
     _attr_brand = "Tuya"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/climate.py b/homeassistant/components/tuya/climate.py
index 564bfab8b14d70..6b3b84ba349eaa 100644
--- a/homeassistant/components/tuya/climate.py
+++ b/homeassistant/components/tuya/climate.py
@@ -125,6 +125,7 @@ class TuyaClimateEntity(TuyaEntity, ClimateEntity):
     _set_humidity: IntegerTypeData | None = None
     _set_temperature: IntegerTypeData | None = None
     entity_description: TuyaClimateEntityDescription
+    _attr_name = None
 
     def __init__(
         self,
@@ -205,7 +206,7 @@ def __init__(
             self._attr_target_temperature_step = self._set_temperature.step_scaled
 
         # Determine HVAC modes
-        self._attr_hvac_modes: list[str] = []
+        self._attr_hvac_modes: list[HVACMode] = []
         self._hvac_to_tuya = {}
         if enum_type := self.find_dpcode(
             DPCode.MODE, dptype=DPType.ENUM, prefer_function=True
diff --git a/homeassistant/components/tuya/diagnostics.py b/homeassistant/components/tuya/diagnostics.py
index 67bbad0aceb5fc..454416970eaa5d 100644
--- a/homeassistant/components/tuya/diagnostics.py
+++ b/homeassistant/components/tuya/diagnostics.py
@@ -155,7 +155,7 @@ def _async_device_as_dict(hass: HomeAssistant, device: TuyaDevice) -> dict[str,
 
         for entity_entry in hass_entities:
             state = hass.states.get(entity_entry.entity_id)
-            state_dict = None
+            state_dict: dict[str, Any] | None = None
             if state:
                 state_dict = dict(state.as_dict())
 
diff --git a/homeassistant/components/tuya/fan.py b/homeassistant/components/tuya/fan.py
index 59cfee3506c7b6..210cc5c75180d7 100644
--- a/homeassistant/components/tuya/fan.py
+++ b/homeassistant/components/tuya/fan.py
@@ -65,6 +65,7 @@ class TuyaFanEntity(TuyaEntity, FanEntity):
     _speed: IntegerTypeData | None = None
     _speeds: EnumTypeData | None = None
     _switch: DPCode | None = None
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/humidifier.py b/homeassistant/components/tuya/humidifier.py
index a9564b94ddc444..6d09ba4314cc87 100644
--- a/homeassistant/components/tuya/humidifier.py
+++ b/homeassistant/components/tuya/humidifier.py
@@ -28,6 +28,7 @@ class TuyaHumidifierEntityDescription(HumidifierEntityDescription):
     # DPCode, to use. If None, the key will be used as DPCode
     dpcode: DPCode | tuple[DPCode, ...] | None = None
 
+    current_humidity: DPCode | None = None
     humidity: DPCode | None = None
 
 
@@ -37,6 +38,7 @@ class TuyaHumidifierEntityDescription(HumidifierEntityDescription):
     "cs": TuyaHumidifierEntityDescription(
         key=DPCode.SWITCH,
         dpcode=(DPCode.SWITCH, DPCode.SWITCH_SPRAY),
+        current_humidity=DPCode.HUMIDITY_INDOOR,
         humidity=DPCode.DEHUMIDITY_SET_VALUE,
         device_class=HumidifierDeviceClass.DEHUMIDIFIER,
     ),
@@ -45,6 +47,7 @@ class TuyaHumidifierEntityDescription(HumidifierEntityDescription):
     "jsq": TuyaHumidifierEntityDescription(
         key=DPCode.SWITCH,
         dpcode=(DPCode.SWITCH, DPCode.SWITCH_SPRAY),
+        current_humidity=DPCode.HUMIDITY_CURRENT,
         humidity=DPCode.HUMIDITY_SET,
         device_class=HumidifierDeviceClass.HUMIDIFIER,
     ),
@@ -79,9 +82,11 @@ def async_discover_device(device_ids: list[str]) -> None:
 class TuyaHumidifierEntity(TuyaEntity, HumidifierEntity):
     """Tuya (de)humidifier Device."""
 
+    _current_humidity: IntegerTypeData | None = None
     _set_humidity: IntegerTypeData | None = None
     _switch_dpcode: DPCode | None = None
     entity_description: TuyaHumidifierEntityDescription
+    _attr_name = None
 
     def __init__(
         self,
@@ -89,7 +94,7 @@ def __init__(
         device_manager: TuyaDeviceManager,
         description: TuyaHumidifierEntityDescription,
     ) -> None:
-        """Init Tuya (de)humidier."""
+        """Init Tuya (de)humidifier."""
         super().__init__(device, device_manager)
         self.entity_description = description
         self._attr_unique_id = f"{super().unique_id}{description.key}"
@@ -107,6 +112,13 @@ def __init__(
             self._attr_min_humidity = int(int_type.min_scaled)
             self._attr_max_humidity = int(int_type.max_scaled)
 
+        # Determine current humidity DPCode
+        if int_type := self.find_dpcode(
+            description.current_humidity,
+            dptype=DPType.INTEGER,
+        ):
+            self._current_humidity = int_type
+
         # Determine mode support and provided modes
         if enum_type := self.find_dpcode(
             DPCode.MODE, dptype=DPType.ENUM, prefer_function=True
@@ -138,6 +150,19 @@ def target_humidity(self) -> int | None:
 
         return round(self._set_humidity.scale_value(humidity))
 
+    @property
+    def current_humidity(self) -> int | None:
+        """Return the current humidity."""
+        if self._current_humidity is None:
+            return None
+
+        if (
+            current_humidity := self.device.status.get(self._current_humidity.dpcode)
+        ) is None:
+            return None
+
+        return round(self._current_humidity.scale_value(current_humidity))
+
     def turn_on(self, **kwargs):
         """Turn the device on."""
         self._send_command([{"code": self._switch_dpcode, "value": True}])
diff --git a/homeassistant/components/tuya/light.py b/homeassistant/components/tuya/light.py
index 44b3494ca7736d..3ab4c3568c4d67 100644
--- a/homeassistant/components/tuya/light.py
+++ b/homeassistant/components/tuya/light.py
@@ -79,6 +79,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "dc": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -90,6 +91,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "dd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -102,6 +104,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "dj": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=(DPCode.BRIGHT_VALUE_V2, DPCode.BRIGHT_VALUE),
             color_temp=(DPCode.TEMP_VALUE_V2, DPCode.TEMP_VALUE),
@@ -120,6 +123,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "fsd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -128,6 +132,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
         # Some ceiling fan lights use LIGHT for DPCode instead of SWITCH_LED
         TuyaLightEntityDescription(
             key=DPCode.LIGHT,
+            name=None,
         ),
     ),
     # Ambient Light
@@ -135,6 +140,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "fwd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -146,6 +152,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "gyd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -157,6 +164,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "jsq": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA_HSV,
@@ -195,6 +203,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "mbd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA,
@@ -206,6 +215,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "qjdcz": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_data=DPCode.COLOUR_DATA,
@@ -296,6 +306,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "tyndj": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -307,6 +318,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "xdd": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_LED,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
@@ -322,6 +334,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "ykq": (
         TuyaLightEntityDescription(
             key=DPCode.SWITCH_CONTROLLER,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_CONTROLLER,
             color_temp=DPCode.TEMP_CONTROLLER,
@@ -332,6 +345,7 @@ class TuyaLightEntityDescription(LightEntityDescription):
     "fs": (
         TuyaLightEntityDescription(
             key=DPCode.LIGHT,
+            name=None,
             color_mode=DPCode.WORK_MODE,
             brightness=DPCode.BRIGHT_VALUE,
             color_temp=DPCode.TEMP_VALUE,
diff --git a/homeassistant/components/tuya/sensor.py b/homeassistant/components/tuya/sensor.py
index a2cd2d5fc410b6..afa40f27afd9b4 100644
--- a/homeassistant/components/tuya/sensor.py
+++ b/homeassistant/components/tuya/sensor.py
@@ -511,6 +511,7 @@ class TuyaSensorEntityDescription(SensorEntityDescription):
     "rqbj": (
         TuyaSensorEntityDescription(
             key=DPCode.GAS_SENSOR_VALUE,
+            name=None,
             icon="mdi:gas-cylinder",
             state_class=SensorStateClass.MEASUREMENT,
         ),
@@ -633,6 +634,7 @@ class TuyaSensorEntityDescription(SensorEntityDescription):
     "ylcg": (
         TuyaSensorEntityDescription(
             key=DPCode.PRESSURE_VALUE,
+            name=None,
             device_class=SensorDeviceClass.PRESSURE,
             state_class=SensorStateClass.MEASUREMENT,
         ),
diff --git a/homeassistant/components/tuya/siren.py b/homeassistant/components/tuya/siren.py
index a60e24eca861a9..c2dc8cea99ba15 100644
--- a/homeassistant/components/tuya/siren.py
+++ b/homeassistant/components/tuya/siren.py
@@ -27,7 +27,6 @@
     "dgnbj": (
         SirenEntityDescription(
             key=DPCode.ALARM_SWITCH,
-            name="Siren",
         ),
     ),
     # Siren Alarm
@@ -35,7 +34,6 @@
     "sgbj": (
         SirenEntityDescription(
             key=DPCode.ALARM_SWITCH,
-            name="Siren",
         ),
     ),
     # Smart Camera
@@ -43,7 +41,6 @@
     "sp": (
         SirenEntityDescription(
             key=DPCode.SIREN_SWITCH,
-            name="Siren",
         ),
     ),
 }
@@ -83,6 +80,7 @@ class TuyaSirenEntity(TuyaEntity, SirenEntity):
     """Tuya Siren Entity."""
 
     _attr_supported_features = SirenEntityFeature.TURN_ON | SirenEntityFeature.TURN_OFF
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/tuya/strings.json b/homeassistant/components/tuya/strings.json
index 534ff1dc9eccab..0cab59de2912c8 100644
--- a/homeassistant/components/tuya/strings.json
+++ b/homeassistant/components/tuya/strings.json
@@ -93,7 +93,7 @@
           "low": "Low",
           "middle": "Middle",
           "high": "High",
-          "closed": "Closed"
+          "closed": "[%key:common::state::closed%]"
         }
       },
       "vacuum_collection": {
@@ -212,5 +212,15 @@
         }
       }
     }
+  },
+  "issues": {
+    "service_deprecation_turn_off": {
+      "title": "Tuya vacuum support for vacuum.turn_off is being removed",
+      "description": "Tuya vacuum support for the vacuum.turn_off service is deprecated and will be removed in Home Assistant 2024.2; Please adjust any automation or script that uses the service to instead call vacuum.stop and select submit below to mark this issue as resolved."
+    },
+    "service_deprecation_turn_on": {
+      "title": "Tuya vacuum support for vacuum.turn_on is being removed",
+      "description": "Tuya vacuum support for the vacuum.turn_on service is deprecated and will be removed in Home Assistant 2024.2; Please adjust any automation or script that uses the service to instead call vacuum.start and select submit below to mark this issue as resolved."
+    }
   }
 }
diff --git a/homeassistant/components/tuya/vacuum.py b/homeassistant/components/tuya/vacuum.py
index 7827fb061eadf8..b332be7de2d650 100644
--- a/homeassistant/components/tuya/vacuum.py
+++ b/homeassistant/components/tuya/vacuum.py
@@ -15,6 +15,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_IDLE, STATE_PAUSED
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -78,6 +79,7 @@ class TuyaVacuumEntity(TuyaEntity, StateVacuumEntity):
 
     _fan_speed: EnumTypeData | None = None
     _battery_level: IntegerTypeData | None = None
+    _attr_name = None
 
     def __init__(self, device: TuyaDevice, device_manager: TuyaDeviceManager) -> None:
         """Init Tuya vacuum."""
@@ -85,7 +87,9 @@ def __init__(self, device: TuyaDevice, device_manager: TuyaDeviceManager) -> Non
 
         self._attr_fan_speed_list = []
 
-        self._attr_supported_features |= VacuumEntityFeature.SEND_COMMAND
+        self._attr_supported_features = (
+            VacuumEntityFeature.SEND_COMMAND | VacuumEntityFeature.STATE
+        )
         if self.find_dpcode(DPCode.PAUSE, prefer_function=True):
             self._attr_supported_features |= VacuumEntityFeature.PAUSE
 
@@ -101,11 +105,6 @@ def __init__(self, device: TuyaDevice, device_manager: TuyaDeviceManager) -> Non
         if self.find_dpcode(DPCode.SEEK, prefer_function=True):
             self._attr_supported_features |= VacuumEntityFeature.LOCATE
 
-        if self.find_dpcode(DPCode.STATUS, prefer_function=True):
-            self._attr_supported_features |= (
-                VacuumEntityFeature.STATE | VacuumEntityFeature.STATUS
-            )
-
         if self.find_dpcode(DPCode.POWER, prefer_function=True):
             self._attr_supported_features |= (
                 VacuumEntityFeature.TURN_ON | VacuumEntityFeature.TURN_OFF
@@ -155,10 +154,30 @@ def state(self) -> str | None:
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         self._send_command([{"code": DPCode.POWER, "value": True}])
+        ir.async_create_issue(
+            self.hass,
+            DOMAIN,
+            "service_deprecation_turn_on",
+            breaks_in_ha_version="2024.2.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="service_deprecation_turn_on",
+        )
 
     def turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         self._send_command([{"code": DPCode.POWER, "value": False}])
+        ir.async_create_issue(
+            self.hass,
+            DOMAIN,
+            "service_deprecation_turn_off",
+            breaks_in_ha_version="2024.2.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key="service_deprecation_turn_off",
+        )
 
     def start(self, **kwargs: Any) -> None:
         """Start the device."""
diff --git a/homeassistant/components/twentemilieu/calendar.py b/homeassistant/components/twentemilieu/calendar.py
index e4ecbd9d866d9f..f4d1e51b171eed 100644
--- a/homeassistant/components/twentemilieu/calendar.py
+++ b/homeassistant/components/twentemilieu/calendar.py
@@ -32,6 +32,7 @@ class TwenteMilieuCalendar(TwenteMilieuEntity, CalendarEntity):
 
     _attr_has_entity_name = True
     _attr_icon = "mdi:delete-empty"
+    _attr_name = None
 
     def __init__(
         self,
diff --git a/homeassistant/components/twitch/const.py b/homeassistant/components/twitch/const.py
new file mode 100644
index 00000000000000..6626889a809754
--- /dev/null
+++ b/homeassistant/components/twitch/const.py
@@ -0,0 +1,10 @@
+"""Const for Twitch."""
+import logging
+
+from twitchAPI.twitch import AuthScope
+
+LOGGER = logging.getLogger(__package__)
+
+CONF_CHANNELS = "channels"
+
+OAUTH_SCOPES = [AuthScope.USER_READ_SUBSCRIPTIONS]
diff --git a/homeassistant/components/twitch/manifest.json b/homeassistant/components/twitch/manifest.json
index c11be26c45a97e..5613360c5942c0 100644
--- a/homeassistant/components/twitch/manifest.json
+++ b/homeassistant/components/twitch/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "twitch",
   "name": "Twitch",
-  "codeowners": [],
+  "codeowners": ["@joostlek"],
   "documentation": "https://www.home-assistant.io/integrations/twitch",
   "iot_class": "cloud_polling",
   "loggers": ["twitch"],
diff --git a/homeassistant/components/twitch/sensor.py b/homeassistant/components/twitch/sensor.py
index fcc8225b73c9b1..3211ca1952bcbe 100644
--- a/homeassistant/components/twitch/sensor.py
+++ b/homeassistant/components/twitch/sensor.py
@@ -1,11 +1,8 @@
 """Support for the Twitch stream status."""
 from __future__ import annotations
 
-import logging
-
 from twitchAPI.helper import first
 from twitchAPI.twitch import (
-    AuthScope,
     AuthType,
     InvalidTokenException,
     MissingScopeException,
@@ -24,7 +21,17 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-_LOGGER = logging.getLogger(__name__)
+from .const import CONF_CHANNELS, LOGGER, OAUTH_SCOPES
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+    {
+        vol.Required(CONF_CLIENT_ID): cv.string,
+        vol.Required(CONF_CLIENT_SECRET): cv.string,
+        vol.Required(CONF_CHANNELS): vol.All(cv.ensure_list, [cv.string]),
+        vol.Optional(CONF_TOKEN): cv.string,
+    }
+)
+
 
 ATTR_GAME = "game"
 ATTR_TITLE = "title"
@@ -36,24 +43,11 @@
 ATTR_FOLLOWING = "followers"
 ATTR_VIEWS = "views"
 
-CONF_CHANNELS = "channels"
-
 ICON = "mdi:twitch"
 
 STATE_OFFLINE = "offline"
 STATE_STREAMING = "streaming"
 
-OAUTH_SCOPES = [AuthScope.USER_READ_SUBSCRIPTIONS]
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_CLIENT_ID): cv.string,
-        vol.Required(CONF_CLIENT_SECRET): cv.string,
-        vol.Required(CONF_CHANNELS): vol.All(cv.ensure_list, [cv.string]),
-        vol.Optional(CONF_TOKEN): cv.string,
-    }
-)
-
 
 async def async_setup_platform(
     hass: HomeAssistant,
@@ -75,7 +69,7 @@ async def async_setup_platform(
         )
         client.auto_refresh_auth = False
     except TwitchAuthorizationException:
-        _LOGGER.error("Invalid client ID or client secret")
+        LOGGER.error("Invalid client ID or client secret")
         return
 
     if oauth_token:
@@ -84,10 +78,10 @@ async def async_setup_platform(
                 token=oauth_token, scope=OAUTH_SCOPES, validate=True
             )
         except MissingScopeException:
-            _LOGGER.error("OAuth token is missing required scope")
+            LOGGER.error("OAuth token is missing required scope")
             return
         except InvalidTokenException:
-            _LOGGER.error("OAuth token is invalid")
+            LOGGER.error("OAuth token is invalid")
             return
 
     twitch_users: list[TwitchUser] = []
@@ -151,9 +145,9 @@ async def _async_add_user_attributes(self) -> None:
             self._attr_extra_state_attributes[ATTR_SUBSCRIPTION] = True
             self._attr_extra_state_attributes[ATTR_SUBSCRIPTION_GIFTED] = sub.is_gift
         except TwitchResourceNotFound:
-            _LOGGER.debug("User is not subscribed")
+            LOGGER.debug("User is not subscribed")
         except TwitchAPIException as exc:
-            _LOGGER.error("Error response on check_user_subscription: %s", exc)
+            LOGGER.error("Error response on check_user_subscription: %s", exc)
 
         follows = (
             await self._client.get_users_follows(
diff --git a/homeassistant/components/ubus/device_tracker.py b/homeassistant/components/ubus/device_tracker.py
index 48d5b4bd6f6b75..f49a06be9dd021 100644
--- a/homeassistant/components/ubus/device_tracker.py
+++ b/homeassistant/components/ubus/device_tracker.py
@@ -75,13 +75,13 @@ class UbusDeviceScanner(DeviceScanner):
 
     def __init__(self, config):
         """Initialize the scanner."""
-        host = config[CONF_HOST]
+        self.host = config[CONF_HOST]
         self.username = config[CONF_USERNAME]
         self.password = config[CONF_PASSWORD]
 
         self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
         self.last_results = {}
-        self.url = f"http://{host}/ubus"
+        self.url = f"http://{self.host}/ubus"
 
         self.ubus = Ubus(self.url, self.username, self.password)
         self.hostapd = []
@@ -108,6 +108,10 @@ def get_device_name(self, device):
         name = self.mac2name.get(device.upper(), None)
         return name
 
+    async def async_get_extra_attributes(self, device: str) -> dict[str, str]:
+        """Return the host to distinguish between multiple routers."""
+        return {"host": self.host}
+
     @_refresh_on_access_denied
     def _update_info(self):
         """Ensure the information from the router is up to date.
diff --git a/homeassistant/components/unifi/__init__.py b/homeassistant/components/unifi/__init__.py
index a7e8aede36192a..4d11a690f35325 100644
--- a/homeassistant/components/unifi/__init__.py
+++ b/homeassistant/components/unifi/__init__.py
@@ -6,7 +6,7 @@
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 
@@ -19,6 +19,8 @@
 STORAGE_KEY = "unifi_data"
 STORAGE_VERSION = 1
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(UNIFI_DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Integration doesn't support configuration through configuration.yaml."""
diff --git a/homeassistant/components/unifi/manifest.json b/homeassistant/components/unifi/manifest.json
index f43e30309163c7..9bfb01e5a88336 100644
--- a/homeassistant/components/unifi/manifest.json
+++ b/homeassistant/components/unifi/manifest.json
@@ -8,7 +8,7 @@
   "iot_class": "local_push",
   "loggers": ["aiounifi"],
   "quality_scale": "platinum",
-  "requirements": ["aiounifi==47"],
+  "requirements": ["aiounifi==49"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/unifiprotect/__init__.py b/homeassistant/components/unifiprotect/__init__.py
index 96d31872d0b0b4..174f60fd1352a5 100644
--- a/homeassistant/components/unifiprotect/__init__.py
+++ b/homeassistant/components/unifiprotect/__init__.py
@@ -12,7 +12,11 @@
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, issue_registry as ir
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    issue_registry as ir,
+)
 from homeassistant.helpers.issue_registry import IssueSeverity
 from homeassistant.helpers.typing import ConfigType
 
@@ -40,6 +44,8 @@
 
 SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the UniFi Protect."""
diff --git a/homeassistant/components/unifiprotect/binary_sensor.py b/homeassistant/components/unifiprotect/binary_sensor.py
index 7aa7c6d5cf142c..fe4399c4c6d37a 100644
--- a/homeassistant/components/unifiprotect/binary_sensor.py
+++ b/homeassistant/components/unifiprotect/binary_sensor.py
@@ -14,8 +14,6 @@
     ProtectAdoptableDeviceModel,
     ProtectModelWithId,
     Sensor,
-    SmartDetectAudioType,
-    SmartDetectObjectType,
 )
 from pyunifiprotect.data.nvr import UOSDisk
 
@@ -364,8 +362,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_person",
         ufp_enabled="is_person_detection_on",
-        ufp_event_obj="last_smart_detect_event",
-        ufp_smart_type=SmartDetectObjectType.PERSON,
+        ufp_event_obj="last_person_detect_event",
     ),
     ProtectBinaryEventEntityDescription(
         key="smart_obj_vehicle",
@@ -374,8 +371,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_vehicle",
         ufp_enabled="is_vehicle_detection_on",
-        ufp_event_obj="last_smart_detect_event",
-        ufp_smart_type=SmartDetectObjectType.VEHICLE,
+        ufp_event_obj="last_vehicle_detect_event",
     ),
     ProtectBinaryEventEntityDescription(
         key="smart_obj_face",
@@ -384,8 +380,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_face",
         ufp_enabled="is_face_detection_on",
-        ufp_event_obj="last_smart_detect_event",
-        ufp_smart_type=SmartDetectObjectType.FACE,
+        ufp_event_obj="last_face_detect_event",
     ),
     ProtectBinaryEventEntityDescription(
         key="smart_obj_package",
@@ -394,8 +389,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_package",
         ufp_enabled="is_package_detection_on",
-        ufp_event_obj="last_smart_detect_event",
-        ufp_smart_type=SmartDetectObjectType.PACKAGE,
+        ufp_event_obj="last_package_detect_event",
     ),
     ProtectBinaryEventEntityDescription(
         key="smart_audio_any",
@@ -412,8 +406,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_smoke",
         ufp_enabled="is_smoke_detection_on",
-        ufp_event_obj="last_smart_audio_detect_event",
-        ufp_smart_type=SmartDetectAudioType.SMOKE,
+        ufp_event_obj="last_smoke_detect_event",
     ),
     ProtectBinaryEventEntityDescription(
         key="smart_audio_cmonx",
@@ -422,8 +415,7 @@ class ProtectBinaryEventEntityDescription(
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_smoke",
         ufp_enabled="is_smoke_detection_on",
-        ufp_event_obj="last_smart_audio_detect_event",
-        ufp_smart_type=SmartDetectAudioType.CMONX,
+        ufp_event_obj="last_cmonx_detect_event",
     ),
 )
 
diff --git a/homeassistant/components/unifiprotect/camera.py b/homeassistant/components/unifiprotect/camera.py
index 00dbbe77e77c2f..a4da77fe50b37d 100644
--- a/homeassistant/components/unifiprotect/camera.py
+++ b/homeassistant/components/unifiprotect/camera.py
@@ -167,9 +167,8 @@ def _async_set_stream_source(self) -> None:
         if not self.channel.is_rtsp_enabled:
             disable_stream = False
 
-        rtsp_url = self.channel.rtsp_url
-        if self._secure:
-            rtsp_url = self.channel.rtsps_url
+        channel = self.channel
+        rtsp_url = channel.rtsps_url if self._secure else channel.rtsp_url
 
         # _async_set_stream_source called by __init__
         self._stream_source = (  # pylint: disable=attribute-defined-outside-init
diff --git a/homeassistant/components/unifiprotect/data.py b/homeassistant/components/unifiprotect/data.py
index 68d48003ba63de..88c500f18fd006 100644
--- a/homeassistant/components/unifiprotect/data.py
+++ b/homeassistant/components/unifiprotect/data.py
@@ -40,6 +40,11 @@
 
 _LOGGER = logging.getLogger(__name__)
 ProtectDeviceType = ProtectAdoptableDeviceModel | NVR
+SMART_EVENTS = {
+    EventType.SMART_DETECT,
+    EventType.SMART_AUDIO_DETECT,
+    EventType.SMART_DETECT_LINE,
+}
 
 
 @callback
@@ -223,6 +228,25 @@ def _async_process_ws_message(self, message: WSSubscriptionMessage) -> None:
 
         # trigger updates for camera that the event references
         elif isinstance(obj, Event):
+            if obj.type in SMART_EVENTS:
+                if obj.camera is not None:
+                    if obj.end is None:
+                        _LOGGER.debug(
+                            "%s (%s): New smart detection started for %s (%s)",
+                            obj.camera.name,
+                            obj.camera.mac,
+                            obj.smart_detect_types,
+                            obj.id,
+                        )
+                    else:
+                        _LOGGER.debug(
+                            "%s (%s): Smart detection ended for %s (%s)",
+                            obj.camera.name,
+                            obj.camera.mac,
+                            obj.smart_detect_types,
+                            obj.id,
+                        )
+
             if obj.type == EventType.DEVICE_ADOPTED:
                 if obj.metadata is not None and obj.metadata.device_id is not None:
                     device = self.api.bootstrap.get_device_from_id(
diff --git a/homeassistant/components/unifiprotect/entity.py b/homeassistant/components/unifiprotect/entity.py
index 9ca27c7174e2cc..15bd17554ad30f 100644
--- a/homeassistant/components/unifiprotect/entity.py
+++ b/homeassistant/components/unifiprotect/entity.py
@@ -1,7 +1,7 @@
 """Shared Entity definition for UniFi Protect Integration."""
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 import logging
 from typing import Any
 
@@ -22,12 +22,8 @@
 
 from homeassistant.core import callback
 import homeassistant.helpers.device_registry as dr
-from homeassistant.helpers.entity import (
-    DEVICE_CLASS_NAME,
-    DeviceInfo,
-    Entity,
-    EntityDescription,
-)
+from homeassistant.helpers.entity import DeviceInfo, Entity, EntityDescription
+from homeassistant.helpers.typing import UNDEFINED
 
 from .const import (
     ATTR_EVENT_ID,
@@ -196,6 +192,9 @@ def __init__(
         super().__init__()
         self.data: ProtectData = data
         self.device = device
+        self._async_get_ufp_enabled: Callable[
+            [ProtectAdoptableDeviceModel], bool
+        ] | None = None
 
         if description is None:
             self._attr_unique_id = f"{self.device.mac}"
@@ -203,12 +202,14 @@ def __init__(
         else:
             self.entity_description = description
             self._attr_unique_id = f"{self.device.mac}_{description.key}"
-            name = description.name or ""
-            # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-            # the assert satisfies the type checker and will catch attempts
-            # to use DEVICE_CLASS_NAME in the entity descriptions.
-            assert name is not DEVICE_CLASS_NAME
+            name = (
+                description.name
+                if description.name and description.name is not UNDEFINED
+                else ""
+            )
             self._attr_name = f"{self.device.display_name} {name.title()}"
+            if isinstance(description, ProtectRequiredKeysMixin):
+                self._async_get_ufp_enabled = description.get_ufp_enabled
 
         self._attr_attribution = DEFAULT_ATTRIBUTION
         self._async_set_device_info()
@@ -236,24 +237,20 @@ def _async_set_device_info(self) -> None:
     @callback
     def _async_update_device_from_protect(self, device: ProtectModelWithId) -> None:
         """Update Entity object from Protect device."""
-        if self.data.last_update_success:
-            assert isinstance(device, ProtectAdoptableDeviceModel)
+        assert isinstance(device, ProtectAdoptableDeviceModel)
+
+        if last_update_success := self.data.last_update_success:
             self.device = device
 
-        is_connected = self.data.last_update_success and (
-            self.device.state == StateType.CONNECTED
-            or (not self.device.is_adopted_by_us and self.device.can_adopt)
-        )
-        if (
-            hasattr(self, "entity_description")
-            and self.entity_description is not None
-            and hasattr(self.entity_description, "get_ufp_enabled")
-        ):
-            assert isinstance(self.entity_description, ProtectRequiredKeysMixin)
-            is_connected = is_connected and self.entity_description.get_ufp_enabled(
-                self.device
+        async_get_ufp_enabled = self._async_get_ufp_enabled
+        self._attr_available = (
+            last_update_success
+            and (
+                device.state == StateType.CONNECTED
+                or (not device.is_adopted_by_us and device.can_adopt)
             )
-        self._attr_available = is_connected
+            and (not async_get_ufp_enabled or async_get_ufp_enabled(device))
+        )
 
     @callback
     def _async_updated_event(self, device: ProtectModelWithId) -> None:
diff --git a/homeassistant/components/unifiprotect/manifest.json b/homeassistant/components/unifiprotect/manifest.json
index fcb30cdba5fbaf..cfa90664f36c02 100644
--- a/homeassistant/components/unifiprotect/manifest.json
+++ b/homeassistant/components/unifiprotect/manifest.json
@@ -41,7 +41,7 @@
   "iot_class": "local_push",
   "loggers": ["pyunifiprotect", "unifi_discovery"],
   "quality_scale": "platinum",
-  "requirements": ["pyunifiprotect==4.9.0", "unifi-discovery==1.1.7"],
+  "requirements": ["pyunifiprotect==4.10.3", "unifi-discovery==1.1.7"],
   "ssdp": [
     {
       "manufacturer": "Ubiquiti Networks",
diff --git a/homeassistant/components/unifiprotect/models.py b/homeassistant/components/unifiprotect/models.py
index 40280c028679c3..8c68823162810c 100644
--- a/homeassistant/components/unifiprotect/models.py
+++ b/homeassistant/components/unifiprotect/models.py
@@ -3,6 +3,7 @@
 
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
+from datetime import timedelta
 from enum import Enum
 import logging
 from typing import Any, Generic, TypeVar, cast
@@ -10,6 +11,7 @@
 from pyunifiprotect.data import NVR, Event, ProtectAdoptableDeviceModel
 
 from homeassistant.helpers.entity import EntityDescription
+from homeassistant.util import dt as dt_util
 
 from .utils import get_nested_attr
 
@@ -67,7 +69,6 @@ class ProtectEventMixin(ProtectRequiredKeysMixin[T]):
     """Mixin for events."""
 
     ufp_event_obj: str | None = None
-    ufp_smart_type: str | None = None
 
     def get_event_obj(self, obj: T) -> Event | None:
         """Return value from UniFi Protect device."""
@@ -79,23 +80,22 @@ def get_event_obj(self, obj: T) -> Event | None:
     def get_is_on(self, obj: T) -> bool:
         """Return value if event is active."""
 
-        value = bool(self.get_ufp_value(obj))
-        if value:
-            event = self.get_event_obj(obj)
-            value = event is not None
-            if not value:
-                _LOGGER.debug("%s (%s): missing event", self.name, obj.mac)
-
-            if event is not None and self.ufp_smart_type is not None:
-                value = self.ufp_smart_type in event.smart_detect_types
-                if not value:
-                    _LOGGER.debug(
-                        "%s (%s): %s not in %s",
-                        self.name,
-                        obj.mac,
-                        self.ufp_smart_type,
-                        event.smart_detect_types,
-                    )
+        event = self.get_event_obj(obj)
+        if event is None:
+            return False
+
+        now = dt_util.utcnow()
+        value = now > event.start
+        if value and event.end is not None and now > event.end:
+            value = False
+            # only log if the recent ended recently
+            if event.end + timedelta(seconds=10) < now:
+                _LOGGER.debug(
+                    "%s (%s): end ended at %s",
+                    self.name,
+                    obj.mac,
+                    event.end.isoformat(),
+                )
 
         if value:
             _LOGGER.debug("%s (%s): value is on", self.name, obj.mac)
diff --git a/homeassistant/components/unifiprotect/sensor.py b/homeassistant/components/unifiprotect/sensor.py
index 783955b340126c..dec6f10a57f1da 100644
--- a/homeassistant/components/unifiprotect/sensor.py
+++ b/homeassistant/components/unifiprotect/sensor.py
@@ -15,7 +15,6 @@
     ProtectDeviceModel,
     ProtectModelWithId,
     Sensor,
-    SmartDetectObjectType,
 )
 
 from homeassistant.components.sensor import (
@@ -528,10 +527,9 @@ def _get_alarm_sound(obj: Sensor) -> str:
         name="License Plate Detected",
         icon="mdi:car",
         translation_key="license_plate",
-        ufp_smart_type=SmartDetectObjectType.LICENSE_PLATE,
         ufp_value="is_smart_detected",
         ufp_required_field="can_detect_license_plate",
-        ufp_event_obj="last_smart_detect_event",
+        ufp_event_obj="last_license_plate_detect_event",
     ),
 )
 
@@ -767,8 +765,7 @@ def _async_update_device_from_protect(self, device: ProtectModelWithId) -> None:
         EventEntityMixin._async_update_device_from_protect(self, device)
         is_on = self.entity_description.get_is_on(device)
         is_license_plate = (
-            self.entity_description.ufp_smart_type
-            == SmartDetectObjectType.LICENSE_PLATE
+            self.entity_description.ufp_event_obj == "last_license_plate_detect_event"
         )
         if (
             not is_on
diff --git a/homeassistant/components/unifiprotect/strings.json b/homeassistant/components/unifiprotect/strings.json
index f8d578e1ca48b1..fc50e8141a1660 100644
--- a/homeassistant/components/unifiprotect/strings.json
+++ b/homeassistant/components/unifiprotect/strings.json
@@ -79,17 +79,6 @@
     "deprecate_smart_sensor": {
       "title": "Smart Detection Sensor Deprecated",
       "description": "The unified \"Detected Object\" sensor for smart detections is now deprecated. It has been replaced with individual smart detection binary sensors for each smart detection type.\n\nBelow are the detected automations or scripts that use one or more of the deprecated entities:\n{items}\nThe above list may be incomplete and it does not include any template usages inside of dashboards. Please update any templates, automations or scripts accordingly."
-    },
-    "deprecated_service_set_doorbell_message": {
-      "title": "set_doorbell_message is Deprecated",
-      "fix_flow": {
-        "step": {
-          "confirm": {
-            "title": "set_doorbell_message is Deprecated",
-            "description": "The `unifiprotect.set_doorbell_message` service is deprecated in favor of the new Doorbell Text entity added to each Doorbell device. It will be removed in v2023.3.0. Please update to use the [`text.set_value` service]({link})."
-          }
-        }
-      }
     }
   },
   "entity": {
diff --git a/homeassistant/components/unifiprotect/utils.py b/homeassistant/components/unifiprotect/utils.py
index 3152213cce8c21..e0c56cfd5fc486 100644
--- a/homeassistant/components/unifiprotect/utils.py
+++ b/homeassistant/components/unifiprotect/utils.py
@@ -38,21 +38,20 @@
     ModelType,
 )
 
+_SENTINEL = object()
+
 
 def get_nested_attr(obj: Any, attr: str) -> Any:
     """Fetch a nested attribute."""
-    attrs = attr.split(".")
-
-    value = obj
-    for key in attrs:
-        if not hasattr(value, key):
-            return None
-        value = getattr(value, key)
-
-    if isinstance(value, Enum):
-        value = value.value
-
-    return value
+    if "." not in attr:
+        value = getattr(obj, attr, None)
+    else:
+        value = obj
+        for key in attr.split("."):
+            if (value := getattr(value, key, _SENTINEL)) is _SENTINEL:
+                return None
+
+    return value.value if isinstance(value, Enum) else value
 
 
 @callback
diff --git a/homeassistant/components/universal/media_player.py b/homeassistant/components/universal/media_player.py
index fd73ad33e16fb6..68ce8e9b96c945 100644
--- a/homeassistant/components/universal/media_player.py
+++ b/homeassistant/components/universal/media_player.py
@@ -95,6 +95,7 @@
 
 ATTR_ACTIVE_CHILD = "active_child"
 
+CONF_ACTIVE_CHILD_TEMPLATE = "active_child_template"
 CONF_ATTRS = "attributes"
 CONF_CHILDREN = "children"
 CONF_COMMANDS = "commands"
@@ -128,6 +129,7 @@
         vol.Optional(CONF_BROWSE_MEDIA_ENTITY): cv.string,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+        vol.Optional(CONF_ACTIVE_CHILD_TEMPLATE): cv.template,
         vol.Optional(CONF_STATE_TEMPLATE): cv.template,
     },
     extra=vol.REMOVE_EXTRA,
@@ -161,6 +163,8 @@ def __init__(
         self.hass = hass
         self._name = config.get(CONF_NAME)
         self._children = config.get(CONF_CHILDREN)
+        self._active_child_template = config.get(CONF_ACTIVE_CHILD_TEMPLATE)
+        self._active_child_template_result = None
         self._cmds = config.get(CONF_COMMANDS)
         self._attrs = {}
         for key, val in config.get(CONF_ATTRS).items():
@@ -186,23 +190,35 @@ def _async_on_dependency_update(event):
 
         @callback
         def _async_on_template_update(event, updates):
-            """Update ha state when dependencies update."""
-            result = updates.pop().result
-
-            if isinstance(result, TemplateError):
-                self._state_template_result = None
-            else:
-                self._state_template_result = result
+            """Update state when template state changes."""
+            for data in updates:
+                template = data.template
+                result = data.result
+
+                if template == self._state_template:
+                    self._state_template_result = (
+                        None if isinstance(result, TemplateError) else result
+                    )
+                if template == self._active_child_template:
+                    self._active_child_template_result = (
+                        None if isinstance(result, TemplateError) else result
+                    )
 
             if event:
                 self.async_set_context(event.context)
 
             self.async_schedule_update_ha_state(True)
 
-        if self._state_template is not None:
+        track_templates: list[TrackTemplate] = []
+        if self._state_template:
+            track_templates.append(TrackTemplate(self._state_template, None))
+        if self._active_child_template:
+            track_templates.append(TrackTemplate(self._active_child_template, None))
+
+        if track_templates:
             result = async_track_template_result(
                 self.hass,
-                [TrackTemplate(self._state_template, None)],
+                track_templates,
                 _async_on_template_update,
             )
             self.hass.bus.async_listen_once(
@@ -644,6 +660,9 @@ async def async_browse_media(
 
     async def async_update(self) -> None:
         """Update state in HA."""
+        if self._active_child_template_result:
+            self._child_state = self.hass.states.get(self._active_child_template_result)
+            return
         self._child_state = None
         for child_name in self._children:
             if (child_state := self.hass.states.get(child_name)) and (
diff --git a/homeassistant/components/upb/light.py b/homeassistant/components/upb/light.py
index 47680714d1901c..4a71789423ffd7 100644
--- a/homeassistant/components/upb/light.py
+++ b/homeassistant/components/upb/light.py
@@ -49,9 +49,10 @@ async def async_setup_entry(
 
 
 class UpbLight(UpbAttachedEntity, LightEntity):
-    """Representation of an UPB Light."""
+    """Representation of a UPB Light."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, element, unique_id, upb):
         """Initialize an UpbLight."""
diff --git a/homeassistant/components/upb/manifest.json b/homeassistant/components/upb/manifest.json
index 00cebe1e0d916d..240660ac89fdc3 100644
--- a/homeassistant/components/upb/manifest.json
+++ b/homeassistant/components/upb/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/upb",
   "iot_class": "local_push",
   "loggers": ["upb_lib"],
-  "requirements": ["upb_lib==0.5.4"]
+  "requirements": ["upb-lib==0.5.4"]
 }
diff --git a/homeassistant/components/upb/scene.py b/homeassistant/components/upb/scene.py
index fe6f07199c4f8f..d1272b7a1f6fb5 100644
--- a/homeassistant/components/upb/scene.py
+++ b/homeassistant/components/upb/scene.py
@@ -47,7 +47,7 @@ async def async_setup_entry(
 
 
 class UpbLink(UpbEntity, Scene):
-    """Representation of an UPB Link."""
+    """Representation of a UPB Link."""
 
     def __init__(self, element, unique_id, upb):
         """Initialize the base of all UPB devices."""
diff --git a/homeassistant/components/update/__init__.py b/homeassistant/components/update/__init__.py
index 3c8a30d5b4f573..e0244034865d48 100644
--- a/homeassistant/components/update/__init__.py
+++ b/homeassistant/components/update/__init__.py
@@ -236,9 +236,6 @@ def entity_picture(self) -> str | None:
         Update entities return the brand icon based on the integration
         domain by default.
         """
-        if self.platform is None:
-            return None
-
         return (
             f"https://brands.home-assistant.io/_/{self.platform.platform_name}/icon.png"
         )
diff --git a/homeassistant/components/update/strings.json b/homeassistant/components/update/strings.json
index 776c2c59a3a747..b69e0acf65e5f2 100644
--- a/homeassistant/components/update/strings.json
+++ b/homeassistant/components/update/strings.json
@@ -12,7 +12,7 @@
       "name": "[%key:component::update::title%]"
     },
     "firmware": {
-      "name": "firmware"
+      "name": "Firmware"
     }
   }
 }
diff --git a/homeassistant/components/uptime/sensor.py b/homeassistant/components/uptime/sensor.py
index f3b215356e59ad..56d570110b00bb 100644
--- a/homeassistant/components/uptime/sensor.py
+++ b/homeassistant/components/uptime/sensor.py
@@ -26,6 +26,7 @@ class UptimeSensor(SensorEntity):
 
     _attr_device_class = SensorDeviceClass.TIMESTAMP
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
 
     def __init__(self, entry: ConfigEntry) -> None:
diff --git a/homeassistant/components/usb/__init__.py b/homeassistant/components/usb/__init__.py
index c6a18a27b422d1..b2358a4b0bd3db 100644
--- a/homeassistant/components/usb/__init__.py
+++ b/homeassistant/components/usb/__init__.py
@@ -24,7 +24,7 @@
     callback as hass_callback,
 )
 from homeassistant.data_entry_flow import BaseServiceInfo
-from homeassistant.helpers import discovery_flow, system_info
+from homeassistant.helpers import config_validation as cv, discovery_flow, system_info
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import USBMatcher, async_get_usb
@@ -47,6 +47,8 @@
     "UsbServiceInfo",
 ]
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 class USBCallbackMatcher(USBMatcher):
     """Callback matcher for the USB integration."""
@@ -298,8 +300,7 @@ def _async_remove_callback() -> None:
 
         return _async_remove_callback
 
-    @hass_callback
-    def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
+    async def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
         """Process a USB discovery."""
         _LOGGER.debug("Discovered USB Device: %s", device)
         device_tuple = dataclasses.astuple(device)
@@ -311,14 +312,7 @@ def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
         if not matched:
             return
 
-        service_info = UsbServiceInfo(
-            device=device.device,
-            vid=device.vid,
-            pid=device.pid,
-            serial_number=device.serial_number,
-            manufacturer=device.manufacturer,
-            description=device.description,
-        )
+        service_info: UsbServiceInfo | None = None
 
         sorted_by_most_targeted = sorted(matched, key=lambda item: -len(item))
         most_matched_fields = len(sorted_by_most_targeted[0])
@@ -329,6 +323,18 @@ def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
             if len(matcher) < most_matched_fields:
                 break
 
+            if service_info is None:
+                service_info = UsbServiceInfo(
+                    device=await self.hass.async_add_executor_job(
+                        get_serial_by_id, device.device
+                    ),
+                    vid=device.vid,
+                    pid=device.pid,
+                    serial_number=device.serial_number,
+                    manufacturer=device.manufacturer,
+                    description=device.description,
+                )
+
             discovery_flow.async_create_flow(
                 self.hass,
                 matcher["domain"],
@@ -336,17 +342,18 @@ def _async_process_discovered_usb_device(self, device: USBDevice) -> None:
                 service_info,
             )
 
-    @hass_callback
-    def _async_process_ports(self, ports: list[ListPortInfo]) -> None:
+    async def _async_process_ports(self, ports: list[ListPortInfo]) -> None:
         """Process each discovered port."""
         for port in ports:
             if port.vid is None and port.pid is None:
                 continue
-            self._async_process_discovered_usb_device(usb_device_from_port(port))
+            await self._async_process_discovered_usb_device(usb_device_from_port(port))
 
     async def _async_scan_serial(self) -> None:
         """Scan serial ports."""
-        self._async_process_ports(await self.hass.async_add_executor_job(comports))
+        await self._async_process_ports(
+            await self.hass.async_add_executor_job(comports)
+        )
         if self.initial_scan_done:
             return
 
diff --git a/homeassistant/components/usgs_earthquakes_feed/manifest.json b/homeassistant/components/usgs_earthquakes_feed/manifest.json
index 09ff6c106dffcf..6dbe43cb4e3cb1 100644
--- a/homeassistant/components/usgs_earthquakes_feed/manifest.json
+++ b/homeassistant/components/usgs_earthquakes_feed/manifest.json
@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aio_geojson_usgs_earthquakes"],
-  "requirements": ["aio_geojson_usgs_earthquakes==0.2"]
+  "requirements": ["aio-geojson-usgs-earthquakes==0.2"]
 }
diff --git a/homeassistant/components/utility_meter/__init__.py b/homeassistant/components/utility_meter/__init__.py
index 11e58fca775c8a..ffe6d7f5433bb3 100644
--- a/homeassistant/components/utility_meter/__init__.py
+++ b/homeassistant/components/utility_meter/__init__.py
@@ -10,7 +10,11 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, CONF_UNIQUE_ID, Platform
 from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.helpers import discovery, entity_registry as er
+from homeassistant.helpers import (
+    device_registry as dr,
+    discovery,
+    entity_registry as er,
+)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
@@ -182,7 +186,9 @@ async def async_reset_meters(service_call):
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Utility Meter from a config entry."""
     entity_registry = er.async_get(hass)
-    hass.data[DATA_UTILITY][entry.entry_id] = {}
+    hass.data[DATA_UTILITY][entry.entry_id] = {
+        "source": entry.options[CONF_SOURCE_SENSOR],
+    }
     hass.data[DATA_UTILITY][entry.entry_id][DATA_TARIFF_SENSORS] = []
 
     try:
@@ -218,8 +224,23 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Update listener, called when the config entry options are changed."""
+    old_source = hass.data[DATA_UTILITY][entry.entry_id]["source"]
     await hass.config_entries.async_reload(entry.entry_id)
 
+    if old_source == entry.options[CONF_SOURCE_SENSOR]:
+        return
+
+    entity_registry = er.async_get(hass)
+    device_registry = dr.async_get(hass)
+
+    old_source_entity = entity_registry.async_get(old_source)
+    if not old_source_entity or not old_source_entity.device_id:
+        return
+
+    device_registry.async_update_device(
+        old_source_entity.device_id, remove_config_entry_id=entry.entry_id
+    )
+
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
diff --git a/homeassistant/components/utility_meter/select.py b/homeassistant/components/utility_meter/select.py
index 55845569af02ae..cf2a6da9e08afe 100644
--- a/homeassistant/components/utility_meter/select.py
+++ b/homeassistant/components/utility_meter/select.py
@@ -7,11 +7,22 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+)
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import CONF_METER, CONF_TARIFFS, DATA_UTILITY, TARIFF_ICON
+from .const import (
+    CONF_METER,
+    CONF_SOURCE_SENSOR,
+    CONF_TARIFFS,
+    DATA_UTILITY,
+    TARIFF_ICON,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,7 +37,36 @@ async def async_setup_entry(
     tariffs: list[str] = config_entry.options[CONF_TARIFFS]
 
     unique_id = config_entry.entry_id
-    tariff_select = TariffSelect(name, tariffs, unique_id)
+
+    registry = er.async_get(hass)
+    source_entity = registry.async_get(config_entry.options[CONF_SOURCE_SENSOR])
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
+    tariff_select = TariffSelect(
+        name,
+        tariffs,
+        unique_id,
+        device_info=device_info,
+    )
     async_add_entities([tariff_select])
 
 
@@ -63,10 +103,17 @@ async def async_setup_platform(
 class TariffSelect(SelectEntity, RestoreEntity):
     """Representation of a Tariff selector."""
 
-    def __init__(self, name, tariffs, unique_id):
+    def __init__(
+        self,
+        name,
+        tariffs,
+        unique_id,
+        device_info: DeviceInfo | None = None,
+    ) -> None:
         """Initialize a tariff selector."""
         self._attr_name = name
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self._current_tariff: str | None = None
         self._tariffs = tariffs
         self._attr_icon = TARIFF_ICON
diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py
index 050e801f0566c1..f52b78b5a5269b 100644
--- a/homeassistant/components/utility_meter/sensor.py
+++ b/homeassistant/components/utility_meter/sensor.py
@@ -28,8 +28,13 @@
     UnitOfEnergy,
 )
 from homeassistant.core import Event, HomeAssistant, State, callback
-from homeassistant.helpers import entity_platform, entity_registry as er
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_platform,
+    entity_registry as er,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
     async_track_point_in_time,
@@ -120,6 +125,28 @@ async def async_setup_entry(
         registry, config_entry.options[CONF_SOURCE_SENSOR]
     )
 
+    source_entity = registry.async_get(source_entity_id)
+    dev_reg = dr.async_get(hass)
+    # Resolve source entity device
+    if (
+        (source_entity is not None)
+        and (source_entity.device_id is not None)
+        and (
+            (
+                device := dev_reg.async_get(
+                    device_id=source_entity.device_id,
+                )
+            )
+            is not None
+        )
+    ):
+        device_info = DeviceInfo(
+            identifiers=device.identifiers,
+            connections=device.connections,
+        )
+    else:
+        device_info = None
+
     cron_pattern = None
     delta_values = config_entry.options[CONF_METER_DELTA_VALUES]
     meter_offset = timedelta(days=config_entry.options[CONF_METER_OFFSET])
@@ -149,6 +176,7 @@ async def async_setup_entry(
             tariff_entity=tariff_entity,
             tariff=None,
             unique_id=entry_id,
+            device_info=device_info,
         )
         meters.append(meter_sensor)
         hass.data[DATA_UTILITY][entry_id][DATA_TARIFF_SENSORS].append(meter_sensor)
@@ -168,6 +196,7 @@ async def async_setup_entry(
                 tariff_entity=tariff_entity,
                 tariff=tariff,
                 unique_id=f"{entry_id}_{tariff}",
+                device_info=device_info,
             )
             meters.append(meter_sensor)
             hass.data[DATA_UTILITY][entry_id][DATA_TARIFF_SENSORS].append(meter_sensor)
@@ -341,9 +370,11 @@ def __init__(
         tariff,
         unique_id,
         suggested_entity_id=None,
+        device_info=None,
     ):
         """Initialize the Utility Meter sensor."""
         self._attr_unique_id = unique_id
+        self._attr_device_info = device_info
         self.entity_id = suggested_entity_id
         self._parent_meter = parent_meter
         self._sensor_source_id = source_entity
@@ -411,7 +442,7 @@ def calculate_adjustment(
         if (old_state_val := self._validate_state(old_state)) is not None:
             return new_state_val - old_state_val
 
-        _LOGGER.warning(
+        _LOGGER.debug(
             "%s received an invalid state change coming from %s (%s > %s)",
             self.name,
             self._sensor_source_id,
diff --git a/homeassistant/components/vacuum/device_action.py b/homeassistant/components/vacuum/device_action.py
index 9b53c761247728..0f212235673c19 100644
--- a/homeassistant/components/vacuum/device_action.py
+++ b/homeassistant/components/vacuum/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -19,14 +20,21 @@
 
 ACTION_TYPES = {"clean", "dock"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -42,7 +50,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "clean"})
@@ -58,8 +66,6 @@ async def async_call_action_from_config(
     context: Context | None,
 ) -> None:
     """Execute a device action."""
-    config = ACTION_SCHEMA(config)
-
     service_data = {ATTR_ENTITY_ID: config[CONF_ENTITY_ID]}
 
     if config[CONF_TYPE] == "clean":
diff --git a/homeassistant/components/vacuum/device_condition.py b/homeassistant/components/vacuum/device_condition.py
index cf5b093466395d..8b7227e788e2a6 100644
--- a/homeassistant/components/vacuum/device_condition.py
+++ b/homeassistant/components/vacuum/device_condition.py
@@ -4,7 +4,6 @@
 import voluptuous as vol
 
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     CONF_CONDITION,
     CONF_DEVICE_ID,
     CONF_DOMAIN,
@@ -26,7 +25,7 @@
 
 CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
     }
 )
@@ -48,7 +47,7 @@ async def async_get_conditions(
             CONF_CONDITION: "device",
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
@@ -66,9 +65,15 @@ def async_condition_from_config(
     else:
         test_states = [STATE_CLEANING, STATE_RETURNING]
 
+    registry = er.async_get(hass)
+    entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
+
     def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
         """Test if an entity is a certain state."""
-        state = hass.states.get(config[ATTR_ENTITY_ID])
-        return state is not None and state.state in test_states
+        return (
+            entity_id is not None
+            and (state := hass.states.get(entity_id)) is not None
+            and state.state in test_states
+        )
 
     return test_is_state
diff --git a/homeassistant/components/vacuum/device_trigger.py b/homeassistant/components/vacuum/device_trigger.py
index 6a2646922b67ad..95c1938ccfa9aa 100644
--- a/homeassistant/components/vacuum/device_trigger.py
+++ b/homeassistant/components/vacuum/device_trigger.py
@@ -24,7 +24,7 @@
 
 TRIGGER_SCHEMA = DEVICE_TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
         vol.Required(CONF_TYPE): vol.In(TRIGGER_TYPES),
         vol.Optional(CONF_FOR): cv.positive_time_period_dict,
     }
@@ -48,7 +48,7 @@ async def async_get_triggers(
                 CONF_PLATFORM: "device",
                 CONF_DEVICE_ID: device_id,
                 CONF_DOMAIN: DOMAIN,
-                CONF_ENTITY_ID: entry.entity_id,
+                CONF_ENTITY_ID: entry.id,
                 CONF_TYPE: trigger,
             }
             for trigger in TRIGGER_TYPES
diff --git a/homeassistant/components/vallox/sensor.py b/homeassistant/components/vallox/sensor.py
index a6158ea21d44c5..a4f6563798dac9 100644
--- a/homeassistant/components/vallox/sensor.py
+++ b/homeassistant/components/vallox/sensor.py
@@ -21,7 +21,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import ValloxDataUpdateCoordinator, ValloxEntity
 from .const import (
@@ -108,7 +108,7 @@ def native_value(self) -> StateType | datetime:
 
         return datetime.combine(
             next_filter_change_date,
-            time(hour=13, minute=0, second=0, tzinfo=dt.DEFAULT_TIME_ZONE),
+            time(hour=13, minute=0, second=0, tzinfo=dt_util.DEFAULT_TIME_ZONE),
         )
 
 
diff --git a/homeassistant/components/velbus/config_flow.py b/homeassistant/components/velbus/config_flow.py
index e0394e4787cfb7..5c35303f8597c1 100644
--- a/homeassistant/components/velbus/config_flow.py
+++ b/homeassistant/components/velbus/config_flow.py
@@ -74,9 +74,7 @@ async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult
         await self.async_set_unique_id(
             f"{discovery_info.vid}:{discovery_info.pid}_{discovery_info.serial_number}_{discovery_info.manufacturer}_{discovery_info.description}"
         )
-        dev_path = await self.hass.async_add_executor_job(
-            usb.get_serial_by_id, discovery_info.device
-        )
+        dev_path = discovery_info.device
         # check if this device is not already configured
         self._async_abort_entries_match({CONF_PORT: dev_path})
         # check if we can make a valid velbus connection
diff --git a/homeassistant/components/venstar/__init__.py b/homeassistant/components/venstar/__init__.py
index 3f31c417a02cb1..48760a8bfc0811 100644
--- a/homeassistant/components/venstar/__init__.py
+++ b/homeassistant/components/venstar/__init__.py
@@ -123,8 +123,6 @@ async def _async_update_data(self) -> None:
                 f"Exception during Venstar runtime update: {ex}"
             ) from ex
 
-        return None
-
 
 class VenstarEntity(CoordinatorEntity[VenstarDataUpdateCoordinator]):
     """Representation of a Venstar entity."""
diff --git a/homeassistant/components/verisure/alarm_control_panel.py b/homeassistant/components/verisure/alarm_control_panel.py
index 9615404a9a6ce5..284b8d6b00aee2 100644
--- a/homeassistant/components/verisure/alarm_control_panel.py
+++ b/homeassistant/components/verisure/alarm_control_panel.py
@@ -35,6 +35,7 @@ class VerisureAlarm(
 
     _attr_code_format = CodeFormat.NUMBER
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_supported_features = (
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
diff --git a/homeassistant/components/verisure/config_flow.py b/homeassistant/components/verisure/config_flow.py
index 9392cdd9bc1222..1fcf0eb9de2921 100644
--- a/homeassistant/components/verisure/config_flow.py
+++ b/homeassistant/components/verisure/config_flow.py
@@ -329,7 +329,7 @@ async def async_step_init(
                     ): int,
                     vol.Optional(
                         CONF_LOCK_DEFAULT_CODE,
-                        default=self.entry.options.get(CONF_LOCK_DEFAULT_CODE),
+                        default=self.entry.options.get(CONF_LOCK_DEFAULT_CODE, ""),
                     ): str,
                 }
             ),
diff --git a/homeassistant/components/verisure/sensor.py b/homeassistant/components/verisure/sensor.py
index 7c9639b65423ff..a4f4d1b4e43109 100644
--- a/homeassistant/components/verisure/sensor.py
+++ b/homeassistant/components/verisure/sensor.py
@@ -47,7 +47,6 @@ class VerisureThermometer(
 
     _attr_device_class = SensorDeviceClass.TEMPERATURE
     _attr_has_entity_name = True
-    _attr_translation_key = "temperature"
     _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS
     _attr_state_class = SensorStateClass.MEASUREMENT
 
@@ -99,7 +98,6 @@ class VerisureHygrometer(
 
     _attr_device_class = SensorDeviceClass.HUMIDITY
     _attr_has_entity_name = True
-    _attr_translation_key = "humidity"
     _attr_native_unit_of_measurement = PERCENTAGE
     _attr_state_class = SensorStateClass.MEASUREMENT
 
diff --git a/homeassistant/components/verisure/strings.json b/homeassistant/components/verisure/strings.json
index 17feb4a7fe9e3d..85b3f4015b54bd 100644
--- a/homeassistant/components/verisure/strings.json
+++ b/homeassistant/components/verisure/strings.json
@@ -62,14 +62,6 @@
       "ethernet": {
         "name": "Ethernet status"
       }
-    },
-    "sensor": {
-      "humidity": {
-        "name": "[%key:component::sensor::entity_component::humidity::name%]"
-      },
-      "temperature": {
-        "name": "[%key:component::sensor::entity_component::temperature::name%]"
-      }
     }
   }
 }
diff --git a/homeassistant/components/verisure/switch.py b/homeassistant/components/verisure/switch.py
index 62e9bdf6cf80b0..6c3dcd81295dfe 100644
--- a/homeassistant/components/verisure/switch.py
+++ b/homeassistant/components/verisure/switch.py
@@ -32,6 +32,7 @@ class VerisureSmartplug(CoordinatorEntity[VerisureDataUpdateCoordinator], Switch
     """Representation of a Verisure smartplug."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self, coordinator: VerisureDataUpdateCoordinator, serial_number: str
diff --git a/homeassistant/components/vesync/common.py b/homeassistant/components/vesync/common.py
index 752a65ff051dca..f0684b6b01dfa7 100644
--- a/homeassistant/components/vesync/common.py
+++ b/homeassistant/components/vesync/common.py
@@ -85,7 +85,7 @@ def device_info(self) -> DeviceInfo:
             identifiers={(DOMAIN, self.base_unique_id)},
             name=self.base_name,
             model=self.device.device_type,
-            default_manufacturer="VeSync",
+            manufacturer="VeSync",
             sw_version=self.device.current_firm_version,
         )
 
diff --git a/homeassistant/components/vilfo/manifest.json b/homeassistant/components/vilfo/manifest.json
index 4b82bba83cd954..850d4fecb27a78 100644
--- a/homeassistant/components/vilfo/manifest.json
+++ b/homeassistant/components/vilfo/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/vilfo",
   "iot_class": "local_polling",
   "loggers": ["vilfo"],
-  "requirements": ["vilfo-api-client==0.3.2"]
+  "requirements": ["vilfo-api-client==0.4.1"]
 }
diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py
index bf52f053b3257a..a989cea488f8e5 100644
--- a/homeassistant/components/vizio/media_player.py
+++ b/homeassistant/components/vizio/media_player.py
@@ -131,8 +131,6 @@ async def async_setup_entry(
 class VizioDevice(MediaPlayerEntity):
     """Media Player implementation which performs REST requests to device."""
 
-    _attr_name: str
-
     def __init__(
         self,
         config_entry: ConfigEntry,
diff --git a/homeassistant/components/voicerss/tts.py b/homeassistant/components/voicerss/tts.py
index 2525393739b169..072e0ee431dd3d 100644
--- a/homeassistant/components/voicerss/tts.py
+++ b/homeassistant/components/voicerss/tts.py
@@ -187,7 +187,7 @@ def supported_languages(self):
         """Return list of supported languages."""
         return SUPPORT_LANGUAGES
 
-    async def async_get_tts_audio(self, message, language, options=None):
+    async def async_get_tts_audio(self, message, language, options):
         """Load TTS from VoiceRSS."""
         websession = async_get_clientsession(self.hass)
         form_data = self._form_data.copy()
diff --git a/homeassistant/components/voip/manifest.json b/homeassistant/components/voip/manifest.json
index 345480da363f47..594abc69c13b64 100644
--- a/homeassistant/components/voip/manifest.json
+++ b/homeassistant/components/voip/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/voip",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["voip-utils==0.0.7"]
+  "requirements": ["voip-utils==0.1.0"]
 }
diff --git a/homeassistant/components/voip/select.py b/homeassistant/components/voip/select.py
index 7383e1b886a6b2..94a3aacc0fd1cc 100644
--- a/homeassistant/components/voip/select.py
+++ b/homeassistant/components/voip/select.py
@@ -4,7 +4,10 @@
 
 from typing import TYPE_CHECKING
 
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -28,13 +31,18 @@ async def async_setup_entry(
     @callback
     def async_add_device(device: VoIPDevice) -> None:
         """Add device."""
-        async_add_entities([VoipPipelineSelect(hass, device)])
+        async_add_entities(
+            [VoipPipelineSelect(hass, device), VoipVadSensitivitySelect(hass, device)]
+        )
 
     domain_data.devices.async_add_new_device_listener(async_add_device)
 
-    async_add_entities(
-        [VoipPipelineSelect(hass, device) for device in domain_data.devices]
-    )
+    entities: list[VoIPEntity] = []
+    for device in domain_data.devices:
+        entities.append(VoipPipelineSelect(hass, device))
+        entities.append(VoipVadSensitivitySelect(hass, device))
+
+    async_add_entities(entities)
 
 
 class VoipPipelineSelect(VoIPEntity, AssistPipelineSelect):
@@ -44,3 +52,12 @@ def __init__(self, hass: HomeAssistant, device: VoIPDevice) -> None:
         """Initialize a pipeline selector."""
         VoIPEntity.__init__(self, device)
         AssistPipelineSelect.__init__(self, hass, device.voip_id)
+
+
+class VoipVadSensitivitySelect(VoIPEntity, VadSensitivitySelect):
+    """VAD sensitivity selector for VoIP devices."""
+
+    def __init__(self, hass: HomeAssistant, device: VoIPDevice) -> None:
+        """Initialize a VAD sensitivity selector."""
+        VoIPEntity.__init__(self, device)
+        VadSensitivitySelect.__init__(self, hass, device.voip_id)
diff --git a/homeassistant/components/voip/strings.json b/homeassistant/components/voip/strings.json
index 2bef9a18008ee1..8bcbb06d4e212a 100644
--- a/homeassistant/components/voip/strings.json
+++ b/homeassistant/components/voip/strings.json
@@ -26,6 +26,14 @@
         "state": {
           "preferred": "[%key:component::assist_pipeline::entity::select::pipeline::state::preferred%]"
         }
+      },
+      "vad_sensitivity": {
+        "name": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::name%]",
+        "state": {
+          "default": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::default%]",
+          "aggressive": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::aggressive%]",
+          "relaxed": "[%key:component::assist_pipeline::entity::select::vad_sensitivity::state::relaxed%]"
+        }
       }
     }
   },
diff --git a/homeassistant/components/voip/voip.py b/homeassistant/components/voip/voip.py
index 8b96941e00a00b..3d0681a847566c 100644
--- a/homeassistant/components/voip/voip.py
+++ b/homeassistant/components/voip/voip.py
@@ -11,23 +11,39 @@
 from typing import TYPE_CHECKING
 
 import async_timeout
-from voip_utils import CallInfo, RtpDatagramProtocol, SdpInfo, VoipDatagramProtocol
+from voip_utils import (
+    CallInfo,
+    RtcpState,
+    RtpDatagramProtocol,
+    SdpInfo,
+    VoipDatagramProtocol,
+)
 
 from homeassistant.components import stt, tts
 from homeassistant.components.assist_pipeline import (
     Pipeline,
     PipelineEvent,
     PipelineEventType,
+    PipelineNotFound,
     async_get_pipeline,
     async_pipeline_from_audio_stream,
     select as pipeline_select,
 )
-from homeassistant.components.assist_pipeline.vad import VoiceCommandSegmenter
+from homeassistant.components.assist_pipeline.vad import (
+    VadSensitivity,
+    VoiceCommandSegmenter,
+)
 from homeassistant.const import __version__
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.util.ulid import ulid
 
-from .const import CHANNELS, DOMAIN, RATE, RTP_AUDIO_SETTINGS, WIDTH
+from .const import (
+    CHANNELS,
+    DOMAIN,
+    RATE,
+    RTP_AUDIO_SETTINGS,
+    WIDTH,
+)
 
 if TYPE_CHECKING:
     from .devices import VoIPDevice, VoIPDevices
@@ -36,7 +52,10 @@
 
 
 def make_protocol(
-    hass: HomeAssistant, devices: VoIPDevices, call_info: CallInfo
+    hass: HomeAssistant,
+    devices: VoIPDevices,
+    call_info: CallInfo,
+    rtcp_state: RtcpState | None = None,
 ) -> VoipDatagramProtocol:
     """Plays a pre-recorded message if pipeline is misconfigured."""
     voip_device = devices.async_get_or_create(call_info)
@@ -45,7 +64,11 @@ def make_protocol(
         DOMAIN,
         voip_device.voip_id,
     )
-    pipeline = async_get_pipeline(hass, pipeline_id)
+    try:
+        pipeline: Pipeline | None = async_get_pipeline(hass, pipeline_id)
+    except PipelineNotFound:
+        pipeline = None
+
     if (
         (pipeline is None)
         or (pipeline.stt_engine is None)
@@ -56,8 +79,15 @@ def make_protocol(
             hass,
             "problem.pcm",
             opus_payload_type=call_info.opus_payload_type,
+            rtcp_state=rtcp_state,
         )
 
+    vad_sensitivity = pipeline_select.get_vad_sensitivity(
+        hass,
+        DOMAIN,
+        voip_device.voip_id,
+    )
+
     # Pipeline is properly configured
     return PipelineRtpDatagramProtocol(
         hass,
@@ -65,6 +95,8 @@ def make_protocol(
         voip_device,
         Context(user_id=devices.config_entry.data["user"]),
         opus_payload_type=call_info.opus_payload_type,
+        silence_seconds=VadSensitivity.to_seconds(vad_sensitivity),
+        rtcp_state=rtcp_state,
     )
 
 
@@ -80,13 +112,14 @@ def __init__(self, hass: HomeAssistant, devices: VoIPDevices) -> None:
                 session_name="voip_hass",
                 version=__version__,
             ),
-            valid_protocol_factory=lambda call_info: make_protocol(
-                hass, devices, call_info
+            valid_protocol_factory=lambda call_info, rtcp_state: make_protocol(
+                hass, devices, call_info, rtcp_state
             ),
-            invalid_protocol_factory=lambda call_info: PreRecordMessageProtocol(
+            invalid_protocol_factory=lambda call_info, rtcp_state: PreRecordMessageProtocol(
                 hass,
                 "not_configured.pcm",
                 opus_payload_type=call_info.opus_payload_type,
+                rtcp_state=rtcp_state,
             ),
         )
         self.hass = hass
@@ -125,6 +158,8 @@ def __init__(
         error_tone_enabled: bool = True,
         tone_delay: float = 0.2,
         tts_extra_timeout: float = 1.0,
+        silence_seconds: float = 1.0,
+        rtcp_state: RtcpState | None = None,
     ) -> None:
         """Set up pipeline RTP server."""
         super().__init__(
@@ -132,6 +167,7 @@ def __init__(
             width=WIDTH,
             channels=CHANNELS,
             opus_payload_type=opus_payload_type,
+            rtcp_state=rtcp_state,
         )
 
         self.hass = hass
@@ -146,6 +182,7 @@ def __init__(
         self.error_tone_enabled = error_tone_enabled
         self.tone_delay = tone_delay
         self.tts_extra_timeout = tts_extra_timeout
+        self.silence_seconds = silence_seconds
 
         self._audio_queue: asyncio.Queue[bytes] = asyncio.Queue()
         self._context = context
@@ -194,7 +231,7 @@ async def _run_pipeline(
 
         try:
             # Wait for speech before starting pipeline
-            segmenter = VoiceCommandSegmenter()
+            segmenter = VoiceCommandSegmenter(silence_seconds=self.silence_seconds)
             chunk_buffer: deque[bytes] = deque(
                 maxlen=self.buffered_chunks_before_speech,
             )
@@ -246,6 +283,7 @@ async def stt_stream():
                         self.hass, DOMAIN, self.voip_device.voip_id
                     ),
                     conversation_id=self._conversation_id,
+                    device_id=self.voip_device.device_id,
                     tts_audio_output="raw",
                 )
 
@@ -261,6 +299,8 @@ async def stt_stream():
                 await self._tts_done.wait()
 
             _LOGGER.debug("Pipeline finished")
+        except PipelineNotFound:
+            _LOGGER.warning("Pipeline not found")
         except asyncio.TimeoutError:
             # Expected after caller hangs up
             _LOGGER.debug("Pipeline timeout")
@@ -285,13 +325,13 @@ async def _wait_for_speech(
             chunk = await self._audio_queue.get()
 
         while chunk:
+            chunk_buffer.append(chunk)
+
             segmenter.process(chunk)
             if segmenter.in_command:
+                # Buffer until command starts
                 return True
 
-            # Buffer until command starts
-            chunk_buffer.append(chunk)
-
             async with async_timeout.timeout(self.audio_timeout):
                 chunk = await self._audio_queue.get()
 
@@ -428,6 +468,7 @@ def __init__(
         opus_payload_type: int,
         message_delay: float = 1.0,
         loop_delay: float = 2.0,
+        rtcp_state: RtcpState | None = None,
     ) -> None:
         """Set up RTP server."""
         super().__init__(
@@ -435,6 +476,7 @@ def __init__(
             width=WIDTH,
             channels=CHANNELS,
             opus_payload_type=opus_payload_type,
+            rtcp_state=rtcp_state,
         )
         self.hass = hass
         self.file_name = file_name
diff --git a/homeassistant/components/w800rf32/__init__.py b/homeassistant/components/w800rf32/__init__.py
index 88aaa934a7b7b7..29701ec82ab087 100644
--- a/homeassistant/components/w800rf32/__init__.py
+++ b/homeassistant/components/w800rf32/__init__.py
@@ -1,8 +1,8 @@
 """Support for w800rf32 devices."""
 import logging
 
-import W800rf32 as w800
 import voluptuous as vol
+import W800rf32 as w800
 
 from homeassistant.const import (
     CONF_DEVICE,
diff --git a/homeassistant/components/w800rf32/binary_sensor.py b/homeassistant/components/w800rf32/binary_sensor.py
index 04007469992965..6d1ce5c61c0ef7 100644
--- a/homeassistant/components/w800rf32/binary_sensor.py
+++ b/homeassistant/components/w800rf32/binary_sensor.py
@@ -3,8 +3,8 @@
 
 import logging
 
-import W800rf32 as w800
 import voluptuous as vol
+import W800rf32 as w800
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASSES_SCHEMA,
diff --git a/homeassistant/components/wake_on_lan/__init__.py b/homeassistant/components/wake_on_lan/__init__.py
index aae640381a2d3a..54809d6cec3c0e 100644
--- a/homeassistant/components/wake_on_lan/__init__.py
+++ b/homeassistant/components/wake_on_lan/__init__.py
@@ -24,6 +24,8 @@
     }
 )
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the wake on LAN component."""
diff --git a/homeassistant/components/waqi/manifest.json b/homeassistant/components/waqi/manifest.json
index d1c75217830b21..e5630d5fd29779 100644
--- a/homeassistant/components/waqi/manifest.json
+++ b/homeassistant/components/waqi/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/waqi",
   "iot_class": "cloud_polling",
   "loggers": ["waqiasync"],
-  "requirements": ["waqiasync==1.0.0"]
+  "requirements": ["waqiasync==1.1.0"]
 }
diff --git a/homeassistant/components/water_heater/device_action.py b/homeassistant/components/water_heater/device_action.py
index 8ae75527abcd75..5b0fe46934cee0 100644
--- a/homeassistant/components/water_heater/device_action.py
+++ b/homeassistant/components/water_heater/device_action.py
@@ -3,6 +3,7 @@
 
 import voluptuous as vol
 
+from homeassistant.components.device_automation import async_validate_entity_schema
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_DEVICE_ID,
@@ -21,14 +22,21 @@
 
 ACTION_TYPES = {"turn_on", "turn_off"}
 
-ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+_ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
-        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+        vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
     }
 )
 
 
+async def async_validate_action_config(
+    hass: HomeAssistant, config: ConfigType
+) -> ConfigType:
+    """Validate config."""
+    return async_validate_entity_schema(hass, config, _ACTION_SCHEMA)
+
+
 async def async_get_actions(
     hass: HomeAssistant, device_id: str
 ) -> list[dict[str, str]]:
@@ -43,7 +51,7 @@ async def async_get_actions(
         base_action = {
             CONF_DEVICE_ID: device_id,
             CONF_DOMAIN: DOMAIN,
-            CONF_ENTITY_ID: entry.entity_id,
+            CONF_ENTITY_ID: entry.id,
         }
 
         actions.append({**base_action, CONF_TYPE: "turn_on"})
diff --git a/homeassistant/components/watson_tts/tts.py b/homeassistant/components/watson_tts/tts.py
index 08e910feae7259..7af6c1ce97bf29 100644
--- a/homeassistant/components/watson_tts/tts.py
+++ b/homeassistant/components/watson_tts/tts.py
@@ -180,7 +180,7 @@ def supported_options(self):
         """Return a list of supported options."""
         return [CONF_VOICE]
 
-    def get_tts_audio(self, message, language=None, options=None):
+    def get_tts_audio(self, message, language, options):
         """Request TTS file from Watson TTS."""
         response = self.service.synthesize(
             text=message, accept=self.output_format, voice=options[CONF_VOICE]
diff --git a/homeassistant/components/weather/__init__.py b/homeassistant/components/weather/__init__.py
index 0a99b6aaaf7e42..c4a6a0ad777c3e 100644
--- a/homeassistant/components/weather/__init__.py
+++ b/homeassistant/components/weather/__init__.py
@@ -30,6 +30,9 @@
 from homeassistant.util.unit_system import US_CUSTOMARY_SYSTEM
 
 from .const import (
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRECIPITATION_UNIT,
@@ -40,6 +43,7 @@
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_VISIBILITY_UNIT,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     ATTR_WEATHER_WIND_SPEED_UNIT,
     DOMAIN,
@@ -68,19 +72,27 @@
 ATTR_CONDITION_WINDY_VARIANT = "windy-variant"
 ATTR_FORECAST = "forecast"
 ATTR_FORECAST_CONDITION: Final = "condition"
+ATTR_FORECAST_HUMIDITY: Final = "humidity"
 ATTR_FORECAST_NATIVE_PRECIPITATION: Final = "native_precipitation"
 ATTR_FORECAST_PRECIPITATION: Final = "precipitation"
 ATTR_FORECAST_PRECIPITATION_PROBABILITY: Final = "precipitation_probability"
 ATTR_FORECAST_NATIVE_PRESSURE: Final = "native_pressure"
 ATTR_FORECAST_PRESSURE: Final = "pressure"
+ATTR_FORECAST_NATIVE_APPARENT_TEMP: Final = "native_apparent_temperature"
+ATTR_FORECAST_APPARENT_TEMP: Final = "apparent_temperature"
 ATTR_FORECAST_NATIVE_TEMP: Final = "native_temperature"
 ATTR_FORECAST_TEMP: Final = "temperature"
 ATTR_FORECAST_NATIVE_TEMP_LOW: Final = "native_templow"
 ATTR_FORECAST_TEMP_LOW: Final = "templow"
 ATTR_FORECAST_TIME: Final = "datetime"
 ATTR_FORECAST_WIND_BEARING: Final = "wind_bearing"
+ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: Final = "native_wind_gust_speed"
+ATTR_FORECAST_WIND_GUST_SPEED: Final = "wind_gust_speed"
 ATTR_FORECAST_NATIVE_WIND_SPEED: Final = "native_wind_speed"
 ATTR_FORECAST_WIND_SPEED: Final = "wind_speed"
+ATTR_FORECAST_NATIVE_DEW_POINT: Final = "native_dew_point"
+ATTR_FORECAST_DEW_POINT: Final = "dew_point"
+ATTR_FORECAST_CLOUD_COVERAGE: Final = "cloud_coverage"
 
 ENTITY_ID_FORMAT = DOMAIN + ".{}"
 
@@ -117,7 +129,9 @@ class Forecast(TypedDict, total=False):
 
     condition: str | None
     datetime: Required[str]
+    humidity: float | None
     precipitation_probability: int | None
+    cloud_coverage: int | None
     native_precipitation: float | None
     precipitation: None
     native_pressure: float | None
@@ -126,9 +140,12 @@ class Forecast(TypedDict, total=False):
     temperature: None
     native_templow: float | None
     templow: None
+    native_apparent_temperature: float | None
     wind_bearing: float | str | None
+    native_wind_gust_speed: float | None
     native_wind_speed: float | None
     wind_speed: None
+    native_dew_point: float | None
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -166,6 +183,7 @@ class WeatherEntity(Entity):
     _attr_forecast: list[Forecast] | None = None
     _attr_humidity: float | None = None
     _attr_ozone: float | None = None
+    _attr_cloud_coverage: int | None = None
     _attr_precision: float
     _attr_pressure: None = (
         None  # Provide backwards compatibility. Use _attr_native_pressure
@@ -199,13 +217,16 @@ class WeatherEntity(Entity):
 
     _attr_native_pressure: float | None = None
     _attr_native_pressure_unit: str | None = None
+    _attr_native_apparent_temperature: float | None = None
     _attr_native_temperature: float | None = None
     _attr_native_temperature_unit: str | None = None
     _attr_native_visibility: float | None = None
     _attr_native_visibility_unit: str | None = None
     _attr_native_precipitation_unit: str | None = None
+    _attr_native_wind_gust_speed: float | None = None
     _attr_native_wind_speed: float | None = None
     _attr_native_wind_speed_unit: str | None = None
+    _attr_native_dew_point: float | None = None
 
     _weather_option_temperature_unit: str | None = None
     _weather_option_pressure_unit: str | None = None
@@ -272,6 +293,11 @@ async def async_internal_added_to_hass(self) -> None:
             return
         self.async_registry_entry_updated()
 
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the apparent temperature in native units."""
+        return self._attr_native_temperature
+
     @final
     @property
     def temperature(self) -> float | None:
@@ -297,6 +323,11 @@ def native_temperature_unit(self) -> str | None:
 
         return self._attr_native_temperature_unit
 
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the dew point temperature in native units."""
+        return self._attr_native_dew_point
+
     @final
     @property
     def temperature_unit(self) -> str | None:
@@ -393,6 +424,11 @@ def humidity(self) -> float | None:
         """Return the humidity in native units."""
         return self._attr_humidity
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind gust speed in native units."""
+        return self._attr_native_wind_gust_speed
+
     @final
     @property
     def wind_speed(self) -> float | None:
@@ -462,6 +498,11 @@ def ozone(self) -> float | None:
         """Return the ozone level."""
         return self._attr_ozone
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the Cloud coverage in %."""
+        return self._attr_cloud_coverage
+
     @final
     @property
     def visibility(self) -> float | None:
@@ -577,7 +618,7 @@ def precision(self) -> float:
 
     @final
     @property
-    def state_attributes(self) -> dict[str, Any]:
+    def state_attributes(self) -> dict[str, Any]:  # noqa: C901
         """Return the state attributes, converted.
 
         Attributes are configured from native units to user-configured units.
@@ -600,6 +641,34 @@ def state_attributes(self) -> dict[str, Any]:
             except (TypeError, ValueError):
                 data[ATTR_WEATHER_TEMPERATURE] = temperature
 
+        if (apparent_temperature := self.native_apparent_temperature) is not None:
+            from_unit = self.native_temperature_unit or self._default_temperature_unit
+            to_unit = self._temperature_unit
+            try:
+                apparent_temperature_f = float(apparent_temperature)
+                value_apparent_temp = UNIT_CONVERSIONS[ATTR_WEATHER_TEMPERATURE_UNIT](
+                    apparent_temperature_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_APPARENT_TEMPERATURE] = round_temperature(
+                    value_apparent_temp, precision
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_APPARENT_TEMPERATURE] = apparent_temperature
+
+        if (dew_point := self.native_dew_point) is not None:
+            from_unit = self.native_temperature_unit or self._default_temperature_unit
+            to_unit = self._temperature_unit
+            try:
+                dew_point_f = float(dew_point)
+                value_dew_point = UNIT_CONVERSIONS[ATTR_WEATHER_TEMPERATURE_UNIT](
+                    dew_point_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_DEW_POINT] = round_temperature(
+                    value_dew_point, precision
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_DEW_POINT] = dew_point
+
         data[ATTR_WEATHER_TEMPERATURE_UNIT] = self._temperature_unit
 
         if (humidity := self.humidity) is not None:
@@ -608,6 +677,9 @@ def state_attributes(self) -> dict[str, Any]:
         if (ozone := self.ozone) is not None:
             data[ATTR_WEATHER_OZONE] = ozone
 
+        if (cloud_coverage := self.cloud_coverage) is not None:
+            data[ATTR_WEATHER_CLOUD_COVERAGE] = cloud_coverage
+
         if (pressure := self.native_pressure) is not None:
             from_unit = self.native_pressure_unit or self._default_pressure_unit
             to_unit = self._pressure_unit
@@ -625,6 +697,20 @@ def state_attributes(self) -> dict[str, Any]:
         if (wind_bearing := self.wind_bearing) is not None:
             data[ATTR_WEATHER_WIND_BEARING] = wind_bearing
 
+        if (wind_gust_speed := self.native_wind_gust_speed) is not None:
+            from_unit = self.native_wind_speed_unit or self._default_wind_speed_unit
+            to_unit = self._wind_speed_unit
+            try:
+                wind_gust_speed_f = float(wind_gust_speed)
+                value_wind_gust_speed = UNIT_CONVERSIONS[ATTR_WEATHER_WIND_SPEED_UNIT](
+                    wind_gust_speed_f, from_unit, to_unit
+                )
+                data[ATTR_WEATHER_WIND_GUST_SPEED] = round(
+                    value_wind_gust_speed, ROUNDING_PRECISION
+                )
+            except (TypeError, ValueError):
+                data[ATTR_WEATHER_WIND_GUST_SPEED] = wind_gust_speed
+
         if (wind_speed := self.native_wind_speed) is not None:
             from_unit = self.native_wind_speed_unit or self._default_wind_speed_unit
             to_unit = self._wind_speed_unit
@@ -686,6 +772,26 @@ def state_attributes(self) -> dict[str, Any]:
                             value_temp, precision
                         )
 
+                if (
+                    forecast_apparent_temp := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_APPARENT_TEMP,
+                        forecast_entry.get(ATTR_FORECAST_NATIVE_APPARENT_TEMP),
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_apparent_temp = float(forecast_apparent_temp)
+                        value_apparent_temp = UNIT_CONVERSIONS[
+                            ATTR_WEATHER_TEMPERATURE_UNIT
+                        ](
+                            forecast_apparent_temp,
+                            from_temp_unit,
+                            to_temp_unit,
+                        )
+
+                        forecast_entry[ATTR_FORECAST_APPARENT_TEMP] = round_temperature(
+                            value_apparent_temp, precision
+                        )
+
                 if (
                     forecast_temp_low := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_TEMP_LOW,
@@ -706,6 +812,26 @@ def state_attributes(self) -> dict[str, Any]:
                             value_temp_low, precision
                         )
 
+                if (
+                    forecast_dew_point := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_DEW_POINT,
+                        None,
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_dew_point_f = float(forecast_dew_point)
+                        value_dew_point = UNIT_CONVERSIONS[
+                            ATTR_WEATHER_TEMPERATURE_UNIT
+                        ](
+                            forecast_dew_point_f,
+                            from_temp_unit,
+                            to_temp_unit,
+                        )
+
+                        forecast_entry[ATTR_FORECAST_DEW_POINT] = round_temperature(
+                            value_dew_point, precision
+                        )
+
                 if (
                     forecast_pressure := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_PRESSURE,
@@ -727,6 +853,27 @@ def state_attributes(self) -> dict[str, Any]:
                             ROUNDING_PRECISION,
                         )
 
+                if (
+                    forecast_wind_gust_speed := forecast_entry.pop(
+                        ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
+                        None,
+                    )
+                ) is not None:
+                    from_wind_speed_unit = (
+                        self.native_wind_speed_unit or self._default_wind_speed_unit
+                    )
+                    to_wind_speed_unit = self._wind_speed_unit
+                    with suppress(TypeError, ValueError):
+                        forecast_wind_gust_speed_f = float(forecast_wind_gust_speed)
+                        forecast_entry[ATTR_FORECAST_WIND_GUST_SPEED] = round(
+                            UNIT_CONVERSIONS[ATTR_WEATHER_WIND_SPEED_UNIT](
+                                forecast_wind_gust_speed_f,
+                                from_wind_speed_unit,
+                                to_wind_speed_unit,
+                            ),
+                            ROUNDING_PRECISION,
+                        )
+
                 if (
                     forecast_wind_speed := forecast_entry.pop(
                         ATTR_FORECAST_NATIVE_WIND_SPEED,
@@ -770,6 +917,18 @@ def state_attributes(self) -> dict[str, Any]:
                             ROUNDING_PRECISION,
                         )
 
+                if (
+                    forecast_humidity := forecast_entry.pop(
+                        ATTR_FORECAST_HUMIDITY,
+                        None,
+                    )
+                ) is not None:
+                    with suppress(TypeError, ValueError):
+                        forecast_humidity_f = float(forecast_humidity)
+                        forecast_entry[ATTR_FORECAST_HUMIDITY] = round(
+                            forecast_humidity_f
+                        )
+
                 forecast.append(forecast_entry)
 
             data[ATTR_FORECAST] = forecast
diff --git a/homeassistant/components/weather/const.py b/homeassistant/components/weather/const.py
index 2dcfd8a2ddc1b7..b995ce2b7299e5 100644
--- a/homeassistant/components/weather/const.py
+++ b/homeassistant/components/weather/const.py
@@ -20,16 +20,20 @@
 
 ATTR_WEATHER_HUMIDITY = "humidity"
 ATTR_WEATHER_OZONE = "ozone"
+ATTR_WEATHER_DEW_POINT = "dew_point"
 ATTR_WEATHER_PRESSURE = "pressure"
 ATTR_WEATHER_PRESSURE_UNIT = "pressure_unit"
+ATTR_WEATHER_APPARENT_TEMPERATURE = "apparent_temperature"
 ATTR_WEATHER_TEMPERATURE = "temperature"
 ATTR_WEATHER_TEMPERATURE_UNIT = "temperature_unit"
 ATTR_WEATHER_VISIBILITY = "visibility"
 ATTR_WEATHER_VISIBILITY_UNIT = "visibility_unit"
 ATTR_WEATHER_WIND_BEARING = "wind_bearing"
+ATTR_WEATHER_WIND_GUST_SPEED = "wind_gust_speed"
 ATTR_WEATHER_WIND_SPEED = "wind_speed"
 ATTR_WEATHER_WIND_SPEED_UNIT = "wind_speed_unit"
 ATTR_WEATHER_PRECIPITATION_UNIT = "precipitation_unit"
+ATTR_WEATHER_CLOUD_COVERAGE = "cloud_coverage"
 
 DOMAIN: Final = "weather"
 
diff --git a/homeassistant/components/weather/strings.json b/homeassistant/components/weather/strings.json
index a64f846722426b..26ccd731828267 100644
--- a/homeassistant/components/weather/strings.json
+++ b/homeassistant/components/weather/strings.json
@@ -30,6 +30,9 @@
         "ozone": {
           "name": "Ozone"
         },
+        "cloud_coverage": {
+          "name": "Cloud coverage"
+        },
         "precipitation_unit": {
           "name": "Precipitation unit"
         },
@@ -39,6 +42,12 @@
         "pressure_unit": {
           "name": "Pressure unit"
         },
+        "apparent_temperature": {
+          "name": "Apparent temperature"
+        },
+        "dew_point": {
+          "name": "Dew point temperature"
+        },
         "temperature": {
           "name": "Temperature"
         },
@@ -54,6 +63,9 @@
         "wind_bearing": {
           "name": "Wind bearing"
         },
+        "wind_gust_speed": {
+          "name": "Wind gust speed"
+        },
         "wind_speed": {
           "name": "Wind speed"
         },
diff --git a/homeassistant/components/webhook/__init__.py b/homeassistant/components/webhook/__init__.py
index e58890a1d184b5..9711c30b19ec20 100644
--- a/homeassistant/components/webhook/__init__.py
+++ b/homeassistant/components/webhook/__init__.py
@@ -16,6 +16,7 @@
 from homeassistant.components import websocket_api
 from homeassistant.components.http.view import HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.network import get_url
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
@@ -30,6 +31,8 @@
 SUPPORTED_METHODS = (METH_GET, METH_HEAD, METH_POST, METH_PUT)
 URL_WEBHOOK_PATH = "/api/webhook/{webhook_id}"
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @callback
 @bind_hass
@@ -160,7 +163,7 @@ async def async_handle_webhook(
                 _LOGGER.warning(
                     "Deprecation warning: "
                     "Webhook '%s' does not provide a value for local_only. "
-                    "This webhook will be blocked after the 2023.7.0 release. "
+                    "This webhook will be blocked after the 2023.11.0 release. "
                     "Use `local_only: false` to keep this webhook operating as-is",
                     webhook_id,
                 )
diff --git a/homeassistant/components/webhook/trigger.py b/homeassistant/components/webhook/trigger.py
index 8c6051cc4a15c4..78728793f5d914 100644
--- a/homeassistant/components/webhook/trigger.py
+++ b/homeassistant/components/webhook/trigger.py
@@ -98,7 +98,7 @@ async def async_attach_trigger(
             hass,
             DOMAIN,
             issue_id,
-            breaks_in_ha_version="2023.7.0",
+            breaks_in_ha_version="2023.11.0",
             is_fixable=False,
             severity=IssueSeverity.WARNING,
             learn_more_url="https://www.home-assistant.io/docs/automation/trigger/#webhook-trigger",
diff --git a/homeassistant/components/webostv/media_player.py b/homeassistant/components/webostv/media_player.py
index 06e7e202b3647f..c2851cb4c6eb20 100644
--- a/homeassistant/components/webostv/media_player.py
+++ b/homeassistant/components/webostv/media_player.py
@@ -115,13 +115,15 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity):
     """Representation of a LG webOS Smart TV."""
 
     _attr_device_class = MediaPlayerDeviceClass.TV
+    _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(self, entry: ConfigEntry, client: WebOsClient) -> None:
         """Initialize the webos device."""
         self._entry = entry
         self._client = client
         self._attr_assumed_state = True
-        self._attr_name = entry.title
+        self._device_name = entry.title
         self._attr_unique_id = entry.unique_id
         self._sources = entry.options.get(CONF_SOURCES)
 
@@ -237,7 +239,7 @@ def _update_states(self) -> None:
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, cast(str, self.unique_id))},
             manufacturer="LG",
-            name=self.name,
+            name=self._device_name,
         )
 
         if self._client.system_info is not None or self.state != MediaPlayerState.OFF:
@@ -376,7 +378,9 @@ async def async_media_play_pause(self) -> None:
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
         if (source_dict := self._source_list.get(source)) is None:
-            _LOGGER.warning("Source %s not found for %s", source, self.name)
+            _LOGGER.warning(
+                "Source %s not found for %s", source, self._friendly_name_internal()
+            )
             return
         if source_dict.get("title"):
             await self._client.launch_app(source_dict["id"])
diff --git a/homeassistant/components/websocket_api/__init__.py b/homeassistant/components/websocket_api/__init__.py
index c98ca54d25a57a..9c2645aec57c62 100644
--- a/homeassistant/components/websocket_api/__init__.py
+++ b/homeassistant/components/websocket_api/__init__.py
@@ -6,6 +6,7 @@
 import voluptuous as vol
 
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 
@@ -41,6 +42,8 @@
 
 DEPENDENCIES: Final[tuple[str]] = ("http",)
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 @bind_hass
 @callback
diff --git a/homeassistant/components/websocket_api/auth.py b/homeassistant/components/websocket_api/auth.py
index 9c074588a1736f..d0831f2e90eee1 100644
--- a/homeassistant/components/websocket_api/auth.py
+++ b/homeassistant/components/websocket_api/auth.py
@@ -12,6 +12,7 @@
 from homeassistant.components.http.ban import process_success_login, process_wrong_login
 from homeassistant.const import __version__
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
+from homeassistant.util.json import JsonValueType
 
 from .connection import ActiveConnection
 from .error import Disconnect
@@ -67,10 +68,10 @@ def __init__(
         self._logger = logger
         self._request = request
 
-    async def async_handle(self, msg: dict[str, str]) -> ActiveConnection:
+    async def async_handle(self, msg: JsonValueType) -> ActiveConnection:
         """Handle authentication."""
         try:
-            msg = AUTH_MESSAGE_SCHEMA(msg)
+            valid_msg = AUTH_MESSAGE_SCHEMA(msg)
         except vol.Invalid as err:
             error_msg = (
                 f"Auth message incorrectly formatted: {humanize_error(msg, err)}"
@@ -79,20 +80,19 @@ async def async_handle(self, msg: dict[str, str]) -> ActiveConnection:
             self._send_message(auth_invalid_message(error_msg))
             raise Disconnect from err
 
-        if "access_token" in msg:
-            self._logger.debug("Received access_token")
-            refresh_token = await self._hass.auth.async_validate_access_token(
-                msg["access_token"]
+        if (access_token := valid_msg.get("access_token")) and (
+            refresh_token := await self._hass.auth.async_validate_access_token(
+                access_token
             )
-            if refresh_token is not None:
-                conn = await self._async_finish_auth(refresh_token.user, refresh_token)
-                conn.subscriptions[
-                    "auth"
-                ] = self._hass.auth.async_register_revoke_token_callback(
-                    refresh_token.id, self._cancel_ws
-                )
-
-                return conn
+        ):
+            conn = await self._async_finish_auth(refresh_token.user, refresh_token)
+            conn.subscriptions[
+                "auth"
+            ] = self._hass.auth.async_register_revoke_token_callback(
+                refresh_token.id, self._cancel_ws
+            )
+
+            return conn
 
         self._send_message(auth_invalid_message("Invalid access token or password"))
         await process_wrong_login(self._request)
diff --git a/homeassistant/components/websocket_api/commands.py b/homeassistant/components/websocket_api/commands.py
index b5dabf8b7339f6..ea00de33390aaf 100644
--- a/homeassistant/components/websocket_api/commands.py
+++ b/homeassistant/components/websocket_api/commands.py
@@ -3,12 +3,13 @@
 
 from collections.abc import Callable
 import datetime as dt
-from functools import lru_cache
+from functools import lru_cache, partial
 import json
 from typing import Any, cast
 
 import voluptuous as vol
 
+from homeassistant.auth.models import User
 from homeassistant.auth.permissions.const import CAT_ENTITIES, POLICY_READ
 from homeassistant.const import (
     EVENT_STATE_CHANGED,
@@ -88,6 +89,32 @@ def pong_message(iden: int) -> dict[str, Any]:
     return {"id": iden, "type": "pong"}
 
 
+def _forward_events_check_permissions(
+    send_message: Callable[[str | dict[str, Any] | Callable[[], str]], None],
+    user: User,
+    msg_id: int,
+    event: Event,
+) -> None:
+    """Forward state changed events to websocket."""
+    # We have to lookup the permissions again because the user might have
+    # changed since the subscription was created.
+    permissions = user.permissions
+    if not permissions.access_all_entities(
+        POLICY_READ
+    ) and not permissions.check_entity(event.data["entity_id"], POLICY_READ):
+        return
+    send_message(messages.cached_event_message(msg_id, event))
+
+
+def _forward_events_unconditional(
+    send_message: Callable[[str | dict[str, Any] | Callable[[], str]], None],
+    msg_id: int,
+    event: Event,
+) -> None:
+    """Forward events to websocket."""
+    send_message(messages.cached_event_message(msg_id, event))
+
+
 @callback
 @decorators.websocket_command(
     {
@@ -109,23 +136,18 @@ def handle_subscribe_events(
         raise Unauthorized
 
     if event_type == EVENT_STATE_CHANGED:
-
-        @callback
-        def forward_events(event: Event) -> None:
-            """Forward state changed events to websocket."""
-            if not connection.user.permissions.check_entity(
-                event.data["entity_id"], POLICY_READ
-            ):
-                return
-
-            connection.send_message(messages.cached_event_message(msg["id"], event))
-
+        forward_events = callback(
+            partial(
+                _forward_events_check_permissions,
+                connection.send_message,
+                connection.user,
+                msg["id"],
+            )
+        )
     else:
-
-        @callback
-        def forward_events(event: Event) -> None:
-            """Forward events to websocket."""
-            connection.send_message(messages.cached_event_message(msg["id"], event))
+        forward_events = callback(
+            partial(_forward_events_unconditional, connection.send_message, msg["id"])
+        )
 
     connection.subscriptions[msg["id"]] = hass.bus.async_listen(
         event_type, forward_events, run_immediately=True
@@ -227,13 +249,13 @@ async def handle_call_service(
 def _async_get_allowed_states(
     hass: HomeAssistant, connection: ActiveConnection
 ) -> list[State]:
-    if connection.user.permissions.access_all_entities("read"):
+    if connection.user.permissions.access_all_entities(POLICY_READ):
         return hass.states.async_all()
     entity_perm = connection.user.permissions.check_entity
     return [
         state
         for state in hass.states.async_all()
-        if entity_perm(state.entity_id, "read")
+        if entity_perm(state.entity_id, POLICY_READ)
     ]
 
 
@@ -277,6 +299,27 @@ def _send_handle_get_states_response(
     connection.send_message(construct_result_message(msg_id, f"[{joined_states}]"))
 
 
+def _forward_entity_changes(
+    send_message: Callable[[str | dict[str, Any] | Callable[[], str]], None],
+    entity_ids: set[str],
+    user: User,
+    msg_id: int,
+    event: Event,
+) -> None:
+    """Forward entity state changed events to websocket."""
+    entity_id = event.data["entity_id"]
+    if entity_ids and entity_id not in entity_ids:
+        return
+    # We have to lookup the permissions again because the user might have
+    # changed since the subscription was created.
+    permissions = user.permissions
+    if not permissions.access_all_entities(
+        POLICY_READ
+    ) and not permissions.check_entity(event.data["entity_id"], POLICY_READ):
+        return
+    send_message(messages.cached_state_diff_message(msg_id, event))
+
+
 @callback
 @decorators.websocket_command(
     {
@@ -289,25 +332,22 @@ def handle_subscribe_entities(
 ) -> None:
     """Handle subscribe entities command."""
     entity_ids = set(msg.get("entity_ids", []))
-
-    @callback
-    def forward_entity_changes(event: Event) -> None:
-        """Forward entity state changed events to websocket."""
-        if not connection.user.permissions.check_entity(
-            event.data["entity_id"], POLICY_READ
-        ):
-            return
-        if entity_ids and event.data["entity_id"] not in entity_ids:
-            return
-
-        connection.send_message(messages.cached_state_diff_message(msg["id"], event))
-
     # We must never await between sending the states and listening for
     # state changed events or we will introduce a race condition
     # where some states are missed
     states = _async_get_allowed_states(hass, connection)
     connection.subscriptions[msg["id"]] = hass.bus.async_listen(
-        EVENT_STATE_CHANGED, forward_entity_changes, run_immediately=True
+        EVENT_STATE_CHANGED,
+        callback(
+            partial(
+                _forward_entity_changes,
+                connection.send_message,
+                entity_ids,
+                connection.user,
+                msg["id"],
+            )
+        ),
+        run_immediately=True,
     )
     connection.send_result(msg["id"])
 
@@ -541,13 +581,13 @@ def handle_entity_source(
     entity_perm = connection.user.permissions.check_entity
 
     if "entity_id" not in msg:
-        if connection.user.permissions.access_all_entities("read"):
+        if connection.user.permissions.access_all_entities(POLICY_READ):
             sources = raw_sources
         else:
             sources = {
                 entity_id: source
                 for entity_id, source in raw_sources.items()
-                if entity_perm(entity_id, "read")
+                if entity_perm(entity_id, POLICY_READ)
             }
 
         connection.send_result(msg["id"], sources)
@@ -556,7 +596,7 @@ def handle_entity_source(
     sources = {}
 
     for entity_id in msg["entity_id"]:
-        if not entity_perm(entity_id, "read"):
+        if not entity_perm(entity_id, POLICY_READ):
             raise Unauthorized(
                 context=connection.context(msg),
                 permission=POLICY_READ,
@@ -664,12 +704,20 @@ async def handle_execute_script(
     """Handle execute script command."""
     # Circular dep
     # pylint: disable-next=import-outside-toplevel
-    from homeassistant.helpers.script import Script
+    from homeassistant.helpers.script import Script, async_validate_actions_config
+
+    script_config = await async_validate_actions_config(hass, msg["sequence"])
 
     context = connection.context(msg)
-    script_obj = Script(hass, msg["sequence"], f"{const.DOMAIN} script", const.DOMAIN)
-    await script_obj.async_run(msg.get("variables"), context=context)
-    connection.send_result(msg["id"], {"context": context})
+    script_obj = Script(hass, script_config, f"{const.DOMAIN} script", const.DOMAIN)
+    response = await script_obj.async_run(msg.get("variables"), context=context)
+    connection.send_result(
+        msg["id"],
+        {
+            "context": context,
+            "response": response,
+        },
+    )
 
 
 @callback
@@ -712,14 +760,14 @@ async def handle_validate_config(
 
     for key, schema, validator in (
         ("trigger", cv.TRIGGER_SCHEMA, trigger.async_validate_trigger_config),
-        ("condition", cv.CONDITION_SCHEMA, condition.async_validate_condition_config),
+        ("condition", cv.CONDITIONS_SCHEMA, condition.async_validate_conditions_config),
         ("action", cv.SCRIPT_SCHEMA, script.async_validate_actions_config),
     ):
         if key not in msg:
             continue
 
         try:
-            await validator(hass, schema(msg[key]))  # type: ignore[operator]
+            await validator(hass, schema(msg[key]))
         except vol.Invalid as err:
             result[key] = {"valid": False, "error": str(err)}
         else:
diff --git a/homeassistant/components/websocket_api/connection.py b/homeassistant/components/websocket_api/connection.py
index 1f6fd3029689a8..a554001970b5ac 100644
--- a/homeassistant/components/websocket_api/connection.py
+++ b/homeassistant/components/websocket_api/connection.py
@@ -13,6 +13,7 @@
 from homeassistant.components.http import current_request
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
+from homeassistant.util.json import JsonValueType
 
 from . import const, messages
 from .util import describe_request
@@ -32,6 +33,20 @@
 class ActiveConnection:
     """Handle an active websocket client connection."""
 
+    __slots__ = (
+        "logger",
+        "hass",
+        "send_message",
+        "user",
+        "refresh_token_id",
+        "subscriptions",
+        "last_id",
+        "can_coalesce",
+        "supported_features",
+        "handlers",
+        "binary_handlers",
+    )
+
     def __init__(
         self,
         logger: WebSocketAdapter,
@@ -56,6 +71,10 @@ def __init__(
         self.binary_handlers: list[BinaryHandler | None] = []
         current_connection.set(self)
 
+    def __repr__(self) -> str:
+        """Return the representation."""
+        return f"<ActiveConnection {self.get_description(None)}>"
+
     def set_supported_features(self, features: dict[str, float]) -> None:
         """Set supported features."""
         self.supported_features = features
@@ -140,7 +159,7 @@ def async_handle_binary(self, handler_id: int, payload: bytes) -> None:
             self.binary_handlers[index] = None
 
     @callback
-    def async_handle(self, msg: dict[str, Any]) -> None:
+    def async_handle(self, msg: JsonValueType) -> None:
         """Handle a single incoming message."""
         if (
             # Not using isinstance as we don't care about children
@@ -153,10 +172,11 @@ def async_handle(self, msg: dict[str, Any]) -> None:
                 or type(type_) is not str  # pylint: disable=unidiomatic-typecheck
             )
         ):
-            self.logger.error("Received invalid command", msg)
+            self.logger.error("Received invalid command: %s", msg)
+            id_ = msg.get("id") if isinstance(msg, dict) else 0
             self.send_message(
                 messages.error_message(
-                    msg.get("id"),
+                    id_,  # type: ignore[arg-type]
                     const.ERR_INVALID_FORMAT,
                     "Message incorrectly formatted.",
                 )
@@ -172,7 +192,7 @@ def async_handle(self, msg: dict[str, Any]) -> None:
             return
 
         if not (handler_schema := self.handlers.get(type_)):
-            self.logger.info(f"Received unknown command: {type_}")
+            self.logger.info("Received unknown command: %s", type_)
             self.send_message(
                 messages.error_message(
                     cur_id, const.ERR_UNKNOWN_COMMAND, "Unknown command."
@@ -193,7 +213,24 @@ def async_handle(self, msg: dict[str, Any]) -> None:
     def async_handle_close(self) -> None:
         """Handle closing down connection."""
         for unsub in self.subscriptions.values():
-            unsub()
+            try:
+                unsub()
+            except Exception:  # pylint: disable=broad-except
+                # If one fails, make sure we still try the rest
+                self.logger.exception(
+                    "Error unsubscribing from subscription: %s", unsub
+                )
+        self.subscriptions.clear()
+        self.send_message = self._connect_closed_error
+        current_request.set(None)
+        current_connection.set(None)
+
+    @callback
+    def _connect_closed_error(
+        self, msg: str | dict[str, Any] | Callable[[], str]
+    ) -> None:
+        """Send a message when the connection is closed."""
+        self.logger.debug("Tried to send message %s on closed connection", msg)
 
     @callback
     def async_handle_exception(self, msg: dict[str, Any], err: Exception) -> None:
diff --git a/homeassistant/components/websocket_api/const.py b/homeassistant/components/websocket_api/const.py
index 9eb04ecbc51579..4b9a0943d9a294 100644
--- a/homeassistant/components/websocket_api/const.py
+++ b/homeassistant/components/websocket_api/const.py
@@ -1,9 +1,7 @@
 """Websocket constants."""
 from __future__ import annotations
 
-import asyncio
 from collections.abc import Awaitable, Callable
-from concurrent import futures
 from typing import TYPE_CHECKING, Any, Final
 
 from homeassistant.core import HomeAssistant
@@ -42,10 +40,6 @@
 
 TYPE_RESULT: Final = "result"
 
-# Define the possible errors that occur when connections are cancelled.
-# Originally, this was just asyncio.CancelledError, but issue #9546 showed
-# that futures.CancelledErrors can also occur in some situations.
-CANCELLATION_ERRORS: Final = (asyncio.CancelledError, futures.CancelledError)
 
 # Event types
 SIGNAL_WEBSOCKET_CONNECTED: Final = "websocket_connected"
diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index 5ca5ea625789b4..728405b5d969e5 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -4,7 +4,6 @@
 import asyncio
 from collections import deque
 from collections.abc import Callable
-from contextlib import suppress
 import datetime as dt
 import logging
 from typing import TYPE_CHECKING, Any, Final
@@ -21,7 +20,6 @@
 
 from .auth import AuthPhase, auth_required_message
 from .const import (
-    CANCELLATION_ERRORS,
     DATA_CONNECTIONS,
     MAX_PENDING_MSG,
     PENDING_MSG_PEAK,
@@ -58,88 +56,123 @@ class WebSocketAdapter(logging.LoggerAdapter):
 
     def process(self, msg: str, kwargs: Any) -> tuple[str, Any]:
         """Add connid to websocket log messages."""
-        if not self.extra or "connid" not in self.extra:
-            return msg, kwargs
+        assert self.extra is not None
         return f'[{self.extra["connid"]}] {msg}', kwargs
 
 
 class WebSocketHandler:
     """Handle an active websocket client connection."""
 
+    __slots__ = (
+        "_hass",
+        "_request",
+        "_wsock",
+        "_handle_task",
+        "_writer_task",
+        "_closing",
+        "_authenticated",
+        "_logger",
+        "_peak_checker_unsub",
+        "_connection",
+        "_message_queue",
+        "_ready_future",
+    )
+
     def __init__(self, hass: HomeAssistant, request: web.Request) -> None:
         """Initialize an active connection."""
-        self.hass = hass
-        self.request = request
-        self.wsock = web.WebSocketResponse(heartbeat=55)
+        self._hass = hass
+        self._request: web.Request = request
+        self._wsock = web.WebSocketResponse(heartbeat=55)
         self._handle_task: asyncio.Task | None = None
         self._writer_task: asyncio.Task | None = None
         self._closing: bool = False
+        self._authenticated: bool = False
         self._logger = WebSocketAdapter(_WS_LOGGER, {"connid": id(self)})
         self._peak_checker_unsub: Callable[[], None] | None = None
-        self.connection: ActiveConnection | None = None
+        self._connection: ActiveConnection | None = None
 
         # The WebSocketHandler has a single consumer and path
         # to where messages are queued. This allows the implementation
         # to use a deque and an asyncio.Future to avoid the overhead of
         # an asyncio.Queue.
-        self._message_queue: deque = deque()
+        self._message_queue: deque[str | Callable[[], str] | None] = deque()
         self._ready_future: asyncio.Future[None] | None = None
 
+    def __repr__(self) -> str:
+        """Return the representation."""
+        return (
+            "<WebSocketHandler "
+            f"closing={self._closing} "
+            f"authenticated={self._authenticated} "
+            f"description={self.description}>"
+        )
+
     @property
     def description(self) -> str:
         """Return a description of the connection."""
-        if self.connection is not None:
-            return self.connection.get_description(self.request)
-        return describe_request(self.request)
+        if connection := self._connection:
+            return connection.get_description(self._request)
+        if request := self._request:
+            return describe_request(request)
+        return "finished connection"
 
     async def _writer(self) -> None:
         """Write outgoing messages."""
         # Variables are set locally to avoid lookups in the loop
         message_queue = self._message_queue
         logger = self._logger
-        send_str = self.wsock.send_str
-        loop = self.hass.loop
+        wsock = self._wsock
+        send_str = wsock.send_str
+        loop = self._hass.loop
         debug = logger.debug
+        is_enabled_for = logger.isEnabledFor
+        logging_debug = logging.DEBUG
         # Exceptions if Socket disconnected or cancelled by connection handler
         try:
-            with suppress(RuntimeError, ConnectionResetError, *CANCELLATION_ERRORS):
-                while not self.wsock.closed:
-                    if (messages_remaining := len(message_queue)) == 0:
-                        self._ready_future = loop.create_future()
-                        await self._ready_future
-                        messages_remaining = len(message_queue)
+            while not wsock.closed:
+                if (messages_remaining := len(message_queue)) == 0:
+                    self._ready_future = loop.create_future()
+                    await self._ready_future
+                    messages_remaining = len(message_queue)
+
+                # A None message is used to signal the end of the connection
+                if (process := message_queue.popleft()) is None:
+                    return
+
+                debug_enabled = is_enabled_for(logging_debug)
+                messages_remaining -= 1
+                message = process if isinstance(process, str) else process()
+
+                if (
+                    not messages_remaining
+                    or not (connection := self._connection)
+                    or not connection.can_coalesce
+                ):
+                    if debug_enabled:
+                        debug("%s: Sending %s", self.description, message)
+                    await send_str(message)
+                    continue
 
+                messages: list[str] = [message]
+                while messages_remaining:
                     # A None message is used to signal the end of the connection
                     if (process := message_queue.popleft()) is None:
                         return
-
+                    messages.append(process if isinstance(process, str) else process())
                     messages_remaining -= 1
-                    message = process if isinstance(process, str) else process()
-
-                    if (
-                        not messages_remaining
-                        or not self.connection
-                        or not self.connection.can_coalesce
-                    ):
-                        debug("Sending %s", message)
-                        await send_str(message)
-                        continue
-
-                    messages: list[str] = [message]
-                    while messages_remaining:
-                        # A None message is used to signal the end of the connection
-                        if (process := message_queue.popleft()) is None:
-                            return
-                        messages.append(
-                            process if isinstance(process, str) else process()
-                        )
-                        messages_remaining -= 1
 
-                    joined_messages = ",".join(messages)
-                    coalesced_messages = f"[{joined_messages}]"
-                    debug("Sending %s", coalesced_messages)
-                    await send_str(coalesced_messages)
+                joined_messages = ",".join(messages)
+                coalesced_messages = f"[{joined_messages}]"
+                if debug_enabled:
+                    debug("%s: Sending %s", self.description, coalesced_messages)
+                await send_str(coalesced_messages)
+        except asyncio.CancelledError:
+            debug("%s: Writer cancelled", self.description)
+            raise
+        except (RuntimeError, ConnectionResetError) as ex:
+            debug("%s: Unexpected error in writer: %s", self.description, ex)
         finally:
+            debug("%s: Writer done", self.description)
             # Clean up the peak checker when we shut down the writer
             self._cancel_peak_checker()
 
@@ -183,8 +216,9 @@ def _send_message(self, message: str | dict[str, Any] | Callable[[], str]) -> No
             return
 
         message_queue.append(message)
-        if self._ready_future and not self._ready_future.done():
-            self._ready_future.set_result(None)
+        ready_future = self._ready_future
+        if ready_future and not ready_future.done():
+            ready_future.set_result(None)
 
         peak_checker_active = self._peak_checker_unsub is not None
 
@@ -195,7 +229,7 @@ def _send_message(self, message: str | dict[str, Any] | Callable[[], str]) -> No
 
         if not peak_checker_active:
             self._peak_checker_unsub = async_call_later(
-                self.hass, PENDING_MSG_PEAK_TIME, self._check_write_peak
+                self._hass, PENDING_MSG_PEAK_TIME, self._check_write_peak
             )
 
     @callback
@@ -231,8 +265,14 @@ def _cancel(self) -> None:
 
     async def async_handle(self) -> web.WebSocketResponse:
         """Handle a websocket response."""
-        request = self.request
-        wsock = self.wsock
+        request = self._request
+        wsock = self._wsock
+        logger = self._logger
+        debug = logger.debug
+        hass = self._hass
+        is_enabled_for = logger.isEnabledFor
+        logging_debug = logging.DEBUG
+
         try:
             async with async_timeout.timeout(10):
                 await wsock.prepare(request)
@@ -240,7 +280,7 @@ async def async_handle(self) -> web.WebSocketResponse:
             self._logger.warning("Timeout preparing request from %s", request.remote)
             return wsock
 
-        self._logger.debug("Connected from %s", request.remote)
+        debug("%s: Connected from %s", self.description, request.remote)
         self._handle_task = asyncio.current_task()
 
         @callback
@@ -248,17 +288,13 @@ def handle_hass_stop(event: Event) -> None:
             """Cancel this connection."""
             self._cancel()
 
-        unsub_stop = self.hass.bus.async_listen(
-            EVENT_HOMEASSISTANT_STOP, handle_hass_stop
-        )
+        unsub_stop = hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, handle_hass_stop)
 
         # As the webserver is now started before the start
         # event we do not want to block for websocket responses
         self._writer_task = asyncio.create_task(self._writer())
 
-        auth = AuthPhase(
-            self._logger, self.hass, self._send_message, self._cancel, request
-        )
+        auth = AuthPhase(logger, hass, self._send_message, self._cancel, request)
         connection = None
         disconnect_warn = None
 
@@ -281,21 +317,22 @@ def handle_hass_stop(event: Event) -> None:
                 raise Disconnect
 
             try:
-                msg_data = msg.json(loads=json_loads)
+                auth_msg_data = json_loads(msg.data)
             except ValueError as err:
                 disconnect_warn = "Received invalid JSON."
                 raise Disconnect from err
 
-            self._logger.debug("Received %s", msg_data)
-            self.connection = connection = await auth.async_handle(msg_data)
-            self.hass.data[DATA_CONNECTIONS] = (
-                self.hass.data.get(DATA_CONNECTIONS, 0) + 1
-            )
-            async_dispatcher_send(self.hass, SIGNAL_WEBSOCKET_CONNECTED)
+            if is_enabled_for(logging_debug):
+                debug("%s: Received %s", self.description, auth_msg_data)
+            connection = await auth.async_handle(auth_msg_data)
+            self._connection = connection
+            hass.data[DATA_CONNECTIONS] = hass.data.get(DATA_CONNECTIONS, 0) + 1
+            async_dispatcher_send(hass, SIGNAL_WEBSOCKET_CONNECTED)
 
+            self._authenticated = True
             #
             #
-            # Our websocket implementation is backed by an asyncio.Queue
+            # Our websocket implementation is backed by a deque
             #
             # As back-pressure builds, the queue will back up and use more memory
             # until we disconnect the client when the queue size reaches
@@ -329,6 +366,8 @@ def handle_hass_stop(event: Event) -> None:
             # reach the code to set the limit, so we have to set it directly.
             #
             wsock._writer._limit = 2**20  # type: ignore[union-attr] # pylint: disable=protected-access
+            async_handle_str = connection.async_handle
+            async_handle_binary = connection.async_handle_binary
 
             # Command phase
             while not wsock.closed:
@@ -343,7 +382,7 @@ def handle_hass_stop(event: Event) -> None:
                         break
                     handler = msg.data[0]
                     payload = msg.data[1:]
-                    connection.async_handle_binary(handler, payload)
+                    async_handle_binary(handler, payload)
                     continue
 
                 if msg.type != WSMsgType.TEXT:
@@ -351,31 +390,38 @@ def handle_hass_stop(event: Event) -> None:
                     break
 
                 try:
-                    msg_data = msg.json(loads=json_loads)
+                    command_msg_data = json_loads(msg.data)
                 except ValueError:
                     disconnect_warn = "Received invalid JSON."
                     break
 
-                self._logger.debug("Received %s", msg_data)
-                if not isinstance(msg_data, list):
-                    connection.async_handle(msg_data)
+                if is_enabled_for(logging_debug):
+                    debug("%s: Received %s", self.description, command_msg_data)
+
+                if not isinstance(command_msg_data, list):
+                    async_handle_str(command_msg_data)
                     continue
 
-                for split_msg in msg_data:
-                    connection.async_handle(split_msg)
+                for split_msg in command_msg_data:
+                    async_handle_str(split_msg)
 
         except asyncio.CancelledError:
-            self._logger.info("Connection closed by client")
+            debug("%s: Connection cancelled", self.description)
+            raise
 
-        except Disconnect:
-            pass
+        except Disconnect as ex:
+            debug("%s: Connection closed by client: %s", self.description, ex)
 
         except Exception:  # pylint: disable=broad-except
-            self._logger.exception("Unexpected error inside websocket API")
+            self._logger.exception(
+                "%s: Unexpected error inside websocket API", self.description
+            )
 
         finally:
             unsub_stop()
 
+            self._cancel_peak_checker()
+
             if connection is not None:
                 connection.async_handle_close()
 
@@ -385,20 +431,37 @@ def handle_hass_stop(event: Event) -> None:
             if self._ready_future and not self._ready_future.done():
                 self._ready_future.set_result(None)
 
+            # If the writer gets canceled we still need to close the websocket
+            # so we have another finally block to make sure we close the websocket
+            # if the writer gets canceled.
             try:
-                # Make sure all error messages are written before closing
                 await self._writer_task
-                await wsock.close()
             finally:
-                if disconnect_warn is None:
-                    self._logger.debug("Disconnected")
-                else:
-                    self._logger.warning("Disconnected: %s", disconnect_warn)
-
-                if connection is not None:
-                    self.hass.data[DATA_CONNECTIONS] -= 1
-                    self.connection = None
+                try:
+                    # Make sure all error messages are written before closing
+                    await wsock.close()
+                finally:
+                    if disconnect_warn is None:
+                        debug("%s: Disconnected", self.description)
+                    else:
+                        self._logger.warning(
+                            "%s: Disconnected: %s", self.description, disconnect_warn
+                        )
 
-                async_dispatcher_send(self.hass, SIGNAL_WEBSOCKET_DISCONNECTED)
+                    if connection is not None:
+                        hass.data[DATA_CONNECTIONS] -= 1
+                        self._connection = None
+
+                    async_dispatcher_send(hass, SIGNAL_WEBSOCKET_DISCONNECTED)
+
+                    # Break reference cycles to make sure GC can happen sooner
+                    self._wsock = None  # type: ignore[assignment]
+                    self._request = None  # type: ignore[assignment]
+                    self._hass = None  # type: ignore[assignment]
+                    self._logger = None  # type: ignore[assignment]
+                    self._message_queue = None  # type: ignore[assignment]
+                    self._handle_task = None
+                    self._writer_task = None
+                    self._ready_future = None
 
         return wsock
diff --git a/homeassistant/components/wemo/__init__.py b/homeassistant/components/wemo/__init__.py
index b208a30f5ec7c8..4488e881938e55 100644
--- a/homeassistant/components/wemo/__init__.py
+++ b/homeassistant/components/wemo/__init__.py
@@ -154,14 +154,14 @@ async def async_add_unique_device(
         self, hass: HomeAssistant, wemo: pywemo.WeMoDevice
     ) -> None:
         """Add a WeMo device to hass if it has not already been added."""
-        if wemo.serialnumber in self._added_serial_numbers:
+        if wemo.serial_number in self._added_serial_numbers:
             return
 
         try:
             coordinator = await async_register_device(hass, self._config_entry, wemo)
         except pywemo.PyWeMoException as err:
-            if wemo.serialnumber not in self._failed_serial_numbers:
-                self._failed_serial_numbers.add(wemo.serialnumber)
+            if wemo.serial_number not in self._failed_serial_numbers:
+                self._failed_serial_numbers.add(wemo.serial_number)
                 _LOGGER.error(
                     "Unable to add WeMo %s %s: %s", repr(wemo), wemo.host, err
                 )
@@ -194,8 +194,8 @@ async def async_add_unique_device(
                     coordinator,
                 )
 
-        self._added_serial_numbers.add(wemo.serialnumber)
-        self._failed_serial_numbers.discard(wemo.serialnumber)
+        self._added_serial_numbers.add(wemo.serial_number)
+        self._failed_serial_numbers.discard(wemo.serial_number)
 
 
 class WemoDiscovery:
diff --git a/homeassistant/components/wemo/config_flow.py b/homeassistant/components/wemo/config_flow.py
index 73f4303cfd6751..e4626b4deaf517 100644
--- a/homeassistant/components/wemo/config_flow.py
+++ b/homeassistant/components/wemo/config_flow.py
@@ -1,11 +1,20 @@
 """Config flow for Wemo."""
 
+from __future__ import annotations
+
+from dataclasses import fields
+from typing import Any, get_type_hints
+
 import pywemo
+import voluptuous as vol
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_flow
+from homeassistant.config_entries import ConfigEntry, OptionsFlow
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.config_entry_flow import DiscoveryFlowHandler
 
 from .const import DOMAIN
+from .wemo_device import Options, OptionsValidationError
 
 
 async def _async_has_devices(hass: HomeAssistant) -> bool:
@@ -13,4 +22,58 @@ async def _async_has_devices(hass: HomeAssistant) -> bool:
     return bool(await hass.async_add_executor_job(pywemo.discover_devices))
 
 
-config_entry_flow.register_discovery_flow(DOMAIN, "Wemo", _async_has_devices)
+class WemoFlow(DiscoveryFlowHandler, domain=DOMAIN):
+    """Discovery flow with options for Wemo."""
+
+    def __init__(self) -> None:
+        """Init discovery flow."""
+        super().__init__(DOMAIN, "Wemo", _async_has_devices)
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
+        """Get the options flow for this handler."""
+        return WemoOptionsFlow(config_entry)
+
+
+class WemoOptionsFlow(OptionsFlow):
+    """Options flow for the WeMo component."""
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Manage options for the WeMo component."""
+        errors: dict[str, str] | None = None
+        if user_input is not None:
+            try:
+                Options(**user_input)
+            except OptionsValidationError as err:
+                errors = {err.field_key: err.error_key}
+            else:
+                return self.async_create_entry(title="", data=user_input)
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=_schema_for_options(Options(**self.config_entry.options)),
+            errors=errors,
+        )
+
+
+def _schema_for_options(options: Options) -> vol.Schema:
+    """Return the Voluptuous schema for the Options instance.
+
+    All values are optional. The default value is set to the current value and
+    the type hint is set to the value of the field type annotation.
+    """
+    return vol.Schema(
+        {
+            vol.Optional(
+                field.name, default=getattr(options, field.name)
+            ): get_type_hints(options)[field.name]
+            for field in fields(options)
+        }
+    )
diff --git a/homeassistant/components/wemo/entity.py b/homeassistant/components/wemo/entity.py
index c8ed9cdde0884e..1debc32a39be8a 100644
--- a/homeassistant/components/wemo/entity.py
+++ b/homeassistant/components/wemo/entity.py
@@ -53,7 +53,7 @@ def unique_id_suffix(self) -> str | None:
     @property
     def unique_id(self) -> str:
         """Return the id of this WeMo device."""
-        serial_number: str = self.wemo.serialnumber
+        serial_number: str = self.wemo.serial_number
         if suffix := self.unique_id_suffix:
             return f"{serial_number}_{suffix}"
         return serial_number
diff --git a/homeassistant/components/wemo/manifest.json b/homeassistant/components/wemo/manifest.json
index 3a562296a50307..bb19d2e1655014 100644
--- a/homeassistant/components/wemo/manifest.json
+++ b/homeassistant/components/wemo/manifest.json
@@ -9,7 +9,7 @@
   },
   "iot_class": "local_push",
   "loggers": ["pywemo"],
-  "requirements": ["pywemo==0.9.1"],
+  "requirements": ["pywemo==1.1.0"],
   "ssdp": [
     {
       "manufacturer": "Belkin International Inc."
diff --git a/homeassistant/components/wemo/sensor.py b/homeassistant/components/wemo/sensor.py
index 3cfc9a16f300a9..15e396cc660687 100644
--- a/homeassistant/components/wemo/sensor.py
+++ b/homeassistant/components/wemo/sensor.py
@@ -28,9 +28,8 @@
 class AttributeSensorDescription(SensorEntityDescription):
     """SensorEntityDescription for WeMo AttributeSensor entities."""
 
-    # AttributeSensor does not support DEVICE_CLASS_NAME
-    # the assert satisfies the type checker and will catch attempts
-    # to use DEVICE_CLASS_NAME in the entity descriptions.
+    # AttributeSensor does not support UNDEFINED,
+    # restrict the type to str | None.
     name: str | None = None
     state_conversion: Callable[[StateType], StateType] | None = None
     unique_id_suffix: str | None = None
diff --git a/homeassistant/components/wemo/strings.json b/homeassistant/components/wemo/strings.json
index 3419b2cb3d1926..b218f7589853a7 100644
--- a/homeassistant/components/wemo/strings.json
+++ b/homeassistant/components/wemo/strings.json
@@ -10,6 +10,20 @@
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "enable_subscription": "Subscribe to device local push updates",
+          "enable_long_press": "Register for device long-press events"
+        }
+      }
+    },
+    "error": {
+      "long_press_requires_subscription": "Local push update subscriptions must be enabled to use long-press events",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  },
   "device_automation": {
     "trigger_type": {
       "long_press": "Wemo button was pressed for 2 seconds"
diff --git a/homeassistant/components/wemo/wemo_device.py b/homeassistant/components/wemo/wemo_device.py
index 56ed9b8e1e6773..65431fb7657994 100644
--- a/homeassistant/components/wemo/wemo_device.py
+++ b/homeassistant/components/wemo/wemo_device.py
@@ -1,10 +1,14 @@
 """Home Assistant wrapper for a pyWeMo device."""
+from __future__ import annotations
+
 import asyncio
+from dataclasses import dataclass, fields
 from datetime import timedelta
 import logging
+from typing import Literal
 
 from pywemo import Insight, LongPressMixin, WeMoDevice
-from pywemo.exceptions import ActionException
+from pywemo.exceptions import ActionException, PyWeMoException
 from pywemo.subscribe import EVENT_TYPE_LONG_PRESS
 
 from homeassistant.config_entries import ConfigEntry
@@ -29,10 +33,62 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+# Literal values must match options.error keys from strings.json.
+ErrorStringKey = Literal["long_press_requires_subscription"]
+# Literal values must match options.step.init.data keys from strings.json.
+OptionsFieldKey = Literal["enable_subscription", "enable_long_press"]
+
+
+class OptionsValidationError(Exception):
+    """Error validating options."""
+
+    def __init__(
+        self, field_key: OptionsFieldKey, error_key: ErrorStringKey, message: str
+    ) -> None:
+        """Store field and error_key so the exception handler can used them.
+
+        The field_key and error_key strings must be the same as in strings.json.
+
+        Args:
+          field_key: Name of the options.step.init.data key that corresponds to this error.
+            field_key must also match one of the field names inside the Options class.
+          error_key: Name of the options.error key that corresponds to this error.
+          message: Message for the Exception class.
+        """
+        super().__init__(message)
+        self.field_key = field_key
+        self.error_key = error_key
+
+
+@dataclass(frozen=True)
+class Options:
+    """Configuration options for the DeviceCoordinator class.
+
+    Note: The field names must match the keys (OptionsFieldKey)
+    from options.step.init.data in strings.json.
+    """
+
+    # Subscribe to device local push updates.
+    enable_subscription: bool = True
+
+    # Register for device long-press events.
+    enable_long_press: bool = True
+
+    def __post_init__(self) -> None:
+        """Validate parameters."""
+        if not self.enable_subscription and self.enable_long_press:
+            raise OptionsValidationError(
+                "enable_subscription",
+                "long_press_requires_subscription",
+                "Local push update subscriptions must be enabled to use long-press events",
+            )
+
 
 class DeviceCoordinator(DataUpdateCoordinator[None]):
     """Home Assistant wrapper for a pyWeMo device."""
 
+    options: Options | None = None
+
     def __init__(self, hass: HomeAssistant, wemo: WeMoDevice, device_id: str) -> None:
         """Initialize DeviceCoordinator."""
         super().__init__(
@@ -45,7 +101,7 @@ def __init__(self, hass: HomeAssistant, wemo: WeMoDevice, device_id: str) -> Non
         self.wemo = wemo
         self.device_id = device_id
         self.device_info = _create_device_info(wemo)
-        self.supports_long_press = wemo.supports_long_press()
+        self.supports_long_press = isinstance(wemo, LongPressMixin)
         self.update_lock = asyncio.Lock()
 
     def subscription_callback(
@@ -61,13 +117,56 @@ def subscription_callback(
                     CONF_NAME: self.wemo.name,
                     CONF_TYPE: event_type,
                     CONF_PARAMS: params,
-                    CONF_UNIQUE_ID: self.wemo.serialnumber,
+                    CONF_UNIQUE_ID: self.wemo.serial_number,
                 },
             )
         else:
             updated = self.wemo.subscription_update(event_type, params)
             self.hass.create_task(self._async_subscription_callback(updated))
 
+    async def _async_set_enable_subscription(self, enable_subscription: bool) -> None:
+        """Turn on/off push updates from the device."""
+        registry = self.hass.data[DOMAIN]["registry"]
+        if enable_subscription:
+            registry.on(self.wemo, None, self.subscription_callback)
+            await self.hass.async_add_executor_job(registry.register, self.wemo)
+        elif self.options is not None:
+            await self.hass.async_add_executor_job(registry.unregister, self.wemo)
+
+    async def _async_set_enable_long_press(self, enable_long_press: bool) -> None:
+        """Turn on/off long-press events from the device."""
+        if not (isinstance(self.wemo, LongPressMixin) and self.supports_long_press):
+            return
+        try:
+            if enable_long_press:
+                await self.hass.async_add_executor_job(
+                    self.wemo.ensure_long_press_virtual_device
+                )
+            elif self.options is not None:
+                await self.hass.async_add_executor_job(
+                    self.wemo.remove_long_press_virtual_device
+                )
+        except PyWeMoException:
+            _LOGGER.exception(
+                "Failed to enable long press support for device: %s", self.wemo.name
+            )
+            self.supports_long_press = False
+
+    async def async_set_options(
+        self, hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> None:
+        """Update the configuration options for the device."""
+        options = Options(**config_entry.options)
+        _LOGGER.debug(
+            "async_set_options old(%s) new(%s)", repr(self.options), repr(options)
+        )
+        for field in fields(options):
+            new_value = getattr(options, field.name)
+            if self.options is None or getattr(self.options, field.name) != new_value:
+                # The value changed, call the _async_set_* method for the option.
+                await getattr(self, f"_async_set_{field.name}")(new_value)
+        self.options = options
+
     async def _async_subscription_callback(self, updated: bool) -> None:
         """Update the state by the Wemo device."""
         # If an update is in progress, we don't do anything.
@@ -131,14 +230,14 @@ def _create_device_info(wemo: WeMoDevice) -> DeviceInfo:
     _dev_info = _device_info(wemo)
     if wemo.model_name == "DLI emulated Belkin Socket":
         _dev_info[ATTR_CONFIGURATION_URL] = f"http://{wemo.host}"
-        _dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serialnumber[:-1])}
+        _dev_info[ATTR_IDENTIFIERS] = {(DOMAIN, wemo.serial_number[:-1])}
     return _dev_info
 
 
 def _device_info(wemo: WeMoDevice) -> DeviceInfo:
     return DeviceInfo(
         connections={(CONNECTION_UPNP, wemo.udn)},
-        identifiers={(DOMAIN, wemo.serialnumber)},
+        identifiers={(DOMAIN, wemo.serial_number)},
         manufacturer="Belkin",
         model=wemo.model_name,
         name=wemo.name,
@@ -160,20 +259,11 @@ async def async_register_device(
 
     device = DeviceCoordinator(hass, wemo, entry.id)
     hass.data[DOMAIN].setdefault("devices", {})[entry.id] = device
-    registry = hass.data[DOMAIN]["registry"]
-    registry.on(wemo, None, device.subscription_callback)
-    await hass.async_add_executor_job(registry.register, wemo)
 
-    if isinstance(wemo, LongPressMixin):
-        try:
-            await hass.async_add_executor_job(wemo.ensure_long_press_virtual_device)
-        # Temporarily handling all exceptions for #52996 & pywemo/pywemo/issues/276
-        # Replace this with `except: PyWeMoException` after upstream has been fixed.
-        except Exception:  # pylint: disable=broad-except
-            _LOGGER.exception(
-                "Failed to enable long press support for device: %s", wemo.name
-            )
-            device.supports_long_press = False
+    config_entry.async_on_unload(
+        config_entry.add_update_listener(device.async_set_options)
+    )
+    await device.async_set_options(hass, config_entry)
 
     return device
 
diff --git a/homeassistant/components/whirlpool/sensor.py b/homeassistant/components/whirlpool/sensor.py
index 9c26a0319f7bdc..de415035c76886 100644
--- a/homeassistant/components/whirlpool/sensor.py
+++ b/homeassistant/components/whirlpool/sensor.py
@@ -290,12 +290,15 @@ def update_from_latest_data(self) -> None:
 
         if machine_state is MachineState.RunningMainCycle:
             self._running = True
+
             new_timestamp = now + timedelta(
                 seconds=int(self._wd.get_attribute("Cavity_TimeStatusEstTimeRemaining"))
             )
 
-            if isinstance(self._attr_native_value, datetime) and abs(
-                new_timestamp - self._attr_native_value
-            ) > timedelta(seconds=60):
+            if (
+                self._attr_native_value is None
+                or isinstance(self._attr_native_value, datetime)
+                and abs(new_timestamp - self._attr_native_value) > timedelta(seconds=60)
+            ):
                 self._attr_native_value = new_timestamp
                 self._async_write_ha_state()
diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py
index 82c3a25590adf2..711c2987735b9d 100644
--- a/homeassistant/components/wirelesstag/binary_sensor.py
+++ b/homeassistant/components/wirelesstag/binary_sensor.py
@@ -100,6 +100,7 @@ def __init__(self, api, tag, sensor_type):
         super().__init__(api, tag)
         self._sensor_type = sensor_type
         self._name = f"{self._tag.name} {self.event.human_readable_name}"
+        self._attr_unique_id = f"{self.tag_id}_{self._sensor_type}"
 
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""
diff --git a/homeassistant/components/wirelesstag/sensor.py b/homeassistant/components/wirelesstag/sensor.py
index cb5f3c59f57e37..fd9a7898f920f8 100644
--- a/homeassistant/components/wirelesstag/sensor.py
+++ b/homeassistant/components/wirelesstag/sensor.py
@@ -100,12 +100,13 @@ def __init__(self, api, tag, description):
         self._sensor_type = description.key
         self.entity_description = description
         self._name = self._tag.name
+        self._attr_unique_id = f"{self.tag_id}_{self._sensor_type}"
 
         # I want to see entity_id as:
         # sensor.wirelesstag_bedroom_temperature
         # and not as sensor.bedroom for temperature and
         # sensor.bedroom_2 for humidity
-        self._entity_id = (
+        self.entity_id = (
             f"sensor.{WIRELESSTAG_DOMAIN}_{self.underscored_name}_{self._sensor_type}"
         )
 
@@ -119,11 +120,6 @@ async def async_added_to_hass(self) -> None:
             )
         )
 
-    @property
-    def entity_id(self):
-        """Overridden version."""
-        return self._entity_id
-
     @property
     def underscored_name(self):
         """Provide name savvy to be used in entity_id name of self."""
diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py
index 26c7d9384a6b6a..df0f72aca186c1 100644
--- a/homeassistant/components/wirelesstag/switch.py
+++ b/homeassistant/components/wirelesstag/switch.py
@@ -82,6 +82,7 @@ def __init__(self, api, tag, description: SwitchEntityDescription) -> None:
         super().__init__(api, tag)
         self.entity_description = description
         self._name = f"{self._tag.name} {description.name}"
+        self._attr_unique_id = f"{self.tag_id}_{description.key}"
 
     def turn_on(self, **kwargs: Any) -> None:
         """Turn on the switch."""
diff --git a/homeassistant/components/withings/common.py b/homeassistant/components/withings/common.py
index a691ffe8f9e5c5..1b173e3a3778a5 100644
--- a/homeassistant/components/withings/common.py
+++ b/homeassistant/components/withings/common.py
@@ -41,7 +41,7 @@
 )
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import const
 from .const import Measurement
@@ -411,7 +411,7 @@ async def _async_get_all_data(self) -> dict[Measurement, Any] | None:
     async def async_get_measures(self) -> dict[Measurement, Any]:
         """Get the measures data."""
         _LOGGER.debug("Updating withings measures")
-        now = dt.utcnow()
+        now = dt_util.utcnow()
         startdate = now - datetime.timedelta(days=7)
 
         response = await self._hass.async_add_executor_job(
@@ -439,7 +439,7 @@ async def async_get_measures(self) -> dict[Measurement, Any]:
     async def async_get_sleep_summary(self) -> dict[Measurement, Any]:
         """Get the sleep summary data."""
         _LOGGER.debug("Updating withing sleep summary")
-        now = dt.utcnow()
+        now = dt_util.utcnow()
         yesterday = now - datetime.timedelta(days=1)
         yesterday_noon = datetime.datetime(
             yesterday.year,
diff --git a/homeassistant/components/wiz/__init__.py b/homeassistant/components/wiz/__init__.py
index 4a6b1dfb44a57c..26d4e33a7a6def 100644
--- a/homeassistant/components/wiz/__init__.py
+++ b/homeassistant/components/wiz/__init__.py
@@ -12,6 +12,7 @@
 from homeassistant.const import CONF_HOST, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
@@ -41,6 +42,8 @@
 
 REQUEST_REFRESH_DELAY = 0.35
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
     """Set up the wiz integration."""
diff --git a/homeassistant/components/wiz/light.py b/homeassistant/components/wiz/light.py
index 084acbe73e7c36..216c5d9335e1ce 100644
--- a/homeassistant/components/wiz/light.py
+++ b/homeassistant/components/wiz/light.py
@@ -71,6 +71,8 @@ async def async_setup_entry(
 class WizBulbEntity(WizToggleEntity, LightEntity):
     """Representation of WiZ Light bulb."""
 
+    _attr_name = None
+
     def __init__(self, wiz_data: WizData, name: str) -> None:
         """Initialize an WiZLight."""
         super().__init__(wiz_data, name)
diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py
index 2c68401376575a..1eb8074bbc1546 100644
--- a/homeassistant/components/wled/light.py
+++ b/homeassistant/components/wled/light.py
@@ -118,7 +118,9 @@ def __init__(
 
         # Segment 0 uses a simpler name, which is more natural for when using
         # a single segment / using WLED with one big LED strip.
-        if segment != 0:
+        if segment == 0:
+            self._attr_name = None
+        else:
             self._attr_name = f"Segment {segment}"
 
         self._attr_unique_id = (
diff --git a/homeassistant/components/wolflink/manifest.json b/homeassistant/components/wolflink/manifest.json
index d01ca126781f4e..0d793385a3bbce 100644
--- a/homeassistant/components/wolflink/manifest.json
+++ b/homeassistant/components/wolflink/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/wolflink",
   "iot_class": "cloud_polling",
   "loggers": ["wolf_smartset"],
-  "requirements": ["wolf_smartset==0.1.11"]
+  "requirements": ["wolf-smartset==0.1.11"]
 }
diff --git a/homeassistant/components/workday/binary_sensor.py b/homeassistant/components/workday/binary_sensor.py
index 9c2e453c03d3e7..51560161faa8fa 100644
--- a/homeassistant/components/workday/binary_sensor.py
+++ b/homeassistant/components/workday/binary_sensor.py
@@ -21,7 +21,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ALLOWED_DAYS,
@@ -92,7 +92,7 @@ async def async_setup_platform(
         hass,
         DOMAIN,
         "deprecated_yaml",
-        breaks_in_ha_version="2023.7.0",
+        breaks_in_ha_version="2023.11.0",
         is_fixable=False,
         severity=IssueSeverity.WARNING,
         translation_key="deprecated_yaml",
@@ -120,7 +120,7 @@ async def async_setup_entry(
     sensor_name: str = entry.options[CONF_NAME]
     workdays: list[str] = entry.options[CONF_WORKDAYS]
 
-    year: int = (dt.now() + timedelta(days=days_offset)).year
+    year: int = (dt_util.now() + timedelta(days=days_offset)).year
     obj_holidays: HolidayBase = getattr(holidays, country)(years=year)
 
     if province:
@@ -140,7 +140,7 @@ async def async_setup_entry(
     for remove_holiday in remove_holidays:
         try:
             # is this formatted as a date?
-            if dt.parse_date(remove_holiday):
+            if dt_util.parse_date(remove_holiday):
                 # remove holiday by date
                 removed = obj_holidays.pop(remove_holiday)
                 LOGGER.debug("Removed %s", remove_holiday)
@@ -178,6 +178,7 @@ class IsWorkdaySensor(BinarySensorEntity):
     """Implementation of a Workday sensor."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     def __init__(
         self,
@@ -231,7 +232,7 @@ async def async_update(self) -> None:
         self._attr_is_on = False
 
         # Get ISO day of the week (1 = Monday, 7 = Sunday)
-        adjusted_date = dt.now() + timedelta(days=self._days_offset)
+        adjusted_date = dt_util.now() + timedelta(days=self._days_offset)
         day = adjusted_date.isoweekday() - 1
         day_of_week = ALLOWED_DAYS[day]
 
diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py
index c440ca5d73e212..7153dac1bcba73 100644
--- a/homeassistant/components/workday/config_flow.py
+++ b/homeassistant/components/workday/config_flow.py
@@ -24,7 +24,7 @@
     SelectSelectorMode,
     TextSelector,
 )
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ALLOWED_DAYS,
@@ -73,16 +73,16 @@ def validate_custom_dates(user_input: dict[str, Any]) -> None:
     """Validate custom dates for add/remove holidays."""
 
     for add_date in user_input[CONF_ADD_HOLIDAYS]:
-        if dt.parse_date(add_date) is None:
+        if dt_util.parse_date(add_date) is None:
             raise AddDatesError("Incorrect date")
 
-    year: int = dt.now().year
+    year: int = dt_util.now().year
     obj_holidays = country_holidays(
         user_input[CONF_COUNTRY], user_input.get(CONF_PROVINCE), year
     )
 
     for remove_date in user_input[CONF_REMOVE_HOLIDAYS]:
-        if dt.parse_date(remove_date) is None:
+        if dt_util.parse_date(remove_date) is None:
             if obj_holidays.get_named(remove_date) == []:
                 raise RemoveDatesError("Incorrect date or name")
 
@@ -247,7 +247,10 @@ async def async_step_options(
             step_id="options",
             data_schema=new_schema,
             errors=errors,
-            description_placeholders={"name": self.data[CONF_NAME]},
+            description_placeholders={
+                "name": self.data[CONF_NAME],
+                "country": self.data[CONF_COUNTRY],
+            },
         )
 
 
@@ -304,6 +307,10 @@ async def async_step_init(
             step_id="init",
             data_schema=new_schema,
             errors=errors,
+            description_placeholders={
+                "name": self.options[CONF_NAME],
+                "country": self.options[CONF_COUNTRY],
+            },
         )
 
 
diff --git a/homeassistant/components/workday/strings.json b/homeassistant/components/workday/strings.json
index b81e027bb051a0..e6753b39dcefaf 100644
--- a/homeassistant/components/workday/strings.json
+++ b/homeassistant/components/workday/strings.json
@@ -12,7 +12,7 @@
         }
       },
       "options": {
-        "description": "Set workday options for {name}",
+        "description": "Set additional options for {name} configured for country {country}",
         "data": {
           "excludes": "Excludes",
           "days_offset": "Offset",
@@ -39,6 +39,7 @@
   "options": {
     "step": {
       "init": {
+        "description": "Change additional options for {name} configured for country {country}",
         "data": {
           "excludes": "[%key:component::workday::config::step::options::data::excludes%]",
           "days_offset": "[%key:component::workday::config::step::options::data::days_offset%]",
diff --git a/homeassistant/components/worxlandroid/sensor.py b/homeassistant/components/worxlandroid/sensor.py
index d15a33e9e17db2..834a0b95f42894 100644
--- a/homeassistant/components/worxlandroid/sensor.py
+++ b/homeassistant/components/worxlandroid/sensor.py
@@ -129,9 +129,8 @@ async def async_update(self) -> None:
             elif self.sensor == "state":
                 self._state = self.get_state(data)
 
-        else:
-            if self.sensor == "error":
-                self._state = "no"
+        elif self.sensor == "error":
+            self._state = "no"
 
     @staticmethod
     def get_error(obj):
diff --git a/homeassistant/components/ws66i/media_player.py b/homeassistant/components/ws66i/media_player.py
index 1101c0c9fbc8c9..0bf58c249ae09b 100644
--- a/homeassistant/components/ws66i/media_player.py
+++ b/homeassistant/components/ws66i/media_player.py
@@ -44,6 +44,9 @@ async def async_setup_entry(
 class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity):
     """Representation of a WS66i amplifier zone."""
 
+    _attr_has_entity_name = True
+    _attr_name = None
+
     def __init__(
         self,
         device: WS66i,
@@ -62,7 +65,6 @@ def __init__(
         self._status: ZoneStatus = coordinator.data[data_idx]
         self._attr_source_list = ws66i_data.sources.name_list
         self._attr_unique_id = f"{entry_id}_{self._zone_id}"
-        self._attr_name = f"Zone {self._zone_id}"
         self._attr_supported_features = (
             MediaPlayerEntityFeature.VOLUME_MUTE
             | MediaPlayerEntityFeature.VOLUME_SET
@@ -73,7 +75,7 @@ def __init__(
         )
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, str(self.unique_id))},
-            name=self.name,
+            name=f"Zone {self._zone_id}",
             manufacturer="Soundavo",
             model="WS66i 6-Zone Amplifier",
         )
diff --git a/homeassistant/components/wyoming/data.py b/homeassistant/components/wyoming/data.py
index 3ef93810b6e7f4..c2d71835c65920 100644
--- a/homeassistant/components/wyoming/data.py
+++ b/homeassistant/components/wyoming/data.py
@@ -53,23 +53,24 @@ async def load_wyoming_info(
 
     for _ in range(retries + 1):
         try:
-            async with AsyncTcpClient(host, port) as client:
-                with async_timeout.timeout(timeout):
-                    # Describe -> Info
-                    await client.write_event(Describe().event())
-                    while True:
-                        event = await client.read_event()
-                        if event is None:
-                            raise WyomingError(
-                                "Connection closed unexpectedly",
-                            )
-
-                        if Info.is_type(event.type):
-                            wyoming_info = Info.from_event(event)
-                            break  # while
-
-                    if wyoming_info is not None:
-                        break  # for
+            async with AsyncTcpClient(host, port) as client, async_timeout.timeout(
+                timeout
+            ):
+                # Describe -> Info
+                await client.write_event(Describe().event())
+                while True:
+                    event = await client.read_event()
+                    if event is None:
+                        raise WyomingError(
+                            "Connection closed unexpectedly",
+                        )
+
+                    if Info.is_type(event.type):
+                        wyoming_info = Info.from_event(event)
+                        break  # while
+
+                if wyoming_info is not None:
+                    break  # for
         except (asyncio.TimeoutError, OSError, WyomingError):
             # Sleep and try again
             await asyncio.sleep(retry_wait)
diff --git a/homeassistant/components/wyoming/stt.py b/homeassistant/components/wyoming/stt.py
index 8d3f6534502721..3f5487881a32b2 100644
--- a/homeassistant/components/wyoming/stt.py
+++ b/homeassistant/components/wyoming/stt.py
@@ -1,4 +1,4 @@
-"""Support for Wyoming speech to text services."""
+"""Support for Wyoming speech-to-text services."""
 from collections.abc import AsyncIterable
 import logging
 
@@ -23,7 +23,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up Wyoming speech to text."""
+    """Set up Wyoming speech-to-text."""
     service: WyomingService = hass.data[DOMAIN][config_entry.entry_id]
     async_add_entities(
         [
@@ -33,7 +33,7 @@ async def async_setup_entry(
 
 
 class WyomingSttProvider(stt.SpeechToTextEntity):
-    """Wyoming speech to text provider."""
+    """Wyoming speech-to-text provider."""
 
     def __init__(
         self,
diff --git a/homeassistant/components/wyoming/tts.py b/homeassistant/components/wyoming/tts.py
index f2e314dc13ea1b..0fc7bf5e6c4cd0 100644
--- a/homeassistant/components/wyoming/tts.py
+++ b/homeassistant/components/wyoming/tts.py
@@ -1,4 +1,4 @@
-"""Support for Wyoming text to speech services."""
+"""Support for Wyoming text-to-speech services."""
 from collections import defaultdict
 import io
 import logging
@@ -25,7 +25,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up Wyoming speech to text."""
+    """Set up Wyoming speech-to-text."""
     service: WyomingService = hass.data[DOMAIN][config_entry.entry_id]
     async_add_entities(
         [
@@ -35,7 +35,7 @@ async def async_setup_entry(
 
 
 class WyomingTtsProvider(tts.TextToSpeechEntity):
-    """Wyoming text to speech provider."""
+    """Wyoming text-to-speech provider."""
 
     def __init__(
         self,
@@ -94,7 +94,7 @@ def async_get_supported_voices(self, language: str) -> list[tts.Voice] | None:
         """Return a list of supported voices for a language."""
         return self._voices.get(language)
 
-    async def async_get_tts_audio(self, message, language, options=None):
+    async def async_get_tts_audio(self, message, language, options):
         """Load TTS from UNIX socket."""
         try:
             async with AsyncTcpClient(self.service.host, self.service.port) as client:
@@ -129,7 +129,7 @@ async def async_get_tts_audio(self, message, language, options=None):
         except (OSError, WyomingError):
             return (None, None)
 
-        if (options is None) or (options[tts.ATTR_AUDIO_OUTPUT] == "wav"):
+        if options[tts.ATTR_AUDIO_OUTPUT] == "wav":
             return ("wav", data)
 
         # Raw output (convert to 16Khz, 16-bit mono)
diff --git a/homeassistant/components/xbox/__init__.py b/homeassistant/components/xbox/__init__.py
index 4263059f0facaf..7f1f11ba25d372 100644
--- a/homeassistant/components/xbox/__init__.py
+++ b/homeassistant/components/xbox/__init__.py
@@ -6,7 +6,6 @@
 from datetime import timedelta
 import logging
 
-import voluptuous as vol
 from xbox.webapi.api.client import XboxLiveClient
 from xbox.webapi.api.provider.catalog.const import SYSTEM_PFN_ID_MAP
 from xbox.webapi.api.provider.catalog.models import AlternateIdType, Product
@@ -20,17 +19,14 @@
     SmartglassConsoleStatus,
 )
 
-from homeassistant.components import application_credentials
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
     aiohttp_client,
     config_entry_oauth2_flow,
     config_validation as cv,
 )
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import api
@@ -38,20 +34,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = vol.Schema(
-    vol.All(
-        cv.deprecated(DOMAIN),
-        {
-            DOMAIN: vol.Schema(
-                {
-                    vol.Required(CONF_CLIENT_ID): cv.string,
-                    vol.Required(CONF_CLIENT_SECRET): cv.string,
-                }
-            )
-        },
-    ),
-    extra=vol.ALLOW_EXTRA,
-)
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -61,40 +44,6 @@
 ]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the xbox component."""
-    hass.data[DOMAIN] = {}
-
-    if DOMAIN not in config:
-        return True
-
-    await application_credentials.async_import_client_credential(
-        hass,
-        DOMAIN,
-        application_credentials.ClientCredential(
-            config[DOMAIN][CONF_CLIENT_ID], config[DOMAIN][CONF_CLIENT_SECRET]
-        ),
-    )
-    async_create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_yaml",
-        breaks_in_ha_version="2022.9.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_yaml",
-    )
-    _LOGGER.warning(
-        "Configuration of Xbox integration in YAML is deprecated and "
-        "will be removed in Home Assistant 2022.9.; Your existing configuration "
-        "(including OAuth Application Credentials) has been imported into "
-        "the UI automatically and can be safely removed from your "
-        "configuration.yaml file"
-    )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up xbox from a config entry."""
     implementation = (
@@ -118,7 +67,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = XboxUpdateCoordinator(hass, client, consoles)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data[DOMAIN][entry.entry_id] = {
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
         "client": XboxLiveClient(auth),
         "consoles": consoles,
         "coordinator": coordinator,
diff --git a/homeassistant/components/xbox/strings.json b/homeassistant/components/xbox/strings.json
index 68af0176fa81a7..accd67759418fc 100644
--- a/homeassistant/components/xbox/strings.json
+++ b/homeassistant/components/xbox/strings.json
@@ -13,11 +13,5 @@
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The Xbox YAML configuration is being removed",
-      "description": "Configuring the Xbox in configuration.yaml is being removed in Home Assistant 2022.9.\n\nYour existing OAuth Application Credentials and access settings have been imported into the UI automatically. Remove the YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/xiaomi_aqara/__init__.py b/homeassistant/components/xiaomi_aqara/__init__.py
index be6eba6793ee07..ef36bd677783b1 100644
--- a/homeassistant/components/xiaomi_aqara/__init__.py
+++ b/homeassistant/components/xiaomi_aqara/__init__.py
@@ -2,6 +2,7 @@
 import asyncio
 from datetime import timedelta
 import logging
+from typing import Any
 
 import voluptuous as vol
 from xiaomi_gateway import AsyncXiaomiGatewayMulticast, XiaomiGateway
@@ -78,6 +79,8 @@
     {vol.Required(ATTR_DEVICE_ID): vol.All(cv.string, vol.Length(min=14, max=14))}
 )
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Xiaomi component."""
@@ -351,9 +354,13 @@ def _async_track_unavailable(self):
             return True
         return False
 
+    def push_data(self, data: dict[str, Any], raw_data: dict[Any, Any]) -> None:
+        """Push from Hub running in another thread."""
+        self.hass.loop.call_soon_threadsafe(self.async_push_data, data, raw_data)
+
     @callback
-    def push_data(self, data, raw_data):
-        """Push from Hub."""
+    def async_push_data(self, data: dict[str, Any], raw_data: dict[Any, Any]) -> None:
+        """Push from Hub handled in the event loop."""
         _LOGGER.debug("PUSH >> %s: %s", self, data)
         was_unavailable = self._async_track_unavailable()
         is_data = self.parse_data(data, raw_data)
diff --git a/homeassistant/components/xiaomi_ble/manifest.json b/homeassistant/components/xiaomi_ble/manifest.json
index 4d5cddd951725d..69a95ea8a9c427 100644
--- a/homeassistant/components/xiaomi_ble/manifest.json
+++ b/homeassistant/components/xiaomi_ble/manifest.json
@@ -16,5 +16,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/xiaomi_ble",
   "iot_class": "local_push",
-  "requirements": ["xiaomi-ble==0.17.0"]
+  "requirements": ["xiaomi-ble==0.17.2"]
 }
diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py
index b6810cf4cf205d..541b077f6f0ef3 100644
--- a/homeassistant/components/xiaomi_miio/__init__.py
+++ b/homeassistant/components/xiaomi_miio/__init__.py
@@ -105,7 +105,12 @@
     Platform.SWITCH,
 ]
 LIGHT_PLATFORMS = [Platform.LIGHT]
-VACUUM_PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.VACUUM]
+VACUUM_PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+    Platform.BUTTON,
+    Platform.VACUUM,
+]
 AIR_MONITOR_PLATFORMS = [Platform.AIR_QUALITY, Platform.SENSOR]
 
 MODEL_TO_CLASS_MAP = {
diff --git a/homeassistant/components/xiaomi_miio/button.py b/homeassistant/components/xiaomi_miio/button.py
index 4a84873d24c268..9ed9b780911cd4 100644
--- a/homeassistant/components/xiaomi_miio/button.py
+++ b/homeassistant/components/xiaomi_miio/button.py
@@ -3,6 +3,8 @@
 
 from dataclasses import dataclass
 
+from miio.integrations.vacuum.roborock.vacuum import Consumable
+
 from homeassistant.components.button import (
     ButtonDeviceClass,
     ButtonEntity,
@@ -19,22 +21,33 @@
     KEY_DEVICE,
     MODEL_AIRFRESH_A1,
     MODEL_AIRFRESH_T2017,
+    MODELS_VACUUM,
 )
 from .device import XiaomiCoordinatedMiioEntity
 
+# Fans
 ATTR_RESET_DUST_FILTER = "reset_dust_filter"
 ATTR_RESET_UPPER_FILTER = "reset_upper_filter"
 
+# Vacuums
+METHOD_VACUUM_RESET_CONSUMABLE = "consumable_reset"
+ATTR_RESET_VACUUM_MAIN_BRUSH = "reset_vacuum_main_brush"
+ATTR_RESET_VACUUM_SIDE_BRUSH = "reset_vacuum_side_brush"
+ATTR_RESET_VACUUM_FILTER = "reset_vacuum_filter"
+ATTR_RESET_VACUUM_SENSOR_DIRTY = "reset_vacuum_sensor_dirty"
+
 
 @dataclass
 class XiaomiMiioButtonDescription(ButtonEntityDescription):
     """A class that describes button entities."""
 
     method_press: str = ""
+    method_press_params: Consumable | None = None
     method_press_error_message: str = ""
 
 
 BUTTON_TYPES = (
+    # Fans
     XiaomiMiioButtonDescription(
         key=ATTR_RESET_DUST_FILTER,
         name="Reset dust filter",
@@ -51,6 +64,50 @@ class XiaomiMiioButtonDescription(ButtonEntityDescription):
         method_press_error_message="Resetting the upper filter lifetime failed.",
         entity_category=EntityCategory.CONFIG,
     ),
+    # Vacuums
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_MAIN_BRUSH,
+        name="Reset main brush",
+        icon="mdi:brush",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.MainBrush,
+        method_press_error_message="Resetting the main brush lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_SIDE_BRUSH,
+        name="Reset side brush",
+        icon="mdi:brush",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.SideBrush,
+        method_press_error_message="Resetting the side brush lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_FILTER,
+        name="Reset filter",
+        icon="mdi:air-filter",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.Filter,
+        method_press_error_message="Resetting the filter lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+    XiaomiMiioButtonDescription(
+        key=ATTR_RESET_VACUUM_SENSOR_DIRTY,
+        name="Reset sensor dirty",
+        icon="mdi:eye-outline",
+        method_press=METHOD_VACUUM_RESET_CONSUMABLE,
+        method_press_params=Consumable.SensorDirty,
+        method_press_error_message="Resetting the sensor lifetime failed.",
+        entity_category=EntityCategory.CONFIG,
+    ),
+)
+
+BUTTONS_FOR_VACUUM = (
+    ATTR_RESET_VACUUM_MAIN_BRUSH,
+    ATTR_RESET_VACUUM_SIDE_BRUSH,
+    ATTR_RESET_VACUUM_FILTER,
+    ATTR_RESET_VACUUM_SENSOR_DIRTY,
 )
 
 MODEL_TO_BUTTON_MAP: dict[str, tuple[str, ...]] = {
@@ -59,6 +116,7 @@ class XiaomiMiioButtonDescription(ButtonEntityDescription):
         ATTR_RESET_DUST_FILTER,
         ATTR_RESET_UPPER_FILTER,
     ),
+    **{model: BUTTONS_FOR_VACUUM for model in MODELS_VACUUM},
 }
 
 
@@ -114,4 +172,5 @@ async def async_press(self) -> None:
         await self._try_command(
             self.entity_description.method_press_error_message,
             method,
+            self.entity_description.method_press_params,
         )
diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py
index aaf471518d8327..a3bb28e7a8b7a1 100644
--- a/homeassistant/components/xiaomi_miio/fan.py
+++ b/homeassistant/components/xiaomi_miio/fan.py
@@ -275,9 +275,7 @@ async def async_service_handler(service: ServiceCall) -> None:
             if not entity_method:
                 continue
             await entity_method(**params)
-            update_tasks.append(
-                hass.async_create_task(entity.async_update_ha_state(True))
-            )
+            update_tasks.append(asyncio.create_task(entity.async_update_ha_state(True)))
 
         if update_tasks:
             await asyncio.wait(update_tasks)
@@ -294,6 +292,8 @@ async def async_service_handler(service: ServiceCall) -> None:
 class XiaomiGenericDevice(XiaomiCoordinatedMiioEntity, FanEntity):
     """Representation of a generic Xiaomi device."""
 
+    _attr_name = None
+
     def __init__(self, device, entry, unique_id, coordinator):
         """Initialize the generic Xiaomi device."""
         super().__init__(device, entry, unique_id, coordinator)
diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py
index 6fde33309e4ee6..0438b606efd9c1 100644
--- a/homeassistant/components/xiaomi_miio/humidifier.py
+++ b/homeassistant/components/xiaomi_miio/humidifier.py
@@ -14,6 +14,7 @@
 )
 
 from homeassistant.components.humidifier import (
+    ATTR_HUMIDITY,
     HumidifierDeviceClass,
     HumidifierEntity,
     HumidifierEntityFeature,
@@ -46,6 +47,7 @@
 AVAILABLE_ATTRIBUTES = {
     ATTR_MODE: "mode",
     ATTR_TARGET_HUMIDITY: "target_humidity",
+    ATTR_HUMIDITY: "humidity",
 }
 
 AVAILABLE_MODES_CA1_CB1 = [
@@ -116,6 +118,7 @@ class XiaomiGenericHumidifier(XiaomiCoordinatedMiioEntity, HumidifierEntity):
 
     _attr_device_class = HumidifierDeviceClass.HUMIDIFIER
     _attr_supported_features = HumidifierEntityFeature.MODES
+    _attr_name = None
 
     def __init__(self, device, entry, unique_id, coordinator):
         """Initialize the generic Xiaomi device."""
@@ -199,6 +202,7 @@ def __init__(self, device, entry, unique_id, coordinator):
             }
         )
         self._target_humidity = self._attributes[ATTR_TARGET_HUMIDITY]
+        self._attr_current_humidity = self._attributes[ATTR_HUMIDITY]
         self._mode = self._attributes[ATTR_MODE]
 
     @property
@@ -217,6 +221,7 @@ def _handle_coordinator_update(self):
             }
         )
         self._target_humidity = self._attributes[ATTR_TARGET_HUMIDITY]
+        self._attr_current_humidity = self._attributes[ATTR_HUMIDITY]
         self._mode = self._attributes[ATTR_MODE]
         self.async_write_ha_state()
 
diff --git a/homeassistant/components/xiaomi_miio/light.py b/homeassistant/components/xiaomi_miio/light.py
index fc38d75d2ca1cc..9b8357a534fe11 100644
--- a/homeassistant/components/xiaomi_miio/light.py
+++ b/homeassistant/components/xiaomi_miio/light.py
@@ -38,7 +38,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import color, dt
+from homeassistant.util import color, dt as dt_util
 
 from .const import (
     CONF_DEVICE,
@@ -229,7 +229,9 @@ async def async_service_handler(service: ServiceCall) -> None:
                 if not hasattr(target_device, method["method"]):
                     continue
                 await getattr(target_device, method["method"])(**params)
-                update_tasks.append(target_device.async_update_ha_state(True))
+                update_tasks.append(
+                    asyncio.create_task(target_device.async_update_ha_state(True))
+                )
 
             if update_tasks:
                 await asyncio.wait(update_tasks)
@@ -362,7 +364,7 @@ async def async_update(self) -> None:
 
         delayed_turn_off = self.delayed_turn_off_timestamp(
             state.delay_off_countdown,
-            dt.utcnow(),
+            dt_util.utcnow(),
             self._state_attrs[ATTR_DELAYED_TURN_OFF],
         )
 
@@ -523,7 +525,7 @@ async def async_update(self) -> None:
 
         delayed_turn_off = self.delayed_turn_off_timestamp(
             state.delay_off_countdown,
-            dt.utcnow(),
+            dt_util.utcnow(),
             self._state_attrs[ATTR_DELAYED_TURN_OFF],
         )
 
@@ -582,7 +584,7 @@ async def async_update(self) -> None:
 
         delayed_turn_off = self.delayed_turn_off_timestamp(
             state.delay_off_countdown,
-            dt.utcnow(),
+            dt_util.utcnow(),
             self._state_attrs[ATTR_DELAYED_TURN_OFF],
         )
 
@@ -625,7 +627,7 @@ async def async_update(self) -> None:
 
         delayed_turn_off = self.delayed_turn_off_timestamp(
             state.delay_off_countdown,
-            dt.utcnow(),
+            dt_util.utcnow(),
             self._state_attrs[ATTR_DELAYED_TURN_OFF],
         )
 
diff --git a/homeassistant/components/xiaomi_miio/number.py b/homeassistant/components/xiaomi_miio/number.py
index 732710f7129f1c..a8346caa8941ab 100644
--- a/homeassistant/components/xiaomi_miio/number.py
+++ b/homeassistant/components/xiaomi_miio/number.py
@@ -441,7 +441,7 @@ async def async_set_delay_off_countdown(self, delay_off_countdown: int) -> bool:
         return await self._try_command(
             "Setting delay off miio device failed.",
             self._device.delay_off,
-            delay_off_countdown * 60,
+            delay_off_countdown,
         )
 
     async def async_set_led_brightness_level(self, level: int) -> bool:
diff --git a/homeassistant/components/xiaomi_miio/strings.json b/homeassistant/components/xiaomi_miio/strings.json
index dfcb503182ce59..15c89498bc7b45 100644
--- a/homeassistant/components/xiaomi_miio/strings.json
+++ b/homeassistant/components/xiaomi_miio/strings.json
@@ -69,7 +69,7 @@
         "state": {
           "bright": "Bright",
           "dim": "Dim",
-          "off": "Off"
+          "off": "[%key:common::state::off%]"
         }
       },
       "display_orientation": {
diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py
index 08b15f58217ba6..9bba9f6112314b 100644
--- a/homeassistant/components/xiaomi_miio/switch.py
+++ b/homeassistant/components/xiaomi_miio/switch.py
@@ -500,7 +500,9 @@ async def async_service_handler(service: ServiceCall) -> None:
                 if not hasattr(device, method["method"]):
                     continue
                 await getattr(device, method["method"])(**params)
-                update_tasks.append(device.async_update_ha_state(True))
+                update_tasks.append(
+                    asyncio.create_task(device.async_update_ha_state(True))
+                )
 
             if update_tasks:
                 await asyncio.wait(update_tasks)
diff --git a/homeassistant/components/xiaomi_miio/vacuum.py b/homeassistant/components/xiaomi_miio/vacuum.py
index 10fd1f2406bfef..34a7b949646878 100644
--- a/homeassistant/components/xiaomi_miio/vacuum.py
+++ b/homeassistant/components/xiaomi_miio/vacuum.py
@@ -187,6 +187,7 @@ class MiroboVacuum(
 ):
     """Representation of a Xiaomi Vacuum cleaner robot."""
 
+    _attr_name = None
     _attr_supported_features = (
         VacuumEntityFeature.STATE
         | VacuumEntityFeature.PAUSE
diff --git a/homeassistant/components/xmpp/manifest.json b/homeassistant/components/xmpp/manifest.json
index dd7df91223c650..99b3ff126d3d8e 100644
--- a/homeassistant/components/xmpp/manifest.json
+++ b/homeassistant/components/xmpp/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/xmpp",
   "iot_class": "cloud_push",
   "loggers": ["pyasn1", "slixmpp"],
-  "requirements": ["slixmpp==1.8.3"]
+  "requirements": ["slixmpp==1.8.4"]
 }
diff --git a/homeassistant/components/yale_home/__init__.py b/homeassistant/components/yale_home/__init__.py
new file mode 100644
index 00000000000000..8313f40e785a80
--- /dev/null
+++ b/homeassistant/components/yale_home/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Yale Home."""
diff --git a/homeassistant/components/yale_home/manifest.json b/homeassistant/components/yale_home/manifest.json
new file mode 100644
index 00000000000000..0e45b0da7d0336
--- /dev/null
+++ b/homeassistant/components/yale_home/manifest.json
@@ -0,0 +1,6 @@
+{
+  "domain": "yale_home",
+  "name": "Yale Home",
+  "integration_type": "virtual",
+  "supported_by": "august"
+}
diff --git a/homeassistant/components/yale_smart_alarm/binary_sensor.py b/homeassistant/components/yale_smart_alarm/binary_sensor.py
index 49cd10f4c64b50..2aad449a3f78f3 100644
--- a/homeassistant/components/yale_smart_alarm/binary_sensor.py
+++ b/homeassistant/components/yale_smart_alarm/binary_sensor.py
@@ -20,25 +20,25 @@
         key="acfail",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Power loss",
+        translation_key="power_loss",
     ),
     BinarySensorEntityDescription(
         key="battery",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Battery",
+        translation_key="battery",
     ),
     BinarySensorEntityDescription(
         key="tamper",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Tamper",
+        translation_key="tamper",
     ),
     BinarySensorEntityDescription(
         key="jam",
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
-        name="Jam",
+        translation_key="jam",
     ),
 )
 
diff --git a/homeassistant/components/yale_smart_alarm/button.py b/homeassistant/components/yale_smart_alarm/button.py
index d8601ec85f9a59..901cd1863eec6b 100644
--- a/homeassistant/components/yale_smart_alarm/button.py
+++ b/homeassistant/components/yale_smart_alarm/button.py
@@ -15,7 +15,7 @@
 BUTTON_TYPES = (
     ButtonEntityDescription(
         key="panic",
-        name="Panic button",
+        translation_key="panic",
         icon="mdi:alarm-light",
     ),
 )
diff --git a/homeassistant/components/yale_smart_alarm/strings.json b/homeassistant/components/yale_smart_alarm/strings.json
index 6a6443c1b9b66d..5928013e098235 100644
--- a/homeassistant/components/yale_smart_alarm/strings.json
+++ b/homeassistant/components/yale_smart_alarm/strings.json
@@ -39,5 +39,26 @@
     "error": {
       "code_format_mismatch": "The code does not match the required number of digits"
     }
+  },
+  "entity": {
+    "binary_sensor": {
+      "power_loss": {
+        "name": "Power loss"
+      },
+      "battery": {
+        "name": "Battery"
+      },
+      "tamper": {
+        "name": "Tamper"
+      },
+      "jam": {
+        "name": "Jam"
+      }
+    },
+    "button": {
+      "panic": {
+        "name": "Panic button"
+      }
+    }
   }
 }
diff --git a/homeassistant/components/yalexs_ble/lock.py b/homeassistant/components/yalexs_ble/lock.py
index 9e97c2f080fb55..0ecf0e7b697482 100644
--- a/homeassistant/components/yalexs_ble/lock.py
+++ b/homeassistant/components/yalexs_ble/lock.py
@@ -29,6 +29,7 @@ class YaleXSBLELock(YALEXSBLEEntity, LockEntity):
     """A yale xs ble lock."""
 
     _attr_has_entity_name = True
+    _attr_name = None
 
     @callback
     def _async_update_state(
diff --git a/homeassistant/components/yalexs_ble/manifest.json b/homeassistant/components/yalexs_ble/manifest.json
index 8aa795b970e127..4822b2d27041e4 100644
--- a/homeassistant/components/yalexs_ble/manifest.json
+++ b/homeassistant/components/yalexs_ble/manifest.json
@@ -12,5 +12,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/yalexs_ble",
   "iot_class": "local_push",
-  "requirements": ["yalexs-ble==2.1.17"]
+  "requirements": ["yalexs-ble==2.1.18"]
 }
diff --git a/homeassistant/components/yamaha_musiccast/media_player.py b/homeassistant/components/yamaha_musiccast/media_player.py
index 05518a6c3c939e..42549fb20d9164 100644
--- a/homeassistant/components/yamaha_musiccast/media_player.py
+++ b/homeassistant/components/yamaha_musiccast/media_player.py
@@ -130,14 +130,11 @@ def zone_id(self):
 
     @property
     def _is_netusb(self):
-        return (
-            self.coordinator.data.netusb_input
-            == self.coordinator.data.zones[self._zone_id].input
-        )
+        return self.coordinator.data.netusb_input == self.source_id
 
     @property
     def _is_tuner(self):
-        return self.coordinator.data.zones[self._zone_id].input == "tuner"
+        return self.source_id == "tuner"
 
     @property
     def media_content_id(self):
@@ -155,6 +152,27 @@ def state(self) -> MediaPlayerState:
             return MediaPlayerState.PLAYING
         return MediaPlayerState.OFF
 
+    @property
+    def source_mapping(self):
+        """Return a mapping of the actual source names to their labels configured in the MusicCast App."""
+        ret = {}
+        for inp in self.coordinator.data.zones[self._zone_id].input_list:
+            label = self.coordinator.data.input_names.get(inp, "")
+            if inp != label and (
+                label in self.coordinator.data.zones[self._zone_id].input_list
+                or list(self.coordinator.data.input_names.values()).count(label) > 1
+            ):
+                label += f" ({inp})"
+            if label == "":
+                label = inp
+            ret[inp] = label
+        return ret
+
+    @property
+    def reverse_source_mapping(self):
+        """Return a mapping from the source label to the source name."""
+        return {v: k for k, v in self.source_mapping.items()}
+
     @property
     def volume_level(self):
         """Return the volume level of the media player (0..1)."""
@@ -491,17 +509,24 @@ async def async_set_repeat(self, repeat: RepeatMode) -> None:
 
     async def async_select_source(self, source: str) -> None:
         """Select input source."""
-        await self.coordinator.musiccast.select_source(self._zone_id, source)
+        await self.coordinator.musiccast.select_source(
+            self._zone_id, self.reverse_source_mapping.get(source, source)
+        )
+
+    @property
+    def source_id(self):
+        """ID of the current input source."""
+        return self.coordinator.data.zones[self._zone_id].input
 
     @property
     def source(self):
         """Name of the current input source."""
-        return self.coordinator.data.zones[self._zone_id].input
+        return self.source_mapping.get(self.source_id)
 
     @property
     def source_list(self):
         """List of available input sources."""
-        return self.coordinator.data.zones[self._zone_id].input_list
+        return list(self.source_mapping.values())
 
     @property
     def media_duration(self):
@@ -574,7 +599,7 @@ def is_network_client(self) -> bool:
         return (
             self.coordinator.data.group_role == "client"
             and self.coordinator.data.group_id != NULL_GROUP
-            and self.source == ATTR_MC_LINK
+            and self.source_id == ATTR_MC_LINK
         )
 
     @property
@@ -583,7 +608,7 @@ def is_client(self) -> bool:
 
         If the media player is not part of a group, False is returned.
         """
-        return self.is_network_client or self.source == ATTR_MAIN_SYNC
+        return self.is_network_client or self.source_id == ATTR_MAIN_SYNC
 
     def get_all_mc_entities(self) -> list[MusicCastMediaPlayer]:
         """Return all media player entities of the musiccast system."""
@@ -616,11 +641,11 @@ def is_part_of_group(self, group_server) -> bool:
                 and self.coordinator.data.group_id
                 == group_server.coordinator.data.group_id
                 and self.ip_address != group_server.ip_address
-                and self.source == ATTR_MC_LINK
+                and self.source_id == ATTR_MC_LINK
             )
             or (
                 self.ip_address == group_server.ip_address
-                and self.source == ATTR_MAIN_SYNC
+                and self.source_id == ATTR_MAIN_SYNC
             )
         )
 
@@ -836,8 +861,12 @@ async def async_client_leave_group(self, force=False):
         """
         _LOGGER.debug("%s client leave called", self.entity_id)
         if not force and (
-            self.source == ATTR_MAIN_SYNC
-            or [entity for entity in self.other_zones if entity.source == ATTR_MC_LINK]
+            self.source_id == ATTR_MAIN_SYNC
+            or [
+                entity
+                for entity in self.other_zones
+                if entity.source_id == ATTR_MC_LINK
+            ]
         ):
             await self.coordinator.musiccast.zone_unjoin(self._zone_id)
         else:
diff --git a/homeassistant/components/yamaha_musiccast/strings.json b/homeassistant/components/yamaha_musiccast/strings.json
index 9905a8af74ba21..af26ed13b38779 100644
--- a/homeassistant/components/yamaha_musiccast/strings.json
+++ b/homeassistant/components/yamaha_musiccast/strings.json
@@ -29,7 +29,7 @@
       },
       "zone_sleep": {
         "state": {
-          "off": "Off",
+          "off": "[%key:common::state::off%]",
           "30_min": "30 Minutes",
           "60_min": "60 Minutes",
           "90_min": "90 Minutes",
diff --git a/homeassistant/components/yandextts/tts.py b/homeassistant/components/yandextts/tts.py
index 4cbbc679e423e1..755207c272d38d 100644
--- a/homeassistant/components/yandextts/tts.py
+++ b/homeassistant/components/yandextts/tts.py
@@ -114,11 +114,10 @@ def supported_options(self):
         """Return list of supported options."""
         return SUPPORTED_OPTIONS
 
-    async def async_get_tts_audio(self, message, language, options=None):
+    async def async_get_tts_audio(self, message, language, options):
         """Load TTS from yandex."""
         websession = async_get_clientsession(self.hass)
         actual_language = language
-        options = options or {}
 
         try:
             async with async_timeout.timeout(10):
diff --git a/homeassistant/components/yeelight/manifest.json b/homeassistant/components/yeelight/manifest.json
index c6f54b45f1e836..cf1bafe24fb225 100644
--- a/homeassistant/components/yeelight/manifest.json
+++ b/homeassistant/components/yeelight/manifest.json
@@ -17,7 +17,7 @@
   "iot_class": "local_push",
   "loggers": ["async_upnp_client", "yeelight"],
   "quality_scale": "platinum",
-  "requirements": ["yeelight==0.7.10", "async-upnp-client==0.33.2"],
+  "requirements": ["yeelight==0.7.11", "async-upnp-client==0.33.2"],
   "zeroconf": [
     {
       "type": "_miio._udp.local.",
diff --git a/homeassistant/components/yeelightsunflower/light.py b/homeassistant/components/yeelightsunflower/light.py
index 29a6118fc031fa..c50c176c1574af 100644
--- a/homeassistant/components/yeelightsunflower/light.py
+++ b/homeassistant/components/yeelightsunflower/light.py
@@ -74,17 +74,16 @@ def turn_on(self, **kwargs: Any) -> None:
         # when no arguments, just turn light on (full brightness)
         if not kwargs:
             self._light.turn_on()
-        else:
-            if ATTR_HS_COLOR in kwargs and ATTR_BRIGHTNESS in kwargs:
-                rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
-                bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
-                self._light.set_all(rgb[0], rgb[1], rgb[2], bright)
-            elif ATTR_HS_COLOR in kwargs:
-                rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
-                self._light.set_rgb_color(rgb[0], rgb[1], rgb[2])
-            elif ATTR_BRIGHTNESS in kwargs:
-                bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
-                self._light.set_brightness(bright)
+        elif ATTR_HS_COLOR in kwargs and ATTR_BRIGHTNESS in kwargs:
+            rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
+            bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
+            self._light.set_all(rgb[0], rgb[1], rgb[2], bright)
+        elif ATTR_HS_COLOR in kwargs:
+            rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
+            self._light.set_rgb_color(rgb[0], rgb[1], rgb[2])
+        elif ATTR_BRIGHTNESS in kwargs:
+            bright = int(kwargs[ATTR_BRIGHTNESS] / 255 * 100)
+            self._light.set_brightness(bright)
 
     def turn_off(self, **kwargs: Any) -> None:
         """Instruct the light to turn off."""
diff --git a/homeassistant/components/yi/camera.py b/homeassistant/components/yi/camera.py
index 0537c268aa42d4..632260a899c5ef 100644
--- a/homeassistant/components/yi/camera.py
+++ b/homeassistant/components/yi/camera.py
@@ -29,7 +29,7 @@
 
 DEFAULT_BRAND = "YI Home Camera"
 DEFAULT_PASSWORD = ""
-DEFAULT_PATH = "/tmp/sd/record"  # nosec
+DEFAULT_PATH = "/tmp/sd/record"  # noqa: S108
 DEFAULT_PORT = 21
 DEFAULT_USERNAME = "root"
 DEFAULT_ARGUMENTS = "-pred 1"
diff --git a/homeassistant/components/yolink/manifest.json b/homeassistant/components/yolink/manifest.json
index 2353afe5f69621..088ddd114f8fa7 100644
--- a/homeassistant/components/yolink/manifest.json
+++ b/homeassistant/components/yolink/manifest.json
@@ -6,5 +6,5 @@
   "dependencies": ["auth", "application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/yolink",
   "iot_class": "cloud_push",
-  "requirements": ["yolink-api==0.2.8"]
+  "requirements": ["yolink-api==0.2.9"]
 }
diff --git a/homeassistant/components/yolink/sensor.py b/homeassistant/components/yolink/sensor.py
index 5f89f54ccbe706..75c4949859cb45 100644
--- a/homeassistant/components/yolink/sensor.py
+++ b/homeassistant/components/yolink/sensor.py
@@ -14,6 +14,7 @@
     ATTR_DEVICE_MOTION_SENSOR,
     ATTR_DEVICE_MULTI_OUTLET,
     ATTR_DEVICE_OUTLET,
+    ATTR_DEVICE_POWER_FAILURE_ALARM,
     ATTR_DEVICE_SIREN,
     ATTR_DEVICE_SMART_REMOTER,
     ATTR_DEVICE_SWITCH,
@@ -71,6 +72,7 @@ class YoLinkSensorEntityDescription(
     ATTR_DEVICE_MULTI_OUTLET,
     ATTR_DEVICE_SMART_REMOTER,
     ATTR_DEVICE_OUTLET,
+    ATTR_DEVICE_POWER_FAILURE_ALARM,
     ATTR_DEVICE_SIREN,
     ATTR_DEVICE_SWITCH,
     ATTR_DEVICE_TH_SENSOR,
@@ -86,6 +88,7 @@ class YoLinkSensorEntityDescription(
     ATTR_DEVICE_DOOR_SENSOR,
     ATTR_DEVICE_LEAK_SENSOR,
     ATTR_DEVICE_MOTION_SENSOR,
+    ATTR_DEVICE_POWER_FAILURE_ALARM,
     ATTR_DEVICE_SMART_REMOTER,
     ATTR_DEVICE_TH_SENSOR,
     ATTR_DEVICE_VIBRATION_SENSOR,
@@ -110,6 +113,14 @@ def cvt_battery(val: int | None) -> int | None:
     return 0
 
 
+def cvt_volume(val: int | None) -> str | None:
+    """Convert volume to string."""
+    if val is None:
+        return None
+    volume_level = {1: "low", 2: "medium", 3: "high"}
+    return volume_level.get(val, None)
+
+
 SENSOR_TYPES: tuple[YoLinkSensorEntityDescription, ...] = (
     YoLinkSensorEntityDescription(
         key="battery",
@@ -157,6 +168,41 @@ def cvt_battery(val: int | None) -> int | None:
         entity_registry_enabled_default=False,
         should_update_entity=lambda value: value is not None,
     ),
+    YoLinkSensorEntityDescription(
+        key="state",
+        device_class=SensorDeviceClass.ENUM,
+        name="Power failure alarm",
+        icon="mdi:flash",
+        options=["normal", "alert", "off"],
+        exists_fn=lambda device: device.device_type in ATTR_DEVICE_POWER_FAILURE_ALARM,
+    ),
+    YoLinkSensorEntityDescription(
+        key="mute",
+        device_class=SensorDeviceClass.ENUM,
+        name="Power failure alarm mute",
+        icon="mdi:volume-mute",
+        options=["muted", "unmuted"],
+        exists_fn=lambda device: device.device_type in ATTR_DEVICE_POWER_FAILURE_ALARM,
+        value=lambda value: "muted" if value is True else "unmuted",
+    ),
+    YoLinkSensorEntityDescription(
+        key="sound",
+        device_class=SensorDeviceClass.ENUM,
+        name="Power failure alarm volume",
+        icon="mdi:volume-high",
+        options=["low", "medium", "high"],
+        exists_fn=lambda device: device.device_type in ATTR_DEVICE_POWER_FAILURE_ALARM,
+        value=cvt_volume,
+    ),
+    YoLinkSensorEntityDescription(
+        key="beep",
+        device_class=SensorDeviceClass.ENUM,
+        name="Power failure alarm beep",
+        icon="mdi:bullhorn",
+        options=["enabled", "disabled"],
+        exists_fn=lambda device: device.device_type in ATTR_DEVICE_POWER_FAILURE_ALARM,
+        value=lambda value: "enabled" if value is True else "disabled",
+    ),
 )
 
 
diff --git a/homeassistant/components/youtube/__init__.py b/homeassistant/components/youtube/__init__.py
new file mode 100644
index 00000000000000..c62c533be060a2
--- /dev/null
+++ b/homeassistant/components/youtube/__init__.py
@@ -0,0 +1,54 @@
+"""Support for YouTube."""
+from __future__ import annotations
+
+from aiohttp.client_exceptions import ClientError, ClientResponseError
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    OAuth2Session,
+    async_get_config_entry_implementation,
+)
+
+from .api import AsyncConfigEntryAuth
+from .const import AUTH, COORDINATOR, DOMAIN
+from .coordinator import YouTubeDataUpdateCoordinator
+
+PLATFORMS = [Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up YouTube from a config entry."""
+    implementation = await async_get_config_entry_implementation(hass, entry)
+    session = OAuth2Session(hass, entry, implementation)
+    auth = AsyncConfigEntryAuth(hass, session)
+    try:
+        await auth.check_and_refresh_token()
+    except ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed(
+                "OAuth session is not valid, reauth required"
+            ) from err
+        raise ConfigEntryNotReady from err
+    except ClientError as err:
+        raise ConfigEntryNotReady from err
+    coordinator = YouTubeDataUpdateCoordinator(hass, auth)
+
+    await coordinator.async_config_entry_first_refresh()
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
+        COORDINATOR: coordinator,
+        AUTH: auth,
+    }
+    await hass.config_entries.async_forward_entry_setups(entry, list(PLATFORMS))
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+    return unload_ok
diff --git a/homeassistant/components/youtube/api.py b/homeassistant/components/youtube/api.py
new file mode 100644
index 00000000000000..64abf1a6753be7
--- /dev/null
+++ b/homeassistant/components/youtube/api.py
@@ -0,0 +1,48 @@
+"""API for YouTube bound to Home Assistant OAuth."""
+from google.auth.exceptions import RefreshError
+from google.oauth2.credentials import Credentials
+from googleapiclient.discovery import Resource, build
+
+from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_entry_oauth2_flow
+
+
+class AsyncConfigEntryAuth:
+    """Provide Google authentication tied to an OAuth2 based config entry."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        oauth2_session: config_entry_oauth2_flow.OAuth2Session,
+    ) -> None:
+        """Initialize YouTube Auth."""
+        self.oauth_session = oauth2_session
+        self.hass = hass
+
+    @property
+    def access_token(self) -> str:
+        """Return the access token."""
+        return self.oauth_session.token[CONF_ACCESS_TOKEN]
+
+    async def check_and_refresh_token(self) -> str:
+        """Check the token."""
+        await self.oauth_session.async_ensure_token_valid()
+        return self.access_token
+
+    async def get_resource(self) -> Resource:
+        """Create executor job to get current resource."""
+        try:
+            credentials = Credentials(await self.check_and_refresh_token())
+        except RefreshError as ex:
+            self.oauth_session.config_entry.async_start_reauth(self.oauth_session.hass)
+            raise ex
+        return await self.hass.async_add_executor_job(self._get_resource, credentials)
+
+    def _get_resource(self, credentials: Credentials) -> Resource:
+        """Get current resource."""
+        return build(
+            "youtube",
+            "v3",
+            credentials=credentials,
+        )
diff --git a/homeassistant/components/youtube/application_credentials.py b/homeassistant/components/youtube/application_credentials.py
new file mode 100644
index 00000000000000..ba6188d9a3dc7e
--- /dev/null
+++ b/homeassistant/components/youtube/application_credentials.py
@@ -0,0 +1,11 @@
+"""application_credentials platform for YouTube."""
+from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.core import HomeAssistant
+
+
+async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
+    """Return authorization server."""
+    return AuthorizationServer(
+        "https://accounts.google.com/o/oauth2/v2/auth",
+        "https://oauth2.googleapis.com/token",
+    )
diff --git a/homeassistant/components/youtube/config_flow.py b/homeassistant/components/youtube/config_flow.py
new file mode 100644
index 00000000000000..fa3bc6c8237352
--- /dev/null
+++ b/homeassistant/components/youtube/config_flow.py
@@ -0,0 +1,228 @@
+"""Config flow for YouTube integration."""
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator, Mapping
+import logging
+from typing import Any
+
+from google.oauth2.credentials import Credentials
+from googleapiclient.discovery import Resource, build
+from googleapiclient.errors import HttpError
+from googleapiclient.http import HttpRequest
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry, OptionsFlowWithConfigEntry
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+)
+
+from .const import (
+    CHANNEL_CREATION_HELP_URL,
+    CONF_CHANNELS,
+    DEFAULT_ACCESS,
+    DOMAIN,
+    LOGGER,
+)
+
+
+async def _get_subscriptions(hass: HomeAssistant, resource: Resource) -> AsyncGenerator:
+    amount_of_subscriptions = 50
+    received_amount_of_subscriptions = 0
+    next_page_token = None
+    while received_amount_of_subscriptions < amount_of_subscriptions:
+        # pylint: disable=no-member
+        subscription_request: HttpRequest = resource.subscriptions().list(
+            part="snippet", mine=True, maxResults=50, pageToken=next_page_token
+        )
+        res = await hass.async_add_executor_job(subscription_request.execute)
+        amount_of_subscriptions = res["pageInfo"]["totalResults"]
+        if "nextPageToken" in res:
+            next_page_token = res["nextPageToken"]
+        for item in res["items"]:
+            received_amount_of_subscriptions += 1
+            yield item
+
+
+async def get_resource(hass: HomeAssistant, token: str) -> Resource:
+    """Get Youtube resource async."""
+
+    def _build_resource() -> Resource:
+        return build(
+            "youtube",
+            "v3",
+            credentials=Credentials(token),
+        )
+
+    return await hass.async_add_executor_job(_build_resource)
+
+
+class OAuth2FlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
+    """Config flow to handle Google OAuth2 authentication."""
+
+    _data: dict[str, Any] = {}
+    _title: str = ""
+
+    DOMAIN = DOMAIN
+
+    reauth_entry: ConfigEntry | None = None
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: ConfigEntry,
+    ) -> YouTubeOptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return YouTubeOptionsFlowHandler(config_entry)
+
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
+
+    @property
+    def extra_authorize_data(self) -> dict[str, Any]:
+        """Extra data that needs to be appended to the authorize url."""
+        return {
+            "scope": " ".join(DEFAULT_ACCESS),
+            # Add params to ensure we get back a refresh token
+            "access_type": "offline",
+            "prompt": "consent",
+        }
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Perform reauth upon an API authentication error."""
+        self.reauth_entry = self.hass.config_entries.async_get_entry(
+            self.context["entry_id"]
+        )
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Confirm reauth dialog."""
+        if user_input is None:
+            return self.async_show_form(step_id="reauth_confirm")
+        return await self.async_step_user()
+
+    async def async_oauth_create_entry(self, data: dict[str, Any]) -> FlowResult:
+        """Create an entry for the flow, or update existing entry."""
+        try:
+            service = await get_resource(self.hass, data[CONF_TOKEN][CONF_ACCESS_TOKEN])
+            # pylint: disable=no-member
+            own_channel_request: HttpRequest = service.channels().list(
+                part="snippet", mine=True
+            )
+            response = await self.hass.async_add_executor_job(
+                own_channel_request.execute
+            )
+            if not response["items"]:
+                return self.async_abort(
+                    reason="no_channel",
+                    description_placeholders={"support_url": CHANNEL_CREATION_HELP_URL},
+                )
+            own_channel = response["items"][0]
+        except HttpError as ex:
+            error = ex.reason
+            return self.async_abort(
+                reason="access_not_configured",
+                description_placeholders={"message": error},
+            )
+        except Exception as ex:  # pylint: disable=broad-except
+            LOGGER.error("Unknown error occurred: %s", ex.args)
+            return self.async_abort(reason="unknown")
+        self._title = own_channel["snippet"]["title"]
+        self._data = data
+
+        if not self.reauth_entry:
+            await self.async_set_unique_id(own_channel["id"])
+            self._abort_if_unique_id_configured()
+
+            return await self.async_step_channels()
+
+        if self.reauth_entry.unique_id == own_channel["id"]:
+            self.hass.config_entries.async_update_entry(self.reauth_entry, data=data)
+            await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)
+            return self.async_abort(reason="reauth_successful")
+
+        return self.async_abort(
+            reason="wrong_account",
+            description_placeholders={"title": self._title},
+        )
+
+    async def async_step_channels(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Select which channels to track."""
+        if user_input:
+            return self.async_create_entry(
+                title=self._title,
+                data=self._data,
+                options=user_input,
+            )
+        service = await get_resource(
+            self.hass, self._data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+        )
+        selectable_channels = [
+            SelectOptionDict(
+                value=subscription["snippet"]["resourceId"]["channelId"],
+                label=subscription["snippet"]["title"],
+            )
+            async for subscription in _get_subscriptions(self.hass, service)
+        ]
+        return self.async_show_form(
+            step_id="channels",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_CHANNELS): SelectSelector(
+                        SelectSelectorConfig(options=selectable_channels, multiple=True)
+                    ),
+                }
+            ),
+        )
+
+
+class YouTubeOptionsFlowHandler(OptionsFlowWithConfigEntry):
+    """YouTube Options flow handler."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Initialize form."""
+        if user_input is not None:
+            return self.async_create_entry(
+                title=self.config_entry.title,
+                data=user_input,
+            )
+        service = await get_resource(
+            self.hass, self.config_entry.data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+        )
+        selectable_channels = [
+            SelectOptionDict(
+                value=subscription["snippet"]["resourceId"]["channelId"],
+                label=subscription["snippet"]["title"],
+            )
+            async for subscription in _get_subscriptions(self.hass, service)
+        ]
+        return self.async_show_form(
+            step_id="init",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(
+                    {
+                        vol.Required(CONF_CHANNELS): SelectSelector(
+                            SelectSelectorConfig(
+                                options=selectable_channels, multiple=True
+                            )
+                        ),
+                    }
+                ),
+                self.options,
+            ),
+        )
diff --git a/homeassistant/components/youtube/const.py b/homeassistant/components/youtube/const.py
new file mode 100644
index 00000000000000..7404cd046652b5
--- /dev/null
+++ b/homeassistant/components/youtube/const.py
@@ -0,0 +1,23 @@
+"""Constants for YouTube integration."""
+import logging
+
+DEFAULT_ACCESS = ["https://www.googleapis.com/auth/youtube.readonly"]
+DOMAIN = "youtube"
+MANUFACTURER = "Google, Inc."
+CHANNEL_CREATION_HELP_URL = "https://support.google.com/youtube/answer/1646861"
+
+CONF_CHANNELS = "channels"
+CONF_ID = "id"
+CONF_UPLOAD_PLAYLIST = "upload_playlist_id"
+COORDINATOR = "coordinator"
+AUTH = "auth"
+
+LOGGER = logging.getLogger(__package__)
+
+ATTR_TITLE = "title"
+ATTR_LATEST_VIDEO = "latest_video"
+ATTR_SUBSCRIBER_COUNT = "subscriber_count"
+ATTR_DESCRIPTION = "description"
+ATTR_THUMBNAIL = "thumbnail"
+ATTR_VIDEO_ID = "video_id"
+ATTR_PUBLISHED_AT = "published_at"
diff --git a/homeassistant/components/youtube/coordinator.py b/homeassistant/components/youtube/coordinator.py
new file mode 100644
index 00000000000000..726295448950e5
--- /dev/null
+++ b/homeassistant/components/youtube/coordinator.py
@@ -0,0 +1,115 @@
+"""DataUpdateCoordinator for the YouTube integration."""
+from __future__ import annotations
+
+from datetime import timedelta
+from typing import Any
+
+from googleapiclient.discovery import Resource
+from googleapiclient.http import HttpRequest
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_ICON, ATTR_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from . import AsyncConfigEntryAuth
+from .const import (
+    ATTR_DESCRIPTION,
+    ATTR_LATEST_VIDEO,
+    ATTR_PUBLISHED_AT,
+    ATTR_SUBSCRIBER_COUNT,
+    ATTR_THUMBNAIL,
+    ATTR_TITLE,
+    ATTR_VIDEO_ID,
+    CONF_CHANNELS,
+    DOMAIN,
+    LOGGER,
+)
+
+
+def get_upload_playlist_id(channel_id: str) -> str:
+    """Return the playlist id with the uploads of the channel.
+
+    Replacing the UC in the channel id (UCxxxxxxxxxxxx) with UU is
+    the way to do it without extra request (UUxxxxxxxxxxxx).
+    """
+    return channel_id.replace("UC", "UU", 1)
+
+
+class YouTubeDataUpdateCoordinator(DataUpdateCoordinator):
+    """A YouTube Data Update Coordinator."""
+
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, auth: AsyncConfigEntryAuth) -> None:
+        """Initialize the YouTube data coordinator."""
+        self._auth = auth
+        super().__init__(
+            hass,
+            LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(minutes=15),
+        )
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        service = await self._auth.get_resource()
+        channels = await self._get_channels(service)
+
+        return await self.hass.async_add_executor_job(
+            self._get_channel_data, service, channels
+        )
+
+    async def _get_channels(self, service: Resource) -> list[dict[str, Any]]:
+        data = []
+        received_channels = 0
+        channels = self.config_entry.options[CONF_CHANNELS]
+        while received_channels < len(channels):
+            # We're slicing the channels in chunks of 50 to avoid making the URI too long
+            end = min(received_channels + 50, len(channels))
+            channel_request: HttpRequest = service.channels().list(
+                part="snippet,statistics",
+                id=",".join(channels[received_channels:end]),
+                maxResults=50,
+            )
+            response: dict = await self.hass.async_add_executor_job(
+                channel_request.execute
+            )
+            data.extend(response["items"])
+            received_channels += len(response["items"])
+        return data
+
+    def _get_channel_data(
+        self, service: Resource, channels: list[dict[str, Any]]
+    ) -> dict[str, Any]:
+        data: dict[str, Any] = {}
+        for channel in channels:
+            playlist_id = get_upload_playlist_id(channel["id"])
+            response = (
+                service.playlistItems()
+                .list(
+                    part="snippet,contentDetails", playlistId=playlist_id, maxResults=1
+                )
+                .execute()
+            )
+            video = response["items"][0]
+            data[channel["id"]] = {
+                ATTR_ID: channel["id"],
+                ATTR_TITLE: channel["snippet"]["title"],
+                ATTR_ICON: channel["snippet"]["thumbnails"]["high"]["url"],
+                ATTR_LATEST_VIDEO: {
+                    ATTR_PUBLISHED_AT: video["snippet"]["publishedAt"],
+                    ATTR_TITLE: video["snippet"]["title"],
+                    ATTR_DESCRIPTION: video["snippet"]["description"],
+                    ATTR_THUMBNAIL: self._get_thumbnail(video),
+                    ATTR_VIDEO_ID: video["contentDetails"]["videoId"],
+                },
+                ATTR_SUBSCRIBER_COUNT: int(channel["statistics"]["subscriberCount"]),
+            }
+        return data
+
+    def _get_thumbnail(self, video: dict[str, Any]) -> str | None:
+        thumbnails = video["snippet"]["thumbnails"]
+        for size in ("standard", "high", "medium", "default"):
+            if size in thumbnails:
+                return thumbnails[size]["url"]
+        return None
diff --git a/homeassistant/components/youtube/entity.py b/homeassistant/components/youtube/entity.py
new file mode 100644
index 00000000000000..2f9238dec2674c
--- /dev/null
+++ b/homeassistant/components/youtube/entity.py
@@ -0,0 +1,35 @@
+"""Entity representing a YouTube account."""
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import ATTR_TITLE, DOMAIN, MANUFACTURER
+from .coordinator import YouTubeDataUpdateCoordinator
+
+
+class YouTubeChannelEntity(CoordinatorEntity):
+    """An HA implementation for YouTube entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: YouTubeDataUpdateCoordinator,
+        description: EntityDescription,
+        channel_id: str,
+    ) -> None:
+        """Initialize a YouTube entity."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.entry_id}_{channel_id}_{description.key}"
+        )
+        self._channel_id = channel_id
+        self._attr_device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, f"{coordinator.config_entry.entry_id}_{channel_id}")},
+            manufacturer=MANUFACTURER,
+            name=coordinator.data[channel_id][ATTR_TITLE],
+        )
diff --git a/homeassistant/components/youtube/manifest.json b/homeassistant/components/youtube/manifest.json
new file mode 100644
index 00000000000000..fbc02bda0069c6
--- /dev/null
+++ b/homeassistant/components/youtube/manifest.json
@@ -0,0 +1,11 @@
+{
+  "domain": "youtube",
+  "name": "YouTube",
+  "codeowners": ["@joostlek"],
+  "config_flow": true,
+  "dependencies": ["application_credentials"],
+  "documentation": "https://www.home-assistant.io/integrations/youtube",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "requirements": ["google-api-python-client==2.71.0"]
+}
diff --git a/homeassistant/components/youtube/sensor.py b/homeassistant/components/youtube/sensor.py
new file mode 100644
index 00000000000000..4560dcfda8cd7a
--- /dev/null
+++ b/homeassistant/components/youtube/sensor.py
@@ -0,0 +1,103 @@
+"""Support for YouTube Sensors."""
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any
+
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_ICON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import StateType
+
+from . import YouTubeDataUpdateCoordinator
+from .const import (
+    ATTR_LATEST_VIDEO,
+    ATTR_SUBSCRIBER_COUNT,
+    ATTR_THUMBNAIL,
+    ATTR_TITLE,
+    ATTR_VIDEO_ID,
+    COORDINATOR,
+    DOMAIN,
+)
+from .entity import YouTubeChannelEntity
+
+
+@dataclass
+class YouTubeMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[Any], StateType]
+    entity_picture_fn: Callable[[Any], str | None]
+    attributes_fn: Callable[[Any], dict[str, Any]] | None
+
+
+@dataclass
+class YouTubeSensorEntityDescription(SensorEntityDescription, YouTubeMixin):
+    """Describes YouTube sensor entity."""
+
+
+SENSOR_TYPES = [
+    YouTubeSensorEntityDescription(
+        key="latest_upload",
+        translation_key="latest_upload",
+        icon="mdi:youtube",
+        value_fn=lambda channel: channel[ATTR_LATEST_VIDEO][ATTR_TITLE],
+        entity_picture_fn=lambda channel: channel[ATTR_LATEST_VIDEO][ATTR_THUMBNAIL],
+        attributes_fn=lambda channel: {
+            ATTR_VIDEO_ID: channel[ATTR_LATEST_VIDEO][ATTR_VIDEO_ID]
+        },
+    ),
+    YouTubeSensorEntityDescription(
+        key="subscribers",
+        translation_key="subscribers",
+        icon="mdi:youtube-subscription",
+        native_unit_of_measurement="subscribers",
+        value_fn=lambda channel: channel[ATTR_SUBSCRIBER_COUNT],
+        entity_picture_fn=lambda channel: channel[ATTR_ICON],
+        attributes_fn=None,
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Set up the YouTube sensor."""
+    coordinator: YouTubeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        COORDINATOR
+    ]
+    async_add_entities(
+        YouTubeSensor(coordinator, sensor_type, channel_id)
+        for channel_id in coordinator.data
+        for sensor_type in SENSOR_TYPES
+    )
+
+
+class YouTubeSensor(YouTubeChannelEntity, SensorEntity):
+    """Representation of a YouTube sensor."""
+
+    entity_description: YouTubeSensorEntityDescription
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the value reported by the sensor."""
+        return self.entity_description.value_fn(self.coordinator.data[self._channel_id])
+
+    @property
+    def entity_picture(self) -> str | None:
+        """Return the value reported by the sensor."""
+        return self.entity_description.entity_picture_fn(
+            self.coordinator.data[self._channel_id]
+        )
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return the extra state attributes."""
+        if self.entity_description.attributes_fn:
+            return self.entity_description.attributes_fn(
+                self.coordinator.data[self._channel_id]
+            )
+        return None
diff --git a/homeassistant/components/youtube/strings.json b/homeassistant/components/youtube/strings.json
new file mode 100644
index 00000000000000..1ecc2bc4db84eb
--- /dev/null
+++ b/homeassistant/components/youtube/strings.json
@@ -0,0 +1,47 @@
+{
+  "config": {
+    "abort": {
+      "access_not_configured": "Please read the below message we got from Google:\n\n{message}",
+      "no_channel": "Please create a YouTube channel to be able to use the integration. Instructions can be found at {support_url}.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "error": {
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "channels": {
+        "description": "Select the channels you want to add.",
+        "data": {
+          "channels": "YouTube channels"
+        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The YouTube integration needs to re-authenticate your account"
+      }
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "description": "Select the channels you want to add.",
+        "data": {
+          "channels": "YouTube channels"
+        }
+      }
+    }
+  },
+  "entity": {
+    "sensor": {
+      "latest_upload": {
+        "name": "Latest upload"
+      },
+      "subscribers": {
+        "name": "Subscribers"
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/zabbix/sensor.py b/homeassistant/components/zabbix/sensor.py
index a5172d5ef956f9..2fd2d48fabab07 100644
--- a/homeassistant/components/zabbix/sensor.py
+++ b/homeassistant/components/zabbix/sensor.py
@@ -67,17 +67,14 @@ def setup_platform(
             for hostid in hostids:
                 _LOGGER.debug("Creating Zabbix Sensor: %s", str(hostid))
                 sensors.append(ZabbixSingleHostTriggerCountSensor(zapi, [hostid], name))
+        elif not hostids:
+            # Single sensor that provides the total count of triggers.
+            _LOGGER.debug("Creating Zabbix Sensor")
+            sensors.append(ZabbixTriggerCountSensor(zapi, name))
         else:
-            if not hostids:
-                # Single sensor that provides the total count of triggers.
-                _LOGGER.debug("Creating Zabbix Sensor")
-                sensors.append(ZabbixTriggerCountSensor(zapi, name))
-            else:
-                # Single sensor that sums total issues for all hosts
-                _LOGGER.debug("Creating Zabbix Sensor group: %s", str(hostids))
-                sensors.append(
-                    ZabbixMultipleHostTriggerCountSensor(zapi, hostids, name)
-                )
+            # Single sensor that sums total issues for all hosts
+            _LOGGER.debug("Creating Zabbix Sensor group: %s", str(hostids))
+            sensors.append(ZabbixMultipleHostTriggerCountSensor(zapi, hostids, name))
 
     else:
         # Single sensor that provides the total count of triggers.
diff --git a/homeassistant/components/zamg/manifest.json b/homeassistant/components/zamg/manifest.json
index 72a7f8de946ce2..3ff7612d47ebec 100644
--- a/homeassistant/components/zamg/manifest.json
+++ b/homeassistant/components/zamg/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zamg",
   "iot_class": "cloud_polling",
-  "requirements": ["zamg==0.2.2"]
+  "requirements": ["zamg==0.2.4"]
 }
diff --git a/homeassistant/components/zamg/strings.json b/homeassistant/components/zamg/strings.json
index 6305f68efd933a..f0a607f2da7da8 100644
--- a/homeassistant/components/zamg/strings.json
+++ b/homeassistant/components/zamg/strings.json
@@ -18,11 +18,5 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "station_not_found": "Station ID not found at zamg"
     }
-  },
-  "issues": {
-    "deprecated_yaml": {
-      "title": "The ZAMG YAML configuration is being removed",
-      "description": "Configuring ZAMG using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the ZAMG YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
   }
 }
diff --git a/homeassistant/components/zeroconf/__init__.py b/homeassistant/components/zeroconf/__init__.py
index 9d7dd73be01899..f77909b1bdda95 100644
--- a/homeassistant/components/zeroconf/__init__.py
+++ b/homeassistant/components/zeroconf/__init__.py
@@ -7,10 +7,9 @@
 from dataclasses import dataclass
 from fnmatch import translate
 from functools import lru_cache
-from ipaddress import IPv4Address, IPv6Address, ip_address
+from ipaddress import IPv4Address, IPv6Address
 import logging
 import re
-import socket
 import sys
 from typing import Any, Final, cast
 
@@ -25,8 +24,6 @@
 
 from homeassistant import config_entries
 from homeassistant.components import network
-from homeassistant.components.network import MDNS_TARGET_IP, async_get_source_ip
-from homeassistant.components.network.models import Adapter
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, __version__
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.data_entry_flow import BaseServiceInfo
@@ -55,6 +52,7 @@
     # Thread based devices
     "_hap._udp.local.",
 ]
+_HOMEKIT_MODEL_SPLITS = (None, " ", "-")
 
 # Top level keys we support matching against in properties that are always matched in
 # lower case. ex: ZeroconfServiceInfo.name
@@ -66,7 +64,8 @@
 DEFAULT_IPV6 = True
 
 HOMEKIT_PAIRED_STATUS_FLAG = "sf"
-HOMEKIT_MODEL = "md"
+HOMEKIT_MODEL_LOWER = "md"
+HOMEKIT_MODEL_UPPER = "MD"
 
 # Property key=value has a max length of 255
 # so we use 230 to leave space for key=
@@ -192,7 +191,17 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     zeroconf_types, homekit_models = await asyncio.gather(
         async_get_zeroconf(hass), async_get_homekit(hass)
     )
-    discovery = ZeroconfDiscovery(hass, zeroconf, zeroconf_types, homekit_models, ipv6)
+    homekit_model_lookup, homekit_model_matchers = _build_homekit_model_lookups(
+        homekit_models
+    )
+    discovery = ZeroconfDiscovery(
+        hass,
+        zeroconf,
+        zeroconf_types,
+        homekit_model_lookup,
+        homekit_model_matchers,
+        ipv6,
+    )
     await discovery.async_setup()
 
     async def _async_zeroconf_hass_start(hass: HomeAssistant, comp: str) -> None:
@@ -212,30 +221,23 @@ async def _async_zeroconf_hass_stop(_event: Event) -> None:
     return True
 
 
-def _get_announced_addresses(
-    adapters: list[Adapter],
-    first_ip: bytes | None = None,
-) -> list[bytes]:
-    """Return a list of IP addresses to announce via zeroconf.
+def _build_homekit_model_lookups(
+    homekit_models: dict[str, HomeKitDiscoveredIntegration]
+) -> tuple[
+    dict[str, HomeKitDiscoveredIntegration],
+    dict[re.Pattern, HomeKitDiscoveredIntegration],
+]:
+    """Build lookups for homekit models."""
+    homekit_model_lookup: dict[str, HomeKitDiscoveredIntegration] = {}
+    homekit_model_matchers: dict[re.Pattern, HomeKitDiscoveredIntegration] = {}
 
-    If first_ip is not None, it will be the first address in the list.
-    """
-    addresses = {
-        addr.packed
-        for addr in [
-            ip_address(ip["address"])
-            for adapter in adapters
-            if adapter["enabled"]
-            for ip in cast(list, adapter["ipv6"]) + cast(list, adapter["ipv4"])
-        ]
-        if not (addr.is_unspecified or addr.is_loopback)
-    }
-    if first_ip:
-        address_list = [first_ip]
-        address_list.extend(addresses - set({first_ip}))
-    else:
-        address_list = list(addresses)
-    return address_list
+    for model, discovery in homekit_models.items():
+        if "*" in model or "?" in model or "[" in model:
+            homekit_model_matchers[_compile_fnmatch(model)] = discovery
+        else:
+            homekit_model_lookup[model] = discovery
+
+    return homekit_model_lookup, homekit_model_matchers
 
 
 def _filter_disallowed_characters(name: str) -> str:
@@ -276,24 +278,13 @@ async def _async_register_hass_zc_service(
     # Set old base URL based on external or internal
     params["base_url"] = params["external_url"] or params["internal_url"]
 
-    adapters = await network.async_get_adapters(hass)
-
-    # Puts the default IPv4 address first in the list to preserve compatibility,
-    # because some mDNS implementations ignores anything but the first announced
-    # address.
-    host_ip = await async_get_source_ip(hass, target_ip=MDNS_TARGET_IP)
-    host_ip_pton = None
-    if host_ip:
-        host_ip_pton = socket.inet_pton(socket.AF_INET, host_ip)
-    address_list = _get_announced_addresses(adapters, host_ip_pton)
-
     _suppress_invalid_properties(params)
 
     info = AsyncServiceInfo(
         ZEROCONF_TYPE,
         name=f"{valid_location_name}.{ZEROCONF_TYPE}",
         server=f"{uuid}.local.",
-        addresses=address_list,
+        parsed_addresses=await network.async_get_announce_addresses(hass),
         port=hass.http.server_port,
         properties=params,
     )
@@ -347,14 +338,17 @@ def __init__(
         hass: HomeAssistant,
         zeroconf: HaZeroconf,
         zeroconf_types: dict[str, list[dict[str, str | dict[str, str]]]],
-        homekit_models: dict[str, HomeKitDiscoveredIntegration],
+        homekit_model_lookups: dict[str, HomeKitDiscoveredIntegration],
+        homekit_model_matchers: dict[re.Pattern, HomeKitDiscoveredIntegration],
         ipv6: bool,
     ) -> None:
         """Init discovery."""
         self.hass = hass
         self.zeroconf = zeroconf
         self.zeroconf_types = zeroconf_types
-        self.homekit_models = homekit_models
+        self.homekit_model_lookups = homekit_model_lookups
+        self.homekit_model_matchers = homekit_model_matchers
+
         self.ipv6 = ipv6
 
         self.async_service_browser: HaAsyncServiceBrowser | None = None
@@ -450,14 +444,14 @@ def _async_process_service_update(
 
         # If we can handle it as a HomeKit discovery, we do that here.
         if service_type in HOMEKIT_TYPES and (
-            homekit_model := async_get_homekit_discovery_domain(
-                self.homekit_models, props
+            homekit_discovery := async_get_homekit_discovery(
+                self.homekit_model_lookups, self.homekit_model_matchers, props
             )
         ):
-            domain = homekit_model.domain
+            domain = homekit_discovery.domain
             discovery_flow.async_create_flow(
                 self.hass,
-                homekit_model.domain,
+                homekit_discovery.domain,
                 {"source": config_entries.SOURCE_HOMEKIT},
                 info,
             )
@@ -468,7 +462,7 @@ def _async_process_service_update(
             # We only send updates to homekit_controller
             # if the device is already paired in order to avoid
             # offering a second discovery for the same device
-            if not is_homekit_paired(props) and not homekit_model.always_discover:
+            if not is_homekit_paired(props) and not homekit_discovery.always_discover:
                 # If the device is paired with HomeKit we must send on
                 # the update to homekit_controller so it can see when
                 # the 'c#' field is updated. This is used to detect
@@ -513,31 +507,28 @@ def _async_process_service_update(
             )
 
 
-def async_get_homekit_discovery_domain(
-    homekit_models: dict[str, HomeKitDiscoveredIntegration], props: dict[str, Any]
+def async_get_homekit_discovery(
+    homekit_model_lookups: dict[str, HomeKitDiscoveredIntegration],
+    homekit_model_matchers: dict[re.Pattern, HomeKitDiscoveredIntegration],
+    props: dict[str, Any],
 ) -> HomeKitDiscoveredIntegration | None:
     """Handle a HomeKit discovery.
 
     Return the domain to forward the discovery data to
     """
-    model = None
-    for key in props:
-        if key.lower() == HOMEKIT_MODEL:
-            model = props[key]
-            break
-
-    if model is None:
+    if not (model := props.get(HOMEKIT_MODEL_LOWER) or props.get(HOMEKIT_MODEL_UPPER)):
         return None
 
-    for test_model in homekit_models:
-        if (
-            model != test_model
-            and not model.startswith((f"{test_model} ", f"{test_model}-"))
-            and not _memorized_fnmatch(model, test_model)
-        ):
-            continue
+    assert isinstance(model, str)
 
-        return homekit_models[test_model]
+    for split_str in _HOMEKIT_MODEL_SPLITS:
+        key = (model.split(split_str))[0] if split_str else model
+        if discovery := homekit_model_lookups.get(key):
+            return discovery
+
+    for pattern, discovery in homekit_model_matchers.items():
+        if pattern.match(model):
+            return discovery
 
     return None
 
@@ -550,26 +541,9 @@ def _stringify_ip_address(ip_addr: IPv4Address | IPv6Address) -> str:
 
 def info_from_service(service: AsyncServiceInfo) -> ZeroconfServiceInfo | None:
     """Return prepared info from mDNS entries."""
-    properties: dict[str, Any] = {"_raw": {}}
-
-    for key, value in service.properties.items():
-        # See https://ietf.org/rfc/rfc6763.html#section-6.4 and
-        # https://ietf.org/rfc/rfc6763.html#section-6.5 for expected encodings
-        # for property keys and values
-        try:
-            key = key.decode("ascii")
-        except UnicodeDecodeError:
-            _LOGGER.debug(
-                "Ignoring invalid key provided by [%s]: %s", service.name, key
-            )
-            continue
-
-        properties["_raw"][key] = value
-
-        with suppress(UnicodeDecodeError):
-            if isinstance(value, bytes):
-                properties[key] = value.decode("utf-8")
-
+    # See https://ietf.org/rfc/rfc6763.html#section-6.4 and
+    # https://ietf.org/rfc/rfc6763.html#section-6.5 for expected encodings
+    # for property keys and values
     if not (ip_addresses := service.ip_addresses_by_version(IPVersion.All)):
         return None
     host: str | None = None
@@ -579,6 +553,12 @@ def info_from_service(service: AsyncServiceInfo) -> ZeroconfServiceInfo | None:
             break
     if not host:
         return None
+    properties: dict[str, Any] = {
+        k.decode("ascii", "replace"): None
+        if v is None
+        else v.decode("utf-8", "replace")
+        for k, v in service.properties.items()
+    }
 
     assert service.server is not None, "server cannot be none if there are addresses"
     return ZeroconfServiceInfo(
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index 63d8f97d5b6067..1c5d25dfb3d2b8 100644
--- a/homeassistant/components/zeroconf/manifest.json
+++ b/homeassistant/components/zeroconf/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["zeroconf"],
   "quality_scale": "internal",
-  "requirements": ["zeroconf==0.62.0"]
+  "requirements": ["zeroconf==0.70.0"]
 }
diff --git a/homeassistant/components/zerproc/__init__.py b/homeassistant/components/zerproc/__init__.py
index 43a768c3844169..edd41d1a8e32b0 100644
--- a/homeassistant/components/zerproc/__init__.py
+++ b/homeassistant/components/zerproc/__init__.py
@@ -1,23 +1,13 @@
 """Zerproc lights integration."""
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_ADDRESSES, DATA_DISCOVERY_SUBSCRIPTION, DOMAIN
 
 PLATFORMS = [Platform.LIGHT]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Zerproc platform."""
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(DOMAIN, context={"source": SOURCE_IMPORT})
-    )
-
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Zerproc from a config entry."""
     if DOMAIN not in hass.data:
diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 5607cabffea19f..8a81648b580ae6 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -3,6 +3,7 @@
 import copy
 import logging
 import os
+import re
 
 import voluptuous as vol
 from zhaquirks import setup as setup_quirks
@@ -85,19 +86,34 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
+def _clean_serial_port_path(path: str) -> str:
+    """Clean the serial port path, applying corrections where necessary."""
+
+    if path.startswith("socket://"):
+        path = path.strip()
+
+    # Removes extraneous brackets from IP addresses (they don't parse in CPython 3.11.4)
+    if re.match(r"^socket://\[\d+\.\d+\.\d+\.\d+\]:\d+$", path):
+        path = path.replace("[", "").replace("]", "")
+
+    return path
+
+
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up ZHA.
 
     Will automatically load components to support devices found on the network.
     """
 
-    # Strip whitespace around `socket://` URIs, this is no longer accepted by zigpy
-    # This will be removed in 2023.7.0
+    # Remove brackets around IP addresses, this no longer works in CPython 3.11.4
+    # This will be removed in 2023.11.0
     path = config_entry.data[CONF_DEVICE][CONF_DEVICE_PATH]
+    cleaned_path = _clean_serial_port_path(path)
     data = copy.deepcopy(dict(config_entry.data))
 
-    if path.startswith("socket://") and path != path.strip():
-        data[CONF_DEVICE][CONF_DEVICE_PATH] = path.strip()
+    if path != cleaned_path:
+        _LOGGER.debug("Cleaned serial port path %r -> %r", path, cleaned_path)
+        data[CONF_DEVICE][CONF_DEVICE_PATH] = cleaned_path
         hass.config_entries.async_update_entry(config_entry, data=data)
 
     zha_data = hass.data.setdefault(DATA_ZHA, {})
diff --git a/homeassistant/components/zha/binary_sensor.py b/homeassistant/components/zha/binary_sensor.py
index 1c29f619719211..48fbf1f0bb2aed 100644
--- a/homeassistant/components/zha/binary_sensor.py
+++ b/homeassistant/components/zha/binary_sensor.py
@@ -236,6 +236,15 @@ def migrate_to_zigpy_cache(self, last_state):
         )
 
 
+@STRICT_MATCH(cluster_handler_names=CLUSTER_HANDLER_ZONE, models={"WL4200", "WL4200S"})
+class SinopeLeakStatus(BinarySensor):
+    """Sinope water leak sensor."""
+
+    SENSOR_ATTR = "leak_status"
+    _attr_name = "Moisture"
+    _attr_device_class = BinarySensorDeviceClass.MOISTURE
+
+
 @MULTI_MATCH(
     cluster_handler_names="tuya_manufacturer",
     manufacturers={
diff --git a/homeassistant/components/zha/button.py b/homeassistant/components/zha/button.py
index 6564f3bc39a7f3..010c0f63e277db 100644
--- a/homeassistant/components/zha/button.py
+++ b/homeassistant/components/zha/button.py
@@ -105,7 +105,7 @@ def create_entity(
             return None
         return cls(unique_id, zha_device, cluster_handlers, **kwargs)
 
-    _attr_device_class: ButtonDeviceClass = ButtonDeviceClass.UPDATE
+    _attr_device_class = ButtonDeviceClass.IDENTIFY
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_name = "Identify"
     _command_name = "identify"
diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index 5230d77ce464d3..ba50839ee44107 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -23,7 +23,7 @@
 from homeassistant.data_entry_flow import FlowHandler, FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.selector import FileSelector, FileSelectorConfig
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .core.const import (
     CONF_BAUDRATE,
@@ -69,7 +69,7 @@ def _format_backup_choice(
 ) -> str:
     """Format network backup info into a short piece of text."""
     if not pan_ids:
-        return dt.as_local(backup.backup_time).strftime("%c")
+        return dt_util.as_local(backup.backup_time).strftime("%c")
 
     identifier = (
         # PAN ID
@@ -78,7 +78,7 @@ def _format_backup_choice(
         f":{str(backup.network_info.extended_pan_id).replace(':', '')}"
     ).lower()
 
-    return f"{dt.as_local(backup.backup_time).strftime('%c')} ({identifier})"
+    return f"{dt_util.as_local(backup.backup_time).strftime('%c')} ({identifier})"
 
 
 async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
@@ -96,7 +96,7 @@ async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
         yellow_radio.manufacturer = "Nabu Casa"
 
     # Present the multi-PAN addon as a setup option, if it's available
-    addon_manager = silabs_multiprotocol_addon.get_addon_manager(hass)
+    addon_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
 
     try:
         addon_info = await addon_manager.async_get_addon_info()
@@ -552,10 +552,9 @@ async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult
         vid = discovery_info.vid
         pid = discovery_info.pid
         serial_number = discovery_info.serial_number
-        device = discovery_info.device
         manufacturer = discovery_info.manufacturer
         description = discovery_info.description
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
 
         await self._set_unique_id_or_update_path(
             unique_id=f"{vid}:{pid}_{serial_number}_{manufacturer}_{description}",
diff --git a/homeassistant/components/zha/core/cluster_handlers/__init__.py b/homeassistant/components/zha/core/cluster_handlers/__init__.py
index 7863b04345556c..dcf8f2a525e2d0 100644
--- a/homeassistant/components/zha/core/cluster_handlers/__init__.py
+++ b/homeassistant/components/zha/core/cluster_handlers/__init__.py
@@ -3,11 +3,12 @@
 
 import asyncio
 from enum import Enum
-from functools import partialmethod, wraps
+from functools import partialmethod
 import logging
 from typing import TYPE_CHECKING, Any, TypedDict
 
 import zigpy.exceptions
+import zigpy.util
 import zigpy.zcl
 from zigpy.zcl.foundation import (
     CommandSchema,
@@ -45,6 +46,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+retry_request = zigpy.util.retryable_request(tries=3)
+
 
 class AttrReportConfig(TypedDict, total=True):
     """Configuration to report for the attributes."""
@@ -73,35 +76,6 @@ def parse_and_log_command(cluster_handler, tsn, command_id, args):
     return name
 
 
-def decorate_command(cluster_handler, command):
-    """Wrap a cluster command to make it safe."""
-
-    @wraps(command)
-    async def wrapper(*args, **kwds):
-        try:
-            result = await command(*args, **kwds)
-            cluster_handler.debug(
-                "executed '%s' command with args: '%s' kwargs: '%s' result: %s",
-                command.__name__,
-                args,
-                kwds,
-                result,
-            )
-            return result
-
-        except (zigpy.exceptions.ZigbeeException, asyncio.TimeoutError) as ex:
-            cluster_handler.debug(
-                "command failed: '%s' args: '%s' kwargs '%s' exception: '%s'",
-                command.__name__,
-                args,
-                kwds,
-                str(ex),
-            )
-            return ex
-
-    return wrapper
-
-
 class ClusterHandlerStatus(Enum):
     """Status of a cluster handler."""
 
@@ -119,7 +93,7 @@ class ClusterHandler(LogMixin):
     # Dict of attributes to read on cluster handler initialization.
     # Dict keys -- attribute ID or names, with bool value indicating whether a cached
     # attribute read is acceptable.
-    ZCL_INIT_ATTRS: dict[int | str, bool] = {}
+    ZCL_INIT_ATTRS: dict[str, bool] = {}
 
     def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
         """Initialize ClusterHandler."""
@@ -396,7 +370,7 @@ def cluster_command(self, tsn, command_id, args):
         """Handle commands received to this cluster."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         self.async_send_signal(
             f"{self.unique_id}_{SIGNAL_ATTR_UPDATED}",
@@ -462,7 +436,7 @@ async def get_attribute_value(self, attribute, from_cache=True):
     async def _get_attributes(
         self,
         raise_exceptions: bool,
-        attributes: list[int | str],
+        attributes: list[str],
         from_cache: bool = True,
         only_cache: bool = True,
     ) -> dict[int | str, Any]:
@@ -510,7 +484,8 @@ def __getattr__(self, name):
         if hasattr(self._cluster, name) and callable(getattr(self._cluster, name)):
             command = getattr(self._cluster, name)
             command.__name__ = name
-            return decorate_command(self, command)
+
+            return retry_request(command)
         return self.__getattribute__(name)
 
 
@@ -568,7 +543,7 @@ class ClientClusterHandler(ClusterHandler):
     """ClusterHandler for Zigbee client (output) clusters."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle an attribute updated on this cluster."""
 
         try:
diff --git a/homeassistant/components/zha/core/cluster_handlers/closures.py b/homeassistant/components/zha/core/cluster_handlers/closures.py
index ab58405b97413f..4262a16800de1d 100644
--- a/homeassistant/components/zha/core/cluster_handlers/closures.py
+++ b/homeassistant/components/zha/core/cluster_handlers/closures.py
@@ -1,11 +1,13 @@
 """Closures cluster handlers module for Zigbee Home Automation."""
+from typing import Any
+
 from zigpy.zcl.clusters import closures
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 from .. import registries
 from ..const import REPORT_CONFIG_IMMEDIATE, SIGNAL_ATTR_UPDATED
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(closures.DoorLock.cluster_id)
@@ -48,7 +50,7 @@ def cluster_command(self, tsn, command_id, args):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from lock cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
@@ -144,7 +146,7 @@ async def async_update(self):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from window_covering cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/general.py b/homeassistant/components/zha/core/cluster_handlers/general.py
index d4014bbf697ff1..622c9e4340e85a 100644
--- a/homeassistant/components/zha/core/cluster_handlers/general.py
+++ b/homeassistant/components/zha/core/cluster_handlers/general.py
@@ -14,12 +14,6 @@
 from homeassistant.core import callback
 from homeassistant.helpers.event import async_call_later
 
-from . import (
-    AttrReportConfig,
-    ClientClusterHandler,
-    ClusterHandler,
-    parse_and_log_command,
-)
 from .. import registries
 from ..const import (
     REPORT_CONFIG_ASAP,
@@ -33,6 +27,12 @@
     SIGNAL_SET_LEVEL,
     SIGNAL_UPDATE_DEVICE,
 )
+from . import (
+    AttrReportConfig,
+    ClientClusterHandler,
+    ClusterHandler,
+    parse_and_log_command,
+)
 from .helpers import is_hue_motion_sensor
 
 if TYPE_CHECKING:
@@ -297,7 +297,7 @@ def cluster_command(self, tsn, command_id, args):
             )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         self.debug("received attribute: %s update with value: %s", attrid, value)
         if attrid == self.CURRENT_LEVEL:
@@ -358,7 +358,7 @@ def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
         super().__init__(cluster, endpoint)
         self._off_listener = None
 
-        if self.cluster.endpoint.model in (
+        if self.cluster.endpoint.model not in (
             "TS011F",
             "TS0121",
             "TS0001",
@@ -366,13 +366,19 @@ def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
             "TS0003",
             "TS0004",
         ):
-            self.ZCL_INIT_ATTRS = (  # pylint: disable=invalid-name
-                self.ZCL_INIT_ATTRS.copy()
-            )
-            self.ZCL_INIT_ATTRS["backlight_mode"] = True
-            self.ZCL_INIT_ATTRS["power_on_state"] = True
-            if self.cluster.endpoint.model == "TS011F":
-                self.ZCL_INIT_ATTRS["child_lock"] = True
+            return
+
+        try:
+            self.cluster.find_attribute("backlight_mode")
+        except KeyError:
+            return
+
+        self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy()  # pylint: disable=invalid-name
+        self.ZCL_INIT_ATTRS["backlight_mode"] = True
+        self.ZCL_INIT_ATTRS["power_on_state"] = True
+
+        if self.cluster.endpoint.model == "TS011F":
+            self.ZCL_INIT_ATTRS["child_lock"] = True
 
     @classmethod
     def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool:
@@ -438,7 +444,7 @@ def set_to_off(self, *_):
         self.cluster.update_attribute(self.ON_OFF, t.Bool.false)
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         if attrid == self.ON_OFF:
             self.async_send_signal(
diff --git a/homeassistant/components/zha/core/cluster_handlers/homeautomation.py b/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
index 981ed08ba00b31..8ca014f453ede7 100644
--- a/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
+++ b/homeassistant/components/zha/core/cluster_handlers/homeautomation.py
@@ -5,7 +5,6 @@
 
 from zigpy.zcl.clusters import homeautomation
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT,
@@ -13,6 +12,7 @@
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(
diff --git a/homeassistant/components/zha/core/cluster_handlers/hvac.py b/homeassistant/components/zha/core/cluster_handlers/hvac.py
index 94154564e8c81d..cbc56f5acc5bae 100644
--- a/homeassistant/components/zha/core/cluster_handlers/hvac.py
+++ b/homeassistant/components/zha/core/cluster_handlers/hvac.py
@@ -14,7 +14,6 @@
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_MAX_INT,
@@ -22,6 +21,7 @@
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 AttributeUpdateRecord = namedtuple("AttributeUpdateRecord", "attr_id, attr_name, value")
 REPORT_CONFIG_CLIMATE = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 25)
@@ -67,7 +67,7 @@ async def async_update(self) -> None:
         await self.get_attribute_value("fan_mode", from_cache=False)
 
     @callback
-    def attribute_updated(self, attrid: int, value: Any) -> None:
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from fan cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
@@ -109,7 +109,7 @@ class ThermostatClusterHandler(ClusterHandler):
         AttrReportConfig(attr="pi_cooling_demand", config=REPORT_CONFIG_CLIMATE_DEMAND),
         AttrReportConfig(attr="pi_heating_demand", config=REPORT_CONFIG_CLIMATE_DEMAND),
     )
-    ZCL_INIT_ATTRS: dict[int | str, bool] = {
+    ZCL_INIT_ATTRS: dict[str, bool] = {
         "abs_min_heat_setpoint_limit": True,
         "abs_max_heat_setpoint_limit": True,
         "abs_min_cool_setpoint_limit": True,
@@ -234,7 +234,7 @@ def unoccupied_heating_setpoint(self) -> int | None:
         return self.cluster.get("unoccupied_heating_setpoint")
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/lighting.py b/homeassistant/components/zha/core/cluster_handlers/lighting.py
index 56f3c701aa1a89..5f54ce381cc903 100644
--- a/homeassistant/components/zha/core/cluster_handlers/lighting.py
+++ b/homeassistant/components/zha/core/cluster_handlers/lighting.py
@@ -1,13 +1,13 @@
 """Lighting cluster handlers module for Zigbee Home Automation."""
 from __future__ import annotations
 
-from functools import cached_property
-
 from zigpy.zcl.clusters import lighting
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
+from homeassistant.backports.functools import cached_property
+
 from .. import registries
 from ..const import REPORT_CONFIG_DEFAULT
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(lighting.Ballast.cluster_id)
diff --git a/homeassistant/components/zha/core/cluster_handlers/lightlink.py b/homeassistant/components/zha/core/cluster_handlers/lightlink.py
index 437a4b4ecf8833..bac4d8c09a9d4e 100644
--- a/homeassistant/components/zha/core/cluster_handlers/lightlink.py
+++ b/homeassistant/components/zha/core/cluster_handlers/lightlink.py
@@ -5,8 +5,8 @@
 from zigpy.zcl.clusters import lightlink
 from zigpy.zcl.foundation import GENERAL_COMMANDS, GeneralCommand
 
-from . import ClusterHandler, ClusterHandlerStatus
 from .. import registries
+from . import ClusterHandler, ClusterHandlerStatus
 
 
 @registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(lightlink.LightLink.cluster_id)
diff --git a/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py b/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
index d20888e1f55357..e46031cce1461d 100644
--- a/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
+++ b/homeassistant/components/zha/core/cluster_handlers/manufacturerspecific.py
@@ -10,7 +10,6 @@
 
 from homeassistant.core import callback
 
-from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 from .. import registries
 from ..const import (
     ATTR_ATTRIBUTE_ID,
@@ -24,6 +23,7 @@
     SIGNAL_ATTR_UPDATED,
     UNKNOWN,
 )
+from . import AttrReportConfig, ClientClusterHandler, ClusterHandler
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
@@ -198,7 +198,7 @@ def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool:
         )
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         try:
             attr_name = self._cluster.attributes[attrid].name
@@ -229,7 +229,7 @@ class InovelliNotificationClusterHandler(ClientClusterHandler):
     """Inovelli Notification cluster handler."""
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle an attribute updated on this cluster."""
 
     @callback
@@ -363,7 +363,7 @@ async def async_update(self) -> None:
         await self.get_attribute_value("fan_mode", from_cache=False)
 
     @callback
-    def attribute_updated(self, attrid: int, value: Any) -> None:
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute update from fan cluster."""
         attr_name = self._get_attribute_name(attrid)
         self.debug(
diff --git a/homeassistant/components/zha/core/cluster_handlers/measurement.py b/homeassistant/components/zha/core/cluster_handlers/measurement.py
index 8b882a299f655e..beeb6296e32f50 100644
--- a/homeassistant/components/zha/core/cluster_handlers/measurement.py
+++ b/homeassistant/components/zha/core/cluster_handlers/measurement.py
@@ -6,7 +6,6 @@
 import zigpy.zcl
 from zigpy.zcl.clusters import measurement
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_DEFAULT,
@@ -14,6 +13,7 @@
     REPORT_CONFIG_MAX_INT,
     REPORT_CONFIG_MIN_INT,
 )
+from . import AttrReportConfig, ClusterHandler
 from .helpers import is_hue_motion_sensor
 
 if TYPE_CHECKING:
diff --git a/homeassistant/components/zha/core/cluster_handlers/protocol.py b/homeassistant/components/zha/core/cluster_handlers/protocol.py
index 6398a8875b689d..1643fe031cdcd4 100644
--- a/homeassistant/components/zha/core/cluster_handlers/protocol.py
+++ b/homeassistant/components/zha/core/cluster_handlers/protocol.py
@@ -1,8 +1,8 @@
 """Protocol cluster handlers module for Zigbee Home Automation."""
 from zigpy.zcl.clusters import protocol
 
-from . import ClusterHandler
 from .. import registries
+from . import ClusterHandler
 
 
 @registries.ZIGBEE_CLUSTER_HANDLER_REGISTRY.register(
diff --git a/homeassistant/components/zha/core/cluster_handlers/security.py b/homeassistant/components/zha/core/cluster_handlers/security.py
index 7e4951ad672e3a..28e2d86366259f 100644
--- a/homeassistant/components/zha/core/cluster_handlers/security.py
+++ b/homeassistant/components/zha/core/cluster_handlers/security.py
@@ -15,7 +15,6 @@
 
 from homeassistant.core import callback
 
-from . import ClusterHandler, ClusterHandlerStatus
 from .. import registries
 from ..const import (
     SIGNAL_ATTR_UPDATED,
@@ -25,6 +24,7 @@
     WARNING_DEVICE_STROBE_HIGH,
     WARNING_DEVICE_STROBE_YES,
 )
+from . import ClusterHandler, ClusterHandlerStatus
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
@@ -388,7 +388,7 @@ async def async_configure(self):
         self.debug("finished IASZoneClusterHandler configuration")
 
     @callback
-    def attribute_updated(self, attrid, value):
+    def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
         """Handle attribute updates on this cluster."""
         if attrid == IasZone.attributes_by_name["zone_status"].id:
             self.async_send_signal(
diff --git a/homeassistant/components/zha/core/cluster_handlers/smartenergy.py b/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
index 1cb647ea313fd8..8fd38425dff3a7 100644
--- a/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
+++ b/homeassistant/components/zha/core/cluster_handlers/smartenergy.py
@@ -8,7 +8,6 @@
 import zigpy.zcl
 from zigpy.zcl.clusters import smartenergy
 
-from . import AttrReportConfig, ClusterHandler
 from .. import registries
 from ..const import (
     REPORT_CONFIG_ASAP,
@@ -16,6 +15,7 @@
     REPORT_CONFIG_OP,
     SIGNAL_ATTR_UPDATED,
 )
+from . import AttrReportConfig, ClusterHandler
 
 if TYPE_CHECKING:
     from ..endpoint import Endpoint
diff --git a/homeassistant/components/zha/core/device.py b/homeassistant/components/zha/core/device.py
index 139acb23923d0c..51ab65e3318a9d 100644
--- a/homeassistant/components/zha/core/device.py
+++ b/homeassistant/components/zha/core/device.py
@@ -5,7 +5,6 @@
 from collections.abc import Callable
 from datetime import timedelta
 from enum import Enum
-from functools import cached_property
 import logging
 import random
 import time
@@ -23,6 +22,7 @@
 from zigpy.zcl.foundation import Status as ZclStatus, ZCLCommandDef
 import zigpy.zdo.types as zdo_types
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.const import ATTR_COMMAND, ATTR_DEVICE_ID, ATTR_NAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -740,9 +740,15 @@ async def write_zigbee_attribute(
         manufacturer=None,
     ):
         """Write a value to a zigbee attribute for a cluster in this entity."""
-        cluster = self.async_get_cluster(endpoint_id, cluster_id, cluster_type)
-        if cluster is None:
-            return None
+        try:
+            cluster: Cluster = self.async_get_cluster(
+                endpoint_id, cluster_id, cluster_type
+            )
+        except KeyError as exc:
+            raise ValueError(
+                f"Cluster {cluster_id} not found on endpoint {endpoint_id} while"
+                f" writing attribute {attribute} with value {value}"
+            ) from exc
 
         try:
             response = await cluster.write_attributes(
@@ -758,15 +764,13 @@ async def write_zigbee_attribute(
             )
             return response
         except zigpy.exceptions.ZigbeeException as exc:
-            self.debug(
-                "failed to set attribute: %s %s %s %s %s",
-                f"{ATTR_VALUE}: {value}",
-                f"{ATTR_ATTRIBUTE}: {attribute}",
-                f"{ATTR_CLUSTER_ID}: {cluster_id}",
-                f"{ATTR_ENDPOINT_ID}: {endpoint_id}",
-                exc,
-            )
-            return None
+            raise HomeAssistantError(
+                f"Failed to set attribute: "
+                f"{ATTR_VALUE}: {value} "
+                f"{ATTR_ATTRIBUTE}: {attribute} "
+                f"{ATTR_CLUSTER_ID}: {cluster_id} "
+                f"{ATTR_ENDPOINT_ID}: {endpoint_id}"
+            ) from exc
 
     async def issue_cluster_command(
         self,
diff --git a/homeassistant/components/zha/core/discovery.py b/homeassistant/components/zha/core/discovery.py
index e8b6f5f83048bf..0ca1c136271857 100644
--- a/homeassistant/components/zha/core/discovery.py
+++ b/homeassistant/components/zha/core/discovery.py
@@ -16,7 +16,6 @@
 from homeassistant.helpers.entity_registry import async_entries_for_device
 from homeassistant.helpers.typing import ConfigType
 
-from . import const as zha_const, registries as zha_regs
 from .. import (  # noqa: F401 pylint: disable=unused-import,
     alarm_control_panel,
     binary_sensor,
@@ -33,6 +32,7 @@
     siren,
     switch,
 )
+from . import const as zha_const, registries as zha_regs
 
 # importing cluster handlers updates registries
 from .cluster_handlers import (  # noqa: F401 pylint: disable=unused-import,
diff --git a/homeassistant/components/zha/cover.py b/homeassistant/components/zha/cover.py
index fce37904126c71..4d76ea27897525 100644
--- a/homeassistant/components/zha/cover.py
+++ b/homeassistant/components/zha/cover.py
@@ -318,16 +318,12 @@ class KeenVent(Shade):
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
         position = self._position or 100
-        tasks = [
+        await asyncio.gather(
             self._level_cluster_handler.move_to_level_with_on_off(
                 position * 255 / 100, 1
             ),
             self._on_off_cluster_handler.on(),
-        ]
-        results = await asyncio.gather(*tasks, return_exceptions=True)
-        if any(isinstance(result, Exception) for result in results):
-            self.debug("couldn't open cover")
-            return
+        )
 
         self._is_open = True
         self._position = position
diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py
index d473eadeebed34..885cd788f701d2 100644
--- a/homeassistant/components/zha/device_tracker.py
+++ b/homeassistant/components/zha/device_tracker.py
@@ -118,10 +118,12 @@ def device_info(  # pylint: disable=overridden-final-method
         # We opt ZHA device tracker back into overriding this method because
         # it doesn't track IP-based devices.
         # Call Super because ScannerEntity overrode it.
-        return super(ZhaEntity, self).device_info
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        return ZhaEntity.device_info.fget(self)  # type: ignore[attr-defined]
 
     @property
     def unique_id(self) -> str:
         """Return unique ID."""
         # Call Super because ScannerEntity overrode it.
-        return super(ZhaEntity, self).unique_id
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        return ZhaEntity.unique_id.fget(self)  # type: ignore[attr-defined]
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index 705176ceda44b4..9e71691aaa5e46 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -622,7 +622,7 @@ def async_transition_complete(self, _=None) -> None:
             )
             if self._debounced_member_refresh is not None:
                 self.debug("transition complete - refreshing group member states")
-                assert self.platform and self.platform.config_entry
+                assert self.platform.config_entry
                 self.platform.config_entry.async_create_background_task(
                     self.hass,
                     self._debounced_member_refresh.async_call(),
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 46fe2ce472a6c9..293822987c30ae 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -20,15 +20,15 @@
     "zigpy_znp"
   ],
   "requirements": [
-    "bellows==0.35.5",
+    "bellows==0.35.8",
     "pyserial==3.5",
     "pyserial-asyncio==0.6",
-    "zha-quirks==0.0.99",
+    "zha-quirks==0.0.101",
     "zigpy-deconz==0.21.0",
-    "zigpy==0.55.0",
-    "zigpy-xbee==0.18.0",
+    "zigpy==0.56.1",
+    "zigpy-xbee==0.18.1",
     "zigpy-zigate==0.11.0",
-    "zigpy-znp==0.11.1"
+    "zigpy-znp==0.11.2"
   ],
   "usb": [
     {
diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
index 6bc6f30a34f4c1..29d6cafe3c845c 100644
--- a/homeassistant/components/zha/number.py
+++ b/homeassistant/components/zha/number.py
@@ -15,6 +15,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import UndefinedType
 
 from .core import discovery
 from .core.const import (
@@ -276,6 +277,7 @@ async def async_setup_entry(
 
 
 @STRICT_MATCH(cluster_handler_names=CLUSTER_HANDLER_ANALOG_OUTPUT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ZhaNumber(ZhaEntity, NumberEntity):
     """Representation of a ZHA Number entity."""
 
@@ -333,7 +335,7 @@ def native_step(self) -> float | None:
         return super().native_step
 
     @property
-    def name(self) -> str | None:
+    def name(self) -> str | UndefinedType | None:
         """Return the name of the number entity."""
         description = self._analog_output_cluster_handler.description
         if description is not None and len(description) > 0:
@@ -376,6 +378,7 @@ async def async_update(self) -> None:
             _LOGGER.debug("read value=%s", value)
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ZHANumberConfigurationEntity(ZhaEntity, NumberEntity):
     """Representation of a ZHA number configuration entity."""
 
@@ -399,6 +402,7 @@ def create_entity(
         cluster_handler = cluster_handlers[0]
         if (
             cls._zcl_attribute in cluster_handler.cluster.unsupported_attributes
+            or cls._zcl_attribute not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._zcl_attribute) is None
         ):
             _LOGGER.debug(
@@ -458,6 +462,7 @@ async def async_update(self) -> None:
     cluster_handler_names="opple_cluster",
     models={"lumi.motion.ac02", "lumi.motion.agl04"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraMotionDetectionInterval(
     ZHANumberConfigurationEntity, id_suffix="detection_interval"
 ):
@@ -470,6 +475,7 @@ class AqaraMotionDetectionInterval(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class OnOffTransitionTimeConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="on_off_transition_time"
 ):
@@ -482,6 +488,7 @@ class OnOffTransitionTimeConfigurationEntity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class OnLevelConfigurationEntity(ZHANumberConfigurationEntity, id_suffix="on_level"):
     """Representation of a ZHA on level configuration entity."""
 
@@ -492,6 +499,7 @@ class OnLevelConfigurationEntity(ZHANumberConfigurationEntity, id_suffix="on_lev
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class OnTransitionTimeConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="on_transition_time"
 ):
@@ -504,6 +512,7 @@ class OnTransitionTimeConfigurationEntity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class OffTransitionTimeConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="off_transition_time"
 ):
@@ -516,6 +525,7 @@ class OffTransitionTimeConfigurationEntity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class DefaultMoveRateConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="default_move_rate"
 ):
@@ -528,6 +538,7 @@ class DefaultMoveRateConfigurationEntity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEVEL)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class StartUpCurrentLevelConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="start_up_current_level"
 ):
@@ -540,6 +551,7 @@ class StartUpCurrentLevelConfigurationEntity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_COLOR)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class StartUpColorTemperatureConfigurationEntity(
     ZHANumberConfigurationEntity, id_suffix="start_up_color_temperature"
 ):
@@ -570,6 +582,7 @@ def __init__(
         "_TZE200_htnnfasr",
     },
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class TimerDurationMinutes(ZHANumberConfigurationEntity, id_suffix="timer_duration"):
     """Representation of a ZHA timer duration configuration entity."""
 
@@ -583,6 +596,7 @@ class TimerDurationMinutes(ZHANumberConfigurationEntity, id_suffix="timer_durati
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names="ikea_airpurifier")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class FilterLifeTime(ZHANumberConfigurationEntity, id_suffix="filter_life_time"):
     """Representation of a ZHA filter lifetime configuration entity."""
 
@@ -600,6 +614,7 @@ class FilterLifeTime(ZHANumberConfigurationEntity, id_suffix="filter_life_time")
     manufacturers={"TexasInstruments"},
     models={"ti.router"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class TiRouterTransmitPower(ZHANumberConfigurationEntity, id_suffix="transmit_power"):
     """Representation of a ZHA TI transmit power configuration entity."""
 
@@ -610,6 +625,7 @@ class TiRouterTransmitPower(ZHANumberConfigurationEntity, id_suffix="transmit_po
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliRemoteDimmingUpSpeed(
     ZHANumberConfigurationEntity, id_suffix="dimming_speed_up_remote"
 ):
@@ -624,6 +640,7 @@ class InovelliRemoteDimmingUpSpeed(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliButtonDelay(ZHANumberConfigurationEntity, id_suffix="button_delay"):
     """Inovelli button delay configuration entity."""
 
@@ -636,6 +653,7 @@ class InovelliButtonDelay(ZHANumberConfigurationEntity, id_suffix="button_delay"
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliLocalDimmingUpSpeed(
     ZHANumberConfigurationEntity, id_suffix="dimming_speed_up_local"
 ):
@@ -650,6 +668,7 @@ class InovelliLocalDimmingUpSpeed(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliLocalRampRateOffToOn(
     ZHANumberConfigurationEntity, id_suffix="ramp_rate_off_to_on_local"
 ):
@@ -664,6 +683,7 @@ class InovelliLocalRampRateOffToOn(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliRemoteDimmingSpeedOffToOn(
     ZHANumberConfigurationEntity, id_suffix="ramp_rate_off_to_on_remote"
 ):
@@ -678,6 +698,7 @@ class InovelliRemoteDimmingSpeedOffToOn(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliRemoteDimmingDownSpeed(
     ZHANumberConfigurationEntity, id_suffix="dimming_speed_down_remote"
 ):
@@ -692,6 +713,7 @@ class InovelliRemoteDimmingDownSpeed(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliLocalDimmingDownSpeed(
     ZHANumberConfigurationEntity, id_suffix="dimming_speed_down_local"
 ):
@@ -706,6 +728,7 @@ class InovelliLocalDimmingDownSpeed(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliLocalRampRateOnToOff(
     ZHANumberConfigurationEntity, id_suffix="ramp_rate_on_to_off_local"
 ):
@@ -720,6 +743,7 @@ class InovelliLocalRampRateOnToOff(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliRemoteDimmingSpeedOnToOff(
     ZHANumberConfigurationEntity, id_suffix="ramp_rate_on_to_off_remote"
 ):
@@ -734,6 +758,7 @@ class InovelliRemoteDimmingSpeedOnToOff(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliMinimumLoadDimmingLevel(
     ZHANumberConfigurationEntity, id_suffix="minimum_level"
 ):
@@ -748,6 +773,7 @@ class InovelliMinimumLoadDimmingLevel(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliMaximumLoadDimmingLevel(
     ZHANumberConfigurationEntity, id_suffix="maximum_level"
 ):
@@ -762,6 +788,7 @@ class InovelliMaximumLoadDimmingLevel(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliAutoShutoffTimer(
     ZHANumberConfigurationEntity, id_suffix="auto_off_timer"
 ):
@@ -776,6 +803,7 @@ class InovelliAutoShutoffTimer(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliLoadLevelIndicatorTimeout(
     ZHANumberConfigurationEntity, id_suffix="load_level_indicator_timeout"
 ):
@@ -790,6 +818,7 @@ class InovelliLoadLevelIndicatorTimeout(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDefaultAllLEDOnColor(
     ZHANumberConfigurationEntity, id_suffix="led_color_when_on"
 ):
@@ -804,6 +833,7 @@ class InovelliDefaultAllLEDOnColor(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDefaultAllLEDOffColor(
     ZHANumberConfigurationEntity, id_suffix="led_color_when_off"
 ):
@@ -818,6 +848,7 @@ class InovelliDefaultAllLEDOffColor(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDefaultAllLEDOnIntensity(
     ZHANumberConfigurationEntity, id_suffix="led_intensity_when_on"
 ):
@@ -832,6 +863,7 @@ class InovelliDefaultAllLEDOnIntensity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDefaultAllLEDOffIntensity(
     ZHANumberConfigurationEntity, id_suffix="led_intensity_when_off"
 ):
@@ -846,6 +878,7 @@ class InovelliDefaultAllLEDOffIntensity(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDoubleTapUpLevel(
     ZHANumberConfigurationEntity, id_suffix="double_tap_up_level"
 ):
@@ -860,6 +893,7 @@ class InovelliDoubleTapUpLevel(
 
 
 @CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_INOVELLI)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class InovelliDoubleTapDownLevel(
     ZHANumberConfigurationEntity, id_suffix="double_tap_down_level"
 ):
@@ -876,6 +910,7 @@ class InovelliDoubleTapDownLevel(
 @CONFIG_DIAGNOSTIC_MATCH(
     cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"}
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederServingSize(ZHANumberConfigurationEntity, id_suffix="serving_size"):
     """Aqara pet feeder serving size configuration entity."""
 
@@ -891,6 +926,7 @@ class AqaraPetFeederServingSize(ZHANumberConfigurationEntity, id_suffix="serving
 @CONFIG_DIAGNOSTIC_MATCH(
     cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"}
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederPortionWeight(
     ZHANumberConfigurationEntity, id_suffix="portion_weight"
 ):
@@ -909,6 +945,7 @@ class AqaraPetFeederPortionWeight(
 @CONFIG_DIAGNOSTIC_MATCH(
     cluster_handler_names="opple_cluster", models={"lumi.airrtc.agl001"}
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraThermostatAwayTemp(
     ZHANumberConfigurationEntity, id_suffix="away_preset_temperature"
 ):
diff --git a/homeassistant/components/zha/radio_manager.py b/homeassistant/components/zha/radio_manager.py
index 9fbfa03b92812c..29214083d27693 100644
--- a/homeassistant/components/zha/radio_manager.py
+++ b/homeassistant/components/zha/radio_manager.py
@@ -250,11 +250,12 @@ async def async_restore_backup_step_1(self) -> bool:
 
             assert self.current_settings is not None
 
+        metadata = self.current_settings.network_info.metadata["ezsp"]
+
         if (
             self.current_settings.node_info.ieee == self.chosen_backup.node_info.ieee
-            or not self.current_settings.network_info.metadata["ezsp"][
-                "can_write_custom_eui64"
-            ]
+            or metadata["can_rewrite_custom_eui64"]
+            or not metadata["can_burn_userdata_custom_eui64"]
         ):
             # No point in prompting the user if the backup doesn't have a new IEEE
             # address or if there is no way to overwrite the IEEE address a second time
diff --git a/homeassistant/components/zha/select.py b/homeassistant/components/zha/select.py
index 2453f40af4461a..27b71484f3e1a5 100644
--- a/homeassistant/components/zha/select.py
+++ b/homeassistant/components/zha/select.py
@@ -176,6 +176,7 @@ def create_entity(
         cluster_handler = cluster_handlers[0]
         if (
             cls._select_attr in cluster_handler.cluster.unsupported_attributes
+            or cls._select_attr not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._select_attr) is None
         ):
             _LOGGER.debug(
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
index 52c1f6a5b193bf..d13dd871865668 100644
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -115,6 +115,7 @@ async def async_setup_entry(
     config_entry.async_on_unload(unsub)
 
 
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Sensor(ZhaEntity, SensorEntity):
     """Base ZHA sensor."""
 
@@ -147,7 +148,10 @@ def create_entity(
         Return entity if it is a supported configuration, otherwise return None
         """
         cluster_handler = cluster_handlers[0]
-        if cls.SENSOR_ATTR in cluster_handler.cluster.unsupported_attributes:
+        if (
+            cls.SENSOR_ATTR in cluster_handler.cluster.unsupported_attributes
+            or cls.SENSOR_ATTR not in cluster_handler.cluster.attributes_by_name
+        ):
             return None
 
         return cls(unique_id, zha_device, cluster_handlers, **kwargs)
@@ -187,6 +191,7 @@ def formatter(self, value: int | enum.IntEnum) -> int | float | str | None:
     manufacturers="Digi",
     stop_on_match_group=CLUSTER_HANDLER_ANALOG_INPUT,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AnalogInput(Sensor):
     """Sensor that displays analog input values."""
 
@@ -195,6 +200,7 @@ class AnalogInput(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_POWER_CONFIGURATION)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Battery(Sensor):
     """Battery sensor of power configuration cluster."""
 
@@ -253,6 +259,7 @@ def extra_state_attributes(self) -> dict[str, Any]:
     stop_on_match_group=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT,
     models={"VZM31-SN", "SP 234", "outletv4"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurement(Sensor):
     """Active power measurement."""
 
@@ -271,8 +278,14 @@ def extra_state_attributes(self) -> dict[str, Any]:
             attrs["measurement_type"] = self._cluster_handler.measurement_type
 
         max_attr_name = f"{self.SENSOR_ATTR}_max"
-        if (max_v := self._cluster_handler.cluster.get(max_attr_name)) is not None:
-            attrs[max_attr_name] = str(self.formatter(max_v))
+
+        try:
+            max_v = self._cluster_handler.cluster.get(max_attr_name)
+        except KeyError:
+            pass
+        else:
+            if max_v is not None:
+                attrs[max_attr_name] = str(self.formatter(max_v))
 
         return attrs
 
@@ -292,6 +305,7 @@ def formatter(self, value: int) -> int | float:
     cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT,
     stop_on_match_group=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class PolledElectricalMeasurement(ElectricalMeasurement):
     """Polled active power measurement."""
 
@@ -305,6 +319,7 @@ async def async_update(self) -> None:
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurementApparentPower(
     ElectricalMeasurement, id_suffix="apparent_power"
 ):
@@ -318,6 +333,7 @@ class ElectricalMeasurementApparentPower(
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurementRMSCurrent(ElectricalMeasurement, id_suffix="rms_current"):
     """RMS current measurement."""
 
@@ -329,6 +345,7 @@ class ElectricalMeasurementRMSCurrent(ElectricalMeasurement, id_suffix="rms_curr
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurementRMSVoltage(ElectricalMeasurement, id_suffix="rms_voltage"):
     """RMS Voltage measurement."""
 
@@ -340,6 +357,7 @@ class ElectricalMeasurementRMSVoltage(ElectricalMeasurement, id_suffix="rms_volt
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurementFrequency(ElectricalMeasurement, id_suffix="ac_frequency"):
     """Frequency measurement."""
 
@@ -351,6 +369,7 @@ class ElectricalMeasurementFrequency(ElectricalMeasurement, id_suffix="ac_freque
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ElectricalMeasurementPowerFactor(ElectricalMeasurement, id_suffix="power_factor"):
     """Frequency measurement."""
 
@@ -368,6 +387,7 @@ class ElectricalMeasurementPowerFactor(ElectricalMeasurement, id_suffix="power_f
     cluster_handler_names=CLUSTER_HANDLER_HUMIDITY,
     stop_on_match_group=CLUSTER_HANDLER_HUMIDITY,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Humidity(Sensor):
     """Humidity sensor."""
 
@@ -380,6 +400,7 @@ class Humidity(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_SOIL_MOISTURE)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SoilMoisture(Sensor):
     """Soil Moisture sensor."""
 
@@ -392,6 +413,7 @@ class SoilMoisture(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_LEAF_WETNESS)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class LeafWetness(Sensor):
     """Leaf Wetness sensor."""
 
@@ -404,6 +426,7 @@ class LeafWetness(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_ILLUMINANCE)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Illuminance(Sensor):
     """Illuminance Sensor."""
 
@@ -422,6 +445,7 @@ def formatter(self, value: int) -> int:
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     stop_on_match_group=CLUSTER_HANDLER_SMARTENERGY_METERING,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SmartEnergyMetering(Sensor):
     """Metering sensor."""
 
@@ -475,6 +499,7 @@ def extra_state_attributes(self) -> dict[str, Any]:
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     stop_on_match_group=CLUSTER_HANDLER_SMARTENERGY_METERING,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SmartEnergySummation(SmartEnergyMetering, id_suffix="summation_delivered"):
     """Smart Energy Metering summation sensor."""
 
@@ -516,6 +541,7 @@ def formatter(self, value: int) -> int | float:
     models={"TS011F", "ZLinky_TIC"},
     stop_on_match_group=CLUSTER_HANDLER_SMARTENERGY_METERING,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class PolledSmartEnergySummation(SmartEnergySummation):
     """Polled Smart Energy Metering summation sensor."""
 
@@ -532,6 +558,7 @@ async def async_update(self) -> None:
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier1SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier1_summation_delivered"
 ):
@@ -545,6 +572,7 @@ class Tier1SmartEnergySummation(
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier2SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier2_summation_delivered"
 ):
@@ -558,6 +586,7 @@ class Tier2SmartEnergySummation(
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier3SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier3_summation_delivered"
 ):
@@ -571,6 +600,7 @@ class Tier3SmartEnergySummation(
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier4SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier4_summation_delivered"
 ):
@@ -584,6 +614,7 @@ class Tier4SmartEnergySummation(
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier5SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier5_summation_delivered"
 ):
@@ -597,6 +628,7 @@ class Tier5SmartEnergySummation(
     cluster_handler_names=CLUSTER_HANDLER_SMARTENERGY_METERING,
     models={"ZLinky_TIC"},
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Tier6SmartEnergySummation(
     PolledSmartEnergySummation, id_suffix="tier6_summation_delivered"
 ):
@@ -607,6 +639,7 @@ class Tier6SmartEnergySummation(
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_PRESSURE)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Pressure(Sensor):
     """Pressure sensor."""
 
@@ -619,6 +652,7 @@ class Pressure(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_TEMPERATURE)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class Temperature(Sensor):
     """Temperature Sensor."""
 
@@ -631,6 +665,7 @@ class Temperature(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_DEVICE_TEMPERATURE)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class DeviceTemperature(Sensor):
     """Device Temperature Sensor."""
 
@@ -644,6 +679,7 @@ class DeviceTemperature(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names="carbon_dioxide_concentration")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class CarbonDioxideConcentration(Sensor):
     """Carbon Dioxide Concentration sensor."""
 
@@ -657,6 +693,7 @@ class CarbonDioxideConcentration(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names="carbon_monoxide_concentration")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class CarbonMonoxideConcentration(Sensor):
     """Carbon Monoxide Concentration sensor."""
 
@@ -671,6 +708,7 @@ class CarbonMonoxideConcentration(Sensor):
 
 @MULTI_MATCH(generic_ids="cluster_handler_0x042e", stop_on_match_group="voc_level")
 @MULTI_MATCH(cluster_handler_names="voc_level", stop_on_match_group="voc_level")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class VOCLevel(Sensor):
     """VOC Level sensor."""
 
@@ -688,11 +726,14 @@ class VOCLevel(Sensor):
     models="lumi.airmonitor.acn01",
     stop_on_match_group="voc_level",
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class PPBVOCLevel(Sensor):
     """VOC Level sensor."""
 
     SENSOR_ATTR = "measured_value"
-    _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+    _attr_device_class: SensorDeviceClass = (
+        SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+    )
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
     _attr_name: str = "VOC level"
     _decimals = 0
@@ -701,10 +742,12 @@ class PPBVOCLevel(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names="pm25")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class PM25(Sensor):
     """Particulate Matter 2.5 microns or less sensor."""
 
     SENSOR_ATTR = "measured_value"
+    _attr_device_class: SensorDeviceClass = SensorDeviceClass.PM25
     _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT
     _attr_name: str = "Particulate matter"
     _decimals = 0
@@ -713,6 +756,7 @@ class PM25(Sensor):
 
 
 @MULTI_MATCH(cluster_handler_names="formaldehyde_concentration")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class FormaldehydeConcentration(Sensor):
     """Formaldehyde Concentration sensor."""
 
@@ -728,6 +772,7 @@ class FormaldehydeConcentration(Sensor):
     cluster_handler_names=CLUSTER_HANDLER_THERMOSTAT,
     stop_on_match_group=CLUSTER_HANDLER_THERMOSTAT,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class ThermostatHVACAction(Sensor, id_suffix="hvac_action"):
     """Thermostat HVAC action sensor."""
 
@@ -821,6 +866,7 @@ def async_set_state(self, *args, **kwargs) -> None:
     manufacturers="Sinope Technologies",
     stop_on_match_group=CLUSTER_HANDLER_THERMOSTAT,
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class SinopeHVACAction(ThermostatHVACAction):
     """Sinope Thermostat HVAC action sensor."""
 
@@ -850,6 +896,7 @@ def _rm_rs_action(self) -> HVACAction:
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_BASIC)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class RSSISensor(Sensor, id_suffix="rssi"):
     """RSSI sensor for a device."""
 
@@ -886,6 +933,7 @@ def native_value(self) -> StateType:
 
 
 @MULTI_MATCH(cluster_handler_names=CLUSTER_HANDLER_BASIC)
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class LQISensor(RSSISensor, id_suffix="lqi"):
     """LQI sensor for a device."""
 
@@ -900,6 +948,7 @@ class LQISensor(RSSISensor, id_suffix="lqi"):
         "_TZE200_htnnfasr",
     },
 )
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class TimeLeft(Sensor, id_suffix="time_left"):
     """Sensor that displays time left value."""
 
@@ -911,6 +960,7 @@ class TimeLeft(Sensor, id_suffix="time_left"):
 
 
 @MULTI_MATCH(cluster_handler_names="ikea_airpurifier")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class IkeaDeviceRunTime(Sensor, id_suffix="device_run_time"):
     """Sensor that displays device run time (in minutes)."""
 
@@ -922,6 +972,7 @@ class IkeaDeviceRunTime(Sensor, id_suffix="device_run_time"):
 
 
 @MULTI_MATCH(cluster_handler_names="ikea_airpurifier")
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class IkeaFilterRunTime(Sensor, id_suffix="filter_run_time"):
     """Sensor that displays run time of the current filter (in minutes)."""
 
@@ -940,6 +991,7 @@ class AqaraFeedingSource(types.enum8):
 
 
 @MULTI_MATCH(cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"})
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederLastFeedingSource(Sensor, id_suffix="last_feeding_source"):
     """Sensor that displays the last feeding source of pet feeder."""
 
@@ -953,6 +1005,7 @@ def formatter(self, value: int) -> int | float | None:
 
 
 @MULTI_MATCH(cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"})
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederLastFeedingSize(Sensor, id_suffix="last_feeding_size"):
     """Sensor that displays the last feeding size of the pet feeder."""
 
@@ -962,6 +1015,7 @@ class AqaraPetFeederLastFeedingSize(Sensor, id_suffix="last_feeding_size"):
 
 
 @MULTI_MATCH(cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"})
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederPortionsDispensed(Sensor, id_suffix="portions_dispensed"):
     """Sensor that displays the number of portions dispensed by the pet feeder."""
 
@@ -972,6 +1026,7 @@ class AqaraPetFeederPortionsDispensed(Sensor, id_suffix="portions_dispensed"):
 
 
 @MULTI_MATCH(cluster_handler_names="opple_cluster", models={"aqara.feeder.acn001"})
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraPetFeederWeightDispensed(Sensor, id_suffix="weight_dispensed"):
     """Sensor that displays the weight dispensed by the pet feeder."""
 
@@ -983,6 +1038,7 @@ class AqaraPetFeederWeightDispensed(Sensor, id_suffix="weight_dispensed"):
 
 
 @MULTI_MATCH(cluster_handler_names="opple_cluster", models={"lumi.sensor_smoke.acn03"})
+# pylint: disable-next=hass-invalid-inheritance # needs fixing
 class AqaraSmokeDensityDbm(Sensor, id_suffix="smoke_density_dbm"):
     """Sensor that displays the smoke density of an Aqara smoke sensor in dB/m."""
 
diff --git a/homeassistant/components/zha/silabs_multiprotocol.py b/homeassistant/components/zha/silabs_multiprotocol.py
new file mode 100644
index 00000000000000..aec52b4ac7513a
--- /dev/null
+++ b/homeassistant/components/zha/silabs_multiprotocol.py
@@ -0,0 +1,81 @@
+"""Silicon Labs Multiprotocol support."""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+
+from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon import (
+    is_multiprotocol_url,
+)
+from homeassistant.core import HomeAssistant
+
+from . import api
+
+# The approximate time it takes ZHA to change channels on SiLabs coordinators
+ZHA_CHANNEL_CHANGE_TIME_S = 10.27
+
+
+def _get_zha_url(hass: HomeAssistant) -> str | None:
+    """Return the ZHA radio path, or None if there's no ZHA config entry."""
+    with contextlib.suppress(ValueError):
+        return api.async_get_radio_path(hass)
+    return None
+
+
+async def _get_zha_channel(hass: HomeAssistant) -> int | None:
+    """Get ZHA channel, or None if there's no ZHA config entry."""
+    zha_network_settings: api.NetworkBackup | None
+    with contextlib.suppress(ValueError):
+        zha_network_settings = await api.async_get_network_settings(hass)
+    if not zha_network_settings:
+        return None
+    channel: int = zha_network_settings.network_info.channel
+    # ZHA uses channel 0 when no channel is set
+    return channel or None
+
+
+async def async_change_channel(
+    hass: HomeAssistant, channel: int, delay: float = 0
+) -> asyncio.Task | None:
+    """Set the channel to be used.
+
+    Does nothing if not configured.
+    """
+    zha_url = _get_zha_url(hass)
+    if not zha_url:
+        # ZHA is not configured
+        return None
+
+    async def finish_migration() -> None:
+        """Finish the channel migration."""
+        await asyncio.sleep(max(0, delay - ZHA_CHANNEL_CHANGE_TIME_S))
+        return await api.async_change_channel(hass, channel)
+
+    return hass.async_create_task(finish_migration())
+
+
+async def async_get_channel(hass: HomeAssistant) -> int | None:
+    """Return the channel.
+
+    Returns None if not configured.
+    """
+    zha_url = _get_zha_url(hass)
+    if not zha_url:
+        # ZHA is not configured
+        return None
+
+    return await _get_zha_channel(hass)
+
+
+async def async_using_multipan(hass: HomeAssistant) -> bool:
+    """Return if the multiprotocol device is used.
+
+    Returns False if not configured.
+    """
+    zha_url = _get_zha_url(hass)
+    if not zha_url:
+        # ZHA is not configured
+        return False
+
+    return is_multiprotocol_url(zha_url)
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index 94b3951f014297..cbdc9cf8477c3f 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -23,8 +23,8 @@
         "description": "Enter the serial port settings",
         "data": {
           "path": "Serial device path",
-          "baudrate": "port speed",
-          "flow_control": "data flow control"
+          "baudrate": "Port speed",
+          "flow_control": "Data flow control"
         }
       },
       "verify_radio": {
@@ -237,12 +237,12 @@
       "button_5": "Fifth button",
       "button_6": "Sixth button",
       "face_any": "With any/specified face(s) activated",
-      "face_1": "with face 1 activated",
-      "face_2": "with face 2 activated",
-      "face_3": "with face 3 activated",
-      "face_4": "with face 4 activated",
-      "face_5": "with face 5 activated",
-      "face_6": "with face 6 activated"
+      "face_1": "With face 1 activated",
+      "face_2": "With face 2 activated",
+      "face_3": "With face 3 activated",
+      "face_4": "With face 4 activated",
+      "face_5": "With face 5 activated",
+      "face_6": "With face 6 activated"
     }
   }
 }
diff --git a/homeassistant/components/zha/switch.py b/homeassistant/components/zha/switch.py
index 99db68760a8d86..451d96a122b8c8 100644
--- a/homeassistant/components/zha/switch.py
+++ b/homeassistant/components/zha/switch.py
@@ -192,6 +192,7 @@ def create_entity(
         cluster_handler = cluster_handlers[0]
         if (
             cls._zcl_attribute in cluster_handler.cluster.unsupported_attributes
+            or cls._zcl_attribute not in cluster_handler.cluster.attributes_by_name
             or cluster_handler.cluster.get(cls._zcl_attribute) is None
         ):
             _LOGGER.debug(
diff --git a/homeassistant/components/zha/websocket_api.py b/homeassistant/components/zha/websocket_api.py
index 2d4126861b4073..97862bd36f05dd 100644
--- a/homeassistant/components/zha/websocket_api.py
+++ b/homeassistant/components/zha/websocket_api.py
@@ -7,6 +7,7 @@
 
 import voluptuous as vol
 import zigpy.backups
+from zigpy.config import CONF_DEVICE
 from zigpy.config.validators import cv_boolean
 from zigpy.types.named import EUI64
 from zigpy.zcl.clusters.security import IasAce
@@ -906,6 +907,7 @@ async def websocket_bind_devices(
         ATTR_TARGET_IEEE,
         target_ieee,
     )
+    connection.send_result(msg[ID])
 
 
 @websocket_api.require_admin
@@ -934,6 +936,7 @@ async def websocket_unbind_devices(
         ATTR_TARGET_IEEE,
         target_ieee,
     )
+    connection.send_result(msg[ID])
 
 
 @websocket_api.require_admin
@@ -950,13 +953,14 @@ async def websocket_bind_group(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Directly bind a device to a group."""
-    zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
+    zha_gateway: ZHAGateway = get_gateway(hass)
     source_ieee: EUI64 = msg[ATTR_SOURCE_IEEE]
     group_id: int = msg[GROUP_ID]
     bindings: list[ClusterBinding] = msg[BINDINGS]
     source_device = zha_gateway.get_device(source_ieee)
     assert source_device
     await source_device.async_bind_to_group(group_id, bindings)
+    connection.send_result(msg[ID])
 
 
 @websocket_api.require_admin
@@ -973,13 +977,19 @@ async def websocket_unbind_group(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Unbind a device from a group."""
-    zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
+    zha_gateway: ZHAGateway = get_gateway(hass)
     source_ieee: EUI64 = msg[ATTR_SOURCE_IEEE]
     group_id: int = msg[GROUP_ID]
     bindings: list[ClusterBinding] = msg[BINDINGS]
     source_device = zha_gateway.get_device(source_ieee)
     assert source_device
     await source_device.async_unbind_from_group(group_id, bindings)
+    connection.send_result(msg[ID])
+
+
+def get_gateway(hass: HomeAssistant) -> ZHAGateway:
+    """Return Gateway, mainly as fixture for mocking during testing."""
+    return hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
 
 
 async def async_binding_operation(
@@ -1136,6 +1146,7 @@ async def websocket_get_network_settings(
         msg[ID],
         {
             "radio_type": async_get_radio_type(hass, zha_gateway.config_entry).name,
+            "device": zha_gateway.application_controller.config[CONF_DEVICE],
             "settings": backup.as_dict(),
         },
     )
@@ -1302,6 +1313,9 @@ async def set_zigbee_cluster_attributes(service: ServiceCall) -> None:
                 cluster_type=cluster_type,
                 manufacturer=manufacturer,
             )
+        else:
+            raise ValueError(f"Device with IEEE {str(ieee)} not found")
+
         _LOGGER.debug(
             (
                 "Set attribute for: %s: [%s] %s: [%s] %s: [%s] %s: [%s] %s: [%s] %s:"
diff --git a/homeassistant/components/zhong_hong/manifest.json b/homeassistant/components/zhong_hong/manifest.json
index 637f468b89b0d5..77f85c9dfcd84b 100644
--- a/homeassistant/components/zhong_hong/manifest.json
+++ b/homeassistant/components/zhong_hong/manifest.json
@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/zhong_hong",
   "iot_class": "local_push",
   "loggers": ["zhong_hong_hvac"],
-  "requirements": ["zhong_hong_hvac==1.0.9"]
+  "requirements": ["zhong-hong-hvac==1.0.9"]
 }
diff --git a/homeassistant/components/ziggo_mediabox_xl/media_player.py b/homeassistant/components/ziggo_mediabox_xl/media_player.py
index a0f789f17082f4..20a78c80ac5618 100644
--- a/homeassistant/components/ziggo_mediabox_xl/media_player.py
+++ b/homeassistant/components/ziggo_mediabox_xl/media_player.py
@@ -62,11 +62,10 @@ def setup_platform(
             # Check if a connection can be established to the device.
             if mediabox.test_connection():
                 connection_successful = True
+            elif manual_config:
+                _LOGGER.info("Can't connect to %s", host)
             else:
-                if manual_config:
-                    _LOGGER.info("Can't connect to %s", host)
-                else:
-                    _LOGGER.error("Can't connect to %s", host)
+                _LOGGER.error("Can't connect to %s", host)
             # When the device is in eco mode it's not connected to the network
             # so it needs to be added anyway if it's configured manually.
             if manual_config or connection_successful:
diff --git a/homeassistant/components/zodiac/__init__.py b/homeassistant/components/zodiac/__init__.py
index 35d4d2eefbfb0c..892bcac5bf9177 100644
--- a/homeassistant/components/zodiac/__init__.py
+++ b/homeassistant/components/zodiac/__init__.py
@@ -1,9 +1,10 @@
 """The zodiac component."""
 import voluptuous as vol
 
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.discovery import async_load_platform
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN
@@ -16,8 +17,32 @@
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the zodiac component."""
+
+    async_create_issue(
+        hass,
+        DOMAIN,
+        "deprecated_yaml",
+        breaks_in_ha_version="2024.1.0",
+        is_fixable=False,
+        severity=IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+    )
+
     hass.async_create_task(
-        async_load_platform(hass, Platform.SENSOR, DOMAIN, {}, config)
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
     )
 
     return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Load a config entry."""
+    await hass.config_entries.async_forward_entry_setups(entry, [Platform.SENSOR])
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, [Platform.SENSOR])
diff --git a/homeassistant/components/zodiac/config_flow.py b/homeassistant/components/zodiac/config_flow.py
new file mode 100644
index 00000000000000..ebc0a819d1dff8
--- /dev/null
+++ b/homeassistant/components/zodiac/config_flow.py
@@ -0,0 +1,31 @@
+"""Config flow to configure the Zodiac integration."""
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.config_entries import ConfigFlow
+from homeassistant.data_entry_flow import FlowResult
+
+from .const import DEFAULT_NAME, DOMAIN
+
+
+class ZodiacConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Config flow for Zodiac."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle a flow initialized by the user."""
+        if self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        if user_input is not None:
+            return self.async_create_entry(title=DEFAULT_NAME, data={})
+
+        return self.async_show_form(step_id="user")
+
+    async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
+        """Handle import from configuration.yaml."""
+        return await self.async_step_user(user_input)
diff --git a/homeassistant/components/zodiac/const.py b/homeassistant/components/zodiac/const.py
index c3e7f13d5e372b..f50e108c2aa782 100644
--- a/homeassistant/components/zodiac/const.py
+++ b/homeassistant/components/zodiac/const.py
@@ -1,5 +1,6 @@
 """Constants for Zodiac."""
 DOMAIN = "zodiac"
+DEFAULT_NAME = "Zodiac"
 
 # Signs
 SIGN_ARIES = "aries"
diff --git a/homeassistant/components/zodiac/manifest.json b/homeassistant/components/zodiac/manifest.json
index ceacbf1645a254..88f3d7fadef9e9 100644
--- a/homeassistant/components/zodiac/manifest.json
+++ b/homeassistant/components/zodiac/manifest.json
@@ -2,7 +2,8 @@
   "domain": "zodiac",
   "name": "Zodiac",
   "codeowners": ["@JulienTant"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zodiac",
-  "iot_class": "local_polling",
+  "iot_class": "calculated",
   "quality_scale": "silver"
 }
diff --git a/homeassistant/components/zodiac/sensor.py b/homeassistant/components/zodiac/sensor.py
index f63c844701f087..d9b306da4dd855 100644
--- a/homeassistant/components/zodiac/sensor.py
+++ b/homeassistant/components/zodiac/sensor.py
@@ -2,14 +2,17 @@
 from __future__ import annotations
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util.dt import as_local, utcnow
 
 from .const import (
     ATTR_ELEMENT,
     ATTR_MODALITY,
+    DEFAULT_NAME,
     DOMAIN,
     ELEMENT_AIR,
     ELEMENT_EARTH,
@@ -159,23 +162,21 @@
 }
 
 
-async def async_setup_platform(
+async def async_setup_entry(
     hass: HomeAssistant,
-    config: ConfigType,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Zodiac sensor platform."""
-    if discovery_info is None:
-        return
+    """Initialize the entries."""
 
-    async_add_entities([ZodiacSensor()], True)
+    async_add_entities([ZodiacSensor(entry_id=entry.entry_id)], True)
 
 
 class ZodiacSensor(SensorEntity):
     """Representation of a Zodiac sensor."""
 
-    _attr_name = "Zodiac"
+    _attr_name = None
+    _attr_has_entity_name = True
     _attr_device_class = SensorDeviceClass.ENUM
     _attr_options = [
         SIGN_AQUARIUS,
@@ -194,6 +195,14 @@ class ZodiacSensor(SensorEntity):
     _attr_translation_key = "sign"
     _attr_unique_id = DOMAIN
 
+    def __init__(self, entry_id: str) -> None:
+        """Initialize Zodiac sensor."""
+        self._attr_device_info = DeviceInfo(
+            name=DEFAULT_NAME,
+            identifiers={(DOMAIN, entry_id)},
+            entry_type=DeviceEntryType.SERVICE,
+        )
+
     async def async_update(self) -> None:
         """Get the time and updates the state."""
         today = as_local(utcnow()).date()
diff --git a/homeassistant/components/zodiac/strings.json b/homeassistant/components/zodiac/strings.json
index cbae6ead433394..8cf0e22237e24f 100644
--- a/homeassistant/components/zodiac/strings.json
+++ b/homeassistant/components/zodiac/strings.json
@@ -1,4 +1,14 @@
 {
+  "config": {
+    "step": {
+      "user": {
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+    }
+  },
   "entity": {
     "sensor": {
       "sign": {
@@ -18,5 +28,11 @@
         }
       }
     }
+  },
+  "issues": {
+    "deprecated_yaml": {
+      "title": "The Zodiac YAML configuration is being removed",
+      "description": "Configuring Zodiac using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove the Zodiac YAML configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
+    }
   }
 }
diff --git a/homeassistant/components/zone/__init__.py b/homeassistant/components/zone/__init__.py
index 2133c8550dab10..35d835c8f16eee 100644
--- a/homeassistant/components/zone/__init__.py
+++ b/homeassistant/components/zone/__init__.py
@@ -3,6 +3,7 @@
 
 from collections.abc import Callable
 import logging
+from operator import attrgetter
 from typing import Any, cast
 
 from typing_extensions import Self
@@ -96,6 +97,10 @@ def empty_value(value: Any) -> Any:
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
 
+ENTITY_ID_SORTER = attrgetter("entity_id")
+
+ZONE_ENTITY_IDS = "zone_entity_ids"
+
 
 @bind_hass
 def async_active_zone(
@@ -106,16 +111,17 @@ def async_active_zone(
     This method must be run in the event loop.
     """
     # Sort entity IDs so that we are deterministic if equal distance to 2 zones
-    zones = (
-        cast(State, hass.states.get(entity_id))
-        for entity_id in sorted(hass.states.async_entity_ids(DOMAIN))
-    )
-
     min_dist = None
     closest = None
-
-    for zone in zones:
-        if zone.state == STATE_UNAVAILABLE or zone.attributes.get(ATTR_PASSIVE):
+    # This can be called before async_setup by device tracker
+    zone_entity_ids: list[str] = hass.data.get(ZONE_ENTITY_IDS, [])
+    for entity_id in zone_entity_ids:
+        zone = hass.states.get(entity_id)
+        if (
+            not zone
+            or zone.state == STATE_UNAVAILABLE
+            or zone.attributes.get(ATTR_PASSIVE)
+        ):
             continue
 
         zone_dist = distance(
@@ -143,6 +149,27 @@ def async_active_zone(
     return closest
 
 
+@callback
+def async_setup_track_zone_entity_ids(hass: HomeAssistant) -> None:
+    """Set up track of entity IDs for zones."""
+    zone_entity_ids: list[str] = hass.states.async_entity_ids(DOMAIN)
+    hass.data[ZONE_ENTITY_IDS] = zone_entity_ids
+
+    @callback
+    def _async_add_zone_entity_id(event_: Event) -> None:
+        """Add zone entity ID."""
+        zone_entity_ids.append(event_.data[ATTR_ENTITY_ID])
+        zone_entity_ids.sort()
+
+    @callback
+    def _async_remove_zone_entity_id(event_: Event) -> None:
+        """Remove zone entity ID."""
+        zone_entity_ids.remove(event_.data[ATTR_ENTITY_ID])
+
+    event.async_track_state_added_domain(hass, DOMAIN, _async_add_zone_entity_id)
+    event.async_track_state_removed_domain(hass, DOMAIN, _async_remove_zone_entity_id)
+
+
 def in_zone(zone: State, latitude: float, longitude: float, radius: float = 0) -> bool:
     """Test if given latitude, longitude is in given zone.
 
@@ -186,6 +213,8 @@ async def _update_data(self, item: dict, update_data: dict) -> dict:
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up configured zones as well as Home Assistant zone if necessary."""
+    async_setup_track_zone_entity_ids(hass)
+
     component = entity_component.EntityComponent[Zone](_LOGGER, DOMAIN, hass)
     id_manager = collection.IDManager()
 
diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index 66839026dd4310..8c1dd9b2197fa2 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -33,7 +33,11 @@
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.issue_registry import (
@@ -115,6 +119,8 @@
 DATA_DRIVER_EVENTS = "driver_events"
 DATA_START_CLIENT_TASK = "start_client_task"
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Z-Wave JS component."""
@@ -209,6 +215,9 @@ async def handle_ha_shutdown(event: Event) -> None:
     LOGGER.info("Connection to Zwave JS Server initialized")
 
     assert client.driver
+    async_dispatcher_send(
+        hass, f"{DOMAIN}_{client.driver.controller.home_id}_connected_to_server"
+    )
 
     await driver_events.setup(client.driver)
 
@@ -308,7 +317,9 @@ def __init__(self, hass: HomeAssistant, driver_events: DriverEvents) -> None:
         self.discovered_value_ids: dict[str, set[str]] = defaultdict(set)
         self.driver_events = driver_events
         self.dev_reg = driver_events.dev_reg
-        self.registered_unique_ids: dict[str, dict[str, set[str]]] = defaultdict(dict)
+        self.registered_unique_ids: dict[str, dict[str, set[str]]] = defaultdict(
+            lambda: defaultdict(set)
+        )
         self.node_events = NodeEvents(hass, self)
 
     @callback
@@ -321,10 +332,25 @@ def remove_device(self, device: dr.DeviceEntry) -> None:
 
     async def async_on_node_added(self, node: ZwaveNode) -> None:
         """Handle node added event."""
+        # Every node including the controller will have at least one sensor
+        await self.driver_events.async_setup_platform(Platform.SENSOR)
+
+        # Remove stale entities that may exist from a previous interview when an
+        # interview is started.
+        base_unique_id = get_valueless_base_unique_id(self.driver_events.driver, node)
+        self.config_entry.async_on_unload(
+            node.on(
+                "interview started",
+                lambda _: async_dispatcher_send(
+                    self.hass,
+                    f"{DOMAIN}_{base_unique_id}_remove_entity_on_interview_started",
+                ),
+            )
+        )
+
         # No need for a ping button or node status sensor for controller nodes
         if not node.is_controller_node:
             # Create a node status sensor for each device
-            await self.driver_events.async_setup_platform(Platform.SENSOR)
             async_dispatcher_send(
                 self.hass,
                 f"{DOMAIN}_{self.config_entry.entry_id}_add_node_status_sensor",
@@ -339,6 +365,13 @@ async def async_on_node_added(self, node: ZwaveNode) -> None:
                 node,
             )
 
+        # Create statistics sensors for each device
+        async_dispatcher_send(
+            self.hass,
+            f"{DOMAIN}_{self.config_entry.entry_id}_add_statistics_sensors",
+            node,
+        )
+
         LOGGER.debug("Node added: %s", node.node_id)
 
         # Listen for ready node events, both new and re-interview.
@@ -455,24 +488,11 @@ def __init__(
     async def async_on_node_ready(self, node: ZwaveNode) -> None:
         """Handle node ready event."""
         LOGGER.debug("Processing node %s", node)
-        driver = self.controller_events.driver_events.driver
         # register (or update) node in device registry
         device = self.controller_events.register_node_in_dev_reg(node)
-        # We only want to create the defaultdict once, even on reinterviews
-        if device.id not in self.controller_events.registered_unique_ids:
-            self.controller_events.registered_unique_ids[device.id] = defaultdict(set)
 
         # Remove any old value ids if this is a reinterview.
         self.controller_events.discovered_value_ids.pop(device.id, None)
-        # Remove stale entities that may exist from a previous interview.
-        async_dispatcher_send(
-            self.hass,
-            (
-                f"{DOMAIN}_"
-                f"{get_valueless_base_unique_id(driver, node)}_"
-                "remove_entity_on_ready_node"
-            ),
-        )
 
         value_updates_disc_info: dict[str, ZwaveDiscoveryInfo] = {}
 
diff --git a/homeassistant/components/zwave_js/api.py b/homeassistant/components/zwave_js/api.py
index 29e0dcf9e069cf..867405530abbb7 100644
--- a/homeassistant/components/zwave_js/api.py
+++ b/homeassistant/components/zwave_js/api.py
@@ -98,6 +98,7 @@
 TYPE = "type"
 PROPERTY = "property"
 PROPERTY_KEY = "property_key"
+ENDPOINT = "endpoint"
 VALUE = "value"
 
 # constants for log config commands
@@ -1608,6 +1609,7 @@ async def websocket_refresh_node_cc_values(
         vol.Required(TYPE): "zwave_js/set_config_parameter",
         vol.Required(DEVICE_ID): str,
         vol.Required(PROPERTY): int,
+        vol.Optional(ENDPOINT, default=0): int,
         vol.Optional(PROPERTY_KEY): int,
         vol.Required(VALUE): vol.Any(int, BITMASK_SCHEMA),
     }
@@ -1623,12 +1625,13 @@ async def websocket_set_config_parameter(
 ) -> None:
     """Set a config parameter value for a Z-Wave node."""
     property_ = msg[PROPERTY]
+    endpoint = msg[ENDPOINT]
     property_key = msg.get(PROPERTY_KEY)
     value = msg[VALUE]
 
     try:
         zwave_value, cmd_status = await async_set_config_parameter(
-            node, value, property_, property_key=property_key
+            node, value, property_, property_key=property_key, endpoint=endpoint
         )
     except (InvalidNewValue, NotFoundError, NotImplementedError, SetValueFailed) as err:
         code = ERR_UNKNOWN_ERROR
@@ -1673,6 +1676,7 @@ async def websocket_get_config_parameters(
         result[value_id] = {
             "property": zwave_value.property_,
             "property_key": zwave_value.property_key,
+            "endpoint": zwave_value.endpoint,
             "configuration_value_type": zwave_value.configuration_value_type.value,
             "metadata": {
                 "description": metadata.description,
diff --git a/homeassistant/components/zwave_js/binary_sensor.py b/homeassistant/components/zwave_js/binary_sensor.py
index 0051d6ccbf2b1d..ef5cdd1b1d22fb 100644
--- a/homeassistant/components/zwave_js/binary_sensor.py
+++ b/homeassistant/components/zwave_js/binary_sensor.py
@@ -315,6 +315,10 @@ def async_add_binary_sensor(info: ZwaveDiscoveryInfo) -> None:
                     config_entry, driver, info, property_description
                 )
             )
+        elif info.platform_hint == "config_parameter":
+            entities.append(
+                ZWaveConfigParameterBinarySensor(config_entry, driver, info)
+            )
         else:
             # boolean sensor
             entities.append(ZWaveBooleanBinarySensor(config_entry, driver, info))
@@ -411,3 +415,22 @@ def is_on(self) -> bool | None:
         if self.info.primary_value.value is None:
             return None
         return self.info.primary_value.value in self.entity_description.on_states
+
+
+class ZWaveConfigParameterBinarySensor(ZWaveBooleanBinarySensor):
+    """Representation of a Z-Wave config parameter binary sensor."""
+
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize a ZWaveConfigParameterBinarySensor entity."""
+        super().__init__(config_entry, driver, info)
+
+        property_key_name = self.info.primary_value.property_key_name
+        # Entity class attributes
+        self._attr_name = self.generate_name(
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[property_key_name] if property_key_name else None,
+        )
diff --git a/homeassistant/components/zwave_js/button.py b/homeassistant/components/zwave_js/button.py
index e743284abddf13..33d1e6dfa63dc9 100644
--- a/homeassistant/components/zwave_js/button.py
+++ b/homeassistant/components/zwave_js/button.py
@@ -36,6 +36,8 @@ def async_add_button(info: ZwaveDiscoveryInfo) -> None:
         entities: list[ZWaveBaseEntity] = []
         if info.platform_hint == "notification idle":
             entities.append(ZWaveNotificationIdleButton(config_entry, driver, info))
+        else:
+            entities.append(ZwaveBooleanNodeButton(config_entry, driver, info))
 
         async_add_entities(entities)
 
@@ -63,6 +65,21 @@ def async_add_ping_button_entity(node: ZwaveNode) -> None:
     )
 
 
+class ZwaveBooleanNodeButton(ZWaveBaseEntity, ButtonEntity):
+    """Representation of a ZWave button entity for a boolean value."""
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize entity."""
+        super().__init__(config_entry, driver, info)
+        self._attr_name = self.generate_name(include_value_name=True)
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        await self._async_set_value(self.info.primary_value, True)
+
+
 class ZWaveNodePingButton(ButtonEntity):
     """Representation of a ping button entity."""
 
@@ -83,6 +100,9 @@ def __init__(self, driver: Driver, node: ZwaveNode) -> None:
 
     async def async_poll_value(self, _: bool) -> None:
         """Poll a value."""
+        # We log an error instead of raising an exception because this service call occurs
+        # in a separate task since it is called via the dispatcher and we don't want to
+        # raise the exception in that separate task because it is confusing to the user.
         LOGGER.error(
             "There is no value to refresh for this entity so the zwave_js.refresh_value"
             " service won't work for it"
@@ -98,6 +118,9 @@ async def async_added_to_hass(self) -> None:
             )
         )
 
+        # we don't listen for `remove_entity_on_ready_node` signal because this entity
+        # is created when the node is added which occurs before ready. It only needs to
+        # be removed if the node is removed from the network.
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
@@ -122,7 +145,9 @@ def __init__(
         """Initialize a ZWaveNotificationIdleButton entity."""
         super().__init__(config_entry, driver, info)
         self._attr_name = self.generate_name(
-            include_value_name=True, name_prefix="Idle"
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[self.info.primary_value.property_key_name],
+            name_prefix="Idle",
         )
         self._attr_unique_id = f"{self._attr_unique_id}.notification_idle"
 
diff --git a/homeassistant/components/zwave_js/climate.py b/homeassistant/components/zwave_js/climate.py
index 5397ab3a65b721..cb027f32e0a5da 100644
--- a/homeassistant/components/zwave_js/climate.py
+++ b/homeassistant/components/zwave_js/climate.py
@@ -10,7 +10,6 @@
     THERMOSTAT_HUMIDITY_PROPERTY,
     THERMOSTAT_MODE_PROPERTY,
     THERMOSTAT_MODE_SETPOINT_MAP,
-    THERMOSTAT_MODES,
     THERMOSTAT_OPERATING_STATE_PROPERTY,
     THERMOSTAT_SETPOINT_PROPERTY,
     ThermostatMode,
@@ -40,7 +39,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.unit_conversion import TemperatureConverter
 
-from .const import DATA_CLIENT, DOMAIN
+from .const import DATA_CLIENT, DOMAIN, LOGGER
 from .discovery import ZwaveDiscoveryInfo
 from .discovery_data_template import DynamicCurrentTempClimateDataTemplate
 from .entity import ZWaveBaseEntity
@@ -48,6 +47,16 @@
 
 PARALLEL_UPDATES = 0
 
+THERMOSTAT_MODES = [
+    ThermostatMode.OFF,
+    ThermostatMode.HEAT,
+    ThermostatMode.COOL,
+    ThermostatMode.AUTO,
+    ThermostatMode.AUTO_CHANGE_OVER,
+    ThermostatMode.FAN,
+    ThermostatMode.DRY,
+]
+
 # Map Z-Wave HVAC Mode to Home Assistant value
 # Note: We treat "auto" as "heat_cool" as most Z-Wave devices
 # report auto_changeover as auto without schedule support.
@@ -233,9 +242,15 @@ def _set_modes_and_presets(self) -> None:
                 # treat value as hvac mode
                 if hass_mode := ZW_HVAC_MODE_MAP.get(mode_id):
                     all_modes[hass_mode] = mode_id
+                # Dry and Fan modes are in the process of being migrated from
+                # presets to hvac modes. In the meantime, we will set them as
+                # both, presets and hvac modes, to maintain backwards compatibility
+                if mode_id in (ThermostatMode.DRY, ThermostatMode.FAN):
+                    all_presets[mode_name] = mode_id
             else:
                 # treat value as hvac preset
                 all_presets[mode_name] = mode_id
+
         self._hvac_modes = all_modes
         self._hvac_presets = all_presets
 
@@ -437,7 +452,7 @@ async def async_set_fan_mode(self, fan_mode: str) -> None:
         except StopIteration:
             raise ValueError(f"Received an invalid fan mode: {fan_mode}") from None
 
-        await self.info.node.async_set_value(self._fan_mode, new_state)
+        await self._async_set_value(self._fan_mode, new_state)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -451,7 +466,7 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
             )
             target_temp: float | None = kwargs.get(ATTR_TEMPERATURE)
             if target_temp is not None:
-                await self.info.node.async_set_value(setpoint, target_temp)
+                await self._async_set_value(setpoint, target_temp)
         elif len(self._current_mode_setpoint_enums) == 2:
             setpoint_low: ZwaveValue = self._setpoint_value_or_raise(
                 self._current_mode_setpoint_enums[0]
@@ -462,9 +477,9 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
             target_temp_low: float | None = kwargs.get(ATTR_TARGET_TEMP_LOW)
             target_temp_high: float | None = kwargs.get(ATTR_TARGET_TEMP_HIGH)
             if target_temp_low is not None:
-                await self.info.node.async_set_value(setpoint_low, target_temp_low)
+                await self._async_set_value(setpoint_low, target_temp_low)
             if target_temp_high is not None:
-                await self.info.node.async_set_value(setpoint_high, target_temp_high)
+                await self._async_set_value(setpoint_high, target_temp_high)
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set new target hvac mode."""
@@ -475,7 +490,7 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
             # Thermostat(valve) has no support for setting a mode, so we make it a no-op
             return
 
-        await self.info.node.async_set_value(self._current_mode, hvac_mode_id)
+        await self._async_set_value(self._current_mode, hvac_mode_id)
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set new target preset mode."""
@@ -487,7 +502,14 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         preset_mode_value = self._hvac_presets.get(preset_mode)
         if preset_mode_value is None:
             raise ValueError(f"Received an invalid preset mode: {preset_mode}")
-        await self.info.node.async_set_value(self._current_mode, preset_mode_value)
+        # Dry and Fan preset modes are deprecated as of 2023.8
+        # Use Dry and Fan HVAC modes instead
+        if preset_mode_value in (ThermostatMode.DRY, ThermostatMode.FAN):
+            LOGGER.warning(
+                "Dry and Fan preset modes are deprecated and will be removed in a future release. "
+                "Use the corresponding Dry and Fan HVAC modes instead"
+            )
+        await self._async_set_value(self._current_mode, preset_mode_value)
 
 
 class DynamicCurrentTempClimate(ZWaveClimate):
diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index e6411e3b879a1e..071b562ceeab0c 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -415,7 +415,6 @@ async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult
         vid = discovery_info.vid
         pid = discovery_info.pid
         serial_number = discovery_info.serial_number
-        device = discovery_info.device
         manufacturer = discovery_info.manufacturer
         description = discovery_info.description
         # Zooz uses this vid/pid, but so do 2652 sticks
@@ -430,7 +429,7 @@ async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult
             f"{vid}:{pid}_{serial_number}_{manufacturer}_{description}"
         )
         self._abort_if_unique_id_configured()
-        dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
+        dev_path = discovery_info.device
         self.usb_path = dev_path
         self._title = usb.human_readable_device_name(
             dev_path,
diff --git a/homeassistant/components/zwave_js/const.py b/homeassistant/components/zwave_js/const.py
index 3967709ccc8b75..5ee8b3006037ee 100644
--- a/homeassistant/components/zwave_js/const.py
+++ b/homeassistant/components/zwave_js/const.py
@@ -1,6 +1,12 @@
 """Constants for the Z-Wave JS integration."""
+from __future__ import annotations
+
 import logging
 
+from zwave_js_server.const.command_class.window_covering import (
+    WindowCoveringPropertyKey,
+)
+
 from homeassistant.const import APPLICATION_NAME, __version__ as HA_VERSION
 
 USER_AGENT = {APPLICATION_NAME: HA_VERSION}
@@ -30,6 +36,9 @@
 
 LOGGER = logging.getLogger(__package__)
 
+# constants extra state attributes
+ATTR_RESERVED_VALUES = "reserved_values"  # ConfigurationValue number entities
+
 # constants for events
 ZWAVE_JS_VALUE_NOTIFICATION_EVENT = f"{DOMAIN}_value_notification"
 ZWAVE_JS_NOTIFICATION_EVENT = f"{DOMAIN}_notification"
@@ -121,11 +130,49 @@
 ENTITY_DESC_KEY_SIGNAL_STRENGTH = "signal_strength"
 ENTITY_DESC_KEY_TEMPERATURE = "temperature"
 ENTITY_DESC_KEY_TARGET_TEMPERATURE = "target_temperature"
+ENTITY_DESC_KEY_UV_INDEX = "uv_index"
 ENTITY_DESC_KEY_MEASUREMENT = "measurement"
 ENTITY_DESC_KEY_TOTAL_INCREASING = "total_increasing"
 
+ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER = "energy_production_power"
+ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME = "energy_production_time"
+ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL = "energy_production_total"
+ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY = "energy_production_today"
+
 # This API key is only for use with Home Assistant. Reach out to Z-Wave JS to apply for
 # your own (https://github.com/zwave-js/firmware-updates/).
 API_KEY_FIRMWARE_UPDATE_SERVICE = (
     "2e39d98fc56386389fbb35e5a98fa1b44b9fdd8f971460303587cff408430d4cfcde6134"
 )
+
+# Platform constants
+# cover
+COVER_POSITION_PROPERTY_KEYS: set[str | int | None] = {
+    WindowCoveringPropertyKey.INBOUND_BOTTOM,
+    WindowCoveringPropertyKey.INBOUND_BOTTOM_NO_POSITION,
+    WindowCoveringPropertyKey.INBOUND_LEFT,
+    WindowCoveringPropertyKey.INBOUND_LEFT_NO_POSITION,
+    WindowCoveringPropertyKey.INBOUND_LEFT_RIGHT,
+    WindowCoveringPropertyKey.INBOUND_LEFT_RIGHT_NO_POSITION,
+    WindowCoveringPropertyKey.INBOUND_RIGHT,
+    WindowCoveringPropertyKey.INBOUND_RIGHT_NO_POSITION,
+    WindowCoveringPropertyKey.INBOUND_TOP,
+    WindowCoveringPropertyKey.INBOUND_TOP_NO_POSITION,
+    WindowCoveringPropertyKey.INBOUND_TOP_BOTTOM,
+    WindowCoveringPropertyKey.INBOUND_TOP_BOTTOM_NO_POSITION,
+    WindowCoveringPropertyKey.OUTBOUND_BOTTOM,
+    WindowCoveringPropertyKey.OUTBOUND_BOTTOM_NO_POSITION,
+    WindowCoveringPropertyKey.OUTBOUND_LEFT,
+    WindowCoveringPropertyKey.OUTBOUND_LEFT_NO_POSITION,
+    WindowCoveringPropertyKey.OUTBOUND_RIGHT,
+    WindowCoveringPropertyKey.OUTBOUND_RIGHT_NO_POSITION,
+    WindowCoveringPropertyKey.OUTBOUND_TOP,
+    WindowCoveringPropertyKey.OUTBOUND_TOP_NO_POSITION,
+}
+
+COVER_TILT_PROPERTY_KEYS: set[str | int | None] = {
+    WindowCoveringPropertyKey.HORIZONTAL_SLATS_ANGLE,
+    WindowCoveringPropertyKey.HORIZONTAL_SLATS_ANGLE_NO_POSITION,
+    WindowCoveringPropertyKey.VERTICAL_SLATS_ANGLE,
+    WindowCoveringPropertyKey.VERTICAL_SLATS_ANGLE_NO_POSITION,
+}
diff --git a/homeassistant/components/zwave_js/cover.py b/homeassistant/components/zwave_js/cover.py
index 686a186a7cbc45..9a8cb203c0555e 100644
--- a/homeassistant/components/zwave_js/cover.py
+++ b/homeassistant/components/zwave_js/cover.py
@@ -4,13 +4,23 @@
 from typing import Any, cast
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import TARGET_STATE_PROPERTY, TARGET_VALUE_PROPERTY
+from zwave_js_server.const import (
+    CURRENT_VALUE_PROPERTY,
+    TARGET_STATE_PROPERTY,
+    TARGET_VALUE_PROPERTY,
+)
 from zwave_js_server.const.command_class.barrier_operator import BarrierState
 from zwave_js_server.const.command_class.multilevel_switch import (
     COVER_ON_PROPERTY,
     COVER_OPEN_PROPERTY,
     COVER_UP_PROPERTY,
 )
+from zwave_js_server.const.command_class.window_covering import (
+    NO_POSITION_PROPERTY_KEYS,
+    NO_POSITION_SUFFIX,
+    WINDOW_COVERING_OPEN_PROPERTY,
+    SlatStates,
+)
 from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.value import Value as ZwaveValue
 
@@ -27,7 +37,12 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DATA_CLIENT, DOMAIN
+from .const import (
+    COVER_POSITION_PROPERTY_KEYS,
+    COVER_TILT_PROPERTY_KEYS,
+    DATA_CLIENT,
+    DOMAIN,
+)
 from .discovery import ZwaveDiscoveryInfo
 from .discovery_data_template import CoverTiltDataTemplate
 from .entity import ZWaveBaseEntity
@@ -49,12 +64,14 @@ def async_add_cover(info: ZwaveDiscoveryInfo) -> None:
         driver = client.driver
         assert driver is not None  # Driver is ready before platforms are loaded.
         entities: list[ZWaveBaseEntity] = []
-        if info.platform_hint == "motorized_barrier":
+        if info.platform_hint == "window_covering":
+            entities.append(ZWaveWindowCovering(config_entry, driver, info))
+        elif info.platform_hint == "motorized_barrier":
             entities.append(ZwaveMotorizedBarrier(config_entry, driver, info))
         elif info.platform_hint and info.platform_hint.endswith("tilt"):
             entities.append(ZWaveTiltCover(config_entry, driver, info))
         else:
-            entities.append(ZWaveCover(config_entry, driver, info))
+            entities.append(ZWaveMultilevelSwitchCover(config_entry, driver, info))
         async_add_entities(entities)
 
     config_entry.async_on_unload(
@@ -66,134 +83,168 @@ def async_add_cover(info: ZwaveDiscoveryInfo) -> None:
     )
 
 
-def percent_to_zwave_position(value: int) -> int:
-    """Convert position in 0-100 scale to 0-99 scale.
-
-    `value` -- (int) Position byte value from 0-100.
-    """
-    if value > 0:
-        return max(1, round((value / 100) * 99))
-    return 0
-
-
-def percent_to_zwave_tilt(value: int) -> int:
-    """Convert position in 0-100 scale to 0-99 scale.
-
-    `value` -- (int) Position byte value from 0-100.
-    """
-    if value > 0:
-        return round((value / 100) * 99)
-    return 0
+class CoverPositionMixin(ZWaveBaseEntity, CoverEntity):
+    """Mix-in class for cover with position support."""
 
+    _current_position_value: ZwaveValue | None = None
+    _target_position_value: ZwaveValue | None = None
+    _stop_position_value: ZwaveValue | None = None
 
-def zwave_tilt_to_percent(value: int) -> int:
-    """Convert 0-99 scale to position in 0-100 scale.
-
-    `value` -- (int) Position byte value from 0-99.
-    """
-    if value > 0:
-        return round((value / 99) * 100)
-    return 0
-
-
-class ZWaveCover(ZWaveBaseEntity, CoverEntity):
-    """Representation of a Z-Wave Cover device."""
-
-    _attr_supported_features = (
-        CoverEntityFeature.OPEN
-        | CoverEntityFeature.CLOSE
-        | CoverEntityFeature.SET_POSITION
-    )
-
-    def __init__(
+    def _set_position_values(
         self,
-        config_entry: ConfigEntry,
-        driver: Driver,
-        info: ZwaveDiscoveryInfo,
+        current_value: ZwaveValue,
+        target_value: ZwaveValue | None = None,
+        stop_value: ZwaveValue | None = None,
     ) -> None:
-        """Initialize a ZWaveCover entity."""
-        super().__init__(config_entry, driver, info)
-
-        self._stop_cover_value = (
-            self.get_zwave_value(COVER_OPEN_PROPERTY)
-            or self.get_zwave_value(COVER_UP_PROPERTY)
-            or self.get_zwave_value(COVER_ON_PROPERTY)
+        """Set values for position."""
+        self._attr_supported_features = (
+            (self._attr_supported_features or 0)
+            | CoverEntityFeature.OPEN
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.SET_POSITION
+        )
+        self._current_position_value = current_value
+        self._target_position_value = target_value or self.get_zwave_value(
+            TARGET_VALUE_PROPERTY, value_property_key=current_value.property_key
         )
 
-        if self._stop_cover_value:
+        if stop_value:
+            self._stop_position_value = stop_value
             self._attr_supported_features |= CoverEntityFeature.STOP
 
-        # Entity class attributes
-        self._attr_device_class = CoverDeviceClass.WINDOW
-        if self.info.platform_hint and self.info.platform_hint.startswith("shutter"):
-            self._attr_device_class = CoverDeviceClass.SHUTTER
-        if self.info.platform_hint and self.info.platform_hint.startswith("blind"):
-            self._attr_device_class = CoverDeviceClass.BLIND
+    def percent_to_zwave_position(self, value: int) -> int:
+        """Convert position in 0-100 scale to closed_value-open_value scale."""
+        return (
+            round(max(min(1, (value / 100)), 0) * self._position_range)
+            + self._fully_closed_position
+        )
+
+    def zwave_to_percent_position(self, value: int) -> int:
+        """Convert closed_value-open_value scale to position in 0-100 scale."""
+        return round(
+            ((value - self._fully_closed_position) / self._position_range) * 100
+        )
+
+    @property
+    def _fully_open_position(self) -> int:
+        """Return value that represents fully opened position."""
+        max_ = self.info.primary_value.metadata.max
+        return 99 if max_ is None else max_
+
+    @property
+    def _fully_closed_position(self) -> int:
+        """Return value that represents fully closed position."""
+        min_ = self.info.primary_value.metadata.min
+        return 0 if min_ is None else min_
+
+    @property
+    def _position_range(self) -> int:
+        """Return range between fully opened and fully closed position."""
+        return self._fully_open_position - self._fully_closed_position
 
     @property
     def is_closed(self) -> bool | None:
         """Return true if cover is closed."""
-        if self.info.primary_value.value is None:
-            # guard missing value
+        if not (value := self._current_position_value) or value.value is None:
             return None
-        return bool(self.info.primary_value.value == 0)
+        return bool(value.value == self._fully_closed_position)
 
     @property
     def current_cover_position(self) -> int | None:
         """Return the current position of cover where 0 means closed and 100 is fully open."""
-        if self.info.primary_value.value is None:
+        if (
+            self._current_position_value is None
+            or self._current_position_value.value is None
+        ):
             # guard missing value
             return None
-        return round((cast(int, self.info.primary_value.value) / 99) * 100)
+        return self.zwave_to_percent_position(self._current_position_value.value)
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
-        target_value = self.get_zwave_value(TARGET_VALUE_PROPERTY)
-        assert target_value is not None
-        await self.info.node.async_set_value(
-            target_value, percent_to_zwave_position(kwargs[ATTR_POSITION])
+        assert self._target_position_value
+        await self._async_set_value(
+            self._target_position_value,
+            self.percent_to_zwave_position(kwargs[ATTR_POSITION]),
         )
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the cover."""
-        target_value = self.get_zwave_value(TARGET_VALUE_PROPERTY)
-        assert target_value is not None
-        await self.info.node.async_set_value(target_value, 99)
+        assert self._target_position_value
+        await self._async_set_value(
+            self._target_position_value, self._fully_open_position
+        )
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
-        target_value = self.get_zwave_value(TARGET_VALUE_PROPERTY)
-        assert target_value is not None
-        await self.info.node.async_set_value(target_value, 0)
+        assert self._target_position_value
+        await self._async_set_value(
+            self._target_position_value, self._fully_closed_position
+        )
 
     async def async_stop_cover(self, **kwargs: Any) -> None:
         """Stop cover."""
-        assert self._stop_cover_value
+        assert self._stop_position_value
         # Stop the cover, will stop regardless of the actual direction of travel.
-        await self.info.node.async_set_value(self._stop_cover_value, False)
+        await self._async_set_value(self._stop_position_value, False)
 
 
-class ZWaveTiltCover(ZWaveCover):
-    """Representation of a Z-Wave cover device with tilt."""
+class CoverTiltMixin(ZWaveBaseEntity, CoverEntity):
+    """Mix-in class for cover with tilt support."""
 
-    def __init__(
+    _current_tilt_value: ZwaveValue | None = None
+    _target_tilt_value: ZwaveValue | None = None
+    _stop_tilt_value: ZwaveValue | None = None
+
+    def _set_tilt_values(
         self,
-        config_entry: ConfigEntry,
-        driver: Driver,
-        info: ZwaveDiscoveryInfo,
+        current_value: ZwaveValue,
+        target_value: ZwaveValue | None = None,
+        stop_value: ZwaveValue | None = None,
     ) -> None:
-        """Initialize a ZWaveCover entity."""
-        super().__init__(config_entry, driver, info)
-
-        self._current_tilt_value = cast(
-            CoverTiltDataTemplate, self.info.platform_data_template
-        ).current_tilt_value(self.info.platform_data)
-
-        self._attr_supported_features |= (
-            CoverEntityFeature.OPEN_TILT
+        """Set values for tilt."""
+        self._attr_supported_features = (
+            (self._attr_supported_features or 0)
+            | CoverEntityFeature.OPEN_TILT
             | CoverEntityFeature.CLOSE_TILT
             | CoverEntityFeature.SET_TILT_POSITION
         )
+        self._current_tilt_value = current_value
+        self._target_tilt_value = target_value or self.get_zwave_value(
+            TARGET_VALUE_PROPERTY, value_property_key=current_value.property_key
+        )
+
+        if stop_value:
+            self._stop_tilt_value = stop_value
+            self._attr_supported_features |= CoverEntityFeature.STOP_TILT
+
+    def percent_to_zwave_tilt(self, value: int) -> int:
+        """Convert position in 0-100 scale to closed_value-open_value scale."""
+        return (
+            round(max(min(1, (value / 100)), 0) * self._tilt_range)
+            + self._fully_closed_tilt
+        )
+
+    def zwave_to_percent_tilt(self, value: int) -> int:
+        """Convert closed_value-open_value scale to position in 0-100 scale."""
+        return round(((value - self._fully_closed_tilt) / self._tilt_range) * 100)
+
+    @property
+    def _fully_open_tilt(self) -> int:
+        """Return value that represents fully opened tilt."""
+        max_ = self.info.primary_value.metadata.max
+        return 99 if max_ is None else max_
+
+    @property
+    def _fully_closed_tilt(self) -> int:
+        """Return value that represents fully closed tilt."""
+        min_ = self.info.primary_value.metadata.min
+        return 0 if min_ is None else min_
+
+    @property
+    def _tilt_range(self) -> int:
+        """Return range between fully opened and fully closed tilt."""
+        return self._fully_open_tilt - self._fully_closed_tilt
 
     @property
     def current_cover_tilt_position(self) -> int | None:
@@ -201,26 +252,155 @@ def current_cover_tilt_position(self) -> int | None:
 
         None is unknown, 0 is closed, 100 is fully open.
         """
-        value = self._current_tilt_value
-        if value is None or value.value is None:
+        if (value := self._current_tilt_value) is None or value.value is None:
             return None
-        return zwave_tilt_to_percent(int(value.value))
+        return self.zwave_to_percent_tilt(int(value.value))
 
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Move the cover tilt to a specific position."""
-        assert self._current_tilt_value
-        await self.info.node.async_set_value(
-            self._current_tilt_value,
-            percent_to_zwave_tilt(kwargs[ATTR_TILT_POSITION]),
+        assert self._target_tilt_value
+        await self._async_set_value(
+            self._target_tilt_value,
+            self.percent_to_zwave_tilt(kwargs[ATTR_TILT_POSITION]),
         )
 
     async def async_open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
-        await self.async_set_cover_tilt_position(tilt_position=100)
+        assert self._target_tilt_value
+        await self._async_set_value(self._target_tilt_value, self._fully_open_tilt)
 
     async def async_close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
-        await self.async_set_cover_tilt_position(tilt_position=0)
+        assert self._target_tilt_value
+        await self._async_set_value(self._target_tilt_value, self._fully_closed_tilt)
+
+    async def async_stop_cover_tilt(self, **kwargs: Any) -> None:
+        """Stop the cover tilt."""
+        assert self._stop_tilt_value
+        # Stop the tilt, will stop regardless of the actual direction of travel.
+        await self._async_set_value(self._stop_tilt_value, False)
+
+
+class ZWaveMultilevelSwitchCover(CoverPositionMixin):
+    """Representation of a Z-Wave Cover that uses Multilevel Switch CC for position."""
+
+    def __init__(
+        self,
+        config_entry: ConfigEntry,
+        driver: Driver,
+        info: ZwaveDiscoveryInfo,
+    ) -> None:
+        """Initialize a ZWaveCover entity."""
+        super().__init__(config_entry, driver, info)
+        self._set_position_values(
+            self.info.primary_value,
+            stop_value=(
+                self.get_zwave_value(COVER_OPEN_PROPERTY)
+                or self.get_zwave_value(COVER_UP_PROPERTY)
+                or self.get_zwave_value(COVER_ON_PROPERTY)
+            ),
+        )
+
+        # Entity class attributes
+        self._attr_device_class = CoverDeviceClass.WINDOW
+        if self.info.platform_hint and self.info.platform_hint.startswith("shutter"):
+            self._attr_device_class = CoverDeviceClass.SHUTTER
+        elif self.info.platform_hint and self.info.platform_hint.startswith("blind"):
+            self._attr_device_class = CoverDeviceClass.BLIND
+        elif self.info.platform_hint and self.info.platform_hint.startswith("gate"):
+            self._attr_device_class = CoverDeviceClass.GATE
+
+
+class ZWaveTiltCover(ZWaveMultilevelSwitchCover, CoverTiltMixin):
+    """Representation of a Z-Wave cover device with tilt."""
+
+    def __init__(
+        self,
+        config_entry: ConfigEntry,
+        driver: Driver,
+        info: ZwaveDiscoveryInfo,
+    ) -> None:
+        """Initialize a ZWaveCover entity."""
+        super().__init__(config_entry, driver, info)
+
+        template = cast(CoverTiltDataTemplate, self.info.platform_data_template)
+        self._set_tilt_values(
+            template.current_tilt_value(self.info.platform_data),
+            template.target_tilt_value(self.info.platform_data),
+        )
+
+
+class ZWaveWindowCovering(CoverPositionMixin, CoverTiltMixin):
+    """Representation of a Z-Wave Window Covering cover device."""
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize."""
+        super().__init__(config_entry, driver, info)
+        pos_value: ZwaveValue | None = None
+        tilt_value: ZwaveValue | None = None
+
+        # If primary value is for position, we have to search for a tilt value
+        if info.primary_value.property_key in COVER_POSITION_PROPERTY_KEYS:
+            pos_value = info.primary_value
+            tilt_value = next(
+                (
+                    value
+                    for property_key in COVER_TILT_PROPERTY_KEYS
+                    if (
+                        value := self.get_zwave_value(
+                            CURRENT_VALUE_PROPERTY, value_property_key=property_key
+                        )
+                    )
+                ),
+                None,
+            )
+        # If primary value is for tilt, there is no position value
+        else:
+            tilt_value = info.primary_value
+
+        # Set position and tilt values if they exist. If the corresponding value is of
+        # the type No Position, we remove the corresponding set position feature.
+        for set_values_func, value, set_position_feature in (
+            (self._set_position_values, pos_value, CoverEntityFeature.SET_POSITION),
+            (self._set_tilt_values, tilt_value, CoverEntityFeature.SET_TILT_POSITION),
+        ):
+            if value:
+                set_values_func(
+                    value,
+                    stop_value=self.get_zwave_value(
+                        WINDOW_COVERING_OPEN_PROPERTY,
+                        value_property_key=value.property_key,
+                    ),
+                )
+                if value.property_key in NO_POSITION_PROPERTY_KEYS:
+                    assert self._attr_supported_features
+                    self._attr_supported_features ^= set_position_feature
+
+        additional_info: list[str] = []
+        for value in (self._current_position_value, self._current_tilt_value):
+            if value and value.property_key_name:
+                additional_info.append(
+                    value.property_key_name.removesuffix(f" {NO_POSITION_SUFFIX}")
+                )
+        self._attr_name = self.generate_name(additional_info=additional_info)
+        self._attr_device_class = CoverDeviceClass.WINDOW
+
+    @property
+    def _fully_open_tilt(self) -> int:
+        """Return position to open cover tilt."""
+        return SlatStates.OPEN
+
+    @property
+    def _fully_closed_tilt(self) -> int:
+        """Return position to close cover tilt."""
+        return SlatStates.CLOSED_1
+
+    @property
+    def _tilt_range(self) -> int:
+        """Return range of valid tilt positions."""
+        return abs(SlatStates.CLOSED_2 - SlatStates.CLOSED_1)
 
 
 class ZwaveMotorizedBarrier(ZWaveBaseEntity, CoverEntity):
@@ -273,8 +453,8 @@ def is_closed(self) -> bool | None:
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Open the garage door."""
-        await self.info.node.async_set_value(self._target_state, BarrierState.OPEN)
+        await self._async_set_value(self._target_state, BarrierState.OPEN)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Close the garage door."""
-        await self.info.node.async_set_value(self._target_state, BarrierState.CLOSED)
+        await self._async_set_value(self._target_state, BarrierState.CLOSED)
diff --git a/homeassistant/components/zwave_js/device_action.py b/homeassistant/components/zwave_js/device_action.py
index bfb7956432be91..18a3ccef7d8a89 100644
--- a/homeassistant/components/zwave_js/device_action.py
+++ b/homeassistant/components/zwave_js/device_action.py
@@ -101,6 +101,7 @@
 SET_CONFIG_PARAMETER_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
     {
         vol.Required(CONF_TYPE): SERVICE_SET_CONFIG_PARAMETER,
+        vol.Required(ATTR_ENDPOINT, default=0): vol.Coerce(int),
         vol.Required(ATTR_CONFIG_PARAMETER): vol.Any(int, str),
         vol.Required(ATTR_CONFIG_PARAMETER_BITMASK): vol.Any(None, int, str),
         vol.Required(ATTR_VALUE): vol.Coerce(int),
@@ -168,6 +169,7 @@ async def async_get_actions(
             {
                 **base_action,
                 CONF_TYPE: SERVICE_SET_CONFIG_PARAMETER,
+                ATTR_ENDPOINT: config_value.endpoint,
                 ATTR_CONFIG_PARAMETER: config_value.property_,
                 ATTR_CONFIG_PARAMETER_BITMASK: config_value.property_key,
                 CONF_SUBTYPE: generate_config_parameter_subtype(config_value),
@@ -347,6 +349,7 @@ async def async_get_action_capabilities(
             CommandClass.CONFIGURATION,
             config[ATTR_CONFIG_PARAMETER],
             property_key=config[ATTR_CONFIG_PARAMETER_BITMASK],
+            endpoint=config[ATTR_ENDPOINT],
         )
         value_schema = get_config_parameter_value_schema(node, value_id)
         if value_schema is None:
diff --git a/homeassistant/components/zwave_js/device_automation_helpers.py b/homeassistant/components/zwave_js/device_automation_helpers.py
index 11c4fde3137590..7a60d491b3cb0f 100644
--- a/homeassistant/components/zwave_js/device_automation_helpers.py
+++ b/homeassistant/components/zwave_js/device_automation_helpers.py
@@ -47,9 +47,15 @@ def generate_config_parameter_subtype(config_value: ConfigurationValue) -> str:
     if config_value.property_key:
         # Property keys for config values are always an int
         assert isinstance(config_value.property_key, int)
-        parameter = f"{parameter}[{hex(config_value.property_key)}]"
-
-    return f"{parameter} ({config_value.property_name})"
+        parameter = (
+            f"{parameter}[{hex(config_value.property_key)}] on endpoint "
+            f"{config_value.endpoint}"
+        )
+
+    return (
+        f"{parameter} ({config_value.property_name}) on endpoint "
+        f"{config_value.endpoint}"
+    )
 
 
 @callback
diff --git a/homeassistant/components/zwave_js/device_trigger.py b/homeassistant/components/zwave_js/device_trigger.py
index a0ac70ccb31d71..da26e4f293e6ba 100644
--- a/homeassistant/components/zwave_js/device_trigger.py
+++ b/homeassistant/components/zwave_js/device_trigger.py
@@ -161,7 +161,7 @@
         vol.Required(ATTR_COMMAND_CLASS): vol.In([cc.value for cc in CommandClass]),
         vol.Required(ATTR_PROPERTY): vol.Any(int, str),
         vol.Optional(ATTR_PROPERTY_KEY): vol.Any(None, vol.Coerce(int), str),
-        vol.Optional(ATTR_ENDPOINT): vol.Any(None, vol.Coerce(int)),
+        vol.Optional(ATTR_ENDPOINT, default=0): vol.Any(None, vol.Coerce(int)),
         vol.Optional(ATTR_FROM): VALUE_SCHEMA,
         vol.Optional(ATTR_TO): VALUE_SCHEMA,
     }
diff --git a/homeassistant/components/zwave_js/diagnostics.py b/homeassistant/components/zwave_js/diagnostics.py
index 4f52c41a08549d..2fe2b17fe1b939 100644
--- a/homeassistant/components/zwave_js/diagnostics.py
+++ b/homeassistant/components/zwave_js/diagnostics.py
@@ -65,7 +65,7 @@ def redact_node_state(node_state: NodeDataType) -> NodeDataType:
 
 
 def get_device_entities(
-    hass: HomeAssistant, node: Node, device: dr.DeviceEntry
+    hass: HomeAssistant, node: Node, config_entry: ConfigEntry, device: dr.DeviceEntry
 ) -> list[dict[str, Any]]:
     """Get entities for a device."""
     entity_entries = er.async_entries_for_device(
@@ -73,6 +73,10 @@ def get_device_entities(
     )
     entities = []
     for entry in entity_entries:
+        # Skip entities that are not part of this integration
+        if entry.config_entry_id != config_entry.entry_id:
+            continue
+
         # If the value ID returns as None, we don't need to include this entity
         if (value_id := get_value_id_from_unique_id(entry.unique_id)) is None:
             continue
@@ -142,7 +146,7 @@ async def async_get_device_diagnostics(
     if node_id is None or node_id not in driver.controller.nodes:
         raise ValueError(f"Node for device {device.id} can't be found")
     node = driver.controller.nodes[node_id]
-    entities = get_device_entities(hass, node, device)
+    entities = get_device_entities(hass, node, config_entry, device)
     assert client.version
     node_state = redact_node_state(async_redact_data(node.data, KEYS_TO_REDACT))
     return {
diff --git a/homeassistant/components/zwave_js/discovery.py b/homeassistant/components/zwave_js/discovery.py
index 79a37c8d9fab6e..947e5157a8af38 100644
--- a/homeassistant/components/zwave_js/discovery.py
+++ b/homeassistant/components/zwave_js/discovery.py
@@ -3,7 +3,7 @@
 
 from collections.abc import Generator
 from dataclasses import asdict, dataclass, field
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 
 from awesomeversion import AwesomeVersion
 from zwave_js_server.const import (
@@ -41,14 +41,18 @@
 from zwave_js_server.exceptions import UnknownValueData
 from zwave_js_server.model.device_class import DeviceClassItem
 from zwave_js_server.model.node import Node as ZwaveNode
-from zwave_js_server.model.value import Value as ZwaveValue
+from zwave_js_server.model.value import (
+    ConfigurationValue,
+    ConfigurationValueType,
+    Value as ZwaveValue,
+)
 
 from homeassistant.backports.enum import StrEnum
-from homeassistant.const import Platform
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceEntry
 
-from .const import LOGGER
+from .const import COVER_POSITION_PROPERTY_KEYS, COVER_TILT_PROPERTY_KEYS, LOGGER
 from .discovery_data_template import (
     BaseDiscoverySchemaDataTemplate,
     ConfigurableFanValueMappingDataTemplate,
@@ -108,7 +112,8 @@ class ZwaveDiscoveryInfo:
     node: ZwaveNode
     # the value object itself for primary value
     primary_value: ZwaveValue
-    # bool to specify whether state is assumed and events should be fired on value update
+    # bool to specify whether state is assumed and events should be fired on value
+    # update
     assumed_state: bool
     # the home assistant platform for which an entity should be created
     platform: Platform
@@ -122,6 +127,8 @@ class ZwaveDiscoveryInfo:
     platform_data_template: BaseDiscoverySchemaDataTemplate | None = None
     # bool to specify whether entity should be enabled by default
     entity_registry_enabled_default: bool = True
+    # the entity category for the discovered entity
+    entity_category: EntityCategory | None = None
 
 
 @dataclass
@@ -130,7 +137,7 @@ class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
 
     The Z-Wave Value must match these conditions.
     Use the Z-Wave specifications to find out the values for these parameters:
-    https://github.com/zwave-js/node-zwave-js/tree/master/specs
+    https://github.com/zwave-js/specs/tree/master
     """
 
     # [optional] the value's command class must match ANY of these values
@@ -143,10 +150,14 @@ class ZWaveValueDiscoverySchema(DataclassMustHaveAtLeastOne):
     property_name: set[str] | None = None
     # [optional] the value's property key must match ANY of these values
     property_key: set[str | int | None] | None = None
-    # [optional] the value's property key name must match ANY of these values
-    property_key_name: set[str | None] | None = None
+    # [optional] the value's property key must NOT match ANY of these values
+    not_property_key: set[str | int | None] | None = None
     # [optional] the value's metadata_type must match ANY of these values
     type: set[str] | None = None
+    # [optional] the value's metadata_readable must match this value
+    readable: bool | None = None
+    # [optional] the value's metadata_writeable must match this value
+    writeable: bool | None = None
     # [optional] the value's states map must include ANY of these key/value pairs
     any_available_states: set[tuple[int, str]] | None = None
 
@@ -157,7 +168,7 @@ class ZWaveDiscoverySchema:
 
     The Z-Wave node and it's (primary) value for an entity must match these conditions.
     Use the Z-Wave specifications to find out the values for these parameters:
-    https://github.com/zwave-js/node-zwave-js/tree/master/specs
+    https://github.com/zwave-js/specs/tree/master
     """
 
     # specify the hass platform for which this scheme applies (e.g. light, sensor)
@@ -176,14 +187,10 @@ class ZWaveDiscoverySchema:
     product_type: set[int] | None = None
     # [optional] the node's firmware_version must be within this range
     firmware_version_range: FirmwareVersionRange | None = None
-    # [optional] the node's firmware_version must match ANY of these values
-    firmware_version: set[str] | None = None
-    # [optional] the node's basic device class must match ANY of these values
-    device_class_basic: set[str | int] | None = None
     # [optional] the node's generic device class must match ANY of these values
-    device_class_generic: set[str | int] | None = None
+    device_class_generic: set[str] | None = None
     # [optional] the node's specific device class must match ANY of these values
-    device_class_specific: set[str | int] | None = None
+    device_class_specific: set[str] | None = None
     # [optional] additional values that ALL need to be present
     # on the node for this scheme to pass
     required_values: list[ZWaveValueDiscoverySchema] | None = None
@@ -198,34 +205,8 @@ class ZWaveDiscoverySchema:
     assumed_state: bool = False
     # [optional] bool to specify whether entity should be enabled by default
     entity_registry_enabled_default: bool = True
-
-
-def get_config_parameter_discovery_schema(
-    property_: set[str | int] | None = None,
-    property_name: set[str] | None = None,
-    property_key: set[str | int | None] | None = None,
-    property_key_name: set[str | None] | None = None,
-    **kwargs: Any,
-) -> ZWaveDiscoverySchema:
-    """Return a discovery schema for a config parameter.
-
-    Supports all keyword arguments to ZWaveValueDiscoverySchema except platform, hint,
-    and primary_value.
-    """
-    return ZWaveDiscoverySchema(
-        platform=Platform.SENSOR,
-        hint="config_parameter",
-        primary_value=ZWaveValueDiscoverySchema(
-            command_class={CommandClass.CONFIGURATION},
-            property=property_,
-            property_name=property_name,
-            property_key=property_key,
-            property_key_name=property_key_name,
-            type={ValueType.NUMBER},
-        ),
-        entity_registry_enabled_default=False,
-        **kwargs,
-    )
+    # [optional] the entity category for the discovered entity
+    entity_category: EntityCategory | None = None
 
 
 DOOR_LOCK_CURRENT_MODE_SCHEMA = ZWaveValueDiscoverySchema(
@@ -256,6 +237,18 @@ def get_config_parameter_discovery_schema(
     type={ValueType.NUMBER},
 )
 
+WINDOW_COVERING_COVER_CURRENT_VALUE_SCHEMA = ZWaveValueDiscoverySchema(
+    command_class={CommandClass.WINDOW_COVERING},
+    property={CURRENT_VALUE_PROPERTY},
+    property_key=COVER_POSITION_PROPERTY_KEYS,
+)
+
+WINDOW_COVERING_SLAT_CURRENT_VALUE_SCHEMA = ZWaveValueDiscoverySchema(
+    command_class={CommandClass.WINDOW_COVERING},
+    property={CURRENT_VALUE_PROPERTY},
+    property_key=COVER_TILT_PROPERTY_KEYS,
+)
+
 # For device class mapping see:
 # https://github.com/zwave-js/node-zwave-js/blob/master/packages/config/config/deviceClasses.json
 DISCOVERY_SCHEMAS = [
@@ -263,11 +256,15 @@ def get_config_parameter_discovery_schema(
     # Honeywell 39358 In-Wall Fan Control using switch multilevel CC
     ZWaveDiscoverySchema(
         platform=Platform.FAN,
+        hint="has_fan_value_mapping",
         manufacturer_id={0x0039},
         product_id={0x3131},
         product_type={0x4944},
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
         required_values=[SWITCH_MULTILEVEL_TARGET_VALUE_SCHEMA],
+        data_template=FixedFanValueMappingDataTemplate(
+            FanValueMapping(speeds=[(1, 32), (33, 66), (67, 99)]),
+        ),
     ),
     # GE/Jasco - In-Wall Smart Fan Control - 12730 / ZW4002
     ZWaveDiscoverySchema(
@@ -281,12 +278,12 @@ def get_config_parameter_discovery_schema(
             FanValueMapping(speeds=[(1, 33), (34, 67), (68, 99)]),
         ),
     ),
-    # GE/Jasco - In-Wall Smart Fan Control - 14287 / ZW4002
+    # GE/Jasco - In-Wall Smart Fan Control - 14287 / 55258 / ZW4002
     ZWaveDiscoverySchema(
         platform=Platform.FAN,
         hint="has_fan_value_mapping",
         manufacturer_id={0x0063},
-        product_id={0x3131},
+        product_id={0x3131, 0x3337},
         product_type={0x4944},
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
         data_template=FixedFanValueMappingDataTemplate(
@@ -360,12 +357,18 @@ def get_config_parameter_discovery_schema(
         product_type={0x0301, 0x0302},
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
         data_template=CoverTiltDataTemplate(
-            tilt_value_id=ZwaveValueID(
+            current_tilt_value_id=ZwaveValueID(
                 property_="fibaro",
                 command_class=CommandClass.MANUFACTURER_PROPRIETARY,
                 endpoint=0,
                 property_key="venetianBlindsTilt",
-            )
+            ),
+            target_tilt_value_id=ZwaveValueID(
+                property_="fibaro",
+                command_class=CommandClass.MANUFACTURER_PROPRIETARY,
+                endpoint=0,
+                property_key="venetianBlindsTilt",
+            ),
         ),
         required_values=[
             ZWaveValueDiscoverySchema(
@@ -375,6 +378,16 @@ def get_config_parameter_discovery_schema(
             )
         ],
     ),
+    # Fibaro Nice BiDi-ZWave (IBT4ZWAVE)
+    ZWaveDiscoverySchema(
+        platform=Platform.COVER,
+        hint="gate",
+        manufacturer_id={0x0441},
+        product_id={0x1000},
+        product_type={0x2400},
+        primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
+        required_values=[SWITCH_MULTILEVEL_TARGET_VALUE_SCHEMA],
+    ),
     # Qubino flush shutter
     ZWaveDiscoverySchema(
         platform=Platform.COVER,
@@ -575,13 +588,6 @@ def get_config_parameter_discovery_schema(
         ),
         absent_values=[SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA],
     ),
-    # ====== START OF CONFIG PARAMETER SPECIFIC MAPPING SCHEMAS =======
-    # Door lock mode config parameter. Functionality equivalent to Notification CC
-    # list sensors.
-    get_config_parameter_discovery_schema(
-        property_name={"Door lock mode"},
-        device_class_generic={"Entry Control"},
-    ),
     # ====== START OF GENERIC MAPPING SCHEMAS =======
     # locks
     # Door Lock CC
@@ -703,23 +709,26 @@ def get_config_parameter_discovery_schema(
         ),
         allow_multi=True,
     ),
-    # generic text sensors
+    # binary sensor for Indicator CC
     ZWaveDiscoverySchema(
-        platform=Platform.SENSOR,
-        hint="string_sensor",
+        platform=Platform.BINARY_SENSOR,
+        hint="boolean",
         primary_value=ZWaveValueDiscoverySchema(
-            command_class={CommandClass.SENSOR_ALARM},
-            type={ValueType.STRING},
+            command_class={CommandClass.INDICATOR},
+            type={ValueType.BOOLEAN},
+            readable=True,
+            writeable=False,
         ),
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
+    # generic text sensors
     ZWaveDiscoverySchema(
         platform=Platform.SENSOR,
         hint="string_sensor",
         primary_value=ZWaveValueDiscoverySchema(
-            command_class={CommandClass.INDICATOR},
+            command_class={CommandClass.SENSOR_ALARM},
             type={ValueType.STRING},
         ),
-        entity_registry_enabled_default=False,
     ),
     # generic numeric sensors
     ZWaveDiscoverySchema(
@@ -727,9 +736,10 @@ def get_config_parameter_discovery_schema(
         hint="numeric_sensor",
         primary_value=ZWaveValueDiscoverySchema(
             command_class={
-                CommandClass.SENSOR_MULTILEVEL,
-                CommandClass.SENSOR_ALARM,
                 CommandClass.BATTERY,
+                CommandClass.ENERGY_PRODUCTION,
+                CommandClass.SENSOR_ALARM,
+                CommandClass.SENSOR_MULTILEVEL,
             },
             type={ValueType.NUMBER},
         ),
@@ -741,9 +751,11 @@ def get_config_parameter_discovery_schema(
         primary_value=ZWaveValueDiscoverySchema(
             command_class={CommandClass.INDICATOR},
             type={ValueType.NUMBER},
+            readable=True,
+            writeable=False,
         ),
         data_template=NumericSensorDataTemplate(),
-        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
     ),
     # Meter sensors for Meter CC
     ZWaveDiscoverySchema(
@@ -776,9 +788,7 @@ def get_config_parameter_discovery_schema(
         platform=Platform.NUMBER,
         hint="Basic",
         primary_value=ZWaveValueDiscoverySchema(
-            command_class={
-                CommandClass.BASIC,
-            },
+            command_class={CommandClass.BASIC},
             type={ValueType.NUMBER},
             property={CURRENT_VALUE_PROPERTY},
         ),
@@ -791,14 +801,48 @@ def get_config_parameter_discovery_schema(
                 property={TARGET_VALUE_PROPERTY},
             )
         ],
-        data_template=NumericSensorDataTemplate(),
         entity_registry_enabled_default=False,
     ),
+    # number for Indicator CC (exclude property keys 3-5)
+    ZWaveDiscoverySchema(
+        platform=Platform.NUMBER,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={CommandClass.INDICATOR},
+            type={ValueType.NUMBER},
+            not_property_key={3, 4, 5},
+            readable=True,
+            writeable=True,
+        ),
+        entity_category=EntityCategory.CONFIG,
+    ),
+    # button for Indicator CC
+    ZWaveDiscoverySchema(
+        platform=Platform.BUTTON,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={CommandClass.INDICATOR},
+            type={ValueType.BOOLEAN},
+            readable=False,
+            writeable=True,
+        ),
+        entity_category=EntityCategory.CONFIG,
+    ),
     # binary switches
     ZWaveDiscoverySchema(
         platform=Platform.SWITCH,
         primary_value=SWITCH_BINARY_CURRENT_VALUE_SCHEMA,
     ),
+    # switch for Indicator CC
+    ZWaveDiscoverySchema(
+        platform=Platform.SWITCH,
+        hint="indicator",
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={CommandClass.INDICATOR},
+            type={ValueType.BOOLEAN},
+            readable=True,
+            writeable=True,
+        ),
+        entity_category=EntityCategory.CONFIG,
+    ),
     # binary switch
     # barrier operator signaling states
     ZWaveDiscoverySchema(
@@ -814,7 +858,18 @@ def get_config_parameter_discovery_schema(
     # window coverings
     ZWaveDiscoverySchema(
         platform=Platform.COVER,
-        hint="cover",
+        hint="window_covering",
+        primary_value=WINDOW_COVERING_COVER_CURRENT_VALUE_SCHEMA,
+    ),
+    ZWaveDiscoverySchema(
+        platform=Platform.COVER,
+        hint="window_covering",
+        primary_value=WINDOW_COVERING_SLAT_CURRENT_VALUE_SCHEMA,
+        absent_values=[WINDOW_COVERING_COVER_CURRENT_VALUE_SCHEMA],
+    ),
+    ZWaveDiscoverySchema(
+        platform=Platform.COVER,
+        hint="multilevel_switch",
         device_class_generic={"Multilevel Switch"},
         device_class_specific={
             "Motor Control Class A",
@@ -823,6 +878,10 @@ def get_config_parameter_discovery_schema(
             "Multiposition Motor",
         },
         primary_value=SWITCH_MULTILEVEL_CURRENT_VALUE_SCHEMA,
+        absent_values=[
+            WINDOW_COVERING_COVER_CURRENT_VALUE_SCHEMA,
+            WINDOW_COVERING_SLAT_CURRENT_VALUE_SCHEMA,
+        ],
     ),
     # cover
     # motorized barriers
@@ -928,9 +987,8 @@ def async_discover_node_values(
     """Run discovery on ZWave node and return matching (primary) values."""
     for value in node.values.values():
         # We don't need to rediscover an already processed value_id
-        if value.value_id in discovered_value_ids[device.id]:
-            continue
-        yield from async_discover_single_value(value, device, discovered_value_ids)
+        if value.value_id not in discovered_value_ids[device.id]:
+            yield from async_discover_single_value(value, device, discovered_value_ids)
 
 
 @callback
@@ -940,24 +998,20 @@ def async_discover_single_value(
     """Run discovery on a single ZWave value and return matching schema info."""
     discovered_value_ids[device.id].add(value.value_id)
     for schema in DISCOVERY_SCHEMAS:
-        # check manufacturer_id
-        if (
-            schema.manufacturer_id is not None
-            and value.node.manufacturer_id not in schema.manufacturer_id
-        ):
-            continue
-
-        # check product_id
-        if (
-            schema.product_id is not None
-            and value.node.product_id not in schema.product_id
-        ):
-            continue
-
-        # check product_type
+        # check manufacturer_id, product_id, product_type
         if (
-            schema.product_type is not None
-            and value.node.product_type not in schema.product_type
+            (
+                schema.manufacturer_id is not None
+                and value.node.manufacturer_id not in schema.manufacturer_id
+            )
+            or (
+                schema.product_id is not None
+                and value.node.product_id not in schema.product_id
+            )
+            or (
+                schema.product_type is not None
+                and value.node.product_type not in schema.product_type
+            )
         ):
             continue
 
@@ -976,19 +1030,6 @@ def async_discover_single_value(
         ):
             continue
 
-        # check firmware_version
-        if (
-            schema.firmware_version is not None
-            and value.node.firmware_version not in schema.firmware_version
-        ):
-            continue
-
-        # check device_class_basic
-        if value.node.device_class and not check_device_class(
-            value.node.device_class.basic, schema.device_class_basic
-        ):
-            continue
-
         # check device_class_generic
         if value.node.device_class and not check_device_class(
             value.node.device_class.generic, schema.device_class_generic
@@ -1049,6 +1090,7 @@ def async_discover_single_value(
             platform_data=resolved_data,
             additional_value_ids_to_watch=additional_value_ids_to_watch,
             entity_registry_enabled_default=schema.entity_registry_enabled_default,
+            entity_category=schema.entity_category,
         )
 
         if not schema.allow_multi:
@@ -1056,6 +1098,85 @@ def async_discover_single_value(
             # by other schemas/platforms
             return
 
+    if value.command_class == CommandClass.CONFIGURATION:
+        yield from async_discover_single_configuration_value(
+            cast(ConfigurationValue, value)
+        )
+
+
+@callback
+def async_discover_single_configuration_value(
+    value: ConfigurationValue,
+) -> Generator[ZwaveDiscoveryInfo, None, None]:
+    """Run discovery on a single ZWave configuration value and return matching schema info."""
+    if value.metadata.writeable and value.metadata.readable:
+        if value.configuration_value_type == ConfigurationValueType.ENUMERATED:
+            yield ZwaveDiscoveryInfo(
+                node=value.node,
+                primary_value=value,
+                assumed_state=False,
+                platform=Platform.SELECT,
+                platform_hint="config_parameter",
+                platform_data=None,
+                additional_value_ids_to_watch=set(),
+                entity_registry_enabled_default=False,
+            )
+        elif value.configuration_value_type in (
+            ConfigurationValueType.RANGE,
+            ConfigurationValueType.MANUAL_ENTRY,
+        ):
+            if value.metadata.type == ValueType.BOOLEAN or (
+                value.metadata.min == 0 and value.metadata.max == 1
+            ):
+                yield ZwaveDiscoveryInfo(
+                    node=value.node,
+                    primary_value=value,
+                    assumed_state=False,
+                    platform=Platform.SWITCH,
+                    platform_hint="config_parameter",
+                    platform_data=None,
+                    additional_value_ids_to_watch=set(),
+                    entity_registry_enabled_default=False,
+                )
+            else:
+                yield ZwaveDiscoveryInfo(
+                    node=value.node,
+                    primary_value=value,
+                    assumed_state=False,
+                    platform=Platform.NUMBER,
+                    platform_hint="config_parameter",
+                    platform_data=None,
+                    additional_value_ids_to_watch=set(),
+                    entity_registry_enabled_default=False,
+                )
+    elif not value.metadata.writeable and value.metadata.readable:
+        if value.metadata.type == ValueType.BOOLEAN or (
+            value.metadata.min == 0
+            and value.metadata.max == 1
+            and not value.metadata.states
+        ):
+            yield ZwaveDiscoveryInfo(
+                node=value.node,
+                primary_value=value,
+                assumed_state=False,
+                platform=Platform.BINARY_SENSOR,
+                platform_hint="config_parameter",
+                platform_data=None,
+                additional_value_ids_to_watch=set(),
+                entity_registry_enabled_default=False,
+            )
+        else:
+            yield ZwaveDiscoveryInfo(
+                node=value.node,
+                primary_value=value,
+                assumed_state=False,
+                platform=Platform.SENSOR,
+                platform_hint="config_parameter",
+                platform_data=None,
+                additional_value_ids_to_watch=set(),
+                entity_registry_enabled_default=False,
+            )
+
 
 @callback
 def check_value(value: ZwaveValue, schema: ZWaveValueDiscoverySchema) -> bool:
@@ -1084,15 +1205,21 @@ def check_value(value: ZwaveValue, schema: ZWaveValueDiscoverySchema) -> bool:
         and value.property_key not in schema.property_key
     ):
         return False
-    # check property_key_name
+    # check property_key against not_property_key set
     if (
-        schema.property_key_name is not None
-        and value.property_key_name not in schema.property_key_name
+        schema.not_property_key is not None
+        and value.property_key in schema.not_property_key
     ):
         return False
     # check metadata_type
     if schema.type is not None and value.metadata.type not in schema.type:
         return False
+    # check metadata_readable
+    if schema.readable is not None and value.metadata.readable != schema.readable:
+        return False
+    # check metadata_writeable
+    if schema.writeable is not None and value.metadata.writeable != schema.writeable:
+        return False
     # check available states
     if (
         schema.any_available_states is not None
@@ -1108,14 +1235,11 @@ def check_value(value: ZwaveValue, schema: ZWaveValueDiscoverySchema) -> bool:
 
 @callback
 def check_device_class(
-    device_class: DeviceClassItem, required_value: set[str | int] | None
+    device_class: DeviceClassItem, required_value: set[str] | None
 ) -> bool:
     """Check if device class id or label matches."""
     if required_value is None:
         return True
-    for val in required_value:
-        if isinstance(val, str) and device_class.label == val:
-            return True
-        if isinstance(val, int) and device_class.key == val:
-            return True
+    if any(device_class.label == val for val in required_value):
+        return True
     return False
diff --git a/homeassistant/components/zwave_js/discovery_data_template.py b/homeassistant/components/zwave_js/discovery_data_template.py
index 249a175d4d294d..7a274df41f2484 100644
--- a/homeassistant/components/zwave_js/discovery_data_template.py
+++ b/homeassistant/components/zwave_js/discovery_data_template.py
@@ -7,6 +7,14 @@
 from typing import Any, cast
 
 from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.energy_production import (
+    EnergyProductionParameter,
+    EnergyProductionScaleType,
+    PowerScale,
+    TodaysProductionScale,
+    TotalProductionScale,
+    TotalTimeScale,
+)
 from zwave_js_server.const.command_class.meter import (
     CURRENT_METER_TYPES,
     ENERGY_TOTAL_INCREASING_METER_TYPES,
@@ -85,6 +93,10 @@
     Value as ZwaveValue,
     get_value_id_str,
 )
+from zwave_js_server.util.command_class.energy_production import (
+    get_energy_production_parameter,
+    get_energy_production_scale_type,
+)
 from zwave_js_server.util.command_class.meter import get_meter_scale_type
 from zwave_js_server.util.command_class.multilevel_sensor import (
     get_multilevel_sensor_scale_type,
@@ -123,6 +135,10 @@
     ENTITY_DESC_KEY_CO2,
     ENTITY_DESC_KEY_CURRENT,
     ENTITY_DESC_KEY_ENERGY_MEASUREMENT,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL,
     ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING,
     ENTITY_DESC_KEY_HUMIDITY,
     ENTITY_DESC_KEY_ILLUMINANCE,
@@ -134,10 +150,23 @@
     ENTITY_DESC_KEY_TARGET_TEMPERATURE,
     ENTITY_DESC_KEY_TEMPERATURE,
     ENTITY_DESC_KEY_TOTAL_INCREASING,
+    ENTITY_DESC_KEY_UV_INDEX,
     ENTITY_DESC_KEY_VOLTAGE,
 )
 from .helpers import ZwaveValueID
 
+ENERGY_PRODUCTION_DEVICE_CLASS_MAP: dict[str, list[EnergyProductionParameter]] = {
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME: [EnergyProductionParameter.TOTAL_TIME],
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY: [
+        EnergyProductionParameter.TODAYS_PRODUCTION
+    ],
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL: [
+        EnergyProductionParameter.TOTAL_PRODUCTION
+    ],
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER: [EnergyProductionParameter.POWER],
+}
+
+
 METER_DEVICE_CLASS_MAP: dict[str, list[MeterScaleType]] = {
     ENTITY_DESC_KEY_CURRENT: CURRENT_METER_TYPES,
     ENTITY_DESC_KEY_VOLTAGE: VOLTAGE_METER_TYPES,
@@ -158,6 +187,17 @@
     ENTITY_DESC_KEY_SIGNAL_STRENGTH: SIGNAL_STRENGTH_SENSORS,
     ENTITY_DESC_KEY_TEMPERATURE: TEMPERATURE_SENSORS,
     ENTITY_DESC_KEY_VOLTAGE: VOLTAGE_SENSORS,
+    ENTITY_DESC_KEY_UV_INDEX: [MultilevelSensorType.ULTRAVIOLET],
+}
+
+ENERGY_PRODUCTION_UNIT_MAP: dict[str, list[EnergyProductionScaleType]] = {
+    UnitOfEnergy.WATT_HOUR: [
+        TotalProductionScale.WATT_HOURS,
+        TodaysProductionScale.WATT_HOURS,
+    ],
+    UnitOfPower.WATT: [PowerScale.WATTS],
+    UnitOfTime.SECONDS: [TotalTimeScale.SECONDS],
+    UnitOfTime.HOURS: [TotalTimeScale.HOURS],
 }
 
 METER_UNIT_MAP: dict[str, list[MeterScaleType]] = {
@@ -320,12 +360,18 @@ class NumericSensorDataTemplate(BaseDiscoverySchemaDataTemplate):
 
     @staticmethod
     def find_key_from_matching_set(
-        enum_value: MultilevelSensorType | MultilevelSensorScaleType | MeterScaleType,
+        enum_value: MultilevelSensorType
+        | MultilevelSensorScaleType
+        | MeterScaleType
+        | EnergyProductionParameter
+        | EnergyProductionScaleType,
         set_map: Mapping[
             str,
             list[MultilevelSensorType]
             | list[MultilevelSensorScaleType]
-            | list[MeterScaleType],
+            | list[MeterScaleType]
+            | list[EnergyProductionScaleType]
+            | list[EnergyProductionParameter],
         ],
     ) -> str | None:
         """Find a key in a set map that matches a given enum value."""
@@ -387,36 +433,63 @@ def resolve_data(self, value: ZwaveValue) -> NumericSensorDataTemplateData:
             if key:
                 return NumericSensorDataTemplateData(key, unit)
 
+        if value.command_class == CommandClass.ENERGY_PRODUCTION:
+            energy_production_parameter = get_energy_production_parameter(value)
+            energy_production_scale_type = get_energy_production_scale_type(value)
+            unit = self.find_key_from_matching_set(
+                energy_production_scale_type, ENERGY_PRODUCTION_UNIT_MAP
+            )
+            key = self.find_key_from_matching_set(
+                energy_production_parameter, ENERGY_PRODUCTION_DEVICE_CLASS_MAP
+            )
+            if key:
+                return NumericSensorDataTemplateData(key, unit)
+
         return NumericSensorDataTemplateData()
 
 
 @dataclass
 class TiltValueMix:
-    """Mixin data class for the tilt_value."""
+    """Mixin data class for the current_tilt_value and target_tilt_value."""
 
-    tilt_value_id: ZwaveValueID
+    current_tilt_value_id: ZwaveValueID
+    target_tilt_value_id: ZwaveValueID
 
 
 @dataclass
 class CoverTiltDataTemplate(BaseDiscoverySchemaDataTemplate, TiltValueMix):
     """Tilt data template class for Z-Wave Cover entities."""
 
-    def resolve_data(self, value: ZwaveValue) -> dict[str, ZwaveValue | None]:
+    def resolve_data(self, value: ZwaveValue) -> dict[str, ZwaveValue]:
         """Resolve helper class data for a discovered value."""
-        return {"tilt_value": self._get_value_from_id(value.node, self.tilt_value_id)}
+        current_tilt_value = self._get_value_from_id(
+            value.node, self.current_tilt_value_id
+        )
+        assert current_tilt_value
+        target_tilt_value = self._get_value_from_id(
+            value.node, self.target_tilt_value_id
+        )
+        assert target_tilt_value
+        return {
+            "current_tilt_value": current_tilt_value,
+            "target_tilt_value": target_tilt_value,
+        }
 
     def values_to_watch(
         self, resolved_data: dict[str, Any]
     ) -> Iterable[ZwaveValue | None]:
         """Return list of all ZwaveValues resolved by helper that should be watched."""
-        return [resolved_data["tilt_value"]]
+        return [resolved_data["current_tilt_value"], resolved_data["target_tilt_value"]]
 
     @staticmethod
-    def current_tilt_value(
-        resolved_data: dict[str, ZwaveValue | None]
-    ) -> ZwaveValue | None:
+    def current_tilt_value(resolved_data: dict[str, ZwaveValue]) -> ZwaveValue:
         """Get current tilt ZwaveValue from resolved data."""
-        return resolved_data["tilt_value"]
+        return resolved_data["current_tilt_value"]
+
+    @staticmethod
+    def target_tilt_value(resolved_data: dict[str, ZwaveValue]) -> ZwaveValue:
+        """Get target tilt ZwaveValue from resolved data."""
+        return resolved_data["target_tilt_value"]
 
 
 @dataclass
diff --git a/homeassistant/components/zwave_js/entity.py b/homeassistant/components/zwave_js/entity.py
index 1f43f9f5bdb428..2a0f5ff4e7233f 100644
--- a/homeassistant/components/zwave_js/entity.py
+++ b/homeassistant/components/zwave_js/entity.py
@@ -1,14 +1,20 @@
 """Generic Z-Wave Entity Class."""
 from __future__ import annotations
 
+from collections.abc import Sequence
+from typing import Any
+
 from zwave_js_server.const import NodeStatus
+from zwave_js_server.exceptions import BaseZwaveJSServerError
 from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.value import Value as ZwaveValue, get_value_id_str
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import DEVICE_CLASS_NAME, DeviceInfo, Entity
+from homeassistant.helpers.entity import DeviceInfo, Entity
+from homeassistant.helpers.typing import UNDEFINED
 
 from .const import DOMAIN, LOGGER
 from .discovery import ZwaveDiscoveryInfo
@@ -44,10 +50,12 @@ def __init__(
         # Entity class attributes
         self._attr_name = self.generate_name()
         self._attr_unique_id = get_unique_id(driver, self.info.primary_value.value_id)
-        self._attr_entity_registry_enabled_default = (
-            self.info.entity_registry_enabled_default
-        )
-        self._attr_assumed_state = self.info.assumed_state
+        if self.info.entity_registry_enabled_default is False:
+            self._attr_entity_registry_enabled_default = False
+        if self.info.entity_category is not None:
+            self._attr_entity_category = self.info.entity_category
+        if self.info.assumed_state:
+            self._attr_assumed_state = True
         # device is precreated in main handler
         self._attr_device_info = DeviceInfo(
             identifiers={get_device_id(driver, self.info.node)},
@@ -60,12 +68,20 @@ def on_value_update(self) -> None:
         To be overridden by platforms needing this event.
         """
 
+    async def _async_poll_value(self, value_or_id: str | ZwaveValue) -> None:
+        """Poll a value."""
+        # We log an error instead of raising an exception because this service call occurs
+        # in a separate task and we don't want to raise the exception in that separate task
+        # because it is confusing to the user.
+        try:
+            await self.info.node.async_poll_value(value_or_id)
+        except BaseZwaveJSServerError as err:
+            LOGGER.error("Error while refreshing value %s: %s", value_or_id, err)
+
     async def async_poll_value(self, refresh_all_values: bool) -> None:
         """Poll a value."""
         if not refresh_all_values:
-            self.hass.async_create_task(
-                self.info.node.async_poll_value(self.info.primary_value)
-            )
+            await self._async_poll_value(self.info.primary_value)
             LOGGER.info(
                 (
                     "Refreshing primary value %s for %s, "
@@ -77,7 +93,7 @@ async def async_poll_value(self, refresh_all_values: bool) -> None:
             return
 
         for value_id in self.watched_value_ids:
-            self.hass.async_create_task(self.info.node.async_poll_value(value_id))
+            await self._async_poll_value(value_id)
 
         LOGGER.info(
             (
@@ -103,7 +119,18 @@ async def async_added_to_hass(self) -> None:
                 (
                     f"{DOMAIN}_"
                     f"{get_valueless_base_unique_id(self.driver, self.info.node)}_"
-                    "remove_entity_on_ready_node"
+                    "remove_entity"
+                ),
+                self.async_remove,
+            )
+        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                (
+                    f"{DOMAIN}_"
+                    f"{get_valueless_base_unique_id(self.driver, self.info.node)}_"
+                    "remove_entity_on_interview_started"
                 ),
                 self.async_remove,
             )
@@ -126,7 +153,7 @@ def generate_name(
         self,
         include_value_name: bool = False,
         alternate_value_name: str | None = None,
-        additional_info: list[str] | None = None,
+        additional_info: Sequence[str | None] | None = None,
         name_prefix: str | None = None,
     ) -> str:
         """Generate entity name."""
@@ -135,11 +162,8 @@ def generate_name(
             hasattr(self, "entity_description")
             and self.entity_description
             and self.entity_description.name
+            and self.entity_description.name is not UNDEFINED
         ):
-            # It's not possible to do string manipulations on DEVICE_CLASS_NAME
-            # the assert satisfies the type checker and will catch attempts
-            # to use DEVICE_CLASS_NAME in the entity descriptions.
-            assert self.entity_description.name is not DEVICE_CLASS_NAME
             name = self.entity_description.name
 
         if name_prefix:
@@ -155,8 +179,11 @@ def generate_name(
                 or self.info.primary_value.property_name
                 or ""
             )
+
         name = f"{name} {value_name}".strip()
-        name = f"{name} {' '.join(additional_info or [])}".strip()
+        # Only include non empty additional info
+        if additional_info := [item for item in (additional_info or []) if item]:
+            name = f"{name} {' '.join(additional_info)}"
         # append endpoint if > 1
         if (
             self.info.primary_value.endpoint is not None
@@ -278,3 +305,19 @@ def get_zwave_value(
         ):
             self.watched_value_ids.add(return_value.value_id)
         return return_value
+
+    async def _async_set_value(
+        self,
+        value: ZwaveValue,
+        new_value: Any,
+        options: dict | None = None,
+        wait_for_result: bool | None = None,
+    ) -> bool | None:
+        """Set value on node."""
+        try:
+            return await self.info.node.async_set_value(
+                value, new_value, options=options, wait_for_result=wait_for_result
+            )
+        except BaseZwaveJSServerError as err:
+            LOGGER.error("Unable to set value %s: %s", value.value_id, err)
+            raise HomeAssistantError from err
diff --git a/homeassistant/components/zwave_js/fan.py b/homeassistant/components/zwave_js/fan.py
index bb634328a069e4..d06306497657a3 100644
--- a/homeassistant/components/zwave_js/fan.py
+++ b/homeassistant/components/zwave_js/fan.py
@@ -6,6 +6,7 @@
 
 from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import TARGET_VALUE_PROPERTY, CommandClass
+from zwave_js_server.const.command_class.multilevel_switch import SET_TO_PREVIOUS_VALUE
 from zwave_js_server.const.command_class.thermostat import (
     THERMOSTAT_FAN_OFF_PROPERTY,
     THERMOSTAT_FAN_STATE_PROPERTY,
@@ -88,6 +89,8 @@ def __init__(
         assert target_value
         self._target_value = target_value
 
+        self._use_optimistic_state: bool = False
+
     async def async_set_percentage(self, percentage: int) -> None:
         """Set the speed percentage of the fan."""
         if percentage == 0:
@@ -97,7 +100,7 @@ async def async_set_percentage(self, percentage: int) -> None:
                 percentage_to_ranged_value(DEFAULT_SPEED_RANGE, percentage)
             )
 
-        await self.info.node.async_set_value(self._target_value, zwave_speed)
+        await self._async_set_value(self._target_value, zwave_speed)
 
     async def async_turn_on(
         self,
@@ -111,16 +114,28 @@ async def async_turn_on(
         elif preset_mode is not None:
             await self.async_set_preset_mode(preset_mode)
         else:
-            # Value 255 tells device to return to previous value
-            await self.info.node.async_set_value(self._target_value, 255)
+            if self.info.primary_value.command_class != CommandClass.SWITCH_MULTILEVEL:
+                raise HomeAssistantError(
+                    "`percentage` or `preset_mode` must be provided"
+                )
+            # If this is a Multilevel Switch CC value, we do an optimistic state update
+            # when setting to a previous value to avoid waiting for the value to be
+            # updated from the device which is typically delayed and causes a confusing
+            # UX.
+            await self._async_set_value(self._target_value, SET_TO_PREVIOUS_VALUE)
+            self._use_optimistic_state = True
+            self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
-        await self.info.node.async_set_value(self._target_value, 0)
+        await self._async_set_value(self._target_value, 0)
 
     @property
     def is_on(self) -> bool | None:
         """Return true if device is on (speed above 0)."""
+        if self._use_optimistic_state:
+            self._use_optimistic_state = False
+            return True
         if self.info.primary_value.value is None:
             # guard missing value
             return None
@@ -157,13 +172,13 @@ def __init__(
     async def async_set_percentage(self, percentage: int) -> None:
         """Set the speed percentage of the fan."""
         zwave_speed = self.percentage_to_zwave_speed(percentage)
-        await self.info.node.async_set_value(self._target_value, zwave_speed)
+        await self._async_set_value(self._target_value, zwave_speed)
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
         for zwave_value, mapped_preset_mode in self.fan_value_mapping.presets.items():
             if preset_mode == mapped_preset_mode:
-                await self.info.node.async_set_value(self._target_value, zwave_value)
+                await self._async_set_value(self._target_value, zwave_value)
                 return
 
         raise NotValidPresetModeError(
@@ -325,13 +340,13 @@ async def async_turn_on(
         """Turn the device on."""
         if not self._fan_off:
             raise HomeAssistantError("Unhandled action turn_on")
-        await self.info.node.async_set_value(self._fan_off, False)
+        await self._async_set_value(self._fan_off, False)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
         if not self._fan_off:
             raise HomeAssistantError("Unhandled action turn_off")
-        await self.info.node.async_set_value(self._fan_off, True)
+        await self._async_set_value(self._fan_off, True)
 
     @property
     def is_on(self) -> bool | None:
@@ -360,7 +375,7 @@ async def async_set_preset_mode(self, preset_mode: str) -> None:
         except StopIteration:
             raise ValueError(f"Received an invalid fan mode: {preset_mode}") from None
 
-        await self.info.node.async_set_value(self._fan_mode, new_state)
+        await self._async_set_value(self._fan_mode, new_state)
 
     @property
     def preset_modes(self) -> list[str] | None:
diff --git a/homeassistant/components/zwave_js/humidifier.py b/homeassistant/components/zwave_js/humidifier.py
index 80760930c2e752..02c6abbc732a63 100644
--- a/homeassistant/components/zwave_js/humidifier.py
+++ b/homeassistant/components/zwave_js/humidifier.py
@@ -175,7 +175,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         else:
             return
 
-        await self.info.node.async_set_value(self._current_mode, new_mode)
+        await self._async_set_value(self._current_mode, new_mode)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off device."""
@@ -192,7 +192,7 @@ async def async_turn_off(self, **kwargs: Any) -> None:
         else:
             return
 
-        await self.info.node.async_set_value(self._current_mode, new_mode)
+        await self._async_set_value(self._current_mode, new_mode)
 
     @property
     def target_humidity(self) -> int | None:
@@ -204,7 +204,7 @@ def target_humidity(self) -> int | None:
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
         if self._setpoint:
-            await self.info.node.async_set_value(self._setpoint, humidity)
+            await self._async_set_value(self._setpoint, humidity)
 
     @property
     def min_humidity(self) -> int:
diff --git a/homeassistant/components/zwave_js/light.py b/homeassistant/components/zwave_js/light.py
index 549685873aa461..1a9abb9b0f83cf 100644
--- a/homeassistant/components/zwave_js/light.py
+++ b/homeassistant/components/zwave_js/light.py
@@ -22,6 +22,7 @@
     TARGET_COLOR_PROPERTY,
     ColorComponent,
 )
+from zwave_js_server.const.command_class.multilevel_switch import SET_TO_PREVIOUS_VALUE
 from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.value import Value
 
@@ -164,6 +165,8 @@ def __init__(
         if self.supports_brightness_transition or self.supports_color_transition:
             self._attr_supported_features |= LightEntityFeature.TRANSITION
 
+        self._set_optimistic_state: bool = False
+
     @callback
     def on_value_update(self) -> None:
         """Call when a watched value is added or updated."""
@@ -187,10 +190,11 @@ def color_mode(self) -> str | None:
     @property
     def is_on(self) -> bool | None:
         """Return true if device is on (brightness above 0)."""
+        if self._set_optimistic_state:
+            self._set_optimistic_state = False
+            return True
         brightness = self.brightness
-        if brightness is None:
-            return None
-        return brightness > 0
+        return brightness > 0 if brightness is not None else None
 
     @property
     def hs_color(self) -> tuple[float, float] | None:
@@ -320,9 +324,7 @@ async def _async_set_colors(
             color_name = MULTI_COLOR_MAP[color]
             colors_dict[color_name] = value
         # set updated color object
-        await self.info.node.async_set_value(
-            combined_color_val, colors_dict, zwave_transition
-        )
+        await self._async_set_value(combined_color_val, colors_dict, zwave_transition)
 
     async def _async_set_brightness(
         self, brightness: int | None, transition: float | None = None
@@ -332,8 +334,7 @@ async def _async_set_brightness(
         if not self._target_brightness:
             return
         if brightness is None:
-            # Level 255 means to set it to previous value.
-            zwave_brightness = 255
+            zwave_brightness = SET_TO_PREVIOUS_VALUE
         else:
             # Zwave multilevel switches use a range of [0, 99] to control brightness.
             zwave_brightness = byte_to_zwave_brightness(brightness)
@@ -347,9 +348,18 @@ async def _async_set_brightness(
                 zwave_transition = {TRANSITION_DURATION_OPTION: "default"}
 
         # setting a value requires setting targetValue
-        await self.info.node.async_set_value(
+        await self._async_set_value(
             self._target_brightness, zwave_brightness, zwave_transition
         )
+        # We do an optimistic state update when setting to a previous value
+        # to avoid waiting for the value to be updated from the device which is
+        # typically delayed and causes a confusing UX.
+        if (
+            zwave_brightness == SET_TO_PREVIOUS_VALUE
+            and self.info.primary_value.command_class == CommandClass.SWITCH_MULTILEVEL
+        ):
+            self._set_optimistic_state = True
+            self.async_write_ha_state()
 
     @callback
     def _calculate_color_values(self) -> None:
diff --git a/homeassistant/components/zwave_js/lock.py b/homeassistant/components/zwave_js/lock.py
index efeadb9b6b33d6..5457916a1e1352 100644
--- a/homeassistant/components/zwave_js/lock.py
+++ b/homeassistant/components/zwave_js/lock.py
@@ -13,12 +13,14 @@
     LOCK_CMD_CLASS_TO_PROPERTY_MAP,
     DoorLockMode,
 )
+from zwave_js_server.exceptions import BaseZwaveJSServerError
 from zwave_js_server.util.lock import clear_usercode, set_usercode
 
 from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN, LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -97,14 +99,17 @@ class ZWaveLock(ZWaveBaseEntity, LockEntity):
     @property
     def is_locked(self) -> bool | None:
         """Return true if the lock is locked."""
-        if self.info.primary_value.value is None:
+        value = self.info.primary_value
+        if value.value is None or (
+            value.command_class == CommandClass.DOOR_LOCK
+            and value.value == DoorLockMode.UNKNOWN
+        ):
             # guard missing value
             return None
-        return int(
-            LOCK_CMD_CLASS_TO_LOCKED_STATE_MAP[
-                CommandClass(self.info.primary_value.command_class)
-            ]
-        ) == int(self.info.primary_value.value)
+        return (
+            LOCK_CMD_CLASS_TO_LOCKED_STATE_MAP[CommandClass(value.command_class)]
+            == self.info.primary_value.value
+        )
 
     async def _set_lock_state(self, target_state: str, **kwargs: Any) -> None:
         """Set the lock state."""
@@ -114,7 +119,7 @@ async def _set_lock_state(self, target_state: str, **kwargs: Any) -> None:
             ]
         )
         if target_value is not None:
-            await self.info.node.async_set_value(
+            await self._async_set_value(
                 target_value,
                 STATE_TO_ZWAVE_MAP[self.info.primary_value.command_class][target_state],
             )
@@ -129,10 +134,20 @@ async def async_unlock(self, **kwargs: Any) -> None:
 
     async def async_set_lock_usercode(self, code_slot: int, usercode: str) -> None:
         """Set the usercode to index X on the lock."""
-        await set_usercode(self.info.node, code_slot, usercode)
+        try:
+            await set_usercode(self.info.node, code_slot, usercode)
+        except BaseZwaveJSServerError as err:
+            raise HomeAssistantError(
+                f"Unable to set lock usercode on code_slot {code_slot}: {err}"
+            ) from err
         LOGGER.debug("User code at slot %s set", code_slot)
 
     async def async_clear_lock_usercode(self, code_slot: int) -> None:
         """Clear the usercode at index X on the lock."""
-        await clear_usercode(self.info.node, code_slot)
+        try:
+            await clear_usercode(self.info.node, code_slot)
+        except BaseZwaveJSServerError as err:
+            raise HomeAssistantError(
+                f"Unable to clear lock usercode on code_slot {code_slot}: {err}"
+            ) from err
         LOGGER.debug("User code at slot %s cleared", code_slot)
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index da144c398ed54e..b163ace1d24f01 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -8,7 +8,8 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.48.1"],
+  "quality_scale": "platinum",
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.49.0"],
   "usb": [
     {
       "vid": "0658",
diff --git a/homeassistant/components/zwave_js/number.py b/homeassistant/components/zwave_js/number.py
index a6a219fa7c63e5..6aa4a57ea4c748 100644
--- a/homeassistant/components/zwave_js/number.py
+++ b/homeassistant/components/zwave_js/number.py
@@ -1,7 +1,8 @@
 """Support for Z-Wave controls using the number platform."""
 from __future__ import annotations
 
-from typing import cast
+from collections.abc import Mapping
+from typing import Any, cast
 
 from zwave_js_server.client import Client as ZwaveClient
 from zwave_js_server.const import TARGET_VALUE_PROPERTY
@@ -10,12 +11,13 @@
 
 from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberEntity
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DATA_CLIENT, DOMAIN
+from .const import ATTR_RESERVED_VALUES, DATA_CLIENT, DOMAIN
 from .discovery import ZwaveDiscoveryInfo
 from .entity import ZWaveBaseEntity
 
@@ -38,6 +40,10 @@ def async_add_number(info: ZwaveDiscoveryInfo) -> None:
         entities: list[ZWaveBaseEntity] = []
         if info.platform_hint == "volume":
             entities.append(ZwaveVolumeNumberEntity(config_entry, driver, info))
+        elif info.platform_hint == "config_parameter":
+            entities.append(
+                ZWaveConfigParameterNumberEntity(config_entry, driver, info)
+            )
         else:
             entities.append(ZwaveNumberEntity(config_entry, driver, info))
         async_add_entities(entities)
@@ -66,7 +72,9 @@ def __init__(
             self._target_value = self.get_zwave_value(TARGET_VALUE_PROPERTY)
 
         # Entity class attributes
-        self._attr_name = self.generate_name(alternate_value_name=info.platform_hint)
+        self._attr_name = self.generate_name(
+            include_value_name=True, alternate_value_name=info.platform_hint
+        )
 
     @property
     def native_min_value(self) -> float:
@@ -96,7 +104,37 @@ async def async_set_native_value(self, value: float) -> None:
         """Set new value."""
         if (target_value := self._target_value) is None:
             raise HomeAssistantError("Missing target value on device.")
-        await self.info.node.async_set_value(target_value, value)
+        await self._async_set_value(target_value, value)
+
+
+class ZWaveConfigParameterNumberEntity(ZwaveNumberEntity):
+    """Representation of a Z-Wave config parameter number."""
+
+    _attr_entity_category = EntityCategory.CONFIG
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize a ZWaveConfigParameterNumber entity."""
+        super().__init__(config_entry, driver, info)
+
+        property_key_name = self.info.primary_value.property_key_name
+        # Entity class attributes
+        self._attr_name = self.generate_name(
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[property_key_name] if property_key_name else None,
+        )
+
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        """Return extra state attributes for entity."""
+        if not self.info.primary_value.metadata.states:
+            return None
+        return {
+            ATTR_RESERVED_VALUES: {
+                int(k): v for k, v in self.info.primary_value.metadata.states.items()
+            }
+        }
 
 
 class ZwaveVolumeNumberEntity(ZWaveBaseEntity, NumberEntity):
@@ -126,6 +164,6 @@ def native_value(self) -> float | None:
 
     async def async_set_native_value(self, value: float) -> None:
         """Set new value."""
-        await self.info.node.async_set_value(
+        await self._async_set_value(
             self.info.primary_value, round(value * self.correction_factor)
         )
diff --git a/homeassistant/components/zwave_js/select.py b/homeassistant/components/zwave_js/select.py
index f74c98117b49e9..3956004336a03c 100644
--- a/homeassistant/components/zwave_js/select.py
+++ b/homeassistant/components/zwave_js/select.py
@@ -42,6 +42,10 @@ def async_add_select(info: ZwaveDiscoveryInfo) -> None:
             entities.append(
                 ZwaveMultilevelSwitchSelectEntity(config_entry, driver, info)
             )
+        elif info.platform_hint == "config_parameter":
+            entities.append(
+                ZWaveConfigParameterSelectEntity(config_entry, driver, info)
+            )
         else:
             entities.append(ZwaveSelectEntity(config_entry, driver, info))
         async_add_entities(entities)
@@ -88,7 +92,26 @@ async def async_select_option(self, option: str) -> None:
             for key, val in self.info.primary_value.metadata.states.items()
             if val == option
         )
-        await self.info.node.async_set_value(self.info.primary_value, int(key))
+        await self._async_set_value(self.info.primary_value, int(key))
+
+
+class ZWaveConfigParameterSelectEntity(ZwaveSelectEntity):
+    """Representation of a Z-Wave config parameter select."""
+
+    _attr_entity_category = EntityCategory.CONFIG
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize a ZWaveConfigParameterSelect entity."""
+        super().__init__(config_entry, driver, info)
+
+        property_key_name = self.info.primary_value.property_key_name
+        # Entity class attributes
+        self._attr_name = self.generate_name(
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[property_key_name] if property_key_name else None,
+        )
 
 
 class ZwaveDefaultToneSelectEntity(ZWaveBaseEntity, SelectEntity):
@@ -139,7 +162,7 @@ async def async_select_option(self, option: str) -> None:
             for key, val in self._tones_value.metadata.states.items()
             if val == option
         )
-        await self.info.node.async_set_value(self.info.primary_value, int(key))
+        await self._async_set_value(self.info.primary_value, int(key))
 
 
 class ZwaveMultilevelSwitchSelectEntity(ZWaveBaseEntity, SelectEntity):
@@ -174,4 +197,4 @@ async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
         assert self._target_value is not None
         key = next(key for key, val in self._lookup_map.items() if val == option)
-        await self.info.node.async_set_value(self._target_value, int(key))
+        await self._async_set_value(self._target_value, int(key))
diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index 313110169c3a4e..468d8f0cbda179 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -6,14 +6,18 @@
 
 import voluptuous as vol
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import CommandClass, ConfigurationValueType, NodeStatus
+from zwave_js_server.const import CommandClass, NodeStatus
 from zwave_js_server.const.command_class.meter import (
     RESET_METER_OPTION_TARGET_VALUE,
     RESET_METER_OPTION_TYPE,
 )
+from zwave_js_server.exceptions import BaseZwaveJSServerError
+from zwave_js_server.model.controller import Controller
+from zwave_js_server.model.controller.statistics import ControllerStatisticsDataType
 from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.node import Node as ZwaveNode
-from zwave_js_server.model.value import ConfigurationValue
+from zwave_js_server.model.node.statistics import NodeStatisticsDataType
+from zwave_js_server.model.value import ConfigurationValue, ConfigurationValueType
 from zwave_js_server.util.command_class.meter import get_meter_type
 
 from homeassistant.components.sensor import (
@@ -29,6 +33,7 @@
     LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    UV_INDEX,
     EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -36,12 +41,14 @@
     UnitOfPower,
     UnitOfPressure,
     UnitOfTemperature,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.typing import UNDEFINED, StateType
 
 from .const import (
     ATTR_METER_TYPE,
@@ -54,6 +61,10 @@
     ENTITY_DESC_KEY_CO2,
     ENTITY_DESC_KEY_CURRENT,
     ENTITY_DESC_KEY_ENERGY_MEASUREMENT,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY,
+    ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL,
     ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING,
     ENTITY_DESC_KEY_HUMIDITY,
     ENTITY_DESC_KEY_ILLUMINANCE,
@@ -65,6 +76,7 @@
     ENTITY_DESC_KEY_TARGET_TEMPERATURE,
     ENTITY_DESC_KEY_TEMPERATURE,
     ENTITY_DESC_KEY_TOTAL_INCREASING,
+    ENTITY_DESC_KEY_UV_INDEX,
     ENTITY_DESC_KEY_VOLTAGE,
     LOGGER,
     SERVICE_RESET_METER,
@@ -231,6 +243,50 @@
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
     ),
+    (
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME,
+        UnitOfTime.SECONDS,
+    ): SensorEntityDescription(
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME,
+        name="Energy production time",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+    ),
+    (ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME, UnitOfTime.HOURS): SensorEntityDescription(
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TIME,
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.HOURS,
+    ),
+    (
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY,
+        UnitOfEnergy.WATT_HOUR,
+    ): SensorEntityDescription(
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TODAY,
+        name="Energy production today",
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+    ),
+    (
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL,
+        UnitOfEnergy.WATT_HOUR,
+    ): SensorEntityDescription(
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_TOTAL,
+        name="Energy production total",
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+    ),
+    (
+        ENTITY_DESC_KEY_ENERGY_PRODUCTION_POWER,
+        UnitOfPower.WATT,
+    ): SensorEntityDescription(
+        ENTITY_DESC_KEY_POWER,
+        name="Energy production power",
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfPower.WATT,
+    ),
 }
 
 # These descriptions are without device class.
@@ -269,9 +325,142 @@
         ENTITY_DESC_KEY_TOTAL_INCREASING,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
+    ENTITY_DESC_KEY_UV_INDEX: SensorEntityDescription(
+        ENTITY_DESC_KEY_UV_INDEX,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UV_INDEX,
+    ),
 }
 
 
+# Controller statistics descriptions
+ENTITY_DESCRIPTION_CONTROLLER_STATISTICS_LIST = [
+    SensorEntityDescription(
+        "messagesTX",
+        name="Successful messages (TX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "messagesRX",
+        name="Successful messages (RX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "messagesDroppedTX",
+        name="Messages dropped (TX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "messagesDroppedRX",
+        name="Messages dropped (RX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "NAK",
+        name="Messages not accepted",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "CAN", name="Collisions", state_class=SensorStateClass.TOTAL
+    ),
+    SensorEntityDescription(
+        "timeoutACK", name="Missing ACKs", state_class=SensorStateClass.TOTAL
+    ),
+    SensorEntityDescription(
+        "timeoutResponse",
+        name="Timed out responses",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "timeoutCallback",
+        name="Timed out callbacks",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel0.average",
+        name="Average background RSSI (channel 0)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel0.current",
+        name="Current background RSSI (channel 0)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel1.average",
+        name="Average background RSSI (channel 1)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel1.current",
+        name="Current background RSSI (channel 1)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel2.average",
+        name="Average background RSSI (channel 2)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+    ),
+    SensorEntityDescription(
+        "backgroundRSSI.channel2.current",
+        name="Current background RSSI (channel 2)",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+]
+
+# Node statistics descriptions
+ENTITY_DESCRIPTION_NODE_STATISTICS_LIST = [
+    SensorEntityDescription(
+        "commandsRX",
+        name="Successful commands (RX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "commandsTX",
+        name="Successful commands (TX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "commandsDroppedRX",
+        name="Commands dropped (RX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "commandsDroppedTX",
+        name="Commands dropped (TX)",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "timeoutResponse",
+        name="Timed out responses",
+        state_class=SensorStateClass.TOTAL,
+    ),
+    SensorEntityDescription(
+        "rtt",
+        name="Round Trip Time",
+        native_unit_of_measurement=UnitOfTime.MILLISECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        "rssi",
+        name="RSSI",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+]
+
+
 def get_entity_description(
     data: NumericSensorDataTemplateData,
 ) -> SensorEntityDescription:
@@ -347,6 +536,27 @@ def async_add_node_status_sensor(node: ZwaveNode) -> None:
         assert driver is not None  # Driver is ready before platforms are loaded.
         async_add_entities([ZWaveNodeStatusSensor(config_entry, driver, node)])
 
+    @callback
+    def async_add_statistics_sensors(node: ZwaveNode) -> None:
+        """Add statistics sensors."""
+        driver = client.driver
+        assert driver is not None  # Driver is ready before platforms are loaded.
+        async_add_entities(
+            [
+                ZWaveStatisticsSensor(
+                    config_entry,
+                    driver,
+                    driver.controller if driver.controller.own_node == node else node,
+                    entity_description,
+                )
+                for entity_description in (
+                    ENTITY_DESCRIPTION_CONTROLLER_STATISTICS_LIST
+                    if driver.controller.own_node == node
+                    else ENTITY_DESCRIPTION_NODE_STATISTICS_LIST
+                )
+            ]
+        )
+
     config_entry.async_on_unload(
         async_dispatcher_connect(
             hass,
@@ -363,6 +573,14 @@ def async_add_node_status_sensor(node: ZwaveNode) -> None:
         )
     )
 
+    config_entry.async_on_unload(
+        async_dispatcher_connect(
+            hass,
+            f"{DOMAIN}_{config_entry.entry_id}_add_statistics_sensors",
+            async_add_statistics_sensors,
+        )
+    )
+
     platform = entity_platform.async_get_current_platform()
     platform.async_register_entity_service(
         SERVICE_RESET_METER,
@@ -386,13 +604,14 @@ def __init__(
         unit_of_measurement: str | None = None,
     ) -> None:
         """Initialize a ZWaveSensorBase entity."""
-        super().__init__(config_entry, driver, info)
         self.entity_description = entity_description
+        super().__init__(config_entry, driver, info)
         self._attr_native_unit_of_measurement = unit_of_measurement
 
         # Entity class attributes
         self._attr_force_update = True
-        self._attr_name = self.generate_name(include_value_name=True)
+        if not entity_description.name or entity_description.name is UNDEFINED:
+            self._attr_name = self.generate_name(include_value_name=True)
 
     @property
     def native_value(self) -> StateType:
@@ -454,9 +673,15 @@ async def async_reset_meter(
         if value is not None:
             options[RESET_METER_OPTION_TARGET_VALUE] = value
         args = [options] if options else []
-        await node.endpoints[endpoint].async_invoke_cc_api(
-            CommandClass.METER, "reset", *args, wait_for_result=False
-        )
+        try:
+            await node.endpoints[endpoint].async_invoke_cc_api(
+                CommandClass.METER, "reset", *args, wait_for_result=False
+            )
+        except BaseZwaveJSServerError as err:
+            LOGGER.error(
+                "Failed to reset meters on node %s endpoint %s: %s", node, endpoint, err
+            )
+            raise HomeAssistantError from err
         LOGGER.debug(
             "Meters on node %s endpoint %s reset with the following options: %s",
             node,
@@ -468,6 +693,35 @@ async def async_reset_meter(
 class ZWaveListSensor(ZwaveSensor):
     """Representation of a Z-Wave Numeric sensor with multiple states."""
 
+    def __init__(
+        self,
+        config_entry: ConfigEntry,
+        driver: Driver,
+        info: ZwaveDiscoveryInfo,
+        entity_description: SensorEntityDescription,
+        unit_of_measurement: str | None = None,
+    ) -> None:
+        """Initialize a ZWaveListSensor entity."""
+        super().__init__(
+            config_entry, driver, info, entity_description, unit_of_measurement
+        )
+
+        # Entity class attributes
+        # Notification sensors have the following name mapping (variables are property
+        # keys, name is property)
+        # https://github.com/zwave-js/node-zwave-js/blob/master/packages/config/config/notifications.json
+        self._attr_name = self.generate_name(
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[self.info.primary_value.property_key_name],
+        )
+
+    @property
+    def options(self) -> list[str] | None:
+        """Return options for enum sensor."""
+        if self.device_class == SensorDeviceClass.ENUM:
+            return list(self.info.primary_value.metadata.states.values())
+        return None
+
     @property
     def device_class(self) -> SensorDeviceClass | None:
         """Return sensor device class."""
@@ -477,13 +731,6 @@ def device_class(self) -> SensorDeviceClass | None:
             return SensorDeviceClass.ENUM
         return None
 
-    @property
-    def options(self) -> list[str] | None:
-        """Return options for enum sensor."""
-        if self.device_class == SensorDeviceClass.ENUM:
-            return list(self.info.primary_value.metadata.states.values())
-        return None
-
     @property
     def extra_state_attributes(self) -> dict[str, str] | None:
         """Return the device specific state attributes."""
@@ -496,6 +743,8 @@ def extra_state_attributes(self) -> dict[str, str] | None:
 class ZWaveConfigParameterSensor(ZWaveListSensor):
     """Representation of a Z-Wave config parameter sensor."""
 
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
     def __init__(
         self,
         config_entry: ConfigEntry,
@@ -515,14 +764,14 @@ def __init__(
         self._attr_name = self.generate_name(
             alternate_value_name=self.info.primary_value.property_name,
             additional_info=[property_key_name] if property_key_name else None,
-            name_prefix="Config parameter",
         )
 
     @property
     def device_class(self) -> SensorDeviceClass | None:
         """Return sensor device class."""
-        if (device_class := super(ZwaveSensor, self).device_class) is not None:
-            return device_class
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if (device_class := ZwaveSensor.device_class.fget(self)) is not None:  # type: ignore[attr-defined]
+            return device_class  # type: ignore[no-any-return]
         if (
             self._primary_value.configuration_value_type
             == ConfigurationValueType.ENUMERATED
@@ -533,10 +782,7 @@ def device_class(self) -> SensorDeviceClass | None:
     @property
     def extra_state_attributes(self) -> dict[str, str] | None:
         """Return the device specific state attributes."""
-        if (
-            self._primary_value.configuration_value_type == ConfigurationValueType.RANGE
-            or (value := self.info.primary_value.value) is None
-        ):
+        if (value := self.info.primary_value.value) is None:
             return None
         # add the value's int value as property for multi-value (list) items
         return {ATTR_VALUE: value}
@@ -565,6 +811,9 @@ def __init__(
 
     async def async_poll_value(self, _: bool) -> None:
         """Poll a value."""
+        # We log an error instead of raising an exception because this service call occurs
+        # in a separate task since it is called via the dispatcher and we don't want to
+        # raise the exception in that separate task because it is confusing to the user.
         LOGGER.error(
             "There is no value to refresh for this entity so the zwave_js.refresh_value"
             " service won't work for it"
@@ -593,6 +842,9 @@ async def async_added_to_hass(self) -> None:
                 self.async_poll_value,
             )
         )
+        # we don't listen for `remove_entity_on_ready_node` signal because this entity
+        # is created when the node is added which occurs before ready. It only needs to
+        # be removed if the node is removed from the network.
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
@@ -602,3 +854,93 @@ async def async_added_to_hass(self) -> None:
         )
         self._attr_native_value: str = self.node.status.name.lower()
         self.async_write_ha_state()
+
+
+class ZWaveStatisticsSensor(SensorEntity):
+    """Representation of a node/controller statistics sensor."""
+
+    _attr_should_poll = False
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_entity_registry_enabled_default = False
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        config_entry: ConfigEntry,
+        driver: Driver,
+        statistics_src: ZwaveNode | Controller,
+        description: SensorEntityDescription,
+    ) -> None:
+        """Initialize a Z-Wave statistics entity."""
+        self.entity_description = description
+        self.config_entry = config_entry
+        self.statistics_src = statistics_src
+        node = (
+            statistics_src.own_node
+            if isinstance(statistics_src, Controller)
+            else statistics_src
+        )
+        assert node
+
+        # Entity class attributes
+        self._base_unique_id = get_valueless_base_unique_id(driver, node)
+        self._attr_unique_id = f"{self._base_unique_id}.statistics_{description.key}"
+        # device may not be precreated in main handler yet
+        self._attr_device_info = get_device_info(driver, node)
+
+    async def async_poll_value(self, _: bool) -> None:
+        """Poll a value."""
+        # We log an error instead of raising an exception because this service call occurs
+        # in a separate task since it is called via the dispatcher and we don't want to
+        # raise the exception in that separate task because it is confusing to the user.
+        LOGGER.error(
+            "There is no value to refresh for this entity so the zwave_js.refresh_value"
+            " service won't work for it"
+        )
+
+    def _get_data_from_statistics(
+        self, statistics: ControllerStatisticsDataType | NodeStatisticsDataType
+    ) -> int | None:
+        """Get the data from the statistics dict."""
+        if "." not in self.entity_description.key:
+            return cast(int | None, statistics.get(self.entity_description.key))
+
+        # If key contains dots, we need to traverse the dict to get to the right value
+        for key in self.entity_description.key.split("."):
+            if key not in statistics:
+                return None
+            statistics = statistics[key]  # type: ignore[literal-required]
+        return cast(int, statistics)
+
+    @callback
+    def statistics_updated(self, event_data: dict) -> None:
+        """Call when statistics updated event is received."""
+        self._attr_native_value = self._get_data_from_statistics(
+            event_data["statistics"]
+        )
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Call when entity is added."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{DOMAIN}_{self.unique_id}_poll_value",
+                self.async_poll_value,
+            )
+        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{DOMAIN}_{self._base_unique_id}_remove_entity",
+                self.async_remove,
+            )
+        )
+        self.async_on_remove(
+            self.statistics_src.on("statistics updated", self.statistics_updated)
+        )
+
+        # Set initial state
+        self._attr_native_value = self._get_data_from_statistics(
+            self.statistics_src.statistics.data
+        )
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index 47a16ee127370b..133cb40740558c 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -213,6 +213,7 @@ def validate_entities(val: dict[str, Any]) -> dict[str, Any]:
                             cv.ensure_list, [cv.string]
                         ),
                         vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+                        vol.Optional(const.ATTR_ENDPOINT, default=0): vol.Coerce(int),
                         vol.Required(const.ATTR_CONFIG_PARAMETER): vol.Any(
                             vol.Coerce(int), cv.string
                         ),
@@ -247,6 +248,7 @@ def validate_entities(val: dict[str, Any]) -> dict[str, Any]:
                             cv.ensure_list, [cv.string]
                         ),
                         vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+                        vol.Optional(const.ATTR_ENDPOINT, default=0): vol.Coerce(int),
                         vol.Required(const.ATTR_CONFIG_PARAMETER): vol.Coerce(int),
                         vol.Required(const.ATTR_CONFIG_VALUE): vol.Any(
                             vol.Coerce(int),
@@ -413,6 +415,7 @@ def validate_entities(val: dict[str, Any]) -> dict[str, Any]:
     async def async_set_config_parameter(self, service: ServiceCall) -> None:
         """Set a config value on a node."""
         nodes: set[ZwaveNode] = service.data[const.ATTR_NODES]
+        endpoint = service.data[const.ATTR_ENDPOINT]
         property_or_property_name = service.data[const.ATTR_CONFIG_PARAMETER]
         property_key = service.data.get(const.ATTR_CONFIG_PARAMETER_BITMASK)
         new_value = service.data[const.ATTR_CONFIG_VALUE]
@@ -424,6 +427,7 @@ async def async_set_config_parameter(self, service: ServiceCall) -> None:
                     new_value,
                     property_or_property_name,
                     property_key=property_key,
+                    endpoint=endpoint,
                 )
                 for node in nodes
             ),
@@ -448,6 +452,7 @@ async def async_bulk_set_partial_config_parameters(
     ) -> None:
         """Bulk set multiple partial config values on a node."""
         nodes: set[ZwaveNode] = service.data[const.ATTR_NODES]
+        endpoint = service.data[const.ATTR_ENDPOINT]
         property_ = service.data[const.ATTR_CONFIG_PARAMETER]
         new_value = service.data[const.ATTR_CONFIG_VALUE]
 
@@ -457,6 +462,7 @@ async def async_bulk_set_partial_config_parameters(
                     node,
                     property_,
                     new_value,
+                    endpoint=endpoint,
                 )
                 for node in nodes
             ),
@@ -627,8 +633,11 @@ async def async_ping(self, service: ServiceCall) -> None:
             "calls will still work for now but the service will be removed in a "
             "future release"
         )
-        nodes: set[ZwaveNode] = service.data[const.ATTR_NODES]
-        await asyncio.gather(*(node.async_ping() for node in nodes))
+        nodes: list[ZwaveNode] = list(service.data[const.ATTR_NODES])
+        results = await asyncio.gather(
+            *(node.async_ping() for node in nodes), return_exceptions=True
+        )
+        raise_exceptions_from_results(nodes, results)
 
     async def async_invoke_cc_api(self, service: ServiceCall) -> None:
         """Invoke a command class API."""
diff --git a/homeassistant/components/zwave_js/services.yaml b/homeassistant/components/zwave_js/services.yaml
index b9209c6904f784..05e2f8bd9fbbf5 100644
--- a/homeassistant/components/zwave_js/services.yaml
+++ b/homeassistant/components/zwave_js/services.yaml
@@ -46,6 +46,14 @@ set_config_parameter:
     entity:
       integration: zwave_js
   fields:
+    endpoint:
+      name: Endpoint
+      description: The configuration parameter's endpoint.
+      example: 1
+      default: 0
+      required: false
+      selector:
+        text:
     parameter:
       name: Parameter
       description: The (name or id of the) configuration parameter you want to configure.
@@ -53,6 +61,12 @@ set_config_parameter:
       required: true
       selector:
         text:
+    bitmask:
+      name: Bitmask
+      description: Target a specific bitmask (see the documentation for more information).
+      advanced: true
+      selector:
+        text:
     value:
       name: Value
       description: The new value to set for this configuration parameter.
@@ -60,12 +74,6 @@ set_config_parameter:
       required: true
       selector:
         text:
-    bitmask:
-      name: Bitmask
-      description: Target a specific bitmask (see the documentation for more information).
-      advanced: true
-      selector:
-        text:
 
 bulk_set_partial_config_parameters:
   name: Bulk set partial configuration parameters for a Z-Wave device (Advanced).
@@ -74,6 +82,14 @@ bulk_set_partial_config_parameters:
     entity:
       integration: zwave_js
   fields:
+    endpoint:
+      name: Endpoint
+      description: The configuration parameter's endpoint.
+      example: 1
+      default: 0
+      required: false
+      selector:
+        text:
     parameter:
       name: Parameter
       description: The id of the configuration parameter you want to configure.
diff --git a/homeassistant/components/zwave_js/siren.py b/homeassistant/components/zwave_js/siren.py
index 5a53d115528150..6de6b0f4e45bb4 100644
--- a/homeassistant/components/zwave_js/siren.py
+++ b/homeassistant/components/zwave_js/siren.py
@@ -79,14 +79,6 @@ def is_on(self) -> bool | None:
             return None
         return bool(self.info.primary_value.value)
 
-    async def async_set_value(
-        self, new_value: int, options: dict[str, Any] | None = None
-    ) -> None:
-        """Set a value on a siren node."""
-        await self.info.node.async_set_value(
-            self.info.primary_value, new_value, options=options
-        )
-
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
         tone_id: int | None = kwargs.get(ATTR_TONE)
@@ -95,11 +87,13 @@ async def async_turn_on(self, **kwargs: Any) -> None:
             options["volume"] = round(volume * 100)
         # Play the default tone if a tone isn't provided
         if tone_id is None:
-            await self.async_set_value(ToneID.DEFAULT, options)
+            await self._async_set_value(
+                self.info.primary_value, ToneID.DEFAULT, options
+            )
             return
 
-        await self.async_set_value(tone_id, options)
+        await self._async_set_value(self.info.primary_value, tone_id, options)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
-        await self.async_set_value(ToneID.OFF)
+        await self._async_set_value(self.info.primary_value, ToneID.OFF)
diff --git a/homeassistant/components/zwave_js/switch.py b/homeassistant/components/zwave_js/switch.py
index 450a0cfd31d97e..409bcd1dbb73ca 100644
--- a/homeassistant/components/zwave_js/switch.py
+++ b/homeassistant/components/zwave_js/switch.py
@@ -12,6 +12,7 @@
 
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -41,6 +42,10 @@ def async_add_switch(info: ZwaveDiscoveryInfo) -> None:
             entities.append(
                 ZWaveBarrierEventSignalingSwitch(config_entry, driver, info)
             )
+        elif info.platform_hint == "config_parameter":
+            entities.append(ZWaveConfigParameterSwitch(config_entry, driver, info))
+        elif info.platform_hint == "indicator":
+            entities.append(ZWaveIndicatorSwitch(config_entry, driver, info))
         else:
             entities.append(ZWaveSwitch(config_entry, driver, info))
 
@@ -77,12 +82,24 @@ def is_on(self) -> bool | None:
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
         if self._target_value is not None:
-            await self.info.node.async_set_value(self._target_value, True)
+            await self._async_set_value(self._target_value, True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         if self._target_value is not None:
-            await self.info.node.async_set_value(self._target_value, False)
+            await self._async_set_value(self._target_value, False)
+
+
+class ZWaveIndicatorSwitch(ZWaveSwitch):
+    """Representation of a Z-Wave Indicator CC switch."""
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize the switch."""
+        super().__init__(config_entry, driver, info)
+        self._target_value = self.info.primary_value
+        self._attr_name = self.generate_name(include_value_name=True)
 
 
 class ZWaveBarrierEventSignalingSwitch(ZWaveBaseEntity, SwitchEntity):
@@ -115,7 +132,7 @@ def is_on(self) -> bool | None:
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
-        await self.info.node.async_set_value(
+        await self._async_set_value(
             self.info.primary_value, BarrierEventSignalingSubsystemState.ON
         )
         # this value is not refreshed, so assume success
@@ -124,7 +141,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
-        await self.info.node.async_set_value(
+        await self._async_set_value(
             self.info.primary_value, BarrierEventSignalingSubsystemState.OFF
         )
         # this value is not refreshed, so assume success
@@ -138,3 +155,30 @@ def _update_state(self) -> None:
             self._state = (
                 self.info.primary_value.value == BarrierEventSignalingSubsystemState.ON
             )
+
+
+class ZWaveConfigParameterSwitch(ZWaveSwitch):
+    """Representation of a Z-Wave config parameter switch."""
+
+    _attr_entity_category = EntityCategory.CONFIG
+
+    def __init__(
+        self, config_entry: ConfigEntry, driver: Driver, info: ZwaveDiscoveryInfo
+    ) -> None:
+        """Initialize a ZWaveConfigParameterSwitch entity."""
+        super().__init__(config_entry, driver, info)
+
+        property_key_name = self.info.primary_value.property_key_name
+        # Entity class attributes
+        self._attr_name = self.generate_name(
+            alternate_value_name=self.info.primary_value.property_name,
+            additional_info=[property_key_name] if property_key_name else None,
+        )
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the switch on."""
+        await self._async_set_value(self.info.primary_value, 1)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the switch off."""
+        await self._async_set_value(self.info.primary_value, 0)
diff --git a/homeassistant/components/zwave_js/triggers/event.py b/homeassistant/components/zwave_js/triggers/event.py
index 12c9d267ca61fd..33cb59d8505154 100644
--- a/homeassistant/components/zwave_js/triggers/event.py
+++ b/homeassistant/components/zwave_js/triggers/event.py
@@ -1,18 +1,20 @@
 """Offer Z-Wave JS event listening automation trigger."""
 from __future__ import annotations
 
+from collections.abc import Callable
 import functools
 
 from pydantic import ValidationError
 import voluptuous as vol
 from zwave_js_server.client import Client
 from zwave_js_server.model.controller import CONTROLLER_EVENT_MODEL_MAP
-from zwave_js_server.model.driver import DRIVER_EVENT_MODEL_MAP
+from zwave_js_server.model.driver import DRIVER_EVENT_MODEL_MAP, Driver
 from zwave_js_server.model.node import NODE_EVENT_MODEL_MAP
 
 from homeassistant.const import ATTR_DEVICE_ID, ATTR_ENTITY_ID, CONF_PLATFORM
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
@@ -140,8 +142,9 @@ async def async_attach_trigger(
 ) -> CALLBACK_TYPE:
     """Listen for state changes based on configuration."""
     dev_reg = dr.async_get(hass)
-    nodes = async_get_nodes_from_targets(hass, config, dev_reg=dev_reg)
-    if config[ATTR_EVENT_SOURCE] == "node" and not nodes:
+    if config[ATTR_EVENT_SOURCE] == "node" and not async_get_nodes_from_targets(
+        hass, config, dev_reg=dev_reg
+    ):
         raise ValueError(
             f"No nodes found for given {ATTR_DEVICE_ID}s or {ATTR_ENTITY_ID}s."
         )
@@ -150,7 +153,7 @@ async def async_attach_trigger(
     event_name = config[ATTR_EVENT]
     event_data_filter = config.get(ATTR_EVENT_DATA, {})
 
-    unsubs = []
+    unsubs: list[Callable] = []
     job = HassJob(action)
 
     trigger_data = trigger_info["trigger_data"]
@@ -199,26 +202,6 @@ def async_on_event(event_data: dict, device: dr.DeviceEntry | None = None) -> No
 
         hass.async_run_hass_job(job, {"trigger": payload})
 
-    if not nodes:
-        entry_id = config[ATTR_CONFIG_ENTRY_ID]
-        client: Client = hass.data[DOMAIN][entry_id][DATA_CLIENT]
-        assert client.driver
-        if event_source == "controller":
-            unsubs.append(client.driver.controller.on(event_name, async_on_event))
-        else:
-            unsubs.append(client.driver.on(event_name, async_on_event))
-
-    for node in nodes:
-        driver = node.client.driver
-        assert driver is not None  # The node comes from the driver.
-        device_identifier = get_device_id(driver, node)
-        device = dev_reg.async_get_device({device_identifier})
-        assert device
-        # We need to store the device for the callback
-        unsubs.append(
-            node.on(event_name, functools.partial(async_on_event, device=device))
-        )
-
     @callback
     def async_remove() -> None:
         """Remove state listeners async."""
@@ -226,4 +209,45 @@ def async_remove() -> None:
             unsub()
         unsubs.clear()
 
+    @callback
+    def _create_zwave_listeners() -> None:
+        """Create Z-Wave JS listeners."""
+        async_remove()
+        # Nodes list can come from different drivers and we will need to listen to
+        # server connections for all of them.
+        drivers: set[Driver] = set()
+        if not (nodes := async_get_nodes_from_targets(hass, config, dev_reg=dev_reg)):
+            entry_id = config[ATTR_CONFIG_ENTRY_ID]
+            client: Client = hass.data[DOMAIN][entry_id][DATA_CLIENT]
+            driver = client.driver
+            assert driver
+            drivers.add(driver)
+            if event_source == "controller":
+                unsubs.append(driver.controller.on(event_name, async_on_event))
+            else:
+                unsubs.append(driver.on(event_name, async_on_event))
+
+        for node in nodes:
+            driver = node.client.driver
+            assert driver is not None  # The node comes from the driver.
+            drivers.add(driver)
+            device_identifier = get_device_id(driver, node)
+            device = dev_reg.async_get_device({device_identifier})
+            assert device
+            # We need to store the device for the callback
+            unsubs.append(
+                node.on(event_name, functools.partial(async_on_event, device=device))
+            )
+
+        for driver in drivers:
+            unsubs.append(
+                async_dispatcher_connect(
+                    hass,
+                    f"{DOMAIN}_{driver.controller.home_id}_connected_to_server",
+                    _create_zwave_listeners,
+                )
+            )
+
+    _create_zwave_listeners()
+
     return async_remove
diff --git a/homeassistant/components/zwave_js/triggers/value_updated.py b/homeassistant/components/zwave_js/triggers/value_updated.py
index 655d1f9070ed24..52ecc0a7742298 100644
--- a/homeassistant/components/zwave_js/triggers/value_updated.py
+++ b/homeassistant/components/zwave_js/triggers/value_updated.py
@@ -1,15 +1,18 @@
 """Offer Z-Wave JS value updated listening automation trigger."""
 from __future__ import annotations
 
+from collections.abc import Callable
 import functools
 
 import voluptuous as vol
 from zwave_js_server.const import CommandClass
+from zwave_js_server.model.driver import Driver
 from zwave_js_server.model.value import Value, get_value_id_str
 
 from homeassistant.const import ATTR_DEVICE_ID, ATTR_ENTITY_ID, CONF_PLATFORM, MATCH_ALL
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
@@ -88,7 +91,7 @@ async def async_attach_trigger(
 ) -> CALLBACK_TYPE:
     """Listen for state changes based on configuration."""
     dev_reg = dr.async_get(hass)
-    if not (nodes := async_get_nodes_from_targets(hass, config, dev_reg=dev_reg)):
+    if not async_get_nodes_from_targets(hass, config, dev_reg=dev_reg):
         raise ValueError(
             f"No nodes found for given {ATTR_DEVICE_ID}s or {ATTR_ENTITY_ID}s."
         )
@@ -99,7 +102,7 @@ async def async_attach_trigger(
     property_ = config[ATTR_PROPERTY]
     endpoint = config.get(ATTR_ENDPOINT)
     property_key = config.get(ATTR_PROPERTY_KEY)
-    unsubs = []
+    unsubs: list[Callable] = []
     job = HassJob(action)
 
     trigger_data = trigger_info["trigger_data"]
@@ -153,29 +156,11 @@ def async_on_value_updated(
             ATTR_PREVIOUS_VALUE_RAW: prev_value_raw,
             ATTR_CURRENT_VALUE: curr_value,
             ATTR_CURRENT_VALUE_RAW: curr_value_raw,
-            "description": f"Z-Wave value {value_id} updated on {device_name}",
+            "description": f"Z-Wave value {value.value_id} updated on {device_name}",
         }
 
         hass.async_run_hass_job(job, {"trigger": payload})
 
-    for node in nodes:
-        driver = node.client.driver
-        assert driver is not None  # The node comes from the driver.
-        device_identifier = get_device_id(driver, node)
-        device = dev_reg.async_get_device({device_identifier})
-        assert device
-        value_id = get_value_id_str(
-            node, command_class, property_, endpoint, property_key
-        )
-        value = node.values[value_id]
-        # We need to store the current value and device for the callback
-        unsubs.append(
-            node.on(
-                "value updated",
-                functools.partial(async_on_value_updated, value, device),
-            )
-        )
-
     @callback
     def async_remove() -> None:
         """Remove state listeners async."""
@@ -183,4 +168,40 @@ def async_remove() -> None:
             unsub()
         unsubs.clear()
 
+    def _create_zwave_listeners() -> None:
+        """Create Z-Wave JS listeners."""
+        async_remove()
+        # Nodes list can come from different drivers and we will need to listen to
+        # server connections for all of them.
+        drivers: set[Driver] = set()
+        for node in async_get_nodes_from_targets(hass, config, dev_reg=dev_reg):
+            driver = node.client.driver
+            assert driver is not None  # The node comes from the driver.
+            drivers.add(driver)
+            device_identifier = get_device_id(driver, node)
+            device = dev_reg.async_get_device({device_identifier})
+            assert device
+            value_id = get_value_id_str(
+                node, command_class, property_, endpoint, property_key
+            )
+            value = node.values[value_id]
+            # We need to store the current value and device for the callback
+            unsubs.append(
+                node.on(
+                    "value updated",
+                    functools.partial(async_on_value_updated, value, device),
+                )
+            )
+
+        for driver in drivers:
+            unsubs.append(
+                async_dispatcher_connect(
+                    hass,
+                    f"{DOMAIN}_{driver.controller.home_id}_connected_to_server",
+                    _create_zwave_listeners,
+                )
+            )
+
+    _create_zwave_listeners()
+
     return async_remove
diff --git a/homeassistant/components/zwave_js/update.py b/homeassistant/components/zwave_js/update.py
index 70d12b22dedc1e..5b7c157552ad3b 100644
--- a/homeassistant/components/zwave_js/update.py
+++ b/homeassistant/components/zwave_js/update.py
@@ -42,6 +42,7 @@
 
 UPDATE_DELAY_STRING = "delay"
 UPDATE_DELAY_INTERVAL = 5  # In minutes
+ATTR_LATEST_VERSION_FIRMWARE = "latest_version_firmware"
 
 
 @dataclass
@@ -53,7 +54,7 @@ class ZWaveNodeFirmwareUpdateExtraStoredData(ExtraStoredData):
     def as_dict(self) -> dict[str, Any]:
         """Return a dict representation of the extra data."""
         return {
-            "latest_version_firmware": asdict(self.latest_version_firmware)
+            ATTR_LATEST_VERSION_FIRMWARE: asdict(self.latest_version_firmware)
             if self.latest_version_firmware
             else None
         }
@@ -61,7 +62,7 @@ def as_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> ZWaveNodeFirmwareUpdateExtraStoredData:
         """Initialize the extra data from a dict."""
-        if not (firmware_dict := data["latest_version_firmware"]):
+        if not (firmware_dict := data[ATTR_LATEST_VERSION_FIRMWARE]):
             return cls(None)
 
         return cls(NodeFirmwareUpdateInfo.from_dict(firmware_dict))
@@ -291,6 +292,9 @@ async def async_install(
 
     async def async_poll_value(self, _: bool) -> None:
         """Poll a value."""
+        # We log an error instead of raising an exception because this service call occurs
+        # in a separate task since it is called via the dispatcher and we don't want to
+        # raise the exception in that separate task because it is confusing to the user.
         LOGGER.error(
             "There is no value to refresh for this entity so the zwave_js.refresh_value"
             " service won't work for it"
@@ -317,26 +321,30 @@ async def async_added_to_hass(self) -> None:
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                f"{DOMAIN}_{self._base_unique_id}_remove_entity_on_ready_node",
+                f"{DOMAIN}_{self._base_unique_id}_remove_entity_on_interview_started",
                 self.async_remove,
             )
         )
 
         # If we have a complete previous state, use that to set the latest version
-        if (state := await self.async_get_last_state()) and (
-            extra_data := await self.async_get_last_extra_data()
+        if (
+            (state := await self.async_get_last_state())
+            and (latest_version := state.attributes.get(ATTR_LATEST_VERSION))
+            is not None
+            and (extra_data := await self.async_get_last_extra_data())
         ):
-            self._attr_latest_version = state.attributes[ATTR_LATEST_VERSION]
+            self._attr_latest_version = latest_version
             self._latest_version_firmware = (
                 ZWaveNodeFirmwareUpdateExtraStoredData.from_dict(
                     extra_data.as_dict()
                 ).latest_version_firmware
             )
-        # If we have no state to restore, we can set the latest version to installed
-        # so that the entity starts as off. If we have partial restore data due to an
-        # upgrade to an HA version where this feature is released from one that is not
-        # the entity will start in an unknown state until we can correct on next update
-        elif not state:
+        # If we have no state or latest version to restore, we can set the latest
+        # version to installed so that the entity starts as off. If we have partial
+        # restore data due to an upgrade to an HA version where this feature is released
+        # from one that is not the entity will start in an unknown state until we can
+        # correct on next update
+        elif not state or not latest_version:
             self._attr_latest_version = self._attr_installed_version
 
         # Spread updates out in 5 minute increments to avoid flooding the network
diff --git a/homeassistant/components/zwave_me/__init__.py b/homeassistant/components/zwave_me/__init__.py
index f49d203cb26aaf..1740820d0ba52f 100644
--- a/homeassistant/components/zwave_me/__init__.py
+++ b/homeassistant/components/zwave_me/__init__.py
@@ -115,7 +115,7 @@ async def async_setup_platforms(
 class ZWaveMeEntity(Entity):
     """Representation of a ZWaveMe device."""
 
-    def __init__(self, controller: ZWaveMeController, device: ZWaveMeData) -> None:
+    def __init__(self, controller, device):
         """Initialize the device."""
         self.controller = controller
         self.device = device
@@ -124,9 +124,13 @@ def __init__(self, controller: ZWaveMeController, device: ZWaveMeData) -> None:
             f"{self.controller.config.unique_id}-{self.device.id}"
         )
         self._attr_should_poll = False
-        self._attr_device_info = DeviceInfo(
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device specific attributes."""
+        return DeviceInfo(
             identifiers={(DOMAIN, self.device.deviceIdentifier)},
-            name=device.title,
+            name=self._attr_name,
             manufacturer=self.device.manufacturer,
             sw_version=self.device.firmware,
             suggested_area=self.device.locationName,
diff --git a/homeassistant/components/zwave_me/manifest.json b/homeassistant/components/zwave_me/manifest.json
index 5870874efa8041..d5c5a69cb96f55 100644
--- a/homeassistant/components/zwave_me/manifest.json
+++ b/homeassistant/components/zwave_me/manifest.json
@@ -6,7 +6,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zwave_me",
   "iot_class": "local_push",
-  "requirements": ["zwave_me_ws==0.4.3", "url-normalize==1.4.3"],
+  "requirements": ["zwave-me-ws==0.4.3", "url-normalize==1.4.3"],
   "zeroconf": [
     {
       "type": "_hap._tcp.local.",
diff --git a/homeassistant/config.py b/homeassistant/config.py
index 0a5da91d9421a7..eed296baf0ec2b 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -96,10 +96,6 @@
 frontend:
   themes: !include_dir_merge_named themes
 
-# Text to speech
-tts:
-  - platform: google_translate
-
 automation: !include {AUTOMATION_CONFIG_PATH}
 script: !include {SCRIPT_CONFIG_PATH}
 scene: !include {SCENE_CONFIG_PATH}
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index adbb2f80f64603..9e27f6efb3e995 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -10,9 +10,8 @@
 import functools
 import logging
 from random import randint
-from types import MappingProxyType, MethodType
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, TypeVar, cast
-import weakref
 
 from typing_extensions import Self
 
@@ -29,6 +28,7 @@
     HomeAssistantError,
 )
 from .helpers import device_registry, entity_registry, storage
+from .helpers.debounce import Debouncer
 from .helpers.dispatcher import async_dispatcher_send
 from .helpers.event import (
     RANDOM_MICROSECOND_MAX,
@@ -88,6 +88,8 @@
 
 SAVE_DELAY = 1
 
+DISCOVERY_COOLDOWN = 1
+
 _R = TypeVar("_R")
 
 
@@ -300,9 +302,7 @@ def __init__(
         self.supports_remove_device: bool | None = None
 
         # Listeners to call on update
-        self.update_listeners: list[
-            weakref.ReferenceType[UpdateListenerType] | weakref.WeakMethod
-        ] = []
+        self.update_listeners: list[UpdateListenerType] = []
 
         # Reason why config entry is in a failed state
         self.reason: str | None = None
@@ -650,16 +650,8 @@ def add_update_listener(self, listener: UpdateListenerType) -> CALLBACK_TYPE:
 
         Returns function to unlisten.
         """
-        weak_listener: Any
-        # weakref.ref is not applicable to a bound method, e.g.,
-        # method of a class instance, as reference will die immediately.
-        if hasattr(listener, "__self__"):
-            weak_listener = weakref.WeakMethod(cast(MethodType, listener))
-        else:
-            weak_listener = weakref.ref(listener)
-        self.update_listeners.append(weak_listener)
-
-        return lambda: self.update_listeners.remove(weak_listener)
+        self.update_listeners.append(listener)
+        return lambda: self.update_listeners.remove(listener)
 
     def as_dict(self) -> dict[str, Any]:
         """Return dictionary version of this entry."""
@@ -745,9 +737,10 @@ def async_get_active_flows(
         """Get any active flows of certain sources for this entry."""
         return (
             flow
-            for flow in hass.config_entries.flow.async_progress_by_handler(self.domain)
+            for flow in hass.config_entries.flow.async_progress_by_handler(
+                self.domain, match_context={"entry_id": self.entry_id}
+            )
             if flow["context"].get("source") in sources
-            and flow["context"].get("entry_id") == self.entry_id
         )
 
     @callback
@@ -807,6 +800,13 @@ def __init__(
         self._hass_config = hass_config
         self._pending_import_flows: dict[str, dict[str, asyncio.Future[None]]] = {}
         self._initialize_tasks: dict[str, list[asyncio.Task]] = {}
+        self._discovery_debouncer = Debouncer(
+            hass,
+            _LOGGER,
+            cooldown=DISCOVERY_COOLDOWN,
+            immediate=True,
+            function=self._async_discovery,
+        )
 
     async def async_wait_import_flow_initialized(self, handler: str) -> None:
         """Wait till all import flows in progress are initialized."""
@@ -882,6 +882,7 @@ async def async_shutdown(self) -> None:
         for task_list in self._initialize_tasks.values():
             for task in task_list:
                 task.cancel()
+        await self._discovery_debouncer.async_shutdown()
 
     async def async_finish_flow(
         self, flow: data_entry_flow.FlowHandler, result: data_entry_flow.FlowResult
@@ -978,16 +979,7 @@ async def async_post_init(
 
         # Create notification.
         if source in DISCOVERY_SOURCES:
-            self.hass.bus.async_fire(EVENT_FLOW_DISCOVERED)
-            persistent_notification.async_create(
-                self.hass,
-                title="New devices discovered",
-                message=(
-                    "We have discovered new devices on your network. "
-                    "[Check it out](/config/integrations)."
-                ),
-                notification_id=DISCOVERY_NOTIFICATION_ID,
-            )
+            await self._discovery_debouncer.async_call()
         elif source == SOURCE_REAUTH:
             persistent_notification.async_create(
                 self.hass,
@@ -999,6 +991,20 @@ async def async_post_init(
                 notification_id=RECONFIGURE_NOTIFICATION_ID,
             )
 
+    @callback
+    def _async_discovery(self) -> None:
+        """Handle discovery."""
+        self.hass.bus.async_fire(EVENT_FLOW_DISCOVERED)
+        persistent_notification.async_create(
+            self.hass,
+            title="New devices discovered",
+            message=(
+                "We have discovered new devices on your network. "
+                "[Check it out](/config/integrations)."
+            ),
+            notification_id=DISCOVERY_NOTIFICATION_ID,
+        )
+
 
 class ConfigEntries:
     """Manage the configuration entries.
@@ -1086,16 +1092,9 @@ async def async_remove(self, entry_id: str) -> dict[str, Any]:
         # If the configuration entry is removed during reauth, it should
         # abort any reauth flow that is active for the removed entry.
         for progress_flow in self.hass.config_entries.flow.async_progress_by_handler(
-            entry.domain
+            entry.domain, match_context={"entry_id": entry_id, "source": SOURCE_REAUTH}
         ):
-            context = progress_flow.get("context")
-            if (
-                context
-                and context["source"] == SOURCE_REAUTH
-                and "entry_id" in context
-                and context["entry_id"] == entry_id
-                and "flow_id" in progress_flow
-            ):
+            if "flow_id" in progress_flow:
                 self.hass.config_entries.flow.async_abort(progress_flow["flow_id"])
 
         # After we have fully removed an "ignore" config entry we can try and rediscover
@@ -1338,12 +1337,11 @@ def async_update_entry(
         if not changed:
             return False
 
-        for listener_ref in entry.update_listeners:
-            if (listener := listener_ref()) is not None:
-                self.hass.async_create_task(
-                    listener(self.hass, entry),
-                    f"config entry update listener {entry.title} {entry.domain} {entry.domain}",
-                )
+        for listener in entry.update_listeners:
+            self.hass.async_create_task(
+                listener(self.hass, entry),
+                f"config entry update listener {entry.title} {entry.domain} {entry.domain}",
+            )
 
         self._async_schedule_save()
         self._async_dispatch(ConfigEntryChange.UPDATED, entry)
@@ -1577,17 +1575,20 @@ async def async_set_unique_id(
             return None
 
         if raise_on_progress:
-            for progress in self._async_in_progress(include_uninitialized=True):
-                if progress["context"].get("unique_id") == unique_id:
-                    raise data_entry_flow.AbortFlow("already_in_progress")
+            if self._async_in_progress(
+                include_uninitialized=True, match_context={"unique_id": unique_id}
+            ):
+                raise data_entry_flow.AbortFlow("already_in_progress")
 
         self.context["unique_id"] = unique_id
 
         # Abort discoveries done using the default discovery unique id
         if unique_id != DEFAULT_DISCOVERY_UNIQUE_ID:
-            for progress in self._async_in_progress(include_uninitialized=True):
-                if progress["context"].get("unique_id") == DEFAULT_DISCOVERY_UNIQUE_ID:
-                    self.hass.config_entries.flow.async_abort(progress["flow_id"])
+            for progress in self._async_in_progress(
+                include_uninitialized=True,
+                match_context={"unique_id": DEFAULT_DISCOVERY_UNIQUE_ID},
+            ):
+                self.hass.config_entries.flow.async_abort(progress["flow_id"])
 
         for entry in self._async_current_entries(include_ignore=True):
             if entry.unique_id == unique_id:
@@ -1633,13 +1634,17 @@ def _async_current_ids(self, include_ignore: bool = True) -> set[str | None]:
 
     @callback
     def _async_in_progress(
-        self, include_uninitialized: bool = False
+        self,
+        include_uninitialized: bool = False,
+        match_context: dict[str, Any] | None = None,
     ) -> list[data_entry_flow.FlowResult]:
         """Return other in progress flows for current domain."""
         return [
             flw
             for flw in self.hass.config_entries.flow.async_progress_by_handler(
-                self.handler, include_uninitialized=include_uninitialized
+                self.handler,
+                include_uninitialized=include_uninitialized,
+                match_context=match_context,
             )
             if flw["flow_id"] != self.flow_id
         ]
@@ -1713,11 +1718,10 @@ def async_abort(
         """Abort the config flow."""
         # Remove reauth notification if no reauth flows are in progress
         if self.source == SOURCE_REAUTH and not any(
-            ent["context"]["source"] == SOURCE_REAUTH
+            ent["flow_id"] != self.flow_id
             for ent in self.hass.config_entries.flow.async_progress_by_handler(
-                self.handler
+                self.handler, match_context={"source": SOURCE_REAUTH}
             )
-            if ent["flow_id"] != self.flow_id
         ):
             persistent_notification.async_dismiss(
                 self.hass, RECONFIGURE_NOTIFICATION_ID
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 46fc8b57568b72..f3d3d48fdd25ab 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -7,14 +7,14 @@
 
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2023
-MINOR_VERSION: Final = 6
+MINOR_VERSION: Final = 8
 PATCH_VERSION: Final = "0.dev0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 10, 0)
-REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 10, 0)
+REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 11, 0)
 # Truthy date string triggers showing related deprecation warning messages.
-REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = ""
+REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = "2023.8"
 
 # Format for platform files
 PLATFORM_FORMAT: Final = "{platform}.{domain}"
@@ -32,10 +32,12 @@ class Platform(StrEnum):
     CLIMATE = "climate"
     COVER = "cover"
     DATE = "date"
+    DATETIME = "datetime"
     DEVICE_TRACKER = "device_tracker"
     FAN = "fan"
     GEO_LOCATION = "geo_location"
     HUMIDIFIER = "humidifier"
+    IMAGE = "image"
     IMAGE_PROCESSING = "image_processing"
     LIGHT = "light"
     LOCK = "lock"
@@ -219,8 +221,9 @@ class Platform(StrEnum):
 CONF_REGION: Final = "region"
 CONF_REPEAT: Final = "repeat"
 CONF_RESOURCE: Final = "resource"
-CONF_RESOURCES: Final = "resources"
 CONF_RESOURCE_TEMPLATE: Final = "resource_template"
+CONF_RESOURCES: Final = "resources"
+CONF_RESPONSE_VARIABLE: Final = "response_variable"
 CONF_RGB: Final = "rgb"
 CONF_ROOM: Final = "room"
 CONF_SCAN_INTERVAL: Final = "scan_interval"
@@ -1165,6 +1168,11 @@ class UnitOfDataRate(StrEnum):
 
 SIGNAL_BOOTSTRAP_INTEGRATIONS = "bootstrap_integrations"
 
+# Date/Time formats
+FORMAT_DATE: Final = "%Y-%m-%d"
+FORMAT_TIME: Final = "%H:%M:%S"
+FORMAT_DATETIME: Final = f"{FORMAT_DATE} {FORMAT_TIME}"
+
 
 class EntityCategory(StrEnum):
     """Category of an entity.
diff --git a/homeassistant/core.py b/homeassistant/core.py
index b2a00cce038e1d..82ea72281570d0 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -16,7 +16,6 @@
 )
 import concurrent.futures
 from contextlib import suppress
-from contextvars import ContextVar
 import datetime
 import enum
 import functools
@@ -25,12 +24,12 @@
 import pathlib
 import re
 import threading
+import time
 from time import monotonic
 from typing import (
     TYPE_CHECKING,
     Any,
     Generic,
-    NamedTuple,
     ParamSpec,
     TypeVar,
     cast,
@@ -81,14 +80,16 @@
 )
 from .helpers.aiohttp_compat import restore_original_aiohttp_cancel_behavior
 from .helpers.json import json_dumps
-from .util import dt as dt_util, location, ulid as ulid_util
+from .util import dt as dt_util, location
 from .util.async_ import (
     cancelling,
     run_callback_threadsafe,
     shutdown_run_callback_threadsafe,
 )
+from .util.json import JsonObjectType
 from .util.read_only_dict import ReadOnlyDict
 from .util.timeout import TimeoutManager
+from .util.ulid import ulid, ulid_at_time
 from .util.unit_system import (
     _CONF_UNIT_SYSTEM_IMPERIAL,
     _CONF_UNIT_SYSTEM_US_CUSTOMARY,
@@ -129,8 +130,7 @@
 # How long to wait to log tasks that are blocking
 BLOCK_LOG_TIMEOUT = 60
 
-# How long we wait for the result of a service call
-SERVICE_CALL_LIMIT = 10  # seconds
+ServiceResponse = JsonObjectType | None
 
 
 class ConfigSource(StrEnum):
@@ -154,8 +154,6 @@ class ConfigSource(StrEnum):
 
 _LOGGER = logging.getLogger(__name__)
 
-_cv_hass: ContextVar[HomeAssistant] = ContextVar("hass")
-
 
 @functools.lru_cache(MAX_EXPECTED_ENTITY_IDS)
 def split_entity_id(entity_id: str) -> tuple[str, str]:
@@ -187,11 +185,6 @@ def valid_entity_id(entity_id: str) -> bool:
     return VALID_ENTITY_ID.match(entity_id) is not None
 
 
-def valid_state(state: str) -> bool:
-    """Test if a state is valid."""
-    return len(state) <= MAX_LENGTH_STATE_STATE
-
-
 def callback(func: _CallableT) -> _CallableT:
     """Annotation to mark method as safe to call from within the event loop."""
     setattr(func, "_hass_callback", True)
@@ -203,16 +196,27 @@ def is_callback(func: Callable[..., Any]) -> bool:
     return getattr(func, "_hass_callback", False) is True
 
 
+class _Hass(threading.local):
+    """Container which makes a HomeAssistant instance available to the event loop."""
+
+    hass: HomeAssistant | None = None
+
+
+_hass = _Hass()
+
+
 @callback
 def async_get_hass() -> HomeAssistant:
     """Return the HomeAssistant instance.
 
-    Raises LookupError if no HomeAssistant instance is available.
+    Raises HomeAssistantError when called from the wrong thread.
 
     This should be used where it's very cumbersome or downright impossible to pass
     hass to the code which needs it.
     """
-    return _cv_hass.get()
+    if not _hass.hass:
+        raise HomeAssistantError("async_get_hass called from the wrong thread")
+    return _hass.hass
 
 
 @enum.unique
@@ -296,9 +300,9 @@ class HomeAssistant:
     config_entries: ConfigEntries = None  # type: ignore[assignment]
 
     def __new__(cls) -> HomeAssistant:
-        """Set the _cv_hass context variable."""
+        """Set the _hass thread local data."""
         hass = super().__new__(cls)
-        _cv_hass.set(hass)
+        _hass.hass = hass
         return hass
 
     def __init__(self) -> None:
@@ -878,7 +882,7 @@ def __init__(
         id: str | None = None,  # pylint: disable=redefined-builtin
     ) -> None:
         """Init the context."""
-        self.id = id or ulid_util.ulid()
+        self.id = id or ulid()
         self.user_id = user_id
         self.parent_id = parent_id
         self.origin_event: Event | None = None
@@ -930,10 +934,14 @@ def __init__(
         self.data = data or {}
         self.origin = origin
         self.time_fired = time_fired or dt_util.utcnow()
-        self.context: Context = context or Context(
-            id=ulid_util.ulid_at_time(dt_util.utc_to_timestamp(self.time_fired))
-        )
+        if not context:
+            context = Context(
+                id=ulid_at_time(dt_util.utc_to_timestamp(self.time_fired))
+            )
+        self.context = context
         self._as_dict: ReadOnlyDict[str, Any] | None = None
+        if not context.origin_event:
+            context.origin_event = self
 
     def as_dict(self) -> ReadOnlyDict[str, Any]:
         """Create a dict representation of this Event.
@@ -963,20 +971,23 @@ def __repr__(self) -> str:
         return f"<Event {self.event_type}[{str(self.origin)[0]}]>"
 
 
-class _FilterableJob(NamedTuple):
-    """Event listener job to be executed with optional filter."""
-
-    job: HassJob[[Event], Coroutine[Any, Any, None] | None]
-    event_filter: Callable[[Event], bool] | None
-    run_immediately: bool
+_FilterableJobType = tuple[
+    HassJob[[Event], Coroutine[Any, Any, None] | None],  # job
+    Callable[[Event], bool] | None,  # event_filter
+    bool,  # run_immediately
+]
 
 
 class EventBus:
     """Allow the firing of and listening for events."""
 
+    __slots__ = ("_listeners", "_match_all_listeners", "_hass")
+
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize a new event bus."""
-        self._listeners: dict[str, list[_FilterableJob]] = {}
+        self._listeners: dict[str, list[_FilterableJobType]] = {}
+        self._match_all_listeners: list[_FilterableJobType] = []
+        self._listeners[MATCH_ALL] = self._match_all_listeners
         self._hass = hass
 
     @callback
@@ -1023,20 +1034,19 @@ def async_fire(
             )
 
         listeners = self._listeners.get(event_type, [])
+        match_all_listeners = self._match_all_listeners
+
+        if not listeners and not match_all_listeners:
+            return
 
-        # EVENT_HOMEASSISTANT_CLOSE should go only to this listeners
-        match_all_listeners = self._listeners.get(MATCH_ALL)
-        if match_all_listeners is not None and event_type != EVENT_HOMEASSISTANT_CLOSE:
+        # EVENT_HOMEASSISTANT_CLOSE should not be sent to MATCH_ALL listeners
+        if event_type != EVENT_HOMEASSISTANT_CLOSE:
             listeners = match_all_listeners + listeners
 
         event = Event(event_type, event_data, origin, time_fired, context)
-        if not event.context.origin_event:
-            event.context.origin_event = event
-
-        _LOGGER.debug("Bus:Handling %s", event)
 
-        if not listeners:
-            return
+        if _LOGGER.isEnabledFor(logging.DEBUG):
+            _LOGGER.debug("Bus:Handling %s", event)
 
         for job, event_filter, run_immediately in listeners:
             if event_filter is not None:
@@ -1103,14 +1113,12 @@ def async_listen(
             raise HomeAssistantError(f"Event listener {listener} is not a callback")
         return self._async_listen_filterable_job(
             event_type,
-            _FilterableJob(
-                HassJob(listener, f"listen {event_type}"), event_filter, run_immediately
-            ),
+            (HassJob(listener, f"listen {event_type}"), event_filter, run_immediately),
         )
 
     @callback
     def _async_listen_filterable_job(
-        self, event_type: str, filterable_job: _FilterableJob
+        self, event_type: str, filterable_job: _FilterableJobType
     ) -> CALLBACK_TYPE:
         self._listeners.setdefault(event_type, []).append(filterable_job)
 
@@ -1157,7 +1165,7 @@ def async_listen_once(
 
         This method must be run in the event loop.
         """
-        filterable_job: _FilterableJob | None = None
+        filterable_job: _FilterableJobType | None = None
 
         @callback
         def _onetime_listener(event: Event) -> None:
@@ -1179,7 +1187,7 @@ def _onetime_listener(event: Event) -> None:
             _onetime_listener, listener, ("__name__", "__qualname__", "__module__"), []
         )
 
-        filterable_job = _FilterableJob(
+        filterable_job = (
             HassJob(_onetime_listener, f"onetime listen {event_type} {listener}"),
             None,
             False,
@@ -1189,7 +1197,7 @@ def _onetime_listener(event: Event) -> None:
 
     @callback
     def _async_remove_listener(
-        self, event_type: str, filterable_job: _FilterableJob
+        self, event_type: str, filterable_job: _FilterableJobType
     ) -> None:
         """Remove a listener of a specific event_type.
 
@@ -1199,7 +1207,7 @@ def _async_remove_listener(
             self._listeners[event_type].remove(filterable_job)
 
             # delete event_type list if empty
-            if not self._listeners[event_type]:
+            if not self._listeners[event_type] and event_type != MATCH_ALL:
                 self._listeners.pop(event_type)
         except (KeyError, ValueError):
             # KeyError is key event_type listener did not exist
@@ -1255,7 +1263,7 @@ def __init__(
                 "Format should be <domain>.<object_id>"
             )
 
-        if not valid_state(state):
+        if len(state) > MAX_LENGTH_STATE_STATE:
             raise InvalidStateError(
                 f"Invalid state encountered for entity ID: {entity_id}. "
                 "State max length is 255 characters."
@@ -1412,6 +1420,8 @@ def __repr__(self) -> str:
 class StateMachine:
     """Helper class that tracks the state of different entities."""
 
+    __slots__ = ("_states", "_reservations", "_bus", "_loop")
+
     def __init__(self, bus: EventBus, loop: asyncio.events.AbstractEventLoop) -> None:
         """Initialize state machine."""
         self._states: dict[str, State] = {}
@@ -1620,10 +1630,24 @@ def async_set(
         if same_state and same_attr:
             return
 
-        now = dt_util.utcnow()
-
         if context is None:
-            context = Context(id=ulid_util.ulid_at_time(dt_util.utc_to_timestamp(now)))
+            # It is much faster to convert a timestamp to a utc datetime object
+            # than converting a utc datetime object to a timestamp since cpython
+            # does not have a fast path for handling the UTC timezone and has to do
+            # multiple local timezone conversions.
+            #
+            # from_timestamp implementation:
+            # https://github.com/python/cpython/blob/c90a862cdcf55dc1753c6466e5fa4a467a13ae24/Modules/_datetimemodule.c#L2936
+            #
+            # timestamp implementation:
+            # https://github.com/python/cpython/blob/c90a862cdcf55dc1753c6466e5fa4a467a13ae24/Modules/_datetimemodule.c#L6387
+            # https://github.com/python/cpython/blob/c90a862cdcf55dc1753c6466e5fa4a467a13ae24/Modules/_datetimemodule.c#L6323
+            timestamp = time.time()
+            now = dt_util.utc_from_timestamp(timestamp)
+            context = Context(id=ulid_at_time(timestamp))
+        else:
+            now = dt_util.utcnow()
+
         state = State(
             entity_id,
             new_state,
@@ -1645,28 +1669,43 @@ def async_set(
         )
 
 
+class SupportsResponse(StrEnum):
+    """Service call response configuration."""
+
+    NONE = "none"
+    """The service does not support responses (the default)."""
+
+    OPTIONAL = "optional"
+    """The service optionally returns response data when asked by the caller."""
+
+    ONLY = "only"
+    """The service is read-only and the caller must always ask for response data."""
+
+
 class Service:
     """Representation of a callable service."""
 
-    __slots__ = ["job", "schema", "domain", "service"]
+    __slots__ = ["job", "schema", "domain", "service", "supports_response"]
 
     def __init__(
         self,
-        func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        func: Callable[[ServiceCall], Coroutine[Any, Any, ServiceResponse] | None],
         schema: vol.Schema | None,
         domain: str,
         service: str,
         context: Context | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Initialize a service."""
         self.job = HassJob(func, f"service {domain}.{service}")
         self.schema = schema
+        self.supports_response = supports_response
 
 
 class ServiceCall:
     """Representation of a call to a service."""
 
-    __slots__ = ["domain", "service", "data", "context"]
+    __slots__ = ("domain", "service", "data", "context", "return_response")
 
     def __init__(
         self,
@@ -1674,12 +1713,14 @@ def __init__(
         service: str,
         data: dict[str, Any] | None = None,
         context: Context | None = None,
+        return_response: bool = False,
     ) -> None:
         """Initialize a service call."""
-        self.domain = domain.lower()
-        self.service = service.lower()
+        self.domain = domain
+        self.service = service
         self.data = ReadOnlyDict(data or {})
         self.context = context or Context()
+        self.return_response = return_response
 
     def __repr__(self) -> str:
         """Return the representation of the service."""
@@ -1695,6 +1736,8 @@ def __repr__(self) -> str:
 class ServiceRegistry:
     """Offer the services over the eventbus."""
 
+    __slots__ = ("_services", "_hass")
+
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize a service registry."""
         self._services: dict[str, dict[str, Service]] = {}
@@ -1720,11 +1763,25 @@ def has_service(self, domain: str, service: str) -> bool:
         """
         return service.lower() in self._services.get(domain.lower(), [])
 
+    def supports_response(self, domain: str, service: str) -> SupportsResponse:
+        """Return whether or not the service supports response data.
+
+        This exists so that callers can return more helpful error messages given
+        the context. Will return NONE if the service does not exist as there is
+        other error handling when calling the service if it does not exist.
+        """
+        if not (handler := self._services[domain][service]):
+            return SupportsResponse.NONE
+        return handler.supports_response
+
     def register(
         self,
         domain: str,
         service: str,
-        service_func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        service_func: Callable[
+            [ServiceCall],
+            Coroutine[Any, Any, ServiceResponse] | None,
+        ],
         schema: vol.Schema | None = None,
     ) -> None:
         """Register a service.
@@ -1740,8 +1797,11 @@ def async_register(
         self,
         domain: str,
         service: str,
-        service_func: Callable[[ServiceCall], Coroutine[Any, Any, None] | None],
+        service_func: Callable[
+            [ServiceCall], Coroutine[Any, Any, ServiceResponse] | None
+        ],
         schema: vol.Schema | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Register a service.
 
@@ -1751,7 +1811,9 @@ def async_register(
         """
         domain = domain.lower()
         service = service.lower()
-        service_obj = Service(service_func, schema, domain, service)
+        service_obj = Service(
+            service_func, schema, domain, service, supports_response=supports_response
+        )
 
         if domain in self._services:
             self._services[domain][service] = service_obj
@@ -1797,16 +1859,22 @@ def call(
         service_data: dict[str, Any] | None = None,
         blocking: bool = False,
         context: Context | None = None,
-        limit: float | None = SERVICE_CALL_LIMIT,
         target: dict[str, Any] | None = None,
-    ) -> bool | None:
+        return_response: bool = False,
+    ) -> ServiceResponse:
         """Call a service.
 
         See description of async_call for details.
         """
         return asyncio.run_coroutine_threadsafe(
             self.async_call(
-                domain, service, service_data, blocking, context, limit, target
+                domain,
+                service,
+                service_data,
+                blocking,
+                context,
+                target,
+                return_response,
             ),
             self._hass.loop,
         ).result()
@@ -1818,16 +1886,16 @@ async def async_call(
         service_data: dict[str, Any] | None = None,
         blocking: bool = False,
         context: Context | None = None,
-        limit: float | None = SERVICE_CALL_LIMIT,
         target: dict[str, Any] | None = None,
-    ) -> bool | None:
+        return_response: bool = False,
+    ) -> ServiceResponse:
         """Call a service.
 
         Specify blocking=True to wait until service is executed.
-        Waits a maximum of limit, which may be None for no timeout.
 
-        If blocking = True, will return boolean if service executed
-        successfully within limit.
+        If return_response=True, indicates that the caller can consume return values
+        from the service, if any. Return values are a dict that can be returned by the
+        standard JSON serialization process. Return values can only be used with blocking=True.
 
         This method will fire an event to indicate the service has been called.
 
@@ -1836,15 +1904,34 @@ async def async_call(
 
         This method is a coroutine.
         """
-        domain = domain.lower()
-        service = service.lower()
         context = context or Context()
         service_data = service_data or {}
 
         try:
             handler = self._services[domain][service]
         except KeyError:
-            raise ServiceNotFound(domain, service) from None
+            # Almost all calls are already lower case, so we avoid
+            # calling lower() on the arguments in the common case.
+            domain = domain.lower()
+            service = service.lower()
+            try:
+                handler = self._services[domain][service]
+            except KeyError:
+                raise ServiceNotFound(domain, service) from None
+
+        if return_response:
+            if not blocking:
+                raise ValueError(
+                    "Invalid argument return_response=True when blocking=False"
+                )
+            if handler.supports_response == SupportsResponse.NONE:
+                raise ValueError(
+                    "Invalid argument return_response=True when handler does not support responses"
+                )
+        elif handler.supports_response == SupportsResponse.ONLY:
+            raise ValueError(
+                "Service call requires responses but caller did not ask for responses"
+            )
 
         if target:
             service_data.update(target)
@@ -1863,13 +1950,15 @@ async def async_call(
         else:
             processed_data = service_data
 
-        service_call = ServiceCall(domain, service, processed_data, context)
+        service_call = ServiceCall(
+            domain, service, processed_data, context, return_response
+        )
 
         self._hass.bus.async_fire(
             EVENT_CALL_SERVICE,
             {
-                ATTR_DOMAIN: domain.lower(),
-                ATTR_SERVICE: service.lower(),
+                ATTR_DOMAIN: domain,
+                ATTR_SERVICE: service,
                 ATTR_SERVICE_DATA: service_data,
             },
             context=context,
@@ -1877,75 +1966,57 @@ async def async_call(
 
         coro = self._execute_service(handler, service_call)
         if not blocking:
-            self._run_service_in_background(coro, service_call)
+            self._hass.async_create_task(
+                self._run_service_call_catch_exceptions(coro, service_call),
+                f"service call background {service_call.domain}.{service_call.service}",
+            )
             return None
 
-        task = self._hass.async_create_task(coro)
-        try:
-            await asyncio.wait({task}, timeout=limit)
-        except asyncio.CancelledError:
-            # Task calling us was cancelled, so cancel service call task, and wait for
-            # it to be cancelled, within reason, before leaving.
-            _LOGGER.debug("Service call was cancelled: %s", service_call)
-            task.cancel()
-            await asyncio.wait({task}, timeout=SERVICE_CALL_LIMIT)
-            raise
-
-        if task.cancelled():
-            # Service call task was cancelled some other way, such as during shutdown.
-            _LOGGER.debug("Service was cancelled: %s", service_call)
-            raise asyncio.CancelledError
-        if task.done():
-            # Propagate any exceptions that might have happened during service call.
-            task.result()
-            # Service call completed successfully!
-            return True
-        # Service call task did not complete before timeout expired.
-        # Let it keep running in background.
-        self._run_service_in_background(task, service_call)
-        _LOGGER.debug("Service did not complete before timeout: %s", service_call)
-        return False
+        response_data = await coro
+        if not return_response:
+            return None
+        if not isinstance(response_data, dict):
+            raise HomeAssistantError(
+                f"Service response data expected a dictionary, was {type(response_data)}"
+            )
+        return response_data
 
-    def _run_service_in_background(
+    async def _run_service_call_catch_exceptions(
         self,
-        coro_or_task: Coroutine[Any, Any, None] | asyncio.Task[None],
+        coro_or_task: Coroutine[Any, Any, Any] | asyncio.Task[Any],
         service_call: ServiceCall,
     ) -> None:
         """Run service call in background, catching and logging any exceptions."""
-
-        async def catch_exceptions() -> None:
-            try:
-                await coro_or_task
-            except Unauthorized:
-                _LOGGER.warning(
-                    "Unauthorized service called %s/%s",
-                    service_call.domain,
-                    service_call.service,
-                )
-            except asyncio.CancelledError:
-                _LOGGER.debug("Service was cancelled: %s", service_call)
-            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Error executing service: %s", service_call)
-
-        self._hass.async_create_task(
-            catch_exceptions(),
-            f"service call background {service_call.domain}.{service_call.service}",
-        )
+        try:
+            await coro_or_task
+        except Unauthorized:
+            _LOGGER.warning(
+                "Unauthorized service called %s/%s",
+                service_call.domain,
+                service_call.service,
+            )
+        except asyncio.CancelledError:
+            _LOGGER.debug("Service was cancelled: %s", service_call)
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Error executing service: %s", service_call)
 
     async def _execute_service(
         self, handler: Service, service_call: ServiceCall
-    ) -> None:
+    ) -> ServiceResponse:
         """Execute a service."""
-        if handler.job.job_type == HassJobType.Coroutinefunction:
-            await cast(Callable[[ServiceCall], Awaitable[None]], handler.job.target)(
-                service_call
-            )
-        elif handler.job.job_type == HassJobType.Callback:
-            cast(Callable[[ServiceCall], None], handler.job.target)(service_call)
-        else:
-            await self._hass.async_add_executor_job(
-                cast(Callable[[ServiceCall], None], handler.job.target), service_call
-            )
+        job = handler.job
+        target = job.target
+        if job.job_type == HassJobType.Coroutinefunction:
+            if TYPE_CHECKING:
+                target = cast(Callable[..., Coroutine[Any, Any, _R]], target)
+            return await target(service_call)
+        if job.job_type == HassJobType.Callback:
+            if TYPE_CHECKING:
+                target = cast(Callable[..., _R], target)
+            return target(service_call)
+        if TYPE_CHECKING:
+            target = cast(Callable[..., _R], target)
+        return await self._hass.async_add_executor_job(target, service_call)
 
 
 class Config:
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index e213814f52cc7f..6f125ce359a940 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -164,16 +164,19 @@ async def async_post_init(self, flow: FlowHandler, result: FlowResult) -> None:
 
     @callback
     def async_has_matching_flow(
-        self, handler: str, context: dict[str, Any], data: Any
+        self, handler: str, match_context: dict[str, Any], data: Any
     ) -> bool:
         """Check if an existing matching flow is in progress.
 
         A flow with the same handler, context, and data.
+
+        If match_context is passed, only return flows with a context that is a
+        superset of match_context.
         """
         return any(
             flow
-            for flow in self._async_progress_by_handler(handler)
-            if flow.context["source"] == context["source"] and flow.init_data == data
+            for flow in self._async_progress_by_handler(handler, match_context)
+            if flow.init_data == data
         )
 
     @callback
@@ -192,11 +195,19 @@ def async_progress(self, include_uninitialized: bool = False) -> list[FlowResult
 
     @callback
     def async_progress_by_handler(
-        self, handler: str, include_uninitialized: bool = False
+        self,
+        handler: str,
+        include_uninitialized: bool = False,
+        match_context: dict[str, Any] | None = None,
     ) -> list[FlowResult]:
-        """Return the flows in progress by handler as a partial FlowResult."""
+        """Return the flows in progress by handler as a partial FlowResult.
+
+        If match_context is specified, only return flows with a context that
+        is a superset of match_context.
+        """
         return _async_flow_handler_to_flow_result(
-            self._async_progress_by_handler(handler), include_uninitialized
+            self._async_progress_by_handler(handler, match_context),
+            include_uninitialized,
         )
 
     @callback
@@ -217,11 +228,26 @@ def async_progress_by_init_data_type(
         )
 
     @callback
-    def _async_progress_by_handler(self, handler: str) -> list[FlowHandler]:
-        """Return the flows in progress by handler."""
+    def _async_progress_by_handler(
+        self, handler: str, match_context: dict[str, Any] | None
+    ) -> list[FlowHandler]:
+        """Return the flows in progress by handler.
+
+        If match_context is specified, only return flows with a context that
+        is a superset of match_context.
+        """
+        match_context_items = match_context.items() if match_context else None
         return [
-            self._progress[flow_id]
+            progress
             for flow_id in self._handler_progress_index.get(handler, {})
+            if (progress := self._progress[flow_id])
+            and (
+                not match_context_items
+                or (
+                    (context := progress.context)
+                    and match_context_items <= context.items()
+                )
+            )
         ]
 
     async def async_init(
diff --git a/homeassistant/generated/application_credentials.py b/homeassistant/generated/application_credentials.py
index 59e76a9c8aebcf..d1b330b5dbe726 100644
--- a/homeassistant/generated/application_credentials.py
+++ b/homeassistant/generated/application_credentials.py
@@ -20,4 +20,5 @@
     "withings",
     "xbox",
     "yolink",
+    "youtube",
 ]
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index 1b76aa2b56d43b..d8ffa25b765da0 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -32,6 +32,7 @@
         "airvisual",
         "airvisual_pro",
         "airzone",
+        "airzone_cloud",
         "aladdin_connect",
         "alarmdecoder",
         "amberelectric",
@@ -94,12 +95,14 @@
         "dialogflow",
         "directv",
         "discord",
+        "discovergy",
         "dlink",
         "dlna_dmr",
         "dlna_dms",
         "dnsip",
         "doorbird",
         "dormakaba_dkey",
+        "dremel_3d_printer",
         "dsmr",
         "dsmr_reader",
         "dunehd",
@@ -170,6 +173,7 @@
         "google_generative_ai_conversation",
         "google_mail",
         "google_sheets",
+        "google_translate",
         "google_travel_time",
         "govee_ble",
         "gpslogger",
@@ -233,6 +237,7 @@
         "lacrosse_view",
         "lametric",
         "landisgyr_heat_meter",
+        "lastfm",
         "launch_library",
         "laundrify",
         "ld2410_ble",
@@ -249,6 +254,7 @@
         "locative",
         "logi_circle",
         "lookin",
+        "loqed",
         "luftdaten",
         "lutron_caseta",
         "lyric",
@@ -282,6 +288,7 @@
         "mutesync",
         "myq",
         "mysensors",
+        "mystrom",
         "nam",
         "nanoleaf",
         "neato",
@@ -314,9 +321,11 @@
         "openai_conversation",
         "openexchangerates",
         "opengarage",
+        "openhome",
         "opentherm_gw",
         "openuv",
         "openweathermap",
+        "opower",
         "oralb",
         "otbr",
         "overkiz",
@@ -348,6 +357,7 @@
         "pvpc_hourly_pricing",
         "qbittorrent",
         "qingping",
+        "qnap",
         "qnap_qsw",
         "rachio",
         "radarr",
@@ -360,6 +370,7 @@
         "rdw",
         "recollect_waste",
         "renault",
+        "renson",
         "reolink",
         "rfxtrx",
         "rhasspy",
@@ -383,7 +394,6 @@
         "screenlogic",
         "season",
         "sense",
-        "senseme",
         "sensibo",
         "sensirion_ble",
         "sensorpro",
@@ -520,10 +530,12 @@
         "yeelight",
         "yolink",
         "youless",
+        "youtube",
         "zamg",
         "zerproc",
         "zeversolar",
         "zha",
+        "zodiac",
         "zwave_js",
         "zwave_me",
     ],
diff --git a/homeassistant/generated/dhcp.py b/homeassistant/generated/dhcp.py
index ce5536e62a4490..6c8910cd7f9900 100644
--- a/homeassistant/generated/dhcp.py
+++ b/homeassistant/generated/dhcp.py
@@ -501,14 +501,6 @@
         "hostname": "sense-*",
         "macaddress": "A4D578*",
     },
-    {
-        "domain": "senseme",
-        "registered_devices": True,
-    },
-    {
-        "domain": "senseme",
-        "macaddress": "20F85E*",
-    },
     {
         "domain": "sensibo",
         "hostname": "sensibo*",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index c9cd79e60dc31a..e8271f2cadec17 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -137,9 +137,20 @@
     },
     "airzone": {
       "name": "Airzone",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_polling"
+      "integrations": {
+        "airzone": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "local_polling",
+          "name": "Airzone"
+        },
+        "airzone_cloud": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "Airzone Cloud"
+        }
+      }
     },
     "aladdin_connect": {
       "name": "Aladdin Connect",
@@ -1080,6 +1091,12 @@
       "config_flow": true,
       "iot_class": "cloud_push"
     },
+    "discovergy": {
+      "name": "Discovergy",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "cloud_polling"
+    },
     "dlib_face_detect": {
       "name": "Dlib Face Detect",
       "integration_type": "hub",
@@ -1161,6 +1178,12 @@
       "integration_type": "hub",
       "config_flow": false
     },
+    "dremel_3d_printer": {
+      "name": "Dremel 3D Printer",
+      "integration_type": "device",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "dsmr": {
       "name": "DSMR Slimme Meter",
       "integration_type": "hub",
@@ -1984,12 +2007,6 @@
         }
       }
     },
-    "goalfeed": {
-      "name": "Goalfeed",
-      "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "cloud_push"
-    },
     "goalzero": {
       "name": "Goal Zero Yeti",
       "integration_type": "device",
@@ -2067,9 +2084,9 @@
         },
         "google_translate": {
           "integration_type": "hub",
-          "config_flow": false,
+          "config_flow": true,
           "iot_class": "cloud_push",
-          "name": "Google Translate Text-to-Speech"
+          "name": "Google Translate text-to-speech"
         },
         "google_travel_time": {
           "integration_type": "hub",
@@ -2105,6 +2122,12 @@
           "config_flow": true,
           "iot_class": "cloud_push",
           "name": "Dialogflow"
+        },
+        "youtube": {
+          "integration_type": "service",
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "YouTube"
         }
       }
     },
@@ -2835,7 +2858,7 @@
     "lastfm": {
       "name": "Last.fm",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "cloud_polling"
     },
     "launch_library": {
@@ -2987,7 +3010,6 @@
       "iot_class": "cloud_push"
     },
     "local_calendar": {
-      "name": "Local Calendar",
       "integration_type": "hub",
       "config_flow": true,
       "iot_class": "local_polling"
@@ -3062,6 +3084,12 @@
       "config_flow": true,
       "iot_class": "local_push"
     },
+    "loqed": {
+      "name": "LOQED Touch Smart Lock",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_push"
+    },
     "luftdaten": {
       "name": "Sensor.Community",
       "integration_type": "device",
@@ -3533,7 +3561,7 @@
     "mystrom": {
       "name": "myStrom",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_polling"
     },
     "mythicbeastsdns": {
@@ -3931,7 +3959,7 @@
     "openhome": {
       "name": "Linn / OpenHome",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_polling"
     },
     "opensensemap": {
@@ -3987,6 +4015,12 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
+    "opower": {
+      "name": "Opower",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "cloud_polling"
+    },
     "opple": {
       "name": "Opple",
       "integration_type": "hub",
@@ -4363,8 +4397,8 @@
       "name": "QNAP",
       "integrations": {
         "qnap": {
-          "integration_type": "hub",
-          "config_flow": false,
+          "integration_type": "device",
+          "config_flow": true,
           "iot_class": "local_polling",
           "name": "QNAP"
         },
@@ -4534,6 +4568,12 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
+    "renson": {
+      "name": "Renson",
+      "integration_type": "hub",
+      "config_flow": true,
+      "iot_class": "local_polling"
+    },
     "reolink": {
       "name": "Reolink IP NVR/camera",
       "integration_type": "hub",
@@ -4783,7 +4823,6 @@
       "iot_class": "local_polling"
     },
     "season": {
-      "name": "Season",
       "integration_type": "service",
       "config_flow": true,
       "iot_class": "local_polling"
@@ -4800,12 +4839,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "senseme": {
-      "name": "SenseME",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "sensibo": {
       "name": "Sensibo",
       "integration_type": "hub",
@@ -6377,6 +6410,12 @@
           "config_flow": true,
           "iot_class": "local_push",
           "name": "Yale Access Bluetooth"
+        },
+        "yale_home": {
+          "integration_type": "virtual",
+          "config_flow": false,
+          "supported_by": "august",
+          "name": "Yale Home"
         }
       }
     },
@@ -6506,8 +6545,8 @@
     "zodiac": {
       "name": "Zodiac",
       "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "local_polling"
+      "config_flow": true,
+      "iot_class": "calculated"
     },
     "zoneminder": {
       "name": "ZoneMinder",
@@ -6636,6 +6675,7 @@
     "input_text",
     "integration",
     "islamic_prayer_times",
+    "local_calendar",
     "local_ip",
     "min_max",
     "mobile_app",
@@ -6646,6 +6686,7 @@
     "proximity",
     "rpi_power",
     "schedule",
+    "season",
     "shopping_list",
     "sun",
     "switch_as_x",
diff --git a/homeassistant/generated/languages.py b/homeassistant/generated/languages.py
index b4aebb0f1a4e36..feedd373fd99d8 100644
--- a/homeassistant/generated/languages.py
+++ b/homeassistant/generated/languages.py
@@ -3,6 +3,8 @@
 To update, run python3 -m script.languages [frontend_tag]
 """
 
+DEFAULT_LANGUAGE = "en"
+
 LANGUAGES = {
     "af",
     "ar",
@@ -66,3 +68,46 @@
     "zh-Hans",
     "zh-Hant",
 }
+
+NATIVE_ENTITY_IDS = {
+    "af",
+    "bs",
+    "ca",
+    "cs",
+    "cy",
+    "da",
+    "de",
+    "en",
+    "en-GB",
+    "eo",
+    "es",
+    "es-419",
+    "et",
+    "eu",
+    "fi",
+    "fr",
+    "fy",
+    "gl",
+    "gsw",
+    "hr",
+    "hu",
+    "id",
+    "is",
+    "it",
+    "ka",
+    "lb",
+    "lt",
+    "lv",
+    "nb",
+    "nl",
+    "nn",
+    "pl",
+    "pt",
+    "pt-BR",
+    "ro",
+    "sk",
+    "sl",
+    "sr-Latn",
+    "sv",
+    "tr",
+}
diff --git a/homeassistant/generated/microsoft_tts.py b/homeassistant/generated/microsoft_tts.py
new file mode 100644
index 00000000000000..2b894e834ee1f4
--- /dev/null
+++ b/homeassistant/generated/microsoft_tts.py
@@ -0,0 +1,154 @@
+"""Automatically generated file.
+
+To update, run python3 -m script.microsoft_tts
+"""
+
+SUPPORTED_LANGUAGES = {
+    "af-za",
+    "am-et",
+    "ar-ae",
+    "ar-bh",
+    "ar-dz",
+    "ar-eg",
+    "ar-iq",
+    "ar-jo",
+    "ar-kw",
+    "ar-lb",
+    "ar-ly",
+    "ar-ma",
+    "ar-om",
+    "ar-qa",
+    "ar-sa",
+    "ar-sy",
+    "ar-tn",
+    "ar-ye",
+    "az-az",
+    "bg-bg",
+    "bn-bd",
+    "bn-in",
+    "bs-ba",
+    "ca-es",
+    "cs-cz",
+    "cy-gb",
+    "da-dk",
+    "de-at",
+    "de-ch",
+    "de-de",
+    "el-gr",
+    "en-au",
+    "en-ca",
+    "en-gb",
+    "en-hk",
+    "en-ie",
+    "en-in",
+    "en-ke",
+    "en-ng",
+    "en-nz",
+    "en-ph",
+    "en-sg",
+    "en-tz",
+    "en-us",
+    "en-za",
+    "es-ar",
+    "es-bo",
+    "es-cl",
+    "es-co",
+    "es-cr",
+    "es-cu",
+    "es-do",
+    "es-ec",
+    "es-es",
+    "es-gq",
+    "es-gt",
+    "es-hn",
+    "es-mx",
+    "es-ni",
+    "es-pa",
+    "es-pe",
+    "es-pr",
+    "es-py",
+    "es-sv",
+    "es-us",
+    "es-uy",
+    "es-ve",
+    "et-ee",
+    "eu-es",
+    "fa-ir",
+    "fi-fi",
+    "fil-ph",
+    "fr-be",
+    "fr-ca",
+    "fr-ch",
+    "fr-fr",
+    "ga-ie",
+    "gl-es",
+    "gu-in",
+    "he-il",
+    "hi-in",
+    "hr-hr",
+    "hu-hu",
+    "hy-am",
+    "id-id",
+    "is-is",
+    "it-it",
+    "ja-jp",
+    "jv-id",
+    "ka-ge",
+    "kk-kz",
+    "km-kh",
+    "kn-in",
+    "ko-kr",
+    "lo-la",
+    "lt-lt",
+    "lv-lv",
+    "mk-mk",
+    "ml-in",
+    "mn-mn",
+    "mr-in",
+    "ms-my",
+    "mt-mt",
+    "my-mm",
+    "nb-no",
+    "ne-np",
+    "nl-be",
+    "nl-nl",
+    "pl-pl",
+    "ps-af",
+    "pt-br",
+    "pt-pt",
+    "ro-ro",
+    "ru-ru",
+    "si-lk",
+    "sk-sk",
+    "sl-si",
+    "so-so",
+    "sq-al",
+    "sr-rs",
+    "su-id",
+    "sv-se",
+    "sw-ke",
+    "sw-tz",
+    "ta-in",
+    "ta-lk",
+    "ta-my",
+    "ta-sg",
+    "te-in",
+    "th-th",
+    "tr-tr",
+    "uk-ua",
+    "ur-in",
+    "ur-pk",
+    "uz-uz",
+    "vi-vn",
+    "wuu-cn",
+    "yue-cn",
+    "zh-cn",
+    "zh-cn-henan",
+    "zh-cn-liaoning",
+    "zh-cn-shaanxi",
+    "zh-cn-shandong",
+    "zh-cn-sichuan",
+    "zh-hk",
+    "zh-tw",
+    "zu-za",
+}
diff --git a/homeassistant/generated/ssdp.py b/homeassistant/generated/ssdp.py
index 3a2097a1d30264..8e7319917f055f 100644
--- a/homeassistant/generated/ssdp.py
+++ b/homeassistant/generated/ssdp.py
@@ -224,6 +224,20 @@
             "manufacturer": "The OctoPrint Project",
         },
     ],
+    "openhome": [
+        {
+            "st": "urn:av-openhome-org:service:Product:1",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:2",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:3",
+        },
+        {
+            "st": "urn:av-openhome-org:service:Product:4",
+        },
+    ],
     "roku": [
         {
             "deviceType": "urn:roku-com:device:player:1-0",
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 93ccb404ae4558..6b5676c4a25c16 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -448,6 +448,10 @@
             "domain": "bosch_shc",
             "name": "bosch shc*",
         },
+        {
+            "domain": "loqed",
+            "name": "loqed*",
+        },
         {
             "domain": "nam",
             "name": "nam-*",
diff --git a/homeassistant/helpers/collection.py b/homeassistant/helpers/collection.py
index a0c47a04903652..80b40cf4fa007d 100644
--- a/homeassistant/helpers/collection.py
+++ b/homeassistant/helpers/collection.py
@@ -8,8 +8,9 @@
 from itertools import groupby
 import logging
 from operator import attrgetter
-from typing import Any, Generic, TypedDict, TypeVar
+from typing import Any, Generic, TypedDict
 
+from typing_extensions import TypeVar
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
@@ -35,6 +36,7 @@
 _ItemT = TypeVar("_ItemT")
 _StoreT = TypeVar("_StoreT", bound="SerializedStorageCollection")
 _StorageCollectionT = TypeVar("_StorageCollectionT", bound="StorageCollection")
+_EntityT = TypeVar("_EntityT", bound=Entity, default=Entity)
 
 
 @dataclass(slots=True)
@@ -421,7 +423,7 @@ def sync_entity_lifecycle(
     hass: HomeAssistant,
     domain: str,
     platform: str,
-    entity_component: EntityComponent,
+    entity_component: EntityComponent[_EntityT],
     collection: StorageCollection | YamlCollection,
     entity_class: type[CollectionEntity],
 ) -> None:
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index e0924b928ca505..e8f1e58615cfe3 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -59,6 +59,7 @@
     CONF_PARALLEL,
     CONF_PLATFORM,
     CONF_REPEAT,
+    CONF_RESPONSE_VARIABLE,
     CONF_SCAN_INTERVAL,
     CONF_SCENE,
     CONF_SEQUENCE,
@@ -86,12 +87,13 @@
     UnitOfTemperature,
 )
 from homeassistant.core import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
     HomeAssistant,
     async_get_hass,
     split_entity_id,
     valid_entity_id,
 )
-from homeassistant.exceptions import TemplateError
+from homeassistant.exceptions import HomeAssistantError, TemplateError
 from homeassistant.generated import currencies
 from homeassistant.generated.countries import COUNTRIES
 from homeassistant.generated.languages import LANGUAGES
@@ -607,7 +609,7 @@ def template(value: Any | None) -> template_helper.Template:
         raise vol.Invalid("template value should be a string")
 
     hass: HomeAssistant | None = None
-    with contextlib.suppress(LookupError):
+    with contextlib.suppress(HomeAssistantError):
         hass = async_get_hass()
 
     template_value = template_helper.Template(str(value), hass)
@@ -629,7 +631,7 @@ def dynamic_template(value: Any | None) -> template_helper.Template:
         raise vol.Invalid("template value does not contain a dynamic template")
 
     hass: HomeAssistant | None = None
-    with contextlib.suppress(LookupError):
+    with contextlib.suppress(HomeAssistantError):
         hass = async_get_hass()
 
     template_value = template_helper.Template(str(value), hass)
@@ -722,7 +724,7 @@ def socket_timeout(value: Any | None) -> object:
             return float_value
         raise vol.Invalid("Invalid socket timeout value. float > 0.0 required.")
     except Exception as err:
-        raise vol.Invalid(f"Invalid socket timeout: {err}")
+        raise vol.Invalid(f"Invalid socket timeout: {err}") from err
 
 
 # pylint: disable=no-value-for-parameter
@@ -759,7 +761,7 @@ def uuid4_hex(value: Any) -> str:
     try:
         result = UUID(value, version=4)
     except (ValueError, AttributeError, TypeError) as error:
-        raise vol.Invalid("Invalid Version4 UUID", error_message=str(error))
+        raise vol.Invalid("Invalid Version4 UUID", error_message=str(error)) from error
 
     if result.hex != value.lower():
         # UUID() will create a uuid4 if input is invalid
@@ -866,7 +868,7 @@ def validator(config: dict) -> dict:
 
             logger_func(warning, *arguments)
             value = config[key]
-            if replacement_key:
+            if replacement_key or option_removed:
                 config.pop(key)
         else:
             value = default
@@ -1045,6 +1047,107 @@ def expand_condition_shorthand(value: Any | None) -> Any:
 
 
 # Schemas
+def empty_config_schema(domain: str) -> Callable[[dict], dict]:
+    """Return a config schema which logs if there are configuration parameters."""
+
+    module = inspect.getmodule(inspect.stack(context=0)[2].frame)
+    if module is not None:
+        module_name = module.__name__
+    else:
+        # If Python is unable to access the sources files, the call stack frame
+        # will be missing information, so let's guard.
+        # https://github.com/home-assistant/core/issues/24982
+        module_name = __name__
+    logger_func = logging.getLogger(module_name).error
+
+    def validator(config: dict) -> dict:
+        if domain in config and config[domain]:
+            logger_func(
+                (
+                    "The %s integration does not support any configuration parameters, "
+                    "got %s. Please remove the configuration parameters from your "
+                    "configuration."
+                ),
+                domain,
+                config[domain],
+            )
+        return config
+
+    return validator
+
+
+def _no_yaml_config_schema(
+    domain: str,
+    issue_base: str,
+    translation_key: str,
+    translation_placeholders: dict[str, str],
+) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    module = inspect.getmodule(inspect.stack(context=0)[2].frame)
+    if module is not None:
+        module_name = module.__name__
+    else:
+        # If Python is unable to access the sources files, the call stack frame
+        # will be missing information, so let's guard.
+        # https://github.com/home-assistant/core/issues/24982
+        module_name = __name__
+    logger_func = logging.getLogger(module_name).error
+
+    def raise_issue() -> None:
+        # pylint: disable-next=import-outside-toplevel
+        from .issue_registry import IssueSeverity, async_create_issue
+
+        with contextlib.suppress(HomeAssistantError):
+            hass = async_get_hass()
+            async_create_issue(
+                hass,
+                HOMEASSISTANT_DOMAIN,
+                f"{issue_base}_{domain}",
+                is_fixable=False,
+                issue_domain=domain,
+                severity=IssueSeverity.ERROR,
+                translation_key=translation_key,
+                translation_placeholders={"domain": domain} | translation_placeholders,
+            )
+
+    def validator(config: dict) -> dict:
+        if domain in config:
+            logger_func(
+                (
+                    "The %s integration does not support YAML setup, please remove it "
+                    "from your configuration file"
+                ),
+                domain,
+            )
+            raise_issue()
+        return config
+
+    return validator
+
+
+def config_entry_only_config_schema(domain: str) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    return _no_yaml_config_schema(
+        domain,
+        "config_entry_only",
+        "config_entry_only",
+        {"add_integration": f"/config/integrations/dashboard/add?domain={domain}"},
+    )
+
+
+def platform_only_config_schema(domain: str) -> Callable[[dict], dict]:
+    """Return a config schema which logs if attempted to setup from YAML."""
+
+    return _no_yaml_config_schema(
+        domain,
+        "platform_only",
+        "platform_only",
+        {},
+    )
+
+
 PLATFORM_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_PLATFORM): string,
@@ -1123,7 +1226,7 @@ def script_action(value: Any) -> dict:
     try:
         action = determine_script_action(value)
     except ValueError as err:
-        raise vol.Invalid(str(err))
+        raise vol.Invalid(str(err)) from err
 
     return ACTION_TYPE_SCHEMAS[action](value)
 
@@ -1163,6 +1266,7 @@ def script_action(value: Any) -> dict:
             ),
             vol.Optional(CONF_ENTITY_ID): comp_entity_ids,
             vol.Optional(CONF_TARGET): vol.Any(TARGET_SERVICE_FIELDS, dynamic_template),
+            vol.Optional(CONF_RESPONSE_VARIABLE): str,
             # The frontend stores data here. Don't use in core.
             vol.Remove("metadata"): dict,
         }
@@ -1423,6 +1527,7 @@ def STATE_CONDITION_SCHEMA(value: Any) -> dict:  # pylint: disable=invalid-name
     )
 )
 
+CONDITIONS_SCHEMA = vol.All(ensure_list, [CONDITION_SCHEMA])
 
 dynamic_template_condition_action = vol.All(
     # Wrap a shorthand template condition action in a template condition
@@ -1585,7 +1690,12 @@ def _base_trigger_validator(value: Any) -> Any:
     {
         **SCRIPT_ACTION_BASE_SCHEMA,
         vol.Required(CONF_STOP): vol.Any(None, string),
-        vol.Optional(CONF_ERROR, default=False): boolean,
+        vol.Exclusive(CONF_ERROR, "error_or_response"): boolean,
+        vol.Exclusive(
+            CONF_RESPONSE_VARIABLE,
+            "error_or_response",
+            msg="not allowed to add a response to an error stop action",
+        ): str,
     }
 )
 
diff --git a/homeassistant/helpers/debounce.py b/homeassistant/helpers/debounce.py
index 2df8965de34a65..4e5d152135a560 100644
--- a/homeassistant/helpers/debounce.py
+++ b/homeassistant/helpers/debounce.py
@@ -90,11 +90,11 @@ async def async_call(self) -> None:
             if self._timer_task:
                 return
 
-            task = self.hass.async_run_hass_job(self._job)
-            if task:
-                await task
-
-            self._schedule_timer()
+            try:
+                if task := self.hass.async_run_hass_job(self._job):
+                    await task
+            finally:
+                self._schedule_timer()
 
     async def _handle_timer_finish(self) -> None:
         """Handle a finished timer."""
@@ -112,14 +112,13 @@ async def _handle_timer_finish(self) -> None:
                 return
 
             try:
-                task = self.hass.async_run_hass_job(self._job)
-                if task:
+                if task := self.hass.async_run_hass_job(self._job):
                     await task
             except Exception:  # pylint: disable=broad-except
                 self.logger.exception("Unexpected exception from %s", self.function)
-
-            # Schedule a new timer to prevent new runs during cooldown
-            self._schedule_timer()
+            finally:
+                # Schedule a new timer to prevent new runs during cooldown
+                self._schedule_timer()
 
     async def async_shutdown(self) -> None:
         """Cancel any scheduled call, and prevent new runs."""
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 29e64639722ec8..7df01fc8fd2b1c 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -292,6 +292,7 @@ class DeviceRegistry:
 
     devices: DeviceRegistryItems[DeviceEntry]
     deleted_devices: DeviceRegistryItems[DeletedDeviceEntry]
+    _device_data: dict[str, DeviceEntry]
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the device registry."""
@@ -306,8 +307,12 @@ def __init__(self, hass: HomeAssistant) -> None:
 
     @callback
     def async_get(self, device_id: str) -> DeviceEntry | None:
-        """Get device."""
-        return self.devices.get(device_id)
+        """Get device.
+
+        We retrieve the DeviceEntry from the underlying dict to avoid
+        the overhead of the UserDict __getitem__.
+        """
+        return self._device_data.get(device_id)
 
     @callback
     def async_get_device(
@@ -641,6 +646,7 @@ async def async_load(self) -> None:
 
         self.devices = devices
         self.deleted_devices = deleted_devices
+        self._device_data = devices.data
 
     @callback
     def async_schedule_save(self) -> None:
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 3cc655a7fd12f3..e87eb15b9545ec 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -12,10 +12,11 @@
 import math
 import sys
 from timeit import default_timer as timer
-from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict, final
+from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict, TypeVar, final
 
 import voluptuous as vol
 
+from homeassistant.backports.functools import cached_property
 from homeassistant.config import DATA_CUSTOMIZE
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -40,28 +41,24 @@
 
 from . import device_registry as dr, entity_registry as er
 from .device_registry import DeviceEntryType
-from .event import async_track_entity_registry_updated_event
-from .typing import StateType
+from .event import (
+    async_track_device_registry_updated_event,
+    async_track_entity_registry_updated_event,
+)
+from .typing import UNDEFINED, StateType, UndefinedType
 
 if TYPE_CHECKING:
     from .entity_platform import EntityPlatform
 
+
+_T = TypeVar("_T")
+
 _LOGGER = logging.getLogger(__name__)
 SLOW_UPDATE_WARNING = 10
 DATA_ENTITY_SOURCE = "entity_info"
 SOURCE_CONFIG_ENTRY = "config_entry"
 SOURCE_PLATFORM_CONFIG = "platform_config"
 
-
-class DeviceClassName(Enum):
-    """Singleton to use device class name."""
-
-    _singleton = 0
-
-
-DEVICE_CLASS_NAME = DeviceClassName._singleton  # pylint: disable=protected-access
-
-
 # Used when converting float states to string: limit precision according to machine
 # epsilon to make the string representation readable
 FLOAT_PRECISION = abs(int(math.floor(math.log10(abs(sys.float_info.epsilon))))) - 1
@@ -229,7 +226,7 @@ class EntityDescription:
     force_update: bool = False
     icon: str | None = None
     has_entity_name: bool = False
-    name: str | DeviceClassName | None = None
+    name: str | UndefinedType | None = UNDEFINED
     translation_key: str | None = None
     unit_of_measurement: str | None = None
 
@@ -242,13 +239,15 @@ class Entity(ABC):
     # this class. These may be used to customize the behavior of the entity.
     entity_id: str = None  # type: ignore[assignment]
 
-    # Owning hass instance. Will be set by EntityPlatform
+    # Owning hass instance. Set by EntityPlatform by calling add_to_platform_start
     # While not purely typed, it makes typehinting more useful for us
     # and removes the need for constant None checks or asserts.
     hass: HomeAssistant = None  # type: ignore[assignment]
 
-    # Owning platform instance. Will be set by EntityPlatform
-    platform: EntityPlatform | None = None
+    # Owning platform instance. Set by EntityPlatform by calling add_to_platform_start
+    # While not purely typed, it makes typehinting more useful for us
+    # and removes the need for constant None checks or asserts.
+    platform: EntityPlatform = None  # type: ignore[assignment]
 
     # Entity description instance for this Entity
     entity_description: EntityDescription
@@ -263,6 +262,12 @@ class Entity(ABC):
     # it should be using async_write_ha_state.
     _async_update_ha_state_reported = False
 
+    # If we reported this entity is implicitly using device name
+    _implicit_device_name_reported = False
+
+    # If we reported this entity was added without its platform set
+    _no_platform_reported = False
+
     # Protect for multiple updates
     _update_staged = False
 
@@ -275,6 +280,8 @@ class Entity(ABC):
     # Hold list for functions to call on remove.
     _on_remove: list[CALLBACK_TYPE] | None = None
 
+    _unsub_device_updates: CALLBACK_TYPE | None = None
+
     # Context
     _context: Context | None = None
     _context_set: datetime | None = None
@@ -298,7 +305,7 @@ class Entity(ABC):
     _attr_extra_state_attributes: MutableMapping[str, Any]
     _attr_force_update: bool
     _attr_icon: str | None
-    _attr_name: str | DeviceClassName | None
+    _attr_name: str | None
     _attr_should_poll: bool = True
     _attr_state: StateType = STATE_UNKNOWN
     _attr_supported_features: int | None = None
@@ -319,6 +326,52 @@ def unique_id(self) -> str | None:
         """Return a unique ID."""
         return self._attr_unique_id
 
+    def _report_implicit_device_name(self) -> None:
+        """Report entities which use implicit device name."""
+        if self._implicit_device_name_reported:
+            return
+        report_issue = self._suggest_report_issue()
+        _LOGGER.warning(
+            (
+                "Entity %s (%s) is implicitly using device name by not setting its "
+                "name. Instead, the name should be set to None, please %s"
+            ),
+            self.entity_id,
+            type(self),
+            report_issue,
+        )
+        self._implicit_device_name_reported = True
+
+    @property
+    def use_device_name(self) -> bool:
+        """Return if this entity does not have its own name.
+
+        Should be True if the entity represents the single main feature of a device.
+        """
+        if hasattr(self, "_attr_name"):
+            return not self._attr_name
+
+        if name_translation_key := self._name_translation_key:
+            if name_translation_key in self.platform.platform_translations:
+                return False
+
+        if hasattr(self, "entity_description"):
+            if not (name := self.entity_description.name):
+                return True
+            if name is UNDEFINED and not self._default_to_device_class_name():
+                # Backwards compatibility with leaving EntityDescription.name unassigned
+                # for device name.
+                # Deprecated in HA Core 2023.6, remove in HA Core 2023.9
+                self._report_implicit_device_name()
+                return True
+            return False
+        if self.name is UNDEFINED and not self._default_to_device_class_name():
+            # Backwards compatibility with not overriding name property for device name.
+            # Deprecated in HA Core 2023.6, remove in HA Core 2023.9
+            self._report_implicit_device_name()
+            return True
+        return not self.name
+
     @property
     def has_entity_name(self) -> bool:
         """Return if the name of the entity is describing only the entity itself."""
@@ -328,39 +381,101 @@ def has_entity_name(self) -> bool:
             return self.entity_description.has_entity_name
         return False
 
-    def _device_class_name(self) -> str | None:
+    def _device_class_name_helper(
+        self,
+        component_translations: dict[str, Any],
+    ) -> str | None:
         """Return a translated name of the entity based on its device class."""
-        assert self.platform
         if not self.has_entity_name:
             return None
         device_class_key = self.device_class or "_"
+        platform = self.platform
         name_translation_key = (
-            f"component.{self.platform.domain}.entity_component."
-            f"{device_class_key}.name"
+            f"component.{platform.domain}.entity_component.{device_class_key}.name"
         )
-        return self.platform.component_translations.get(name_translation_key)
+        return component_translations.get(name_translation_key)
 
-    @property
-    def name(self) -> str | None:
+    @cached_property
+    def _object_id_device_class_name(self) -> str | None:
+        """Return a translated name of the entity based on its device class."""
+        return self._device_class_name_helper(
+            self.platform.object_id_component_translations
+        )
+
+    @cached_property
+    def _device_class_name(self) -> str | None:
+        """Return a translated name of the entity based on its device class."""
+        return self._device_class_name_helper(self.platform.component_translations)
+
+    def _default_to_device_class_name(self) -> bool:
+        """Return True if an unnamed entity should be named by its device class."""
+        return False
+
+    @cached_property
+    def _name_translation_key(self) -> str | None:
+        """Return translation key for entity name."""
+        if self.translation_key is None:
+            return None
+        platform = self.platform
+        return (
+            f"component.{platform.platform_name}.entity.{platform.domain}"
+            f".{self.translation_key}.name"
+        )
+
+    def _name_internal(
+        self,
+        device_class_name: str | None,
+        platform_translations: dict[str, Any],
+    ) -> str | UndefinedType | None:
         """Return the name of the entity."""
         if hasattr(self, "_attr_name"):
-            if self._attr_name is DEVICE_CLASS_NAME:
-                return self._device_class_name()
             return self._attr_name
-        if self.translation_key is not None and self.has_entity_name:
-            assert self.platform
-            name_translation_key = (
-                f"component.{self.platform.platform_name}.entity.{self.platform.domain}"
-                f".{self.translation_key}.name"
-            )
-            if name_translation_key in self.platform.platform_translations:
-                name: str = self.platform.platform_translations[name_translation_key]
-                return name
+        if (
+            self.has_entity_name
+            and (name_translation_key := self._name_translation_key)
+            and (name := platform_translations.get(name_translation_key))
+        ):
+            if TYPE_CHECKING:
+                assert isinstance(name, str)
+            return name
         if hasattr(self, "entity_description"):
-            if self.entity_description.name is DEVICE_CLASS_NAME:
-                return self._device_class_name()
-            return self.entity_description.name
-        return None
+            description_name = self.entity_description.name
+            if description_name is UNDEFINED and self._default_to_device_class_name():
+                return device_class_name
+            return description_name
+
+        # The entity has no name set by _attr_name, translation_key or entity_description
+        # Check if the entity should be named by its device class
+        if self._default_to_device_class_name():
+            return device_class_name
+        return UNDEFINED
+
+    @property
+    def suggested_object_id(self) -> str | None:
+        """Return input for object id."""
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        # mypy doesn't know about fget: https://github.com/python/mypy/issues/6185
+        if self.__class__.name.fget is Entity.name.fget and self.platform:  # type: ignore[attr-defined]
+            name = self._name_internal(
+                self._object_id_device_class_name,
+                self.platform.object_id_platform_translations,
+            )
+        else:
+            name = self.name
+        return None if name is UNDEFINED else name
+
+    @property
+    def name(self) -> str | UndefinedType | None:
+        """Return the name of the entity."""
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        if not self.platform:
+            return self._name_internal(None, {})
+        return self._name_internal(
+            self._device_class_name,
+            self.platform.platform_translations,
+        )
 
     @property
     def state(self) -> StateType:
@@ -603,6 +718,22 @@ def async_write_ha_state(self) -> None:
         if self.hass is None:
             raise RuntimeError(f"Attribute hass is None for {self}")
 
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
+        if self.platform is None and not self._no_platform_reported:  # type: ignore[unreachable]
+            report_issue = self._suggest_report_issue()  # type: ignore[unreachable]
+            _LOGGER.warning(
+                (
+                    "Entity %s (%s) does not have a platform, this may be caused by "
+                    "adding it manually instead of with an EntityComponent helper"
+                    ", please %s"
+                ),
+                self.entity_id,
+                type(self),
+                report_issue,
+            )
+            self._no_platform_reported = True
+
         if self.entity_id is None:
             raise NoEntitySpecifiedError(
                 f"No entity id specified for entity {self.name}"
@@ -628,18 +759,23 @@ def _friendly_name_internal(self) -> str | None:
         If has_entity_name is False, this returns self.name
         If has_entity_name is True, this returns device.name + self.name
         """
+        name = self.name
+        if name is UNDEFINED:
+            name = None
+
         if not self.has_entity_name or not self.registry_entry:
-            return self.name
+            return name
 
         device_registry = dr.async_get(self.hass)
         if not (device_id := self.registry_entry.device_id) or not (
             device_entry := device_registry.async_get(device_id)
         ):
-            return self.name
+            return name
 
-        if not (name := self.name):
-            return device_entry.name_by_user or device_entry.name
-        return f"{device_entry.name_by_user or device_entry.name} {name}"
+        device_name = device_entry.name_by_user or device_entry.name
+        if self.use_device_name:
+            return device_name
+        return f"{device_name} {name}" if device_name else name
 
     @callback
     def _async_write_ha_state(self) -> None:
@@ -655,7 +791,6 @@ def _async_write_ha_state(self) -> None:
         if entry and entry.disabled_by:
             if not self._disabled_reported:
                 self._disabled_reported = True
-                assert self.platform is not None
                 _LOGGER.warning(
                     (
                         "Entity %s is incorrectly being triggered for updates while it"
@@ -796,8 +931,8 @@ async def async_device_update(self, warning: bool = True) -> None:
             await self.parallel_updates.acquire()
 
         if warning:
-            update_warn = hass.loop.call_later(
-                SLOW_UPDATE_WARNING, self._async_slow_update_warning
+            update_warn = hass.loop.call_at(
+                hass.loop.time() + SLOW_UPDATE_WARNING, self._async_slow_update_warning
             )
 
         try:
@@ -861,7 +996,7 @@ def add_to_platform_abort(self) -> None:
         self._call_on_remove_callbacks()
 
         self.hass = None  # type: ignore[assignment]
-        self.platform = None
+        self.platform = None  # type: ignore[assignment]
         self.parallel_updates = None
 
     async def add_to_platform_finish(self) -> None:
@@ -880,6 +1015,8 @@ async def async_remove(self, *, force_remove: bool = False) -> None:
         If the entity doesn't have a non disabled entry in the entity registry,
         or if force_remove=True, its state will be removed.
         """
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
         if self.platform and self._platform_state != EntityPlatformState.ADDED:
             raise HomeAssistantError(
                 f"Entity {self.entity_id} async_remove called twice"
@@ -927,19 +1064,18 @@ async def async_internal_added_to_hass(self) -> None:
 
         Not to be extended by integrations.
         """
-        if self.platform:
-            info = {
-                "domain": self.platform.platform_name,
-                "custom_component": "custom_components" in type(self).__module__,
-            }
-
-            if self.platform.config_entry:
-                info["source"] = SOURCE_CONFIG_ENTRY
-                info["config_entry"] = self.platform.config_entry.entry_id
-            else:
-                info["source"] = SOURCE_PLATFORM_CONFIG
+        info = {
+            "domain": self.platform.platform_name,
+            "custom_component": "custom_components" in type(self).__module__,
+        }
+
+        if self.platform.config_entry:
+            info["source"] = SOURCE_CONFIG_ENTRY
+            info["config_entry"] = self.platform.config_entry.entry_id
+        else:
+            info["source"] = SOURCE_PLATFORM_CONFIG
 
-            self.hass.data[DATA_ENTITY_SOURCE][self.entity_id] = info
+        self.hass.data[DATA_ENTITY_SOURCE][self.entity_id] = info
 
         if self.registry_entry is not None:
             # This is an assert as it should never happen, but helps in tests
@@ -952,12 +1088,15 @@ async def async_internal_added_to_hass(self) -> None:
                     self.hass, self.entity_id, self._async_registry_updated
                 )
             )
+            self._async_subscribe_device_updates()
 
     async def async_internal_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass.
 
         Not to be extended by integrations.
         """
+        # The check for self.platform guards against integrations not using an
+        # EntityComponent and can be removed in HA Core 2024.1
         if self.platform:
             self.hass.data[DATA_ENTITY_SOURCE].pop(self.entity_id)
 
@@ -972,6 +1111,9 @@ async def _async_registry_updated(self, event: Event) -> None:
         if data["action"] != "update":
             return
 
+        if "device_id" in data["changes"]:
+            self._async_subscribe_device_updates()
+
         ent_reg = er.async_get(self.hass)
         old = self.registry_entry
         self.registry_entry = ent_reg.async_get(data["entity_id"])
@@ -989,21 +1131,65 @@ async def _async_registry_updated(self, event: Event) -> None:
 
         await self.async_remove(force_remove=True)
 
-        assert self.platform is not None
         self.entity_id = self.registry_entry.entity_id
         await self.platform.async_add_entities([self])
 
+    @callback
+    def _async_unsubscribe_device_updates(self) -> None:
+        """Unsubscribe from device registry updates."""
+        if not self._unsub_device_updates:
+            return
+        self._unsub_device_updates()
+        self._unsub_device_updates = None
+
+    @callback
+    def _async_device_registry_updated(self, event: Event) -> None:
+        """Handle device registry update."""
+        data = event.data
+
+        if data["action"] != "update":
+            return
+
+        if "name" not in data["changes"] and "name_by_user" not in data["changes"]:
+            return
+
+        self.async_write_ha_state()
+
+    @callback
+    def _async_subscribe_device_updates(self) -> None:
+        """Subscribe to device registry updates."""
+        assert self.registry_entry
+
+        self._async_unsubscribe_device_updates()
+
+        if (device_id := self.registry_entry.device_id) is None:
+            return
+
+        if not self.has_entity_name:
+            return
+
+        self._unsub_device_updates = async_track_device_registry_updated_event(
+            self.hass,
+            device_id,
+            self._async_device_registry_updated,
+        )
+        if (
+            not self._on_remove
+            or self._async_unsubscribe_device_updates not in self._on_remove
+        ):
+            self.async_on_remove(self._async_unsubscribe_device_updates)
+
     def __repr__(self) -> str:
         """Return the representation."""
         return f"<entity {self.entity_id}={self._stringify_state(self.available)}>"
 
-    async def async_request_call(self, coro: Coroutine[Any, Any, Any]) -> None:
+    async def async_request_call(self, coro: Coroutine[Any, Any, _T]) -> _T:
         """Process request batched."""
         if self.parallel_updates:
             await self.parallel_updates.acquire()
 
         try:
-            await coro
+            return await coro
         finally:
             if self.parallel_updates:
                 self.parallel_updates.release()
@@ -1018,6 +1204,8 @@ def _suggest_report_issue(self) -> str:
                 "create a bug report at "
                 "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue"
             )
+            # The check for self.platform guards against integrations not using an
+            # EntityComponent and can be removed in HA Core 2024.1
             if self.platform:
                 report_issue += (
                     f"+label%3A%22integration%3A+{self.platform.platform_name}%22"
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index dc101a10b05a91..af1b87ec0faf70 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -7,8 +7,9 @@
 from itertools import chain
 import logging
 from types import ModuleType
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
+from typing_extensions import TypeVar
 import voluptuous as vol
 
 from homeassistant import config as conf_util
@@ -18,7 +19,14 @@
     CONF_SCAN_INTERVAL,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Event,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import async_get_integration, bind_hass
 from homeassistant.setup import async_prepare_setup_platform
@@ -30,7 +38,7 @@
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=15)
 DATA_INSTANCES = "entity_components"
 
-_EntityT = TypeVar("_EntityT", bound=entity.Entity)
+_EntityT = TypeVar("_EntityT", bound=entity.Entity, default=entity.Entity)
 
 
 @bind_hass
@@ -216,18 +224,21 @@ def async_register_entity_service(
         schema: dict[str | vol.Marker, Any] | vol.Schema,
         func: str | Callable[..., Any],
         required_features: list[int] | None = None,
+        supports_response: SupportsResponse = SupportsResponse.NONE,
     ) -> None:
         """Register an entity service."""
         if isinstance(schema, dict):
             schema = cv.make_entity_service_schema(schema)
 
-        async def handle_service(call: ServiceCall) -> None:
+        async def handle_service(call: ServiceCall) -> ServiceResponse:
             """Handle the service."""
-            await service.entity_service_call(
+            return await service.entity_service_call(
                 self.hass, self._platforms.values(), func, call, required_features
             )
 
-        self.hass.services.async_register(self.domain, name, handle_service, schema)
+        self.hass.services.async_register(
+            self.domain, name, handle_service, schema, supports_response
+        )
 
     async def async_setup_platform(
         self,
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index 4a2ff020fe28f5..55d167ae253c6e 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -19,6 +19,7 @@
 )
 from homeassistant.core import (
     CALLBACK_TYPE,
+    DOMAIN as HOMEASSISTANT_DOMAIN,
     CoreState,
     HomeAssistant,
     ServiceCall,
@@ -31,6 +32,7 @@
     PlatformNotReady,
     RequiredParameterMissing,
 )
+from homeassistant.generated import languages
 from homeassistant.setup import async_start_setup
 from homeassistant.util.async_ import run_callback_threadsafe
 
@@ -44,7 +46,8 @@
 from .device_registry import DeviceRegistry
 from .entity_registry import EntityRegistry, RegistryEntryDisabler, RegistryEntryHider
 from .event import async_call_later, async_track_time_interval
-from .typing import ConfigType, DiscoveryInfoType
+from .issue_registry import IssueSeverity, async_create_issue
+from .typing import UNDEFINED, ConfigType, DiscoveryInfoType
 
 if TYPE_CHECKING:
     from .entity import Entity
@@ -127,6 +130,8 @@ def __init__(
         self.entities: dict[str, Entity] = {}
         self.component_translations: dict[str, Any] = {}
         self.platform_translations: dict[str, Any] = {}
+        self.object_id_component_translations: dict[str, Any] = {}
+        self.object_id_platform_translations: dict[str, Any] = {}
         self._tasks: list[asyncio.Task[None]] = []
         # Stop tracking tasks after setup is completed
         self._setup_complete = False
@@ -137,6 +142,7 @@ def __init__(
         self._process_updates: asyncio.Lock | None = None
 
         self.parallel_updates: asyncio.Semaphore | None = None
+        self._update_in_sequence: bool = False
 
         # Platform is None for the EntityComponent "catch-all" EntityPlatform
         # which powers entity_component.add_entities
@@ -187,6 +193,7 @@ def _get_parallel_updates_semaphore(
 
         if parallel_updates is not None:
             self.parallel_updates = asyncio.Semaphore(parallel_updates)
+            self._update_in_sequence = parallel_updates == 1
 
         return self.parallel_updates
 
@@ -210,6 +217,30 @@ async def async_setup(
                 self.platform_name,
                 self.domain,
             )
+            learn_more_url = None
+            if self.platform and "custom_components" not in self.platform.__file__:  # type: ignore[attr-defined]
+                learn_more_url = (
+                    f"https://www.home-assistant.io/integrations/{self.platform_name}/"
+                )
+            platform_key = f"platform: {self.platform_name}"
+            yaml_example = f"```yaml\n{self.domain}:\n  - {platform_key}\n```"
+            async_create_issue(
+                self.hass,
+                HOMEASSISTANT_DOMAIN,
+                f"platform_integration_no_support_{self.domain}_{self.platform_name}",
+                is_fixable=False,
+                issue_domain=self.platform_name,
+                learn_more_url=learn_more_url,
+                severity=IssueSeverity.ERROR,
+                translation_key="no_platform_setup",
+                translation_placeholders={
+                    "domain": self.domain,
+                    "platform": self.platform_name,
+                    "platform_key": platform_key,
+                    "yaml_example": yaml_example,
+                },
+            )
+
             return
 
         @callback
@@ -278,27 +309,48 @@ async def _async_setup_platform(
         logger = self.logger
         hass = self.hass
         full_name = f"{self.domain}.{self.platform_name}"
+        object_id_language = (
+            hass.config.language
+            if hass.config.language in languages.NATIVE_ENTITY_IDS
+            else languages.DEFAULT_LANGUAGE
+        )
 
-        try:
-            self.component_translations = await translation.async_get_translations(
-                hass, hass.config.language, "entity_component", {self.domain}
-            )
-        except Exception as err:  # pylint: disable=broad-exception-caught
-            _LOGGER.debug(
-                "Could not load translations for %s", self.domain, exc_info=err
-            )
-        try:
-            self.platform_translations = await translation.async_get_translations(
-                hass, hass.config.language, "entity", {self.platform_name}
+        async def get_translations(
+            language: str, category: str, integration: str
+        ) -> dict[str, Any]:
+            """Get entity translations."""
+            try:
+                return await translation.async_get_translations(
+                    hass, language, category, {integration}
+                )
+            except Exception as err:  # pylint: disable=broad-exception-caught
+                _LOGGER.debug(
+                    "Could not load translations for %s",
+                    integration,
+                    exc_info=err,
+                )
+            return {}
+
+        self.component_translations = await get_translations(
+            hass.config.language, "entity_component", self.domain
+        )
+        self.platform_translations = await get_translations(
+            hass.config.language, "entity", self.platform_name
+        )
+        if object_id_language == hass.config.language:
+            self.object_id_component_translations = self.component_translations
+            self.object_id_platform_translations = self.platform_translations
+        else:
+            self.object_id_component_translations = await get_translations(
+                object_id_language, "entity_component", self.domain
             )
-        except Exception as err:  # pylint: disable=broad-exception-caught
-            _LOGGER.debug(
-                "Could not load translations for %s", self.platform_name, exc_info=err
+            self.object_id_platform_translations = await get_translations(
+                object_id_language, "entity", self.platform_name
             )
 
         logger.info("Setting up %s", full_name)
-        warn_task = hass.loop.call_later(
-            SLOW_SETUP_WARNING,
+        warn_task = hass.loop.call_at(
+            hass.loop.time() + SLOW_SETUP_WARNING,
             logger.warning,
             "Setup of %s platform %s is taking over %s seconds.",
             self.domain,
@@ -536,6 +588,10 @@ async def _async_add_entity(  # noqa: C901
         suggested_object_id: str | None = None
         generate_new_entity_id = False
 
+        entity_name = entity.name
+        if entity_name is UNDEFINED:
+            entity_name = None
+
         # Get entity_id from unique ID registration
         if entity.unique_id is not None:
             registered_entity_id = entity_registry.async_get_entity_id(
@@ -564,19 +620,12 @@ async def _async_add_entity(  # noqa: C901
                     entity.add_to_platform_abort()
                     return
 
-            if self.config_entry is not None:
-                config_entry_id: str | None = self.config_entry.entry_id
-            else:
-                config_entry_id = None
-
             device_info = entity.device_info
             device_id = None
             device = None
 
-            if config_entry_id is not None and device_info is not None:
-                processed_dev_info: dict[str, str | None] = {
-                    "config_entry_id": config_entry_id
-                }
+            if self.config_entry and device_info is not None:
+                processed_dev_info: dict[str, str | None] = {}
                 for key in (
                     "connections",
                     "default_manufacturer",
@@ -597,6 +646,17 @@ async def _async_add_entity(  # noqa: C901
                             key  # type: ignore[literal-required]
                         ]
 
+                if (
+                    # device info that is purely meant for linking doesn't need default name
+                    any(
+                        key not in {"identifiers", "connections"}
+                        for key in (processed_dev_info)
+                    )
+                    and "default_name" not in processed_dev_info
+                    and not processed_dev_info.get("name")
+                ):
+                    processed_dev_info["name"] = self.config_entry.title
+
                 if "configuration_url" in device_info:
                     if device_info["configuration_url"] is None:
                         processed_dev_info["configuration_url"] = None
@@ -616,7 +676,8 @@ async def _async_add_entity(  # noqa: C901
 
                 try:
                     device = device_registry.async_get_or_create(
-                        **processed_dev_info  # type: ignore[arg-type]
+                        config_entry_id=self.config_entry.entry_id,
+                        **processed_dev_info,  # type: ignore[arg-type]
                     )
                     device_id = device.id
                 except RequiredParameterMissing:
@@ -629,12 +690,14 @@ async def _async_add_entity(  # noqa: C901
             else:
                 if device and entity.has_entity_name:
                     device_name = device.name_by_user or device.name
-                    if not entity.name:
+                    if entity.use_device_name:
                         suggested_object_id = device_name
                     else:
-                        suggested_object_id = f"{device_name} {entity.name}"
+                        suggested_object_id = (
+                            f"{device_name} {entity.suggested_object_id}"
+                        )
                 if not suggested_object_id:
-                    suggested_object_id = entity.name
+                    suggested_object_id = entity.suggested_object_id
 
             if self.entity_namespace is not None:
                 suggested_object_id = f"{self.entity_namespace} {suggested_object_id}"
@@ -662,7 +725,7 @@ async def _async_add_entity(  # noqa: C901
                 known_object_ids=self.entities.keys(),
                 original_device_class=entity.device_class,
                 original_icon=entity.icon,
-                original_name=entity.name,
+                original_name=entity_name,
                 suggested_object_id=suggested_object_id,
                 supported_features=entity.supported_features,
                 translation_key=entity.translation_key,
@@ -689,7 +752,7 @@ async def _async_add_entity(  # noqa: C901
         # Generate entity ID
         if entity.entity_id is None or generate_new_entity_id:
             suggested_object_id = (
-                suggested_object_id or entity.name or DEVICE_DEFAULT_NAME
+                suggested_object_id or entity.suggested_object_id or DEVICE_DEFAULT_NAME
             )
 
             if self.entity_namespace is not None:
@@ -707,7 +770,7 @@ async def _async_add_entity(  # noqa: C901
 
         if already_exists:
             self.logger.error(
-                f"Entity id already exists - ignoring: {entity.entity_id}"
+                "Entity id already exists - ignoring: %s", entity.entity_id
             )
             entity.add_to_platform_abort()
             return
@@ -716,7 +779,7 @@ async def _async_add_entity(  # noqa: C901
             self.logger.debug(
                 "Not adding entity %s because it's disabled",
                 entry.name
-                or entity.name
+                or entity_name
                 or f'"{self.platform_name} {entity.unique_id}"',
             )
             entity.add_to_platform_abort()
@@ -853,13 +916,22 @@ async def _update_entity_states(self, now: datetime) -> None:
             return
 
         async with self._process_updates:
-            tasks: list[Coroutine[Any, Any, None]] = []
-            for entity in self.entities.values():
-                if not entity.should_poll:
-                    continue
-                tasks.append(entity.async_update_ha_state(True))
+            if self._update_in_sequence or len(self.entities) <= 1:
+                # If we know we will update sequentially, we want to avoid scheduling
+                # the coroutines as tasks that will wait on the semaphore lock.
+                for entity in list(self.entities.values()):
+                    # If the entity is removed from hass during the previous
+                    # entity being updated, we need to skip updating the
+                    # entity.
+                    if entity.should_poll and entity.hass:
+                        await entity.async_update_ha_state(True)
+                return
 
-            if tasks:
+            if tasks := [
+                entity.async_update_ha_state(True)
+                for entity in self.entities.values()
+                if entity.should_poll
+            ]:
                 await asyncio.gather(*tasks)
 
 
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index d8c5a6c1cf6724..cabac2617c2939 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -11,8 +11,9 @@
 
 from collections import UserDict
 from collections.abc import Callable, Iterable, Mapping, ValuesView
+from datetime import datetime, timedelta
 import logging
-from types import MappingProxyType
+import time
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
 import attr
@@ -27,6 +28,7 @@
     ATTR_SUPPORTED_FEATURES,
     ATTR_UNIT_OF_MEASUREMENT,
     EVENT_HOMEASSISTANT_START,
+    EVENT_HOMEASSISTANT_STOP,
     MAX_LENGTH_STATE_DOMAIN,
     MAX_LENGTH_STATE_ENTITY_ID,
     STATE_UNAVAILABLE,
@@ -44,6 +46,7 @@
 from homeassistant.exceptions import MaxLengthExceeded
 from homeassistant.util import slugify, uuid as uuid_util
 from homeassistant.util.json import format_unserializable_data
+from homeassistant.util.read_only_dict import ReadOnlyDict
 
 from . import device_registry as dr, storage
 from .device_registry import EVENT_DEVICE_REGISTRY_UPDATED
@@ -61,9 +64,12 @@
 _LOGGER = logging.getLogger(__name__)
 
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 10
+STORAGE_VERSION_MINOR = 11
 STORAGE_KEY = "core.entity_registry"
 
+CLEANUP_INTERVAL = 3600 * 24
+ORPHANED_ENTITY_KEEP_SECONDS = 3600 * 24 * 30
+
 ENTITY_CATEGORY_VALUE_TO_INDEX: dict[EntityCategory | None, int] = {
     # mypy does not understand strenum
     val: idx  # type: ignore[misc]
@@ -102,6 +108,7 @@ class RegistryEntryHider(StrEnum):
 
 
 EntityOptionsType = Mapping[str, Mapping[str, Any]]
+ReadOnlyEntityOptionsType = ReadOnlyDict[str, Mapping[str, Any]]
 
 DISLAY_DICT_OPTIONAL = (
     ("ai", "area_id"),
@@ -110,27 +117,13 @@ class RegistryEntryHider(StrEnum):
 )
 
 
-class _EntityOptions(UserDict[str, MappingProxyType]):
-    """Container for entity options."""
-
-    def __init__(self, data: Mapping[str, Mapping] | None) -> None:
-        """Initialize."""
-        super().__init__()
-        if data is None:
-            return
-        self.data = {key: MappingProxyType(val) for key, val in data.items()}
-
-    def __setitem__(self, key: str, entry: Mapping) -> None:
-        """Add an item."""
-        raise NotImplementedError
-
-    def __delitem__(self, key: str) -> None:
-        """Remove an item."""
-        raise NotImplementedError
-
-    def as_dict(self) -> dict[str, dict]:
-        """Return dictionary version."""
-        return {key: dict(val) for key, val in self.data.items()}
+def _protect_entity_options(
+    data: EntityOptionsType | None,
+) -> ReadOnlyEntityOptionsType:
+    """Protect entity options from being modified."""
+    if data is None:
+        return ReadOnlyDict({})
+    return ReadOnlyDict({key: ReadOnlyDict(val) for key, val in data.items()})
 
 
 @attr.s(slots=True, frozen=True)
@@ -151,10 +144,15 @@ class RegistryEntry:
     entity_category: EntityCategory | None = attr.ib(default=None)
     hidden_by: RegistryEntryHider | None = attr.ib(default=None)
     icon: str | None = attr.ib(default=None)
-    id: str = attr.ib(factory=uuid_util.random_uuid_hex)
+    id: str = attr.ib(
+        default=None,
+        converter=attr.converters.default_if_none(factory=uuid_util.random_uuid_hex),  # type: ignore[misc]
+    )
     has_entity_name: bool = attr.ib(default=False)
     name: str | None = attr.ib(default=None)
-    options: _EntityOptions = attr.ib(default=None, converter=_EntityOptions)
+    options: ReadOnlyEntityOptionsType = attr.ib(
+        default=None, converter=_protect_entity_options
+    )
     # As set by integration
     original_device_class: str | None = attr.ib(default=None)
     original_icon: str | None = attr.ib(default=None)
@@ -308,6 +306,24 @@ def write_unavailable_state(self, hass: HomeAssistant) -> None:
         hass.states.async_set(self.entity_id, STATE_UNAVAILABLE, attrs)
 
 
+@attr.s(slots=True, frozen=True)
+class DeletedRegistryEntry:
+    """Deleted Entity Registry Entry."""
+
+    entity_id: str = attr.ib()
+    unique_id: str = attr.ib()
+    platform: str = attr.ib()
+    config_entry_id: str | None = attr.ib()
+    domain: str = attr.ib(init=False, repr=False)
+    id: str = attr.ib()
+    orphaned_timestamp: float | None = attr.ib()
+
+    @domain.default
+    def _domain_default(self) -> str:
+        """Compute domain value."""
+        return split_entity_id(self.entity_id)[0]
+
+
 class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
     """Store entity registry data."""
 
@@ -383,6 +399,10 @@ async def _async_migrate_func(
             for entity in data["entities"]:
                 entity["aliases"] = []
 
+        if old_major_version == 1 and old_minor_version < 11:
+            # Version 1.11 adds deleted_entities
+            data["deleted_entities"] = data.get("deleted_entities", [])
+
         if old_major_version > 1:
             raise NotImplementedError
         return data
@@ -435,7 +455,9 @@ def get_entry(self, key: str) -> RegistryEntry | None:
 class EntityRegistry:
     """Class to hold a registry of entities."""
 
+    deleted_entities: dict[tuple[str, str, str], DeletedRegistryEntry]
     entities: EntityRegistryItems
+    _entities_data: dict[str, RegistryEntry]
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the registry."""
@@ -480,9 +502,15 @@ def async_is_registered(self, entity_id: str) -> bool:
         return entity_id in self.entities
 
     @callback
-    def async_get(self, entity_id: str) -> RegistryEntry | None:
-        """Get EntityEntry for an entity_id."""
-        return self.entities.get(entity_id)
+    def async_get(self, entity_id_or_uuid: str) -> RegistryEntry | None:
+        """Get EntityEntry for an entity_id or entity entry id.
+
+        We retrieve the RegistryEntry from the underlying dict to avoid
+        the overhead of the UserDict __getitem__.
+        """
+        return self._entities_data.get(entity_id_or_uuid) or self.entities.get_entry(
+            entity_id_or_uuid
+        )
 
     @callback
     def async_get_entity_id(
@@ -500,6 +528,9 @@ def _entity_id_available(
         - It's not registered
         - It's not known by the entity component adding the entity
         - It's not in the state machine
+
+        Note that an entity_id which belongs to a deleted entity is considered
+        available.
         """
         if known_object_ids is None:
             known_object_ids = {}
@@ -595,8 +626,16 @@ def async_get_or_create(
                 unit_of_measurement=unit_of_measurement,
             )
 
+        entity_registry_id: str | None = None
+        deleted_entity = self.deleted_entities.pop((domain, platform, unique_id), None)
+        if deleted_entity is not None:
+            # Restore id
+            entity_registry_id = deleted_entity.id
+
         entity_id = self.async_generate_entity_id(
-            domain, suggested_object_id or f"{platform}_{unique_id}", known_object_ids
+            domain,
+            suggested_object_id or f"{platform}_{unique_id}",
+            known_object_ids,
         )
 
         if disabled_by and not isinstance(disabled_by, RegistryEntryDisabler):
@@ -634,6 +673,7 @@ def none_if_undefined(value: T | UndefinedType) -> T | None:
             entity_id=entity_id,
             hidden_by=hidden_by,
             has_entity_name=none_if_undefined(has_entity_name) or False,
+            id=entity_registry_id,
             options=initial_options,
             original_device_class=none_if_undefined(original_device_class),
             original_icon=none_if_undefined(original_icon),
@@ -657,7 +697,19 @@ def none_if_undefined(value: T | UndefinedType) -> T | None:
     @callback
     def async_remove(self, entity_id: str) -> None:
         """Remove an entity from registry."""
-        self.entities.pop(entity_id)
+        entity = self.entities.pop(entity_id)
+        config_entry_id = entity.config_entry_id
+        key = (entity.domain, entity.platform, entity.unique_id)
+        # If the entity does not belong to a config entry, mark it as orphaned
+        orphaned_timestamp = None if config_entry_id else time.time()
+        self.deleted_entities[key] = DeletedRegistryEntry(
+            config_entry_id=config_entry_id,
+            entity_id=entity_id,
+            id=entity.id,
+            orphaned_timestamp=orphaned_timestamp,
+            platform=entity.platform,
+            unique_id=entity.unique_id,
+        )
         self.hass.bus.async_fire(
             EVENT_ENTITY_REGISTRY_UPDATED, {"action": "remove", "entity_id": entity_id}
         )
@@ -958,10 +1010,12 @@ def async_update_entity_options(
 
     async def async_load(self) -> None:
         """Load the entity registry."""
-        async_setup_entity_restore(self.hass, self)
+        _async_setup_cleanup(self.hass, self)
+        _async_setup_entity_restore(self.hass, self)
 
         data = await self._store.async_load()
         entities = EntityRegistryItems()
+        deleted_entities: dict[tuple[str, str, str], DeletedRegistryEntry] = {}
 
         if data is not None:
             for entity in data["entities"]:
@@ -1000,8 +1054,24 @@ async def async_load(self) -> None:
                     unique_id=entity["unique_id"],
                     unit_of_measurement=entity["unit_of_measurement"],
                 )
+            for entity in data["deleted_entities"]:
+                key = (
+                    split_entity_id(entity["entity_id"])[0],
+                    entity["platform"],
+                    entity["unique_id"],
+                )
+                deleted_entities[key] = DeletedRegistryEntry(
+                    config_entry_id=entity["config_entry_id"],
+                    entity_id=entity["entity_id"],
+                    id=entity["id"],
+                    orphaned_timestamp=entity["orphaned_timestamp"],
+                    platform=entity["platform"],
+                    unique_id=entity["unique_id"],
+                )
 
+        self.deleted_entities = deleted_entities
         self.entities = entities
+        self._entities_data = entities.data
 
     @callback
     def async_schedule_save(self) -> None:
@@ -1029,7 +1099,7 @@ def _data_to_save(self) -> dict[str, Any]:
                 "id": entry.id,
                 "has_entity_name": entry.has_entity_name,
                 "name": entry.name,
-                "options": entry.options.as_dict(),
+                "options": entry.options,
                 "original_device_class": entry.original_device_class,
                 "original_icon": entry.original_icon,
                 "original_name": entry.original_name,
@@ -1041,18 +1111,54 @@ def _data_to_save(self) -> dict[str, Any]:
             }
             for entry in self.entities.values()
         ]
+        data["deleted_entities"] = [
+            {
+                "config_entry_id": entry.config_entry_id,
+                "entity_id": entry.entity_id,
+                "id": entry.id,
+                "orphaned_timestamp": entry.orphaned_timestamp,
+                "platform": entry.platform,
+                "unique_id": entry.unique_id,
+            }
+            for entry in self.deleted_entities.values()
+        ]
 
         return data
 
     @callback
-    def async_clear_config_entry(self, config_entry: str) -> None:
+    def async_clear_config_entry(self, config_entry_id: str) -> None:
         """Clear config entry from registry entries."""
+        now_time = time.time()
         for entity_id in [
             entity_id
             for entity_id, entry in self.entities.items()
-            if config_entry == entry.config_entry_id
+            if config_entry_id == entry.config_entry_id
         ]:
             self.async_remove(entity_id)
+        for key, deleted_entity in list(self.deleted_entities.items()):
+            if config_entry_id != deleted_entity.config_entry_id:
+                continue
+            # Add a time stamp when the deleted entity became orphaned
+            self.deleted_entities[key] = attr.evolve(
+                deleted_entity, orphaned_timestamp=now_time, config_entry_id=None
+            )
+            self.async_schedule_save()
+
+    @callback
+    def async_purge_expired_orphaned_entities(self) -> None:
+        """Purge expired orphaned entities from the registry.
+
+        We need to purge these periodically to avoid the database
+        growing without bound.
+        """
+        now_time = time.time()
+        for key, deleted_entity in list(self.deleted_entities.items()):
+            if (orphaned_timestamp := deleted_entity.orphaned_timestamp) is None:
+                continue
+
+            if orphaned_timestamp + ORPHANED_ENTITY_KEEP_SECONDS < now_time:
+                self.deleted_entities.pop(key)
+                self.async_schedule_save()
 
     @callback
     def async_clear_area_id(self, area_id: str) -> None:
@@ -1139,7 +1245,31 @@ def async_config_entry_disabled_by_changed(
 
 
 @callback
-def async_setup_entity_restore(hass: HomeAssistant, registry: EntityRegistry) -> None:
+def _async_setup_cleanup(hass: HomeAssistant, registry: EntityRegistry) -> None:
+    """Clean up device registry when entities removed."""
+    from . import event  # pylint: disable=import-outside-toplevel
+
+    @callback
+    def cleanup(_: datetime) -> None:
+        """Clean up entity registry."""
+        # Periodic purge of orphaned entities to avoid the registry
+        # growing without bounds when there are lots of deleted entities
+        registry.async_purge_expired_orphaned_entities()
+
+    cancel = event.async_track_time_interval(
+        hass, cleanup, timedelta(seconds=CLEANUP_INTERVAL)
+    )
+
+    @callback
+    def _on_homeassistant_stop(event: Event) -> None:
+        """Cancel cleanup."""
+        cancel()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _on_homeassistant_stop)
+
+
+@callback
+def _async_setup_entity_restore(hass: HomeAssistant, registry: EntityRegistry) -> None:
     """Set up the entity restore mechanism."""
 
     @callback
diff --git a/homeassistant/helpers/entity_values.py b/homeassistant/helpers/entity_values.py
index d489a4b1d379fa..fe4a4249c54311 100644
--- a/homeassistant/helpers/entity_values.py
+++ b/homeassistant/helpers/entity_values.py
@@ -3,14 +3,24 @@
 
 from collections import OrderedDict
 import fnmatch
+from functools import lru_cache
 import re
 from typing import Any
 
 from homeassistant.core import split_entity_id
 
+_MAX_EXPECTED_ENTITIES = 16384
+
 
 class EntityValues:
-    """Class to store entity id based values."""
+    """Class to store entity id based values.
+
+    This class is expected to only be used infrequently
+    as it caches all entity ids up to _MAX_EXPECTED_ENTITIES.
+
+    The cache includes `self` so it is important to
+    only use this in places where usage of `EntityValues` is immortal.
+    """
 
     def __init__(
         self,
@@ -19,7 +29,6 @@ def __init__(
         glob: dict[str, dict[str, str]] | None = None,
     ) -> None:
         """Initialize an EntityConfigDict."""
-        self._cache: dict[str, dict[str, str]] = {}
         self._exact = exact
         self._domain = domain
 
@@ -32,13 +41,11 @@ def __init__(
 
         self._glob = compiled
 
+    @lru_cache(maxsize=_MAX_EXPECTED_ENTITIES)
     def get(self, entity_id: str) -> dict[str, str]:
         """Get config for an entity id."""
-        if entity_id in self._cache:
-            return self._cache[entity_id]
-
         domain, _ = split_entity_id(entity_id)
-        result = self._cache[entity_id] = {}
+        result: dict[str, str] = {}
 
         if self._domain is not None and domain in self._domain:
             result.update(self._domain[domain])
diff --git a/homeassistant/helpers/entityfilter.py b/homeassistant/helpers/entityfilter.py
index 057e8f0955e377..1a449ec15f0f36 100644
--- a/homeassistant/helpers/entityfilter.py
+++ b/homeassistant/helpers/entityfilter.py
@@ -35,7 +35,14 @@ def __init__(self, config: dict[str, list[str]]) -> None:
         self._exclude_d = set(config[CONF_EXCLUDE_DOMAINS])
         self._include_eg = _convert_globs_to_pattern(config[CONF_INCLUDE_ENTITY_GLOBS])
         self._exclude_eg = _convert_globs_to_pattern(config[CONF_EXCLUDE_ENTITY_GLOBS])
-        self._filter: Callable[[str], bool] | None = None
+        self._filter = _generate_filter_from_sets_and_pattern_lists(
+            self._include_d,
+            self._include_e,
+            self._exclude_d,
+            self._exclude_e,
+            self._include_eg,
+            self._exclude_eg,
+        )
 
     def explicitly_included(self, entity_id: str) -> bool:
         """Check if an entity is explicitly included."""
@@ -49,17 +56,12 @@ def explicitly_excluded(self, entity_id: str) -> bool:
             bool(self._exclude_eg and self._exclude_eg.match(entity_id))
         )
 
+    def get_filter(self) -> Callable[[str], bool]:
+        """Return the filter function."""
+        return self._filter
+
     def __call__(self, entity_id: str) -> bool:
         """Run the filter."""
-        if self._filter is None:
-            self._filter = _generate_filter_from_sets_and_pattern_lists(
-                self._include_d,
-                self._include_e,
-                self._exclude_d,
-                self._exclude_e,
-                self._include_eg,
-                self._exclude_eg,
-            )
         return self._filter(entity_id)
 
 
@@ -183,22 +185,6 @@ def _generate_filter_from_sets_and_pattern_lists(
     have_exclude = bool(exclude_e or exclude_d or exclude_eg)
     have_include = bool(include_e or include_d or include_eg)
 
-    def entity_included(domain: str, entity_id: str) -> bool:
-        """Return true if entity matches inclusion filters."""
-        return (
-            entity_id in include_e
-            or domain in include_d
-            or (bool(include_eg and include_eg.match(entity_id)))
-        )
-
-    def entity_excluded(domain: str, entity_id: str) -> bool:
-        """Return true if entity matches exclusion filters."""
-        return (
-            entity_id in exclude_e
-            or domain in exclude_d
-            or (bool(exclude_eg and exclude_eg.match(entity_id)))
-        )
-
     # Case 1 - No filter
     # - All entities included
     if not have_include and not have_exclude:
@@ -211,12 +197,16 @@ def entity_excluded(domain: str, entity_id: str) -> bool:
     # - Otherwise: exclude
     if have_include and not have_exclude:
 
-        def entity_filter_2(entity_id: str) -> bool:
-            """Return filter function for case 2."""
-            domain = split_entity_id(entity_id)[0]
-            return entity_included(domain, entity_id)
+        def entity_included(entity_id: str) -> bool:
+            """Return true if entity matches inclusion filters."""
+            return (
+                entity_id in include_e
+                or split_entity_id(entity_id)[0] in include_d
+                or (bool(include_eg and include_eg.match(entity_id)))
+            )
 
-        return entity_filter_2
+        # Return filter function for case 2
+        return entity_included
 
     # Case 3 - Only excludes
     # - Entity listed in exclude: exclude
@@ -225,12 +215,15 @@ def entity_filter_2(entity_id: str) -> bool:
     # - Otherwise: include
     if not have_include and have_exclude:
 
-        def entity_filter_3(entity_id: str) -> bool:
-            """Return filter function for case 3."""
-            domain = split_entity_id(entity_id)[0]
-            return not entity_excluded(domain, entity_id)
+        def entity_not_excluded(entity_id: str) -> bool:
+            """Return true if entity matches exclusion filters."""
+            return not (
+                entity_id in exclude_e
+                or split_entity_id(entity_id)[0] in exclude_d
+                or (exclude_eg and exclude_eg.match(entity_id))
+            )
 
-        return entity_filter_3
+        return entity_not_excluded
 
     # Case 4 - Domain and/or glob includes (may also have excludes)
     # - Entity listed in entities include: include
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index 38d811c2afd700..b7254c5c347538 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -36,6 +36,7 @@
 from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import run_callback_threadsafe
 
+from .device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from .entity_registry import EVENT_ENTITY_REGISTRY_UPDATED
 from .ratelimit import KeyedRateLimit
 from .sun import get_astral_event_next
@@ -54,6 +55,9 @@
 TRACK_ENTITY_REGISTRY_UPDATED_CALLBACKS = "track_entity_registry_updated_callbacks"
 TRACK_ENTITY_REGISTRY_UPDATED_LISTENER = "track_entity_registry_updated_listener"
 
+TRACK_DEVICE_REGISTRY_UPDATED_CALLBACKS = "track_device_registry_updated_callbacks"
+TRACK_DEVICE_REGISTRY_UPDATED_LISTENER = "track_device_registry_updated_listener"
+
 _ALL_LISTENER = "all"
 _DOMAINS_LISTENER = "domains"
 _ENTITIES_LISTENER = "entities"
@@ -256,6 +260,34 @@ def async_track_state_change_event(
     return _async_track_state_change_event(hass, entity_ids, action)
 
 
+@callback
+def _async_dispatch_entity_id_event(
+    hass: HomeAssistant,
+    callbacks: dict[str, list[HassJob[[Event], Any]]],
+    event: Event,
+) -> None:
+    """Dispatch to listeners."""
+    if not (callbacks_list := callbacks.get(event.data["entity_id"])):
+        return
+    for job in callbacks_list[:]:
+        try:
+            hass.async_run_hass_job(job, event)
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception(
+                "Error while dispatching event for %s to %s",
+                event.data["entity_id"],
+                job,
+            )
+
+
+@callback
+def _async_state_change_filter(
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
+) -> bool:
+    """Filter state changes by entity_id."""
+    return event.data["entity_id"] in callbacks
+
+
 @bind_hass
 def _async_track_state_change_event(
     hass: HomeAssistant,
@@ -263,85 +295,124 @@ def _async_track_state_change_event(
     action: Callable[[Event], Any],
 ) -> CALLBACK_TYPE:
     """async_track_state_change_event without lowercasing."""
-    entity_callbacks: dict[str, list[HassJob[[Event], Any]]] = hass.data.setdefault(
-        TRACK_STATE_CHANGE_CALLBACKS, {}
+    return _async_track_event(
+        hass,
+        entity_ids,
+        TRACK_STATE_CHANGE_CALLBACKS,
+        TRACK_STATE_CHANGE_LISTENER,
+        EVENT_STATE_CHANGED,
+        _async_dispatch_entity_id_event,
+        _async_state_change_filter,
+        action,
     )
 
-    if TRACK_STATE_CHANGE_LISTENER not in hass.data:
 
-        @callback
-        def _async_state_change_filter(event: Event) -> bool:
-            """Filter state changes by entity_id."""
-            return event.data.get("entity_id") in entity_callbacks
+@callback
+def _remove_empty_listener() -> None:
+    """Remove a listener that does nothing."""
 
-        @callback
-        def _async_state_change_dispatcher(event: Event) -> None:
-            """Dispatch state changes by entity_id."""
-            entity_id = event.data.get("entity_id")
 
-            if entity_id not in entity_callbacks:
-                return
+@callback
+def _remove_listener(
+    hass: HomeAssistant,
+    listeners_key: str,
+    keys: Iterable[str],
+    job: HassJob[[Event], Any],
+    callbacks: dict[str, list[HassJob[[Event], Any]]],
+) -> None:
+    """Remove listener."""
+    for key in keys:
+        callbacks[key].remove(job)
+        if len(callbacks[key]) == 0:
+            del callbacks[key]
 
-            for job in entity_callbacks[entity_id][:]:
-                try:
-                    hass.async_run_hass_job(job, event)
-                except Exception:  # pylint: disable=broad-except
-                    _LOGGER.exception(
-                        "Error while processing state change for %s", entity_id
-                    )
-
-        hass.data[TRACK_STATE_CHANGE_LISTENER] = hass.bus.async_listen(
-            EVENT_STATE_CHANGED,
-            _async_state_change_dispatcher,
-            event_filter=_async_state_change_filter,
-        )
+    if not callbacks:
+        hass.data[listeners_key]()
+        del hass.data[listeners_key]
 
-    job = HassJob(action, f"track state change event {entity_ids}")
 
-    for entity_id in entity_ids:
-        entity_callbacks.setdefault(entity_id, []).append(job)
+def _async_track_event(
+    hass: HomeAssistant,
+    keys: str | Iterable[str],
+    callbacks_key: str,
+    listeners_key: str,
+    event_type: str,
+    dispatcher_callable: Callable[
+        [HomeAssistant, dict[str, list[HassJob[[Event], Any]]], Event], None
+    ],
+    filter_callable: Callable[
+        [HomeAssistant, dict[str, list[HassJob[[Event], Any]]], Event], bool
+    ],
+    action: Callable[[Event], None],
+) -> CALLBACK_TYPE:
+    """Track an event by a specific key."""
+    if not keys:
+        return _remove_empty_listener
 
-    @callback
-    def remove_listener() -> None:
-        """Remove state change listener."""
-        _async_remove_indexed_listeners(
-            hass,
-            TRACK_STATE_CHANGE_CALLBACKS,
-            TRACK_STATE_CHANGE_LISTENER,
-            entity_ids,
-            job,
+    if isinstance(keys, str):
+        keys = [keys]
+
+    hass_data = hass.data
+
+    callbacks: dict[str, list[HassJob[[Event], Any]]] | None = hass_data.get(
+        callbacks_key
+    )
+    if not callbacks:
+        callbacks = hass_data[callbacks_key] = {}
+
+    if listeners_key not in hass_data:
+        hass_data[listeners_key] = hass.bus.async_listen(
+            event_type,
+            callback(ft.partial(dispatcher_callable, hass, callbacks)),
+            event_filter=callback(ft.partial(filter_callable, hass, callbacks)),
         )
 
-    return remove_listener
+    job = HassJob(action, f"track {event_type} event {keys}")
 
+    for key in keys:
+        callback_list = callbacks.get(key)
+        if callback_list:
+            callback_list.append(job)
+        else:
+            callbacks[key] = [job]
 
-@callback
-def _remove_empty_listener() -> None:
-    """Remove a listener that does nothing."""
+    return ft.partial(_remove_listener, hass, listeners_key, keys, job, callbacks)
 
 
 @callback
-def _async_remove_indexed_listeners(
+def _async_dispatch_old_entity_id_or_entity_id_event(
     hass: HomeAssistant,
-    data_key: str,
-    listener_key: str,
-    storage_keys: Iterable[str],
-    job: HassJob[[Event], Any],
+    callbacks: dict[str, list[HassJob[[Event], Any]]],
+    event: Event,
 ) -> None:
-    """Remove a listener."""
-    callbacks: dict[str, list[HassJob[[Event], Any]]] = hass.data[data_key]
+    """Dispatch to listeners."""
+    if not (
+        callbacks_list := callbacks.get(
+            event.data.get("old_entity_id", event.data["entity_id"])
+        )
+    ):
+        return
+    for job in callbacks_list[:]:
+        try:
+            hass.async_run_hass_job(job, event)
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception(
+                "Error while dispatching event for %s to %s",
+                event.data.get("old_entity_id", event.data["entity_id"]),
+                job,
+            )
 
-    for storage_key in storage_keys:
-        callbacks[storage_key].remove(job)
-        if len(callbacks[storage_key]) == 0:
-            del callbacks[storage_key]
 
-    if not callbacks:
-        hass.data[listener_key]()
-        del hass.data[listener_key]
+@callback
+def _async_entity_registry_updated_filter(
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
+) -> bool:
+    """Filter entity registry updates by entity_id."""
+    return event.data.get("old_entity_id", event.data["entity_id"]) in callbacks
 
 
 @bind_hass
+@callback
 def async_track_entity_registry_updated_event(
     hass: HomeAssistant,
     entity_ids: str | Iterable[str],
@@ -353,76 +424,71 @@ def async_track_entity_registry_updated_event(
 
     Similar to async_track_state_change_event.
     """
-    if not entity_ids:
-        return _remove_empty_listener
-    if isinstance(entity_ids, str):
-        entity_ids = [entity_ids]
-
-    entity_callbacks: dict[str, list[HassJob[[Event], Any]]] = hass.data.setdefault(
-        TRACK_ENTITY_REGISTRY_UPDATED_CALLBACKS, {}
+    return _async_track_event(
+        hass,
+        entity_ids,
+        TRACK_ENTITY_REGISTRY_UPDATED_CALLBACKS,
+        TRACK_ENTITY_REGISTRY_UPDATED_LISTENER,
+        EVENT_ENTITY_REGISTRY_UPDATED,
+        _async_dispatch_old_entity_id_or_entity_id_event,
+        _async_entity_registry_updated_filter,
+        action,
     )
 
-    if TRACK_ENTITY_REGISTRY_UPDATED_LISTENER not in hass.data:
-
-        @callback
-        def _async_entity_registry_updated_filter(event: Event) -> bool:
-            """Filter entity registry updates by entity_id."""
-            entity_id = event.data.get("old_entity_id", event.data["entity_id"])
-            return entity_id in entity_callbacks
-
-        @callback
-        def _async_entity_registry_updated_dispatcher(event: Event) -> None:
-            """Dispatch entity registry updates by entity_id."""
-            entity_id = event.data.get("old_entity_id", event.data["entity_id"])
-
-            if entity_id not in entity_callbacks:
-                return
-
-            for job in entity_callbacks[entity_id][:]:
-                try:
-                    hass.async_run_hass_job(job, event)
-                except Exception:  # pylint: disable=broad-except
-                    _LOGGER.exception(
-                        "Error while processing entity registry update for %s",
-                        entity_id,
-                    )
-
-        hass.data[TRACK_ENTITY_REGISTRY_UPDATED_LISTENER] = hass.bus.async_listen(
-            EVENT_ENTITY_REGISTRY_UPDATED,
-            _async_entity_registry_updated_dispatcher,
-            event_filter=_async_entity_registry_updated_filter,
-        )
-
-    job = HassJob(action, f"track entity registry updated event {entity_ids}")
 
-    for entity_id in entity_ids:
-        entity_callbacks.setdefault(entity_id, []).append(job)
+@callback
+def _async_device_registry_updated_filter(
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
+) -> bool:
+    """Filter device registry updates by device_id."""
+    return event.data["device_id"] in callbacks
 
-    @callback
-    def remove_listener() -> None:
-        """Remove state change listener."""
-        _async_remove_indexed_listeners(
-            hass,
-            TRACK_ENTITY_REGISTRY_UPDATED_CALLBACKS,
-            TRACK_ENTITY_REGISTRY_UPDATED_LISTENER,
-            entity_ids,
-            job,
-        )
 
-    return remove_listener
+@callback
+def _async_dispatch_device_id_event(
+    hass: HomeAssistant,
+    callbacks: dict[str, list[HassJob[[Event], Any]]],
+    event: Event,
+) -> None:
+    """Dispatch to listeners."""
+    if not (callbacks_list := callbacks.get(event.data["device_id"])):
+        return
+    for job in callbacks_list[:]:
+        try:
+            hass.async_run_hass_job(job, event)
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception(
+                "Error while dispatching event for %s to %s",
+                event.data["device_id"],
+                job,
+            )
 
 
 @callback
-def _async_domain_has_listeners(
-    domain: str, callbacks: dict[str, list[HassJob[[Event], Any]]]
-) -> bool:
-    """Check if the domain has any listeners."""
-    return domain in callbacks or MATCH_ALL in callbacks
+def async_track_device_registry_updated_event(
+    hass: HomeAssistant,
+    device_ids: str | Iterable[str],
+    action: Callable[[Event], Any],
+) -> CALLBACK_TYPE:
+    """Track specific device registry updated events indexed by device_id.
+
+    Similar to async_track_entity_registry_updated_event.
+    """
+    return _async_track_event(
+        hass,
+        device_ids,
+        TRACK_DEVICE_REGISTRY_UPDATED_CALLBACKS,
+        TRACK_DEVICE_REGISTRY_UPDATED_LISTENER,
+        EVENT_DEVICE_REGISTRY_UPDATED,
+        _async_dispatch_device_id_event,
+        _async_device_registry_updated_filter,
+        action,
+    )
 
 
 @callback
 def _async_dispatch_domain_event(
-    hass: HomeAssistant, event: Event, callbacks: dict[str, list[HassJob[[Event], Any]]]
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
 ) -> None:
     """Dispatch domain event listeners."""
     domain = split_entity_id(event.data["entity_id"])[0]
@@ -435,6 +501,17 @@ def _async_dispatch_domain_event(
             )
 
 
+@callback
+def _async_domain_added_filter(
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
+) -> bool:
+    """Filter state changes by entity_id."""
+    return event.data.get("old_state") is None and (
+        MATCH_ALL in callbacks
+        or split_entity_id(event.data["entity_id"])[0] in callbacks
+    )
+
+
 @bind_hass
 def async_track_state_added_domain(
     hass: HomeAssistant,
@@ -453,48 +530,28 @@ def _async_track_state_added_domain(
     domains: str | Iterable[str],
     action: Callable[[Event], Any],
 ) -> CALLBACK_TYPE:
-    """async_track_state_added_domain without lowercasing."""
-    domain_callbacks: dict[str, list[HassJob[[Event], Any]]] = hass.data.setdefault(
-        TRACK_STATE_ADDED_DOMAIN_CALLBACKS, {}
+    """Track state change events when an entity is added to domains."""
+    return _async_track_event(
+        hass,
+        domains,
+        TRACK_STATE_ADDED_DOMAIN_CALLBACKS,
+        TRACK_STATE_ADDED_DOMAIN_LISTENER,
+        EVENT_STATE_CHANGED,
+        _async_dispatch_domain_event,
+        _async_domain_added_filter,
+        action,
     )
 
-    if TRACK_STATE_ADDED_DOMAIN_LISTENER not in hass.data:
-
-        @callback
-        def _async_state_change_filter(event: Event) -> bool:
-            """Filter state changes by entity_id."""
-            return event.data.get("old_state") is None and _async_domain_has_listeners(
-                split_entity_id(event.data["entity_id"])[0], domain_callbacks
-            )
 
-        @callback
-        def _async_state_change_dispatcher(event: Event) -> None:
-            """Dispatch state changes by entity_id."""
-            _async_dispatch_domain_event(hass, event, domain_callbacks)
-
-        hass.data[TRACK_STATE_ADDED_DOMAIN_LISTENER] = hass.bus.async_listen(
-            EVENT_STATE_CHANGED,
-            _async_state_change_dispatcher,
-            event_filter=_async_state_change_filter,
-        )
-
-    job = HassJob(action, f"track state added domain event {domains}")
-
-    for domain in domains:
-        domain_callbacks.setdefault(domain, []).append(job)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove state change listener."""
-        _async_remove_indexed_listeners(
-            hass,
-            TRACK_STATE_ADDED_DOMAIN_CALLBACKS,
-            TRACK_STATE_ADDED_DOMAIN_LISTENER,
-            domains,
-            job,
-        )
-
-    return remove_listener
+@callback
+def _async_domain_removed_filter(
+    hass: HomeAssistant, callbacks: dict[str, list[HassJob[[Event], Any]]], event: Event
+) -> bool:
+    """Filter state changes by entity_id."""
+    return event.data.get("new_state") is None and (
+        MATCH_ALL in callbacks
+        or split_entity_id(event.data["entity_id"])[0] in callbacks
+    )
 
 
 @bind_hass
@@ -504,51 +561,17 @@ def async_track_state_removed_domain(
     action: Callable[[Event], Any],
 ) -> CALLBACK_TYPE:
     """Track state change events when an entity is removed from domains."""
-    if not (domains := _async_string_to_lower_list(domains)):
-        return _remove_empty_listener
-
-    domain_callbacks: dict[str, list[HassJob[[Event], Any]]] = hass.data.setdefault(
-        TRACK_STATE_REMOVED_DOMAIN_CALLBACKS, {}
+    return _async_track_event(
+        hass,
+        domains,
+        TRACK_STATE_REMOVED_DOMAIN_CALLBACKS,
+        TRACK_STATE_REMOVED_DOMAIN_LISTENER,
+        EVENT_STATE_CHANGED,
+        _async_dispatch_domain_event,
+        _async_domain_removed_filter,
+        action,
     )
 
-    if TRACK_STATE_REMOVED_DOMAIN_LISTENER not in hass.data:
-
-        @callback
-        def _async_state_change_filter(event: Event) -> bool:
-            """Filter state changes by entity_id."""
-            return event.data.get("new_state") is None and _async_domain_has_listeners(
-                split_entity_id(event.data["entity_id"])[0], domain_callbacks
-            )
-
-        @callback
-        def _async_state_change_dispatcher(event: Event) -> None:
-            """Dispatch state changes by entity_id."""
-            _async_dispatch_domain_event(hass, event, domain_callbacks)
-
-        hass.data[TRACK_STATE_REMOVED_DOMAIN_LISTENER] = hass.bus.async_listen(
-            EVENT_STATE_CHANGED,
-            _async_state_change_dispatcher,
-            event_filter=_async_state_change_filter,
-        )
-
-    job = HassJob(action, f"track state removed domain event {domains}")
-
-    for domain in domains:
-        domain_callbacks.setdefault(domain, []).append(job)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove state change listener."""
-        _async_remove_indexed_listeners(
-            hass,
-            TRACK_STATE_REMOVED_DOMAIN_CALLBACKS,
-            TRACK_STATE_REMOVED_DOMAIN_LISTENER,
-            domains,
-            job,
-        )
-
-    return remove_listener
-
 
 @callback
 def _async_string_to_lower_list(instr: str | Iterable[str]) -> list[str]:
@@ -1322,6 +1345,7 @@ def async_track_point_in_utc_time(
     # Since this is called once, we accept a HassJob so we can avoid
     # having to figure out how to call the action every time its called.
     cancel_callback: asyncio.TimerHandle | None = None
+    loop = hass.loop
 
     @callback
     def run_action(job: HassJob[[datetime], Coroutine[Any, Any, None] | None]) -> None:
@@ -1335,7 +1359,7 @@ def run_action(job: HassJob[[datetime], Coroutine[Any, Any, None] | None]) -> No
         if (delta := (expected_fire_timestamp - time_tracker_timestamp())) > 0:
             _LOGGER.debug("Called %f seconds too early, rearming", delta)
 
-            cancel_callback = hass.loop.call_later(delta, run_action, job)
+            cancel_callback = loop.call_at(loop.time() + delta, run_action, job)
             return
 
         hass.async_run_hass_job(job, utc_point_in_time)
@@ -1346,11 +1370,11 @@ def run_action(job: HassJob[[datetime], Coroutine[Any, Any, None] | None]) -> No
         else HassJob(action, f"track point in utc time {utc_point_in_time}")
     )
     delta = expected_fire_timestamp - time.time()
-    cancel_callback = hass.loop.call_later(delta, run_action, job)
+    cancel_callback = loop.call_at(loop.time() + delta, run_action, job)
 
     @callback
     def unsub_point_in_time_listener() -> None:
-        """Cancel the call_later."""
+        """Cancel the call_at."""
         assert cancel_callback is not None
         cancel_callback.cancel()
 
@@ -1382,7 +1406,7 @@ def run_action(job: HassJob[[datetime], Coroutine[Any, Any, None] | None]) -> No
         if isinstance(action, HassJob)
         else HassJob(action, f"call_later {delay}")
     )
-    cancel_callback = hass.loop.call_later(delay, run_action, job)
+    cancel_callback = hass.loop.call_at(hass.loop.time() + delay, run_action, job)
 
     @callback
     def unsub_call_later_listener() -> None:
diff --git a/homeassistant/helpers/httpx_client.py b/homeassistant/helpers/httpx_client.py
index beb084d8c1c63f..93b199b1db56cf 100644
--- a/homeassistant/helpers/httpx_client.py
+++ b/homeassistant/helpers/httpx_client.py
@@ -19,8 +19,13 @@
 
 from .frame import warn_use
 
+# We have a lot of integrations that poll every 10-30 seconds
+# and we want to keep the connection open for a while so we
+# don't have to reconnect every time so we use 15s to match aiohttp.
+KEEP_ALIVE_TIMEOUT = 15
 DATA_ASYNC_CLIENT = "httpx_async_client"
 DATA_ASYNC_CLIENT_NOVERIFY = "httpx_async_client_noverify"
+DEFAULT_LIMITS = limits = httpx.Limits(keepalive_expiry=KEEP_ALIVE_TIMEOUT)
 SERVER_SOFTWARE = "{0}/{1} httpx/{2} Python/{3[0]}.{3[1]}".format(
     APPLICATION_NAME, __version__, httpx.__version__, sys.version_info
 )
@@ -78,6 +83,7 @@ def create_async_httpx_client(
     client = HassHttpXAsyncClient(
         verify=ssl_context,
         headers={USER_AGENT: SERVER_SOFTWARE},
+        limits=DEFAULT_LIMITS,
         **kwargs,
     )
 
diff --git a/homeassistant/helpers/instance_id.py b/homeassistant/helpers/instance_id.py
index 8561d10794ca4b..5bb8be5a9febc9 100644
--- a/homeassistant/helpers/instance_id.py
+++ b/homeassistant/helpers/instance_id.py
@@ -1,6 +1,7 @@
 """Helper to create a unique instance ID."""
 from __future__ import annotations
 
+import logging
 import uuid
 
 from homeassistant.core import HomeAssistant
@@ -12,17 +13,30 @@
 
 LEGACY_UUID_FILE = ".uuid"
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @singleton.singleton(DATA_KEY)
 async def async_get(hass: HomeAssistant) -> str:
     """Get unique ID for the hass instance."""
     store = storage.Store[dict[str, str]](hass, DATA_VERSION, DATA_KEY, True)
 
-    data: dict[str, str] | None = await storage.async_migrator(
-        hass,
-        hass.config.path(LEGACY_UUID_FILE),
-        store,
-    )
+    data: dict[str, str] | None = None
+    try:
+        data = await storage.async_migrator(
+            hass,
+            hass.config.path(LEGACY_UUID_FILE),
+            store,
+        )
+    except Exception:  # pylint: disable=broad-exception-caught
+        _LOGGER.exception(
+            (
+                "Could not read hass instance ID from '%s' or '%s', a new instance ID "
+                "will be generated"
+            ),
+            DATA_KEY,
+            LEGACY_UUID_FILE,
+        )
 
     if data is not None:
         return data["uuid"]
diff --git a/homeassistant/helpers/intent.py b/homeassistant/helpers/intent.py
index 8b07c2adc9acd2..f27cea8dd1e6f0 100644
--- a/homeassistant/helpers/intent.py
+++ b/homeassistant/helpers/intent.py
@@ -57,6 +57,16 @@ def async_register(hass: HomeAssistant, handler: IntentHandler) -> None:
     intents[handler.intent_type] = handler
 
 
+@callback
+@bind_hass
+def async_remove(hass: HomeAssistant, intent_type: str) -> None:
+    """Remove an intent from Home Assistant."""
+    if (intents := hass.data.get(DATA_KEY)) is None:
+        return
+
+    intents.pop(intent_type, None)
+
+
 @bind_hass
 async def async_handle(
     hass: HomeAssistant,
@@ -483,15 +493,36 @@ async def async_handle_states(
     async def async_call_service(self, intent_obj: Intent, state: State) -> None:
         """Call service on entity."""
         hass = intent_obj.hass
-        await hass.services.async_call(
-            self.domain,
-            self.service,
-            {ATTR_ENTITY_ID: state.entity_id},
-            context=intent_obj.context,
-            blocking=True,
-            limit=self.service_timeout,
+        await self._run_then_background(
+            hass.async_create_task(
+                hass.services.async_call(
+                    self.domain,
+                    self.service,
+                    {ATTR_ENTITY_ID: state.entity_id},
+                    context=intent_obj.context,
+                    blocking=True,
+                ),
+                f"intent_call_service_{self.domain}_{self.service}",
+            )
         )
 
+    async def _run_then_background(self, task: asyncio.Task) -> None:
+        """Run task with timeout to (hopefully) catch validation errors.
+
+        After the timeout the task will continue to run in the background.
+        """
+        try:
+            await asyncio.wait({task}, timeout=self.service_timeout)
+        except asyncio.TimeoutError:
+            pass
+        except asyncio.CancelledError:
+            # Task calling us was cancelled, so cancel service call task, and wait for
+            # it to be cancelled, within reason, before leaving.
+            _LOGGER.debug("Service call was cancelled: %s", task.get_name())
+            task.cancel()
+            await asyncio.wait({task}, timeout=5)
+            raise
+
 
 class IntentCategory(Enum):
     """Category of an intent."""
diff --git a/homeassistant/helpers/json.py b/homeassistant/helpers/json.py
index 5f8a6894121b1b..38c23050885119 100644
--- a/homeassistant/helpers/json.py
+++ b/homeassistant/helpers/json.py
@@ -2,10 +2,11 @@
 from collections import deque
 from collections.abc import Callable
 import datetime
+from functools import partial
 import json
 import logging
 from pathlib import Path
-from typing import Any, Final
+from typing import TYPE_CHECKING, Any, Final
 
 import orjson
 
@@ -55,6 +56,18 @@ def json_encoder_default(obj: Any) -> Any:
     raise TypeError
 
 
+if TYPE_CHECKING:
+
+    def json_bytes(obj: Any) -> bytes:
+        """Dump json bytes."""
+
+else:
+    json_bytes = partial(
+        orjson.dumps, option=orjson.OPT_NON_STR_KEYS, default=json_encoder_default
+    )
+    """Dump json bytes."""
+
+
 class ExtendedJSONEncoder(JSONEncoder):
     """JSONEncoder that supports Home Assistant objects and falls back to repr(o)."""
 
@@ -75,13 +88,6 @@ def default(self, o: Any) -> Any:
             return {"__type": str(type(o)), "repr": repr(o)}
 
 
-def json_bytes(data: Any) -> bytes:
-    """Dump json bytes."""
-    return orjson.dumps(
-        data, option=orjson.OPT_NON_STR_KEYS, default=json_encoder_default
-    )
-
-
 def _strip_null(obj: Any) -> Any:
     """Strip NUL from an object."""
     if isinstance(obj, str):
@@ -119,9 +125,7 @@ def json_dumps(data: Any) -> str:
     with option |= orjson.OPT_PASSTHROUGH_DATACLASS and it
     will fallback to as_dict
     """
-    return orjson.dumps(
-        data, option=orjson.OPT_NON_STR_KEYS, default=json_encoder_default
-    ).decode("utf-8")
+    return json_bytes(data).decode("utf-8")
 
 
 def json_dumps_sorted(data: Any) -> str:
diff --git a/homeassistant/helpers/restore_state.py b/homeassistant/helpers/restore_state.py
index d31c12d0fd526d..ab3b93cf3c4734 100644
--- a/homeassistant/helpers/restore_state.py
+++ b/homeassistant/helpers/restore_state.py
@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-import asyncio
 from datetime import datetime, timedelta
 import logging
 from typing import Any, cast
@@ -17,11 +16,11 @@
 from . import start
 from .entity import Entity
 from .event import async_track_time_interval
+from .frame import report
 from .json import JSONEncoder
-from .singleton import singleton
 from .storage import Store
 
-DATA_RESTORE_STATE_TASK = "restore_state_task"
+DATA_RESTORE_STATE = "restore_state"
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -96,45 +95,41 @@ def from_dict(cls, json_dict: dict) -> Self:
         )
 
 
-class RestoreStateData:
-    """Helper class for managing the helper saved data."""
-
-    @staticmethod
-    @singleton(DATA_RESTORE_STATE_TASK)
-    async def async_get_instance(hass: HomeAssistant) -> RestoreStateData:
-        """Get the singleton instance of this data helper."""
-        data = RestoreStateData(hass)
+async def async_load(hass: HomeAssistant) -> None:
+    """Load the restore state task."""
+    restore_state = RestoreStateData(hass)
+    await restore_state.async_setup()
+    hass.data[DATA_RESTORE_STATE] = restore_state
 
-        try:
-            stored_states = await data.store.async_load()
-        except HomeAssistantError as exc:
-            _LOGGER.error("Error loading last states", exc_info=exc)
-            stored_states = None
-
-        if stored_states is None:
-            _LOGGER.debug("Not creating cache - no saved states found")
-            data.last_states = {}
-        else:
-            data.last_states = {
-                item["state"]["entity_id"]: StoredState.from_dict(item)
-                for item in stored_states
-                if valid_entity_id(item["state"]["entity_id"])
-            }
-            _LOGGER.debug("Created cache with %s", list(data.last_states))
 
-        async def hass_start(hass: HomeAssistant) -> None:
-            """Start the restore state task."""
-            data.async_setup_dump()
+@callback
+def async_get(hass: HomeAssistant) -> RestoreStateData:
+    """Get the restore state data helper."""
+    return cast(RestoreStateData, hass.data[DATA_RESTORE_STATE])
 
-        start.async_at_start(hass, hass_start)
 
-        return data
+class RestoreStateData:
+    """Helper class for managing the helper saved data."""
 
     @classmethod
     async def async_save_persistent_states(cls, hass: HomeAssistant) -> None:
         """Dump states now."""
-        data = await cls.async_get_instance(hass)
-        await data.async_dump_states()
+        await async_get(hass).async_dump_states()
+
+    @classmethod
+    async def async_get_instance(cls, hass: HomeAssistant) -> RestoreStateData:
+        """Return the instance of this class."""
+        # Nothing should actually be calling this anymore, but we'll keep it
+        # around for a while to avoid breaking custom components.
+        #
+        # In fact they should not be accessing this at all.
+        report(
+            "restore_state.RestoreStateData.async_get_instance is deprecated, "
+            "and not intended to be called by custom components; Please"
+            "refactor your code to use RestoreEntity instead;"
+            " restore_state.async_get(hass) can be used in the meantime",
+        )
+        return async_get(hass)
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the restore state data class."""
@@ -145,6 +140,35 @@ def __init__(self, hass: HomeAssistant) -> None:
         self.last_states: dict[str, StoredState] = {}
         self.entities: dict[str, RestoreEntity] = {}
 
+    async def async_setup(self) -> None:
+        """Set up up the instance of this data helper."""
+        await self.async_load()
+
+        async def hass_start(hass: HomeAssistant) -> None:
+            """Start the restore state task."""
+            self.async_setup_dump()
+
+        start.async_at_start(self.hass, hass_start)
+
+    async def async_load(self) -> None:
+        """Load the instance of this data helper."""
+        try:
+            stored_states = await self.store.async_load()
+        except HomeAssistantError as exc:
+            _LOGGER.error("Error loading last states", exc_info=exc)
+            stored_states = None
+
+        if stored_states is None:
+            _LOGGER.debug("Not creating cache - no saved states found")
+            self.last_states = {}
+        else:
+            self.last_states = {
+                item["state"]["entity_id"]: StoredState.from_dict(item)
+                for item in stored_states
+                if valid_entity_id(item["state"]["entity_id"])
+            }
+            _LOGGER.debug("Created cache with %s", list(self.last_states))
+
     @callback
     def async_get_stored_states(self) -> list[StoredState]:
         """Get the set of states which should be stored.
@@ -288,21 +312,18 @@ class RestoreEntity(Entity):
 
     async def async_internal_added_to_hass(self) -> None:
         """Register this entity as a restorable entity."""
-        _, data = await asyncio.gather(
-            super().async_internal_added_to_hass(),
-            RestoreStateData.async_get_instance(self.hass),
-        )
-        data.async_restore_entity_added(self)
+        await super().async_internal_added_to_hass()
+        async_get(self.hass).async_restore_entity_added(self)
 
     async def async_internal_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass."""
-        _, data = await asyncio.gather(
-            super().async_internal_will_remove_from_hass(),
-            RestoreStateData.async_get_instance(self.hass),
+        async_get(self.hass).async_restore_entity_removed(
+            self.entity_id, self.extra_restore_state_data
         )
-        data.async_restore_entity_removed(self.entity_id, self.extra_restore_state_data)
+        await super().async_internal_will_remove_from_hass()
 
-    async def _async_get_restored_data(self) -> StoredState | None:
+    @callback
+    def _async_get_restored_data(self) -> StoredState | None:
         """Get data stored for an entity, if any."""
         if self.hass is None or self.entity_id is None:
             # Return None if this entity isn't added to hass yet
@@ -310,20 +331,17 @@ async def _async_get_restored_data(self) -> StoredState | None:
                 "Cannot get last state. Entity not added to hass"
             )
             return None
-        data = await RestoreStateData.async_get_instance(self.hass)
-        if self.entity_id not in data.last_states:
-            return None
-        return data.last_states[self.entity_id]
+        return async_get(self.hass).last_states.get(self.entity_id)
 
     async def async_get_last_state(self) -> State | None:
         """Get the entity state from the previous run."""
-        if (stored_state := await self._async_get_restored_data()) is None:
+        if (stored_state := self._async_get_restored_data()) is None:
             return None
         return stored_state.state
 
     async def async_get_last_extra_data(self) -> ExtraStoredData | None:
         """Get the entity specific state data from the previous run."""
-        if (stored_state := await self._async_get_restored_data()) is None:
+        if (stored_state := self._async_get_restored_data()) is None:
             return None
         return stored_state.extra_data
 
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 9ba4e7a9d88cf7..0dacb90e3189f6 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -11,7 +11,7 @@
 import itertools
 import logging
 from types import MappingProxyType
-from typing import Any, TypedDict, cast
+from typing import Any, TypedDict, TypeVar, cast
 
 import async_timeout
 import voluptuous as vol
@@ -46,6 +46,7 @@
     CONF_MODE,
     CONF_PARALLEL,
     CONF_REPEAT,
+    CONF_RESPONSE_VARIABLE,
     CONF_SCENE,
     CONF_SEQUENCE,
     CONF_SERVICE,
@@ -64,11 +65,12 @@
     SERVICE_TURN_ON,
 )
 from homeassistant.core import (
-    SERVICE_CALL_LIMIT,
     Context,
     Event,
     HassJob,
     HomeAssistant,
+    ServiceResponse,
+    SupportsResponse,
     callback,
 )
 from homeassistant.util import slugify
@@ -100,6 +102,8 @@
 
 # mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
 
+_T = TypeVar("_T")
+
 SCRIPT_MODE_PARALLEL = "parallel"
 SCRIPT_MODE_QUEUED = "queued"
 SCRIPT_MODE_RESTART = "restart"
@@ -349,6 +353,11 @@ class _ConditionFail(_HaltScript):
 class _StopScript(_HaltScript):
     """Throw if script needs to stop."""
 
+    def __init__(self, message: str, response: Any) -> None:
+        """Initialize a halt exception."""
+        super().__init__(message)
+        self.response = response
+
 
 class _ScriptRun:
     """Manage Script sequence run."""
@@ -393,13 +402,14 @@ def _step_log(self, default_message, timeout=None):
         )
         self._log("Executing step %s%s", self._script.last_action, _timeout)
 
-    async def async_run(self) -> None:
+    async def async_run(self) -> ServiceResponse:
         """Run script."""
         # Push the script to the script execution stack
         if (script_stack := script_stack_cv.get()) is None:
             script_stack = []
             script_stack_cv.set(script_stack)
         script_stack.append(id(self._script))
+        response = None
 
         try:
             self._log("Running %s", self._script.running_description)
@@ -417,11 +427,15 @@ async def async_run(self) -> None:
                 raise
         except _ConditionFail:
             script_execution_set("aborted")
-        except _StopScript:
-            script_execution_set("finished")
+        except _StopScript as err:
+            script_execution_set("finished", err.response)
+            response = err.response
+
             # Let the _StopScript bubble up if this is a sub-script
             if not self._script.top_level:
-                raise
+                # We already consumed the response, do not pass it on
+                err.response = None
+                raise err
         except Exception:
             script_execution_set("error")
             raise
@@ -430,6 +444,8 @@ async def async_run(self) -> None:
             script_stack.pop()
             self._finish()
 
+        return response
+
     async def _async_step(self, log_exceptions):
         continue_on_error = self._action.get(CONF_CONTINUE_ON_ERROR, False)
 
@@ -618,7 +634,7 @@ def async_script_wait(entity_id, from_s, to_s):
                 task.cancel()
             unsub()
 
-    async def _async_run_long_action(self, long_task: asyncio.Task) -> None:
+    async def _async_run_long_action(self, long_task: asyncio.Task[_T]) -> _T | None:
         """Run a long task while monitoring for stop request."""
 
         async def async_cancel_long_task() -> None:
@@ -646,10 +662,10 @@ async def async_cancel_long_task() -> None:
             raise asyncio.CancelledError
         if long_task.done():
             # Propagate any exceptions that occurred.
-            long_task.result()
-        else:
-            # Stopped before long task completed, so cancel it.
-            await async_cancel_long_task()
+            return long_task.result()
+        # Stopped before long task completed, so cancel it.
+        await async_cancel_long_task()
+        return None
 
     async def _async_call_service_step(self):
         """Call the service specified in the action."""
@@ -659,33 +675,43 @@ async def _async_call_service_step(self):
             self._hass, self._action, self._variables
         )
 
+        # Validate response data parameters. This check ignores services that do
+        # not exist which will raise an appropriate error in the service call below.
+        response_variable = self._action.get(CONF_RESPONSE_VARIABLE)
+        return_response = response_variable is not None
+        if self._hass.services.has_service(params[CONF_DOMAIN], params[CONF_SERVICE]):
+            supports_response = self._hass.services.supports_response(
+                params[CONF_DOMAIN], params[CONF_SERVICE]
+            )
+            if supports_response == SupportsResponse.ONLY and not return_response:
+                raise vol.Invalid(
+                    f"Script requires '{CONF_RESPONSE_VARIABLE}' for response data "
+                    f"for service call {params[CONF_DOMAIN]}.{params[CONF_SERVICE]}"
+                )
+            if supports_response == SupportsResponse.NONE and return_response:
+                raise vol.Invalid(
+                    f"Script does not support '{CONF_RESPONSE_VARIABLE}' for service "
+                    f"'{CONF_RESPONSE_VARIABLE}' which does not support response data."
+                )
+
         running_script = (
             params[CONF_DOMAIN] == "automation"
             and params[CONF_SERVICE] == "trigger"
             or params[CONF_DOMAIN] in ("python_script", "script")
         )
-        # If this might start a script then disable the call timeout.
-        # Otherwise use the normal service call limit.
-        if running_script:
-            limit = None
-        else:
-            limit = SERVICE_CALL_LIMIT
-
-        trace_set_result(params=params, running_script=running_script, limit=limit)
-        service_task = self._hass.async_create_task(
-            self._hass.services.async_call(
-                **params,
-                blocking=True,
-                context=self._context,
-                limit=limit,
-            )
+        trace_set_result(params=params, running_script=running_script)
+        response_data = await self._async_run_long_action(
+            self._hass.async_create_task(
+                self._hass.services.async_call(
+                    **params,
+                    blocking=True,
+                    context=self._context,
+                    return_response=return_response,
+                )
+            ),
         )
-        if limit is not None:
-            # There is a call limit, so just wait for it to finish.
-            await service_task
-            return
-
-        await self._async_run_long_action(service_task)
+        if response_variable:
+            self._variables[response_variable] = response_data
 
     async def _async_device_step(self):
         """Perform the device automation specified in the action."""
@@ -997,13 +1023,24 @@ async def _async_variables_step(self):
     async def _async_stop_step(self):
         """Stop script execution."""
         stop = self._action[CONF_STOP]
-        error = self._action[CONF_ERROR]
+        error = self._action.get(CONF_ERROR, False)
         trace_set_result(stop=stop, error=error)
         if error:
             self._log("Error script sequence: %s", stop)
             raise _AbortScript(stop)
+
         self._log("Stop script sequence: %s", stop)
-        raise _StopScript(stop)
+        if CONF_RESPONSE_VARIABLE in self._action:
+            try:
+                response = self._variables[self._action[CONF_RESPONSE_VARIABLE]]
+            except KeyError as ex:
+                raise _AbortScript(
+                    f"Response variable '{self._action[CONF_RESPONSE_VARIABLE]}' "
+                    "is not defined"
+                ) from ex
+        else:
+            response = None
+        raise _StopScript(stop, response)
 
     @async_trace_path("parallel")
     async def _async_parallel_step(self) -> None:
@@ -1442,7 +1479,7 @@ async def async_run(
         run_variables: _VarsType | None = None,
         context: Context | None = None,
         started_action: Callable[..., Any] | None = None,
-    ) -> None:
+    ) -> ServiceResponse:
         """Run script."""
         if context is None:
             self._log(
@@ -1453,7 +1490,7 @@ async def async_run(
         # Prevent spawning new script runs when Home Assistant is shutting down
         if DATA_NEW_SCRIPT_RUNS_NOT_ALLOWED in self._hass.data:
             self._log("Home Assistant is shutting down, starting script blocked")
-            return
+            return None
 
         # Prevent spawning new script runs if not allowed by script mode
         if self.is_running:
@@ -1461,7 +1498,7 @@ async def async_run(
                 if self._max_exceeded != "SILENT":
                     self._log("Already running", level=LOGSEVERITY[self._max_exceeded])
                 script_execution_set("failed_single")
-                return
+                return None
             if self.script_mode != SCRIPT_MODE_RESTART and self.runs == self.max_runs:
                 if self._max_exceeded != "SILENT":
                     self._log(
@@ -1469,7 +1506,7 @@ async def async_run(
                         level=LOGSEVERITY[self._max_exceeded],
                     )
                 script_execution_set("failed_max_runs")
-                return
+                return None
 
         # If this is a top level Script then make a copy of the variables in case they
         # are read-only, but more importantly, so as not to leak any variables created
@@ -1490,11 +1527,10 @@ async def async_run(
                 variables = {}
 
             variables["context"] = context
+        elif self._copy_variables_on_run:
+            variables = cast(dict, copy(run_variables))
         else:
-            if self._copy_variables_on_run:
-                variables = cast(dict, copy(run_variables))
-            else:
-                variables = cast(dict, run_variables)
+            variables = cast(dict, run_variables)
 
         # Prevent non-allowed recursive calls which will cause deadlocks when we try to
         # stop (restart) or wait for (queued) our own script run.
@@ -1506,7 +1542,7 @@ async def async_run(
         ):
             script_execution_set("disallowed_recursion_detected")
             self._log("Disallowed recursion detected", level=logging.WARNING)
-            return
+            return None
 
         if self.script_mode != SCRIPT_MODE_QUEUED:
             cls = _ScriptRun
@@ -1530,7 +1566,7 @@ async def async_run(
         self._changed()
 
         try:
-            await asyncio.shield(run.async_run())
+            return await asyncio.shield(run.async_run())
         except asyncio.CancelledError:
             await run.async_stop()
             self._changed()
diff --git a/homeassistant/helpers/selector.py b/homeassistant/helpers/selector.py
index fec9d25563e725..84c0f769c7cec8 100644
--- a/homeassistant/helpers/selector.py
+++ b/homeassistant/helpers/selector.py
@@ -189,8 +189,6 @@ class DeviceFilterSelectorConfig(TypedDict, total=False):
     integration: str
     manufacturer: str
     model: str
-    entity: EntityFilterSelectorConfig | list[EntityFilterSelectorConfig]
-    filter: DeviceFilterSelectorConfig | list[DeviceFilterSelectorConfig]
 
 
 class ActionSelectorConfig(TypedDict):
@@ -340,6 +338,28 @@ def __call__(self, data: Any) -> str:
         return attribute
 
 
+class BackupLocationSelectorConfig(TypedDict, total=False):
+    """Class to represent a backup location selector config."""
+
+
+@SELECTORS.register("backup_location")
+class BackupLocationSelector(Selector[BackupLocationSelectorConfig]):
+    """Selector of a backup location."""
+
+    selector_type = "backup_location"
+
+    CONFIG_SCHEMA = vol.Schema({})
+
+    def __init__(self, config: BackupLocationSelectorConfig | None = None) -> None:
+        """Instantiate a selector."""
+        super().__init__(config)
+
+    def __call__(self, data: Any) -> str:
+        """Validate the passed selection."""
+        name: str = vol.Match(r"^(?:\/backup|\w+)$")(data)
+        return name
+
+
 class BooleanSelectorConfig(TypedDict):
     """Class to represent a boolean selector config."""
 
@@ -480,6 +500,34 @@ def __call__(self, data: Any) -> Any:
         return self.config["value"]
 
 
+class ConversationAgentSelectorConfig(TypedDict, total=False):
+    """Class to represent a conversation agent selector config."""
+
+    language: str
+
+
+@SELECTORS.register("conversation_agent")
+class COnversationAgentSelector(Selector[ConversationAgentSelectorConfig]):
+    """Selector for a conversation agent."""
+
+    selector_type = "conversation_agent"
+
+    CONFIG_SCHEMA = vol.Schema(
+        {
+            vol.Optional("language"): str,
+        }
+    )
+
+    def __init__(self, config: ConversationAgentSelectorConfig) -> None:
+        """Instantiate a selector."""
+        super().__init__(config)
+
+    def __call__(self, data: Any) -> str:
+        """Validate the passed selection."""
+        agent: str = vol.Schema(str)(data)
+        return agent
+
+
 class DateSelectorConfig(TypedDict):
     """Class to represent a date selector config."""
 
@@ -524,14 +572,12 @@ def __call__(self, data: Any) -> Any:
         return data
 
 
-class DeviceSelectorConfig(TypedDict, total=False):
+class DeviceSelectorConfig(DeviceFilterSelectorConfig, total=False):
     """Class to represent a device selector config."""
 
-    integration: str
-    manufacturer: str
-    model: str
     entity: EntityFilterSelectorConfig | list[EntityFilterSelectorConfig]
     multiple: bool
+    filter: DeviceFilterSelectorConfig | list[DeviceFilterSelectorConfig]
 
 
 @SELECTORS.register("device")
@@ -600,6 +646,7 @@ class EntitySelectorConfig(EntityFilterSelectorConfig, total=False):
     exclude_entities: list[str]
     include_entities: list[str]
     multiple: bool
+    filter: EntityFilterSelectorConfig | list[EntityFilterSelectorConfig]
 
 
 @SELECTORS.register("entity")
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index a9d7b906e73303..40bb96506309e8 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable, Callable, Iterable
+from collections.abc import Awaitable, Callable, Coroutine, Iterable
 import dataclasses
 from enum import Enum
 from functools import cache, partial, wraps
@@ -26,7 +26,14 @@
     ENTITY_MATCH_ALL,
     ENTITY_MATCH_NONE,
 )
-from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+    Context,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import (
     HomeAssistantError,
     TemplateError,
@@ -233,7 +240,7 @@ def log_missing(self, missing_entities: set[str]) -> None:
             return
 
         _LOGGER.warning(
-            "Unable to find referenced %s or it is/they are currently not available",
+            "Referenced %s are missing or not currently available",
             ", ".join(parts),
         )
 
@@ -559,7 +566,9 @@ async def async_get_all_descriptions(
     hass: HomeAssistant,
 ) -> dict[str, dict[str, Any]]:
     """Return descriptions (i.e. user documentation) for all service calls."""
-    descriptions_cache = hass.data.setdefault(SERVICE_DESCRIPTION_CACHE, {})
+    descriptions_cache: dict[
+        tuple[str, str], dict[str, Any] | None
+    ] = hass.data.setdefault(SERVICE_DESCRIPTION_CACHE, {})
     services = hass.services.async_services()
 
     # See if there are new services not seen before.
@@ -567,59 +576,60 @@ async def async_get_all_descriptions(
     missing = set()
     all_services = []
     for domain in services:
-        for service in services[domain]:
-            cache_key = (domain, service)
+        for service_name in services[domain]:
+            cache_key = (domain, service_name)
             all_services.append(cache_key)
             if cache_key not in descriptions_cache:
                 missing.add(domain)
 
     # If we have a complete cache, check if it is still valid
-    if ALL_SERVICE_DESCRIPTIONS_CACHE in hass.data:
-        previous_all_services, previous_descriptions_cache = hass.data[
-            ALL_SERVICE_DESCRIPTIONS_CACHE
-        ]
+    if all_cache := hass.data.get(ALL_SERVICE_DESCRIPTIONS_CACHE):
+        previous_all_services, previous_descriptions_cache = all_cache
         # If the services are the same, we can return the cache
         if previous_all_services == all_services:
             return cast(dict[str, dict[str, Any]], previous_descriptions_cache)
 
     # Files we loaded for missing descriptions
-    loaded = {}
+    loaded: dict[str, JSON_TYPE] = {}
 
     if missing:
         ints_or_excs = await async_get_integrations(hass, missing)
-        integrations = [
-            int_or_exc
-            for int_or_exc in ints_or_excs.values()
-            if isinstance(int_or_exc, Integration)
-        ]
-
+        integrations: list[Integration] = []
+        for domain, int_or_exc in ints_or_excs.items():
+            if type(int_or_exc) is Integration:  # pylint: disable=unidiomatic-typecheck
+                integrations.append(int_or_exc)
+                continue
+            if TYPE_CHECKING:
+                assert isinstance(int_or_exc, Exception)
+            _LOGGER.error("Failed to load integration: %s", domain, exc_info=int_or_exc)
         contents = await hass.async_add_executor_job(
             _load_services_files, hass, integrations
         )
-
-        for domain, content in zip(missing, contents):
-            loaded[domain] = content
+        loaded = dict(zip(missing, contents))
 
     # Build response
     descriptions: dict[str, dict[str, Any]] = {}
-    for domain in services:
+    for domain, services_map in services.items():
         descriptions[domain] = {}
+        domain_descriptions = descriptions[domain]
 
-        for service in services[domain]:
-            cache_key = (domain, service)
+        for service_name in services_map:
+            cache_key = (domain, service_name)
             description = descriptions_cache.get(cache_key)
-
             # Cache missing descriptions
             if description is None:
-                domain_yaml = loaded[domain]
+                domain_yaml = loaded.get(domain) or {}
+                # The YAML may be empty for dynamically defined
+                # services (ie shell_command) that never call
+                # service.async_set_service_schema for the dynamic
+                # service
 
                 yaml_description = domain_yaml.get(  # type: ignore[union-attr]
-                    service, {}
+                    service_name, {}
                 )
 
                 # Don't warn for missing services, because it triggers false
                 # positives for things like scripts, that register as a service
-
                 description = {
                     "name": yaml_description.get("name", ""),
                     "description": yaml_description.get("description", ""),
@@ -629,9 +639,16 @@ async def async_get_all_descriptions(
                 if "target" in yaml_description:
                     description["target"] = yaml_description["target"]
 
+                if (
+                    response := hass.services.supports_response(domain, service_name)
+                ) != SupportsResponse.NONE:
+                    description["response"] = {
+                        "optional": response == SupportsResponse.OPTIONAL,
+                    }
+
                 descriptions_cache[cache_key] = description
 
-            descriptions[domain][service] = description
+            domain_descriptions[service_name] = description
 
     hass.data[ALL_SERVICE_DESCRIPTIONS_CACHE] = (all_services, descriptions)
     return descriptions
@@ -653,7 +670,9 @@ def async_set_service_schema(
     hass: HomeAssistant, domain: str, service: str, schema: dict[str, Any]
 ) -> None:
     """Register a description for a service."""
-    hass.data.setdefault(SERVICE_DESCRIPTION_CACHE, {})
+    descriptions_cache: dict[
+        tuple[str, str], dict[str, Any] | None
+    ] = hass.data.setdefault(SERVICE_DESCRIPTION_CACHE, {})
 
     description = {
         "name": schema.get("name", ""),
@@ -664,31 +683,36 @@ def async_set_service_schema(
     if "target" in schema:
         description["target"] = schema["target"]
 
+    if (
+        response := hass.services.supports_response(domain, service)
+    ) != SupportsResponse.NONE:
+        description["response"] = {
+            "optional": response == SupportsResponse.OPTIONAL,
+        }
+
     hass.data.pop(ALL_SERVICE_DESCRIPTIONS_CACHE, None)
-    hass.data[SERVICE_DESCRIPTION_CACHE][(domain, service)] = description
+    descriptions_cache[(domain, service)] = description
 
 
 @bind_hass
 async def entity_service_call(  # noqa: C901
     hass: HomeAssistant,
     platforms: Iterable[EntityPlatform],
-    func: str | Callable[..., Any],
+    func: str | Callable[..., Coroutine[Any, Any, ServiceResponse]],
     call: ServiceCall,
     required_features: Iterable[int] | None = None,
-) -> None:
+) -> ServiceResponse | None:
     """Handle an entity service call.
 
     Calls all platforms simultaneously.
     """
+    entity_perms: None | (Callable[[str, str], bool]) = None
     if call.context.user_id:
         user = await hass.auth.async_get_user(call.context.user_id)
         if user is None:
             raise UnknownUser(context=call.context)
-        entity_perms: None | (
-            Callable[[str, str], bool]
-        ) = user.permissions.check_entity
-    else:
-        entity_perms = None
+        if not user.is_admin:
+            entity_perms = user.permissions.check_entity
 
     target_all_entities = call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_ALL
 
@@ -714,15 +738,15 @@ async def entity_service_call(  # noqa: C901
 
     if entity_perms is None:
         for platform in platforms:
+            platform_entities = platform.entities
             if target_all_entities:
-                entity_candidates.extend(platform.entities.values())
+                entity_candidates.extend(platform_entities.values())
             else:
                 assert all_referenced is not None
                 entity_candidates.extend(
                     [
-                        entity
-                        for entity in platform.entities.values()
-                        if entity.entity_id in all_referenced
+                        platform_entities[entity_id]
+                        for entity_id in all_referenced.intersection(platform_entities)
                     ]
                 )
 
@@ -742,21 +766,20 @@ async def entity_service_call(  # noqa: C901
         assert all_referenced is not None
 
         for platform in platforms:
-            platform_entities = []
-            for entity in platform.entities.values():
-                if entity.entity_id not in all_referenced:
-                    continue
-
-                if not entity_perms(entity.entity_id, POLICY_CONTROL):
+            platform_entities = platform.entities
+            platform_entity_candidates = []
+            entity_id_matches = all_referenced.intersection(platform_entities)
+            for entity_id in entity_id_matches:
+                if not entity_perms(entity_id, POLICY_CONTROL):
                     raise Unauthorized(
                         context=call.context,
-                        entity_id=entity.entity_id,
+                        entity_id=entity_id,
                         permission=POLICY_CONTROL,
                     )
 
-                platform_entities.append(entity)
+                platform_entity_candidates.append(platform_entities[entity_id])
 
-            entity_candidates.extend(platform_entities)
+            entity_candidates.extend(platform_entity_candidates)
 
     if not target_all_entities:
         assert referenced is not None
@@ -769,7 +792,7 @@ async def entity_service_call(  # noqa: C901
 
         referenced.log_missing(missing)
 
-    entities = []
+    entities: list[Entity] = []
 
     for entity in entity_candidates:
         if not entity.available:
@@ -794,7 +817,16 @@ async def entity_service_call(  # noqa: C901
         entities.append(entity)
 
     if not entities:
-        return
+        if call.return_response:
+            raise HomeAssistantError(
+                "Service call requested response data but did not match any entities"
+            )
+        return None
+
+    if call.return_response and len(entities) != 1:
+        raise HomeAssistantError(
+            "Service call requested response data but matched more than one entity"
+        )
 
     done, pending = await asyncio.wait(
         [
@@ -807,10 +839,12 @@ async def entity_service_call(  # noqa: C901
         ]
     )
     assert not pending
-    for future in done:
-        future.result()  # pop exception if have
 
-    tasks = []
+    response_data: ServiceResponse | None
+    for task in done:
+        response_data = task.result()  # pop exception if have
+
+    tasks: list[asyncio.Task[None]] = []
 
     for entity in entities:
         if not entity.should_poll:
@@ -827,28 +861,32 @@ async def entity_service_call(  # noqa: C901
         for future in done:
             future.result()  # pop exception if have
 
+    return response_data if call.return_response else None
+
 
 async def _handle_entity_call(
     hass: HomeAssistant,
     entity: Entity,
-    func: str | Callable[..., Any],
+    func: str | Callable[..., Coroutine[Any, Any, ServiceResponse]],
     data: dict | ServiceCall,
     context: Context,
-) -> None:
+) -> ServiceResponse:
     """Handle calling service method."""
     entity.async_set_context(context)
 
+    task: asyncio.Future[ServiceResponse] | None
     if isinstance(func, str):
-        result = hass.async_run_job(
+        task = hass.async_run_job(
             partial(getattr(entity, func), **data)  # type: ignore[arg-type]
         )
     else:
-        result = hass.async_run_job(func, entity, data)
+        task = hass.async_run_job(func, entity, data)
 
     # Guard because callback functions do not return a task when passed to
     # async_run_job.
-    if result is not None:
-        await result
+    result: ServiceResponse | None = None
+    if task is not None:
+        result = await task
 
     if asyncio.iscoroutine(result):
         _LOGGER.error(
@@ -859,7 +897,9 @@ async def _handle_entity_call(
             func,
             entity.entity_id,
         )
-        await result
+        result = await result
+
+    return result
 
 
 @bind_hass
diff --git a/homeassistant/helpers/singleton.py b/homeassistant/helpers/singleton.py
index f15806ae5ff09c..5579106bb55814 100644
--- a/homeassistant/helpers/singleton.py
+++ b/homeassistant/helpers/singleton.py
@@ -38,7 +38,7 @@ def wrapped(hass: HomeAssistant) -> _T:
         async def async_wrapped(hass: HomeAssistant) -> Any:
             if data_key not in hass.data:
                 evt = hass.data[data_key] = asyncio.Event()
-                result = await func(hass)  # type: ignore[misc]
+                result = await func(hass)
                 hass.data[data_key] = result
                 evt.set()
                 return cast(_T, result)
diff --git a/homeassistant/helpers/storage.py b/homeassistant/helpers/storage.py
index bd9b01cd6a6c68..128a36e3e14c4e 100644
--- a/homeassistant/helpers/storage.py
+++ b/homeassistant/helpers/storage.py
@@ -34,11 +34,11 @@
 async def async_migrator(
     hass: HomeAssistant,
     old_path: str,
-    store: Store,
+    store: Store[_T],
     *,
     old_conf_load_func: Callable | None = None,
     old_conf_migrate_func: Callable | None = None,
-) -> Any:
+) -> _T | None:
     """Migrate old data to a store and then load data.
 
     async def old_conf_migrate_func(old_data)
diff --git a/homeassistant/helpers/template_entity.py b/homeassistant/helpers/template_entity.py
index 2b2774eea66dba..42d578555abb69 100644
--- a/homeassistant/helpers/template_entity.py
+++ b/homeassistant/helpers/template_entity.py
@@ -65,6 +65,19 @@
     }
 )
 
+
+def make_template_entity_base_schema(default_name: str) -> vol.Schema:
+    """Return a schema with default name."""
+    return vol.Schema(
+        {
+            vol.Optional(CONF_ICON): cv.template,
+            vol.Optional(CONF_NAME, default=default_name): cv.template,
+            vol.Optional(CONF_PICTURE): cv.template,
+            vol.Optional(CONF_UNIQUE_ID): cv.string,
+        }
+    )
+
+
 TEMPLATE_SENSOR_BASE_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
@@ -172,8 +185,6 @@ def handle_result(
 class TemplateEntity(Entity):
     """Entity that uses templates to calculate attributes."""
 
-    _attr_name: str | None
-
     _attr_available = True
     _attr_entity_picture = None
     _attr_icon = None
@@ -430,7 +441,7 @@ async def async_run_script(
         """Run an action script."""
         if run_variables is None:
             run_variables = {}
-        return await script.async_run(
+        await script.async_run(
             run_variables={
                 "this": TemplateStateFromEntityId(self.hass, self.entity_id),
                 **run_variables,
diff --git a/homeassistant/helpers/trace.py b/homeassistant/helpers/trace.py
index 3a5fb83395aa35..fd7a3081f7a345 100644
--- a/homeassistant/helpers/trace.py
+++ b/homeassistant/helpers/trace.py
@@ -8,6 +8,7 @@
 from functools import wraps
 from typing import Any, cast
 
+from homeassistant.core import ServiceResponse
 import homeassistant.util.dt as dt_util
 
 from .typing import TemplateVarsType
@@ -16,6 +17,17 @@
 class TraceElement:
     """Container for trace data."""
 
+    __slots__ = (
+        "_child_key",
+        "_child_run_id",
+        "_error",
+        "path",
+        "_result",
+        "reuse_by_child",
+        "_timestamp",
+        "_variables",
+    )
+
     def __init__(self, variables: TemplateVarsType, path: str) -> None:
         """Container for trace data."""
         self._child_key: str | None = None
@@ -207,13 +219,15 @@ class StopReason:
     """Mutable container class for script_execution."""
 
     script_execution: str | None = None
+    response: ServiceResponse = None
 
 
-def script_execution_set(reason: str) -> None:
+def script_execution_set(reason: str, response: ServiceResponse = None) -> None:
     """Set stop reason."""
     if (data := script_execution_cv.get()) is None:
         return
     data.script_execution = reason
+    data.response = response
 
 
 def script_execution_get() -> str | None:
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 5706e34dc9caeb..36dd7d27d4a9b7 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -30,7 +30,7 @@
 REQUEST_REFRESH_DEFAULT_COOLDOWN = 10
 REQUEST_REFRESH_DEFAULT_IMMEDIATE = True
 
-_T = TypeVar("_T")
+_DataT = TypeVar("_DataT")
 _BaseDataUpdateCoordinatorT = TypeVar(
     "_BaseDataUpdateCoordinatorT", bound="BaseDataUpdateCoordinatorProtocol"
 )
@@ -53,7 +53,7 @@ def async_add_listener(
         """Listen for data updates."""
 
 
-class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_T]):
+class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
     """Class to manage fetching data from single endpoint."""
 
     def __init__(
@@ -63,7 +63,7 @@ def __init__(
         *,
         name: str,
         update_interval: timedelta | None = None,
-        update_method: Callable[[], Awaitable[_T]] | None = None,
+        update_method: Callable[[], Awaitable[_DataT]] | None = None,
         request_refresh_debouncer: Debouncer[Coroutine[Any, Any, None]] | None = None,
     ) -> None:
         """Initialize global data updater."""
@@ -80,7 +80,7 @@ def __init__(
         # to make sure the first update was successful.
         # Set type to just T to remove annoying checks that data is not None
         # when it was already checked during setup.
-        self.data: _T = None  # type: ignore[assignment]
+        self.data: _DataT = None  # type: ignore[assignment]
 
         # Pick a random microsecond to stagger the refreshes
         # and avoid a thundering herd.
@@ -235,7 +235,7 @@ async def async_request_refresh(self) -> None:
         """
         await self._debounced_refresh.async_call()
 
-    async def _async_update_data(self) -> _T:
+    async def _async_update_data(self) -> _DataT:
         """Fetch the latest data from the source."""
         if self.update_method is None:
             raise NotImplementedError("Update method not implemented")
@@ -383,7 +383,7 @@ def async_set_update_error(self, err: Exception) -> None:
             self.async_update_listeners()
 
     @callback
-    def async_set_updated_data(self, data: _T) -> None:
+    def async_set_updated_data(self, data: _DataT) -> None:
         """Manually update data, notify listeners and reset refresh interval."""
         self._async_unsub_refresh()
         self._debounced_refresh.async_cancel()
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index e7658c44567c54..6a8131d2454ebc 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -891,14 +891,15 @@ async def async_get_integrations(
     results: dict[str, Integration | Exception] = {}
     needed: dict[str, asyncio.Future[None]] = {}
     in_progress: dict[str, asyncio.Future[None]] = {}
+    if TYPE_CHECKING:
+        cache = cast(dict[str, Integration | asyncio.Future[None]], cache)
     for domain in domains:
-        int_or_fut: Integration | asyncio.Future[None] | None = cache.get(
-            domain, _UNDEF
-        )
-        if isinstance(int_or_fut, asyncio.Future):
-            in_progress[domain] = int_or_fut
+        int_or_fut = cache.get(domain, _UNDEF)
+        # Integration is never subclassed, so we can check for type
+        if type(int_or_fut) is Integration:  # pylint: disable=unidiomatic-typecheck
+            results[domain] = int_or_fut
         elif int_or_fut is not _UNDEF:
-            results[domain] = cast(Integration, int_or_fut)
+            in_progress[domain] = cast(asyncio.Future[None], int_or_fut)
         elif "." in domain:
             results[domain] = ValueError(f"Invalid domain {domain}")
         else:
@@ -915,19 +916,21 @@ async def async_get_integrations(
             else:
                 results[domain] = cast(Integration, int_or_fut)
 
+    if not needed:
+        return results
+
     # First we look for custom components
-    if needed:
-        # Instead of using resolve_from_root we use the cache of custom
-        # components to find the integration.
-        custom = await async_get_custom_components(hass)
-        for domain, future in needed.items():
-            if integration := custom.get(domain):
-                results[domain] = cache[domain] = integration
-                future.set_result(None)
+    # Instead of using resolve_from_root we use the cache of custom
+    # components to find the integration.
+    custom = await async_get_custom_components(hass)
+    for domain, future in needed.items():
+        if integration := custom.get(domain):
+            results[domain] = cache[domain] = integration
+            future.set_result(None)
 
-        for domain in results:
-            if domain in needed:
-                del needed[domain]
+    for domain in results:
+        if domain in needed:
+            del needed[domain]
 
     # Now the rest use resolve_from_root
     if needed:
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index a13a8f84790030..d4cdafd7ec1981 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,12 +1,9 @@
-PyJWT==2.7.0
-PyNaCl==1.5.0
-PyTurboJPEG==1.6.7
 aiodiscover==1.4.16
+aiohttp-cors==0.7.0
 aiohttp==3.8.4
-aiohttp_cors==0.7.0
 astral==2.2
+async-timeout==4.0.2
 async-upnp-client==0.33.2
-async_timeout==4.0.2
 atomicwrites-homeassistant==1.4.1
 attrs==22.2.0
 awesomeversion==22.9.0
@@ -15,44 +12,47 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 bluetooth-adapters==0.15.3
 bluetooth-auto-recovery==1.2.0
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 certifi>=2021.5.30
 ciso8601==2.3.0
-cryptography==40.0.2
+cryptography==41.0.1
 dbus-fast==1.86.0
 fnv-hash-fast==0.3.1
-ha-av==10.0.0
-hass-nabucasa==0.67.1
+ha-av==10.1.0
+hass-nabucasa==0.69.0
 hassil==1.0.6
 home-assistant-bluetooth==1.10.0
-home-assistant-frontend==20230503.3
-home-assistant-intents==2023.4.26
-httpx==0.24.0
+home-assistant-frontend==20230705.1
+home-assistant-intents==2023.6.28
+httpx==0.24.1
 ifaddr==0.2.0
 janus==1.0.0
-jinja2==3.1.2
-lru-dict==1.1.8
+Jinja2==3.1.2
+lru-dict==1.2.0
 mutagen==1.46.0
-orjson==3.8.12
+orjson==3.9.1
 paho-mqtt==1.6.1
-pillow==9.5.0
-pip>=21.0,<23.2
+Pillow==9.5.0
+pip>=21.3.1,<23.2
 psutil-home-assistant==0.0.1
-pyOpenSSL==23.1.0
+PyJWT==2.7.0
+PyNaCl==1.5.0
+pyOpenSSL==23.2.0
 pyserial==3.5
 python-slugify==4.0.1
+PyTurboJPEG==1.7.1
 pyudev==0.23.2
-pyyaml==6.0
+PyYAML==6.0
 requests==2.31.0
 scapy==2.5.0
-sqlalchemy==2.0.15
-typing-extensions>=4.5.0,<5.0
+SQLAlchemy==2.0.15
+typing-extensions>=4.7.0,<5.0
 ulid-transform==0.7.2
 voluptuous-serialize==2.6.0
 voluptuous==0.13.1
 webrtcvad==2.0.10
 yarl==1.9.2
-zeroconf==0.62.0
+zeroconf==0.70.0
 
 # Constrain pycryptodome to avoid vulnerability
 # see https://github.com/home-assistant/core/pull/16238
@@ -100,9 +100,9 @@ regex==2021.8.28
 # these requirements are quite loose. As the entire stack has some outstanding issues, and
 # even newer versions seem to introduce new issues, it's useful for us to pin all these
 # requirements so we can directly link HA versions to these library versions.
-anyio==3.6.2
+anyio==3.7.0
 h11==0.14.0
-httpcore==0.17.0
+httpcore==0.17.2
 
 # Ensure we have a hyperframe version that works in Python 3.10
 # 5.2.0 fixed a collections abc deprecation
@@ -128,9 +128,8 @@ authlib<1.0
 # Version 2.0 added typing, prevent accidental fallbacks
 backoff>=2.0
 
-# Breaking change in version
-# https://github.com/samuelcolvin/pydantic/issues/4092
-pydantic!=1.9.1
+# Require to avoid issues with decorators (#93904). v2 has breaking changes.
+pydantic>=1.10.8,<2.0
 
 # Breaks asyncio
 # https://github.com/pubnub/python/issues/130
@@ -154,7 +153,7 @@ pyOpenSSL>=23.1.0
 
 # protobuf must be in package constraints for the wheel
 # builder to build binary wheels
-protobuf==4.23.1
+protobuf==4.23.3
 
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
@@ -175,3 +174,7 @@ pysnmplib==5.0.21
 # pysnmp is no longer maintained and does not work with newer
 # python
 pysnmp==1000000000.0.0
+
+# The get-mac package has been replaced with getmac. Installing get-mac alongside getmac
+# breaks getmac due to them both sharing the same python package name inside 'getmac'.
+get-mac==1000000000.0.0
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 36b17690d7e86b..bf405d5dedab0d 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -18,8 +18,9 @@
     PLATFORM_FORMAT,
     Platform,
 )
-from .core import CALLBACK_TYPE
+from .core import CALLBACK_TYPE, DOMAIN as HOMEASSISTANT_DOMAIN
 from .exceptions import DependencyError, HomeAssistantError
+from .helpers.issue_registry import IssueSeverity, async_create_issue
 from .helpers.typing import ConfigType
 from .util import dt as dt_util, ensure_unique_string
 
@@ -173,7 +174,7 @@ async def _async_setup_component(
     """
     integration: loader.Integration | None = None
 
-    def log_error(msg: str) -> None:
+    def log_error(msg: str, exc_info: Exception | None = None) -> None:
         """Log helper."""
         if integration is None:
             custom = ""
@@ -181,7 +182,9 @@ def log_error(msg: str) -> None:
         else:
             custom = "" if integration.is_built_in else "custom integration "
             link = integration.documentation
-        _LOGGER.error("Setup failed for %s%s: %s", custom, domain, msg)
+        _LOGGER.error(
+            "Setup failed for %s%s: %s", custom, domain, msg, exc_info=exc_info
+        )
         async_notify_setup_error(hass, domain, link)
 
     try:
@@ -211,7 +214,7 @@ def log_error(msg: str) -> None:
     try:
         component = integration.get_component()
     except ImportError as err:
-        log_error(f"Unable to import component: {err}")
+        log_error(f"Unable to import component: {err}", err)
         return False
 
     processed_config = await conf_util.async_process_component_config(
@@ -222,6 +225,34 @@ def log_error(msg: str) -> None:
         log_error("Invalid config.")
         return False
 
+    # Detect attempt to setup integration which can be setup only from config entry
+    if (
+        domain in processed_config
+        and not hasattr(component, "async_setup")
+        and not hasattr(component, "setup")
+        and not hasattr(component, "CONFIG_SCHEMA")
+    ):
+        _LOGGER.error(
+            (
+                "The %s integration does not support YAML setup, please remove it from "
+                "your configuration"
+            ),
+            domain,
+        )
+        async_create_issue(
+            hass,
+            HOMEASSISTANT_DOMAIN,
+            f"config_entry_only_{domain}",
+            is_fixable=False,
+            severity=IssueSeverity.ERROR,
+            issue_domain=domain,
+            translation_key="config_entry_only",
+            translation_placeholders={
+                "domain": domain,
+                "add_integration": f"/config/integrations/dashboard/add?domain={domain}",
+            },
+        )
+
     start = timer()
     _LOGGER.info("Setting up %s", domain)
     with async_start_setup(hass, [domain]):
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index 2dfc9a6f622f42..4f49ec44ca78ca 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -81,7 +81,8 @@ def set_default_time_zone(time_zone: dt.tzinfo) -> None:
 
     Async friendly.
     """
-    global DEFAULT_TIME_ZONE  # pylint: disable=global-statement
+    # pylint: disable-next=global-statement
+    global DEFAULT_TIME_ZONE  # noqa: PLW0603
 
     assert isinstance(time_zone, dt.tzinfo)
 
diff --git a/homeassistant/util/language.py b/homeassistant/util/language.py
index 615024e059cc40..4ec8c74ffa9fd7 100644
--- a/homeassistant/util/language.py
+++ b/homeassistant/util/language.py
@@ -10,6 +10,14 @@
 from homeassistant.const import MATCH_ALL
 
 SEPARATOR_RE = re.compile(r"[-_]")
+SAME_LANGUAGES = (
+    # no = spoken Norwegian
+    # nb = written Norwegian (Bokmål)
+    ("nb", "no"),
+    # he = Hebrew new code
+    # iw = Hebrew old code
+    ("he", "iw"),
+)
 
 
 def preferred_regions(
@@ -60,9 +68,7 @@ def is_language_match(lang_1: str, lang_2: str) -> bool:
         # Exact match
         return True
 
-    if {lang_1, lang_2} == {"no", "nb"}:
-        # no = spoken Norwegian
-        # nb = written Norwegian (Bokmål)
+    if tuple(sorted([lang_1, lang_2])) in SAME_LANGUAGES:
         return True
 
     return False
diff --git a/homeassistant/util/unit_conversion.py b/homeassistant/util/unit_conversion.py
index a22a204e69a6bb..5ce31b072cf8e6 100644
--- a/homeassistant/util/unit_conversion.py
+++ b/homeassistant/util/unit_conversion.py
@@ -1,6 +1,9 @@
 """Typing Helpers for Home Assistant."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from functools import lru_cache
+
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
@@ -67,30 +70,49 @@ class BaseUnitConverter:
     @classmethod
     def convert(cls, value: float, from_unit: str | None, to_unit: str | None) -> float:
         """Convert one unit of measurement to another."""
-        if from_unit == to_unit:
-            return value
+        return cls.converter_factory(from_unit, to_unit)(value)
 
-        try:
-            from_ratio = cls._UNIT_CONVERSION[from_unit]
-        except KeyError as err:
-            raise HomeAssistantError(
-                UNIT_NOT_RECOGNIZED_TEMPLATE.format(from_unit, cls.UNIT_CLASS)
-            ) from err
+    @classmethod
+    @lru_cache
+    def converter_factory(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> Callable[[float], float]:
+        """Return a function to convert one unit of measurement to another."""
+        if from_unit == to_unit:
+            return lambda value: value
+        from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        return lambda val: (val / from_ratio) * to_ratio
 
+    @classmethod
+    def _get_from_to_ratio(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> tuple[float, float]:
+        """Get unit ratio between units of measurement."""
+        unit_conversion = cls._UNIT_CONVERSION
         try:
-            to_ratio = cls._UNIT_CONVERSION[to_unit]
+            return unit_conversion[from_unit], unit_conversion[to_unit]
         except KeyError as err:
             raise HomeAssistantError(
-                UNIT_NOT_RECOGNIZED_TEMPLATE.format(to_unit, cls.UNIT_CLASS)
+                UNIT_NOT_RECOGNIZED_TEMPLATE.format(err.args[0], cls.UNIT_CLASS)
             ) from err
 
-        new_value = value / from_ratio
-        return new_value * to_ratio
+    @classmethod
+    @lru_cache
+    def converter_factory_allow_none(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> Callable[[float | None], float | None]:
+        """Return a function to convert one unit of measurement to another which allows None."""
+        if from_unit == to_unit:
+            return lambda value: value
+        from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        return lambda val: None if val is None else (val / from_ratio) * to_ratio
 
     @classmethod
+    @lru_cache
     def get_unit_ratio(cls, from_unit: str | None, to_unit: str | None) -> float:
         """Get unit ratio between units of measurement."""
-        return cls._UNIT_CONVERSION[from_unit] / cls._UNIT_CONVERSION[to_unit]
+        from_ratio, to_ratio = cls._get_from_to_ratio(from_unit, to_unit)
+        return from_ratio / to_ratio
 
 
 class DataRateConverter(BaseUnitConverter):
@@ -339,7 +361,37 @@ class TemperatureConverter(BaseUnitConverter):
     }
 
     @classmethod
-    def convert(cls, value: float, from_unit: str | None, to_unit: str | None) -> float:
+    @lru_cache(maxsize=8)
+    def converter_factory(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> Callable[[float], float]:
+        """Return a function to convert a temperature from one unit to another."""
+        if from_unit == to_unit:
+            # Return a function that does nothing. This is not
+            # in _converter_factory because we do not want to wrap
+            # it with the None check in converter_factory_allow_none.
+            return lambda value: value
+
+        return cls._converter_factory(from_unit, to_unit)
+
+    @classmethod
+    @lru_cache(maxsize=8)
+    def converter_factory_allow_none(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> Callable[[float | None], float | None]:
+        """Return a function to convert a temperature from one unit to another which allows None."""
+        if from_unit == to_unit:
+            # Return a function that does nothing. This is not
+            # in _converter_factory because we do not want to wrap
+            # it with the None check in this case.
+            return lambda value: value
+        convert = cls._converter_factory(from_unit, to_unit)
+        return lambda value: None if value is None else convert(value)
+
+    @classmethod
+    def _converter_factory(
+        cls, from_unit: str | None, to_unit: str | None
+    ) -> Callable[[float], float]:
         """Convert a temperature from one unit to another.
 
         eg. 10°C will return 50°F
@@ -349,32 +401,29 @@ def convert(cls, value: float, from_unit: str | None, to_unit: str | None) -> fl
         """
         # We cannot use the implementation from BaseUnitConverter here because the
         # temperature units do not use the same floor: 0°C, 0°F and 0K do not align
-        if from_unit == to_unit:
-            return value
-
         if from_unit == UnitOfTemperature.CELSIUS:
             if to_unit == UnitOfTemperature.FAHRENHEIT:
-                return cls._celsius_to_fahrenheit(value)
+                return cls._celsius_to_fahrenheit
             if to_unit == UnitOfTemperature.KELVIN:
-                return cls._celsius_to_kelvin(value)
+                return cls._celsius_to_kelvin
             raise HomeAssistantError(
                 UNIT_NOT_RECOGNIZED_TEMPLATE.format(to_unit, cls.UNIT_CLASS)
             )
 
         if from_unit == UnitOfTemperature.FAHRENHEIT:
             if to_unit == UnitOfTemperature.CELSIUS:
-                return cls._fahrenheit_to_celsius(value)
+                return cls._fahrenheit_to_celsius
             if to_unit == UnitOfTemperature.KELVIN:
-                return cls._celsius_to_kelvin(cls._fahrenheit_to_celsius(value))
+                return cls._fahrenheit_to_kelvin
             raise HomeAssistantError(
                 UNIT_NOT_RECOGNIZED_TEMPLATE.format(to_unit, cls.UNIT_CLASS)
             )
 
         if from_unit == UnitOfTemperature.KELVIN:
             if to_unit == UnitOfTemperature.CELSIUS:
-                return cls._kelvin_to_celsius(value)
+                return cls._kelvin_to_celsius
             if to_unit == UnitOfTemperature.FAHRENHEIT:
-                return cls._celsius_to_fahrenheit(cls._kelvin_to_celsius(value))
+                return cls._kelvin_to_fahrenheit
             raise HomeAssistantError(
                 UNIT_NOT_RECOGNIZED_TEMPLATE.format(to_unit, cls.UNIT_CLASS)
             )
@@ -393,7 +442,17 @@ def convert_interval(cls, interval: float, from_unit: str, to_unit: str) -> floa
         """
         # We use BaseUnitConverter implementation here because we are only interested
         # in the ratio between the units.
-        return super().convert(interval, from_unit, to_unit)
+        return super().converter_factory(from_unit, to_unit)(interval)
+
+    @classmethod
+    def _kelvin_to_fahrenheit(cls, kelvin: float) -> float:
+        """Convert a temperature in Kelvin to Fahrenheit."""
+        return (kelvin - 273.15) * 1.8 + 32.0
+
+    @classmethod
+    def _fahrenheit_to_kelvin(cls, fahrenheit: float) -> float:
+        """Convert a temperature in Fahrenheit to Kelvin."""
+        return 273.15 + ((fahrenheit - 32.0) / 1.8)
 
     @classmethod
     def _fahrenheit_to_celsius(cls, fahrenheit: float) -> float:
diff --git a/machine/build.yaml b/machine/build.yaml
index 340b8079b9fb5f..2f8aa3fe5c3e4b 100644
--- a/machine/build.yaml
+++ b/machine/build.yaml
@@ -1,5 +1,4 @@
-image: homeassistant/{machine}-homeassistant
-shadow_repository: ghcr.io/home-assistant
+image: ghcr.io/home-assistant/{machine}-homeassistant
 build_from:
   aarch64: "ghcr.io/home-assistant/aarch64-homeassistant:"
   armv7: "ghcr.io/home-assistant/armv7-homeassistant:"
@@ -9,6 +8,9 @@ build_from:
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
+cosign:
+  base_identity: https://github.com/home-assistant/core/.*
+  identity: https://github.com/home-assistant/core/.*
 labels:
   io.hass.type: core
   org.opencontainers.image.source: https://github.com/home-assistant/core
diff --git a/machine/generic-x86-64 b/machine/generic-x86-64
index bbd72e93d513a4..874f0aecc1030b 100644
--- a/machine/generic-x86-64
+++ b/machine/generic-x86-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
     libva-intel-driver
diff --git a/machine/intel-nuc b/machine/intel-nuc
index 9b8a2b3eef9727..750b49727bec11 100644
--- a/machine/intel-nuc
+++ b/machine/intel-nuc
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 # NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
 # changes in generic-x86-64 as well.
diff --git a/machine/khadas-vim3 b/machine/khadas-vim3
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-c2 b/machine/odroid-c2
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/odroid-c2
+++ b/machine/odroid-c2
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-c4 b/machine/odroid-c4
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/odroid-c4
+++ b/machine/odroid-c4
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-m1 b/machine/odroid-m1
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/odroid-m1
+++ b/machine/odroid-m1
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-n2 b/machine/odroid-n2
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/odroid-n2
+++ b/machine/odroid-n2
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/odroid-xu b/machine/odroid-xu
index 57f6d0cddb8e6a..c1d74d3528ee95 100644
--- a/machine/odroid-xu
+++ b/machine/odroid-xu
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemuarm b/machine/qemuarm
index 54fc002097a4c4..c1d74d3528ee95 100644
--- a/machine/qemuarm
+++ b/machine/qemuarm
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemuarm-64 b/machine/qemuarm-64
index af934f31f0e345..c1d74d3528ee95 100644
--- a/machine/qemuarm-64
+++ b/machine/qemuarm-64
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemux86 b/machine/qemux86
index 23264cb6b18ed0..c1d74d3528ee95 100644
--- a/machine/qemux86
+++ b/machine/qemux86
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/i386-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/qemux86-64 b/machine/qemux86-64
index 3e7a43d1335498..c1d74d3528ee95 100644
--- a/machine/qemux86-64
+++ b/machine/qemux86-64
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/amd64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/raspberrypi b/machine/raspberrypi
index 876fcfce21e3d8..3cce504661e38d 100644
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armhf-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
index 5d109e240b7b36..c49db40b40875e 100644
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
index 5d109e240b7b36..c49db40b40875e 100644
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
index 9205b90389a307..c49db40b40875e 100644
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
index 5d109e240b7b36..c49db40b40875e 100644
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
index 9205b90389a307..c49db40b40875e 100644
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/machine/tinker b/machine/tinker
index 57f6d0cddb8e6a..c1d74d3528ee95 100644
--- a/machine/tinker
+++ b/machine/tinker
@@ -1,2 +1,4 @@
-ARG BUILD_VERSION
-FROM homeassistant/armv7-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
diff --git a/machine/yellow b/machine/yellow
index 9205b90389a307..c49db40b40875e 100644
--- a/machine/yellow
+++ b/machine/yellow
@@ -1,5 +1,7 @@
-ARG BUILD_VERSION
-FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
         raspberrypi \
diff --git a/mypy.ini b/mypy.ini
index fd5e87bd499e92..ab8b5a5df8989d 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -251,6 +251,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.airzone_cloud.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.aladdin_connect.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -621,6 +631,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.cloud.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.configurator.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -1432,6 +1452,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.hydrawise.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.hyperion.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -1452,6 +1482,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.image.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.image_processing.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2092,6 +2132,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.opensky.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.openuv.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2152,6 +2202,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.ping.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.powerwall.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2472,16 +2532,6 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
-[mypy-homeassistant.components.senseme.*]
-check_untyped_defs = true
-disallow_incomplete_defs = true
-disallow_subclassing_any = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
-warn_return_any = true
-warn_unreachable = true
-
 [mypy-homeassistant.components.sensibo.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -2803,6 +2853,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.text.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.threshold.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
diff --git a/pylint/plugins/hass_enforce_type_hints.py b/pylint/plugins/hass_enforce_type_hints.py
index a3cdb139131587..85b1b1370a19a4 100644
--- a/pylint/plugins/hass_enforce_type_hints.py
+++ b/pylint/plugins/hass_enforce_type_hints.py
@@ -140,6 +140,7 @@ class ClassTypeHintMatch:
     "recorder_mock": "Recorder",
     "requests_mock": "requests_mock.Mocker",
     "snapshot": "SnapshotAssertion",
+    "stub_blueprint_populate": "None",
     "tmp_path": "Path",
     "tmpdir": "py.path.local",
 }
@@ -572,7 +573,7 @@ class ClassTypeHintMatch:
     ),
     TypeHintMatch(
         function_name="name",
-        return_type=["str", None],
+        return_type=["str", "UndefinedType", None],
     ),
     TypeHintMatch(
         function_name="state",
@@ -1022,15 +1023,15 @@ class ClassTypeHintMatch:
                 ),
                 TypeHintMatch(
                     function_name="hvac_mode",
-                    return_type=["HVACMode", "str", None],
+                    return_type=["HVACMode", None],
                 ),
                 TypeHintMatch(
                     function_name="hvac_modes",
-                    return_type=["list[HVACMode]", "list[str]"],
+                    return_type="list[HVACMode]",
                 ),
                 TypeHintMatch(
                     function_name="hvac_action",
-                    return_type=["HVACAction", "str", None],
+                    return_type=["HVACAction", None],
                 ),
                 TypeHintMatch(
                     function_name="current_temperature",
@@ -2449,7 +2450,7 @@ class ClassTypeHintMatch:
                 ),
                 TypeHintMatch(
                     function_name="get_tts_audio",
-                    arg_types={1: "str", 2: "str", 3: "dict[str, Any] | None"},
+                    arg_types={1: "str", 2: "str", 3: "dict[str, Any]"},
                     return_type="TtsAudioType",
                     has_async_counterpart=True,
                 ),
diff --git a/pylint/plugins/hass_inheritance.py b/pylint/plugins/hass_inheritance.py
new file mode 100644
index 00000000000000..716479202c74a7
--- /dev/null
+++ b/pylint/plugins/hass_inheritance.py
@@ -0,0 +1,76 @@
+"""Plugin to enforce type hints on specific functions."""
+from __future__ import annotations
+
+import re
+
+from astroid import nodes
+from pylint.checkers import BaseChecker
+from pylint.lint import PyLinter
+
+_MODULE_REGEX: re.Pattern[str] = re.compile(r"^homeassistant\.components\.\w+(\.\w+)?$")
+
+
+def _get_module_platform(module_name: str) -> str | None:
+    """Return the platform for the module name."""
+    if not (module_match := _MODULE_REGEX.match(module_name)):
+        # Ensure `homeassistant.components.<component>`
+        # Or `homeassistant.components.<component>.<platform>`
+        return None
+
+    platform = module_match.groups()[0]
+    return platform.lstrip(".") if platform else "__init__"
+
+
+class HassInheritanceChecker(BaseChecker):  # type: ignore[misc]
+    """Checker for invalid inheritance."""
+
+    name = "hass_inheritance"
+    priority = -1
+    msgs = {
+        "W7411": (
+            "Invalid inheritance: %s",
+            "hass-invalid-inheritance",
+            "Used when a class has inheritance has issues",
+        ),
+    }
+    options = ()
+
+    _module_name: str
+    _module_platform: str | None
+
+    def visit_module(self, node: nodes.Module) -> None:
+        """Populate matchers for a Module node."""
+        self._module_name = node.name
+        self._module_platform = _get_module_platform(node.name)
+
+    def visit_classdef(self, node: nodes.ClassDef) -> None:
+        """Apply relevant type hint checks on a ClassDef node."""
+        if self._module_platform not in {"number", "sensor"}:
+            return
+
+        ancestors = [a.name for a in node.ancestors()]
+        if (
+            "RestoreEntity" in ancestors
+            and "SensorEntity" in ancestors
+            and "RestoreSensor" not in ancestors
+        ):
+            self.add_message(
+                "hass-invalid-inheritance",
+                node=node,
+                args="SensorEntity and RestoreEntity should not be combined, please use RestoreSensor",
+            )
+        elif (
+            "RestoreEntity" in ancestors
+            and "NumberEntity" in ancestors
+            and "RestoreNumber" not in ancestors
+        ):
+            self.add_message(
+                "hass-invalid-inheritance",
+                node=node,
+                args="NumberEntity and RestoreEntity should not be combined, please use RestoreNumber",
+            )
+
+
+def register(linter: PyLinter) -> None:
+    """Register the checker."""
+    linter.register_checker(HassInheritanceChecker(linter))
diff --git a/pylint/ruff.toml b/pylint/ruff.toml
new file mode 100644
index 00000000000000..271881141a9259
--- /dev/null
+++ b/pylint/ruff.toml
@@ -0,0 +1,7 @@
+# This extend our general Ruff rules specifically for tests
+extend = "../pyproject.toml"
+
+[isort]
+known-third-party = [
+    "pylint",
+]
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 1bda10f067778a..8256ce2d06060d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools~=62.3", "wheel~=0.37.1"]
+requires = ["setuptools~=68.0", "wheel~=0.40.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2023.6.0.dev0"
+version     = "2023.8.0.dev0"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"
@@ -19,13 +19,14 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Home Automation",
 ]
 requires-python = ">=3.10.0"
 dependencies    = [
     "aiohttp==3.8.4",
     "astral==2.2",
-    "async_timeout==4.0.2",
+    "async-timeout==4.0.2",
     "attrs==22.2.0",
     "atomicwrites-homeassistant==1.4.1",
     "awesomeversion==22.9.0",
@@ -34,22 +35,22 @@ dependencies    = [
     "ciso8601==2.3.0",
     # When bumping httpx, please check the version pins of
     # httpcore, anyio, and h11 in gen_requirements_all
-    "httpx==0.24.0",
+    "httpx==0.24.1",
     "home-assistant-bluetooth==1.10.0",
     "ifaddr==0.2.0",
-    "jinja2==3.1.2",
-    "lru-dict==1.1.8",
+    "Jinja2==3.1.2",
+    "lru-dict==1.2.0",
     "PyJWT==2.7.0",
     # PyJWT has loose dependency. We want the latest one.
-    "cryptography==40.0.2",
-    # pyOpenSSL 23.1.0 is required to work with cryptography 39+
-    "pyOpenSSL==23.1.0",
-    "orjson==3.8.12",
-    "pip>=21.0,<23.2",
+    "cryptography==41.0.1",
+    # pyOpenSSL 23.2.0 is required to work with cryptography 41+
+    "pyOpenSSL==23.2.0",
+    "orjson==3.9.1",
+    "pip>=21.3.1,<23.2",
     "python-slugify==4.0.1",
-    "pyyaml==6.0",
+    "PyYAML==6.0",
     "requests==2.31.0",
-    "typing-extensions>=4.5.0,<5.0",
+    "typing-extensions>=4.7.0,<5.0",
     "ulid-transform==0.7.2",
     "voluptuous==0.13.1",
     "voluptuous-serialize==2.6.0",
@@ -57,6 +58,7 @@ dependencies    = [
 ]
 
 [project.urls]
+"Homepage"    = "https://www.home-assistant.io/"
 "Source Code" = "https://github.com/home-assistant/core"
 "Bug Reports" = "https://github.com/home-assistant/core/issues"
 "Docs: Dev"   = "https://developers.home-assistant.io/"
@@ -77,20 +79,6 @@ include = ["homeassistant*"]
 [tool.black]
 extend-exclude = "/generated/"
 
-[tool.isort]
-# https://github.com/PyCQA/isort/wiki/isort-Settings
-profile = "black"
-# will group `import x` and `from x import` of the same module.
-force_sort_within_sections = true
-known_first_party = [
-    "homeassistant",
-    "tests",
-]
-forced_separate = [
-    "tests",
-]
-combine_as_imports = true
-
 [tool.pylint.MAIN]
 py-version = "3.10"
 ignore = [
@@ -113,6 +101,7 @@ load-plugins = [
     "pylint.extensions.code_style",
     "pylint.extensions.typing",
     "hass_enforce_type_hints",
+    "hass_inheritance",
     "hass_imports",
     "hass_logger",
     "pylint_per_file_ignores",
@@ -174,19 +163,223 @@ disable = [
     "too-few-public-methods",
     "too-many-ancestors",
     "too-many-arguments",
-    "too-many-branches",
     "too-many-instance-attributes",
     "too-many-lines",
     "too-many-locals",
     "too-many-public-methods",
-    "too-many-return-statements",
-    "too-many-statements",
     "too-many-boolean-expressions",
-    "unused-argument",
     "wrong-import-order",
     "consider-using-f-string",
     "consider-using-namedtuple-or-dataclass",
     "consider-using-assignment-expr",
+
+    # Handled by ruff
+    # Ref: <https://github.com/astral-sh/ruff/issues/970>
+    "await-outside-async", # PLE1142
+    "bad-str-strip-call", # PLE1310
+    "bad-string-format-type", # PLE1307
+    "bidirectional-unicode", # PLE2502
+    "continue-in-finally", # PLE0116
+    "duplicate-bases", # PLE0241
+    "format-needs-mapping", # F502
+    "function-redefined", # F811
+    "invalid-all-format", # PLE0605
+    "invalid-all-object", # PLE0604
+    "invalid-character-backspace", # PLE2510
+    "invalid-character-esc", # PLE2513
+    "invalid-character-nul", # PLE2514
+    "invalid-character-sub", # PLE2512
+    "invalid-character-zero-width-space", # PLE2515
+    "logging-too-few-args", # PLE1206
+    "logging-too-many-args", # PLE1205
+    "missing-format-string-key", # F524
+    "mixed-format-string", # F506
+    "no-method-argument", # N805
+    "no-self-argument", # N805
+    "nonexistent-operator", # B002
+    "nonlocal-without-binding", # PLE0117
+    "not-in-loop", # F701, F702
+    "notimplemented-raised", # F901
+    "return-in-init", # PLE0101
+    "return-outside-function", # F706
+    "syntax-error", # E999
+    "too-few-format-args", # F524
+    "too-many-format-args", # F522
+    "too-many-star-expressions", # F622
+    "truncated-format-string", # F501
+    "undefined-all-variable", # F822
+    "undefined-variable", # F821
+    "used-prior-global-declaration", # PLE0118
+    "yield-inside-async-function", # PLE1700
+    "yield-outside-function", # F704
+    "anomalous-backslash-in-string", # W605
+    "assert-on-string-literal", # PLW0129
+    "assert-on-tuple", # F631
+    "bad-format-string", # W1302, F
+    "bad-format-string-key", # W1300, F
+    "bare-except", # E722
+    "binary-op-exception", # PLW0711
+    "cell-var-from-loop", # B023
+    # "dangerous-default-value", # B006, ruff catches new occurrences, needs more work
+    "duplicate-except", # B014
+    "duplicate-key", # F601
+    "duplicate-string-formatting-argument", # F
+    "duplicate-value", # F
+    "eval-used", # PGH001
+    "exec-used", # S102
+    # "expression-not-assigned", # B018, ruff catches new occurrences, needs more work
+    "f-string-without-interpolation", # F541
+    "forgotten-debug-statement", # T100
+    "format-string-without-interpolation", # F
+    # "global-statement", # PLW0603, ruff catches new occurrences, needs more work
+    "global-variable-not-assigned", # PLW0602
+    "implicit-str-concat", # ISC001
+    "import-self", # PLW0406
+    "inconsistent-quotes", # Q000
+    "invalid-envvar-default", # PLW1508
+    "keyword-arg-before-vararg", # B026
+    "logging-format-interpolation", # G
+    "logging-fstring-interpolation", # G
+    "logging-not-lazy", # G
+    "misplaced-future", # F404
+    "named-expr-without-context", # PLW0131
+    "nested-min-max", # PLW3301
+    # "pointless-statement", # B018, ruff catches new occurrences, needs more work
+    "raise-missing-from", # TRY200
+    # "redefined-builtin", # A001, ruff is way more stricter, needs work
+    "try-except-raise", # TRY302
+    "unused-argument", # ARG001, we don't use it
+    "unused-format-string-argument", #F507
+    "unused-format-string-key", # F504
+    "unused-import", # F401
+    "unused-variable", # F841
+    "useless-else-on-loop", # PLW0120
+    "wildcard-import", # F403
+    "bad-classmethod-argument", # N804
+    "consider-iterating-dictionary", # SIM118
+    "empty-docstring", # D419
+    "invalid-name", # N815
+    "line-too-long", # E501, disabled globally
+    "missing-class-docstring", # D101
+    "missing-final-newline", # W292
+    "missing-function-docstring", # D103
+    "missing-module-docstring", # D100
+    "multiple-imports", #E401
+    "singleton-comparison", # E711, E712
+    "superfluous-parens", # UP034
+    "ungrouped-imports", # I001
+    "unidiomatic-typecheck", # E721
+    "unnecessary-direct-lambda-call", # PLC3002
+    "unnecessary-lambda-assignment", # PLC3001
+    "unneeded-not", # SIM208
+    "useless-import-alias", # PLC0414
+    "wrong-import-order", # I001
+    "wrong-import-position", # E402
+    "comparison-of-constants", # PLR0133
+    "comparison-with-itself", # PLR0124
+    "consider-alternative-union-syntax", # UP007
+    "consider-merging-isinstance", # PLR1701
+    "consider-using-alias", # UP006
+    "consider-using-dict-comprehension", # C402
+    "consider-using-generator", # C417
+    "consider-using-get", # SIM401
+    "consider-using-set-comprehension", # C401
+    "consider-using-sys-exit", # PLR1722
+    "consider-using-ternary", # SIM108
+    "literal-comparison", # F632
+    "property-with-parameters", # PLR0206
+    "super-with-arguments", # UP008
+    "too-many-branches", # PLR0912
+    "too-many-return-statements", # PLR0911
+    "too-many-statements", # PLR0915
+    "trailing-comma-tuple", # COM818
+    "unnecessary-comprehension", # C416
+    "use-a-generator", # C417
+    "use-dict-literal", # C406
+    "use-list-literal", # C405
+    "useless-object-inheritance", # UP004
+    "useless-return", # PLR1711
+
+    # Handled by mypy
+    # Ref: <https://github.com/antonagestam/pylint-mypy-overlap>
+    "abstract-class-instantiated",
+    "arguments-differ",
+    "assigning-non-slot",
+    "assignment-from-no-return",
+    "assignment-from-none",
+    "bad-exception-cause",
+    "bad-format-character",
+    "bad-reversed-sequence",
+    "bad-super-call",
+    "bad-thread-instantiation",
+    "catching-non-exception",
+    "comparison-with-callable",
+    "deprecated-class",
+    "dict-iter-missing-items",
+    "format-combined-specification",
+    "global-variable-undefined",
+    "import-error",
+    "inconsistent-mro",
+    "inherit-non-class",
+    "init-is-generator",
+    "invalid-class-object",
+    "invalid-enum-extension",
+    "invalid-envvar-value",
+    "invalid-format-returned",
+    "invalid-hash-returned",
+    "invalid-metaclass",
+    "invalid-overridden-method",
+    "invalid-repr-returned",
+    "invalid-sequence-index",
+    "invalid-slice-index",
+    "invalid-slots-object",
+    "invalid-slots",
+    "invalid-star-assignment-target",
+    "invalid-str-returned",
+    "invalid-unary-operand-type",
+    "invalid-unicode-codec",
+    "isinstance-second-argument-not-valid-type",
+    "method-hidden",
+    "misplaced-format-function",
+    "missing-format-argument-key",
+    "missing-format-attribute",
+    "missing-kwoa",
+    "no-member",
+    "no-value-for-parameter",
+    "non-iterator-returned",
+    "non-str-assignment-to-dunder-name",
+    "nonlocal-and-global",
+    "not-a-mapping",
+    "not-an-iterable",
+    "not-async-context-manager",
+    "not-callable",
+    "not-context-manager",
+    "overridden-final-method",
+    "raising-bad-type",
+    "raising-non-exception",
+    "redundant-keyword-arg",
+    "relative-beyond-top-level",
+    "self-cls-assignment",
+    "signature-differs",
+    "star-needs-assignment-target",
+    "subclassed-final-class",
+    "super-without-brackets",
+    "too-many-function-args",
+    "typevar-double-variance",
+    "typevar-name-mismatch",
+    "unbalanced-dict-unpacking",
+    "unbalanced-tuple-unpacking",
+    "unexpected-keyword-arg",
+    "unhashable-member",
+    "unpacking-non-sequence",
+    "unsubscriptable-object",
+    "unsupported-assignment-operation",
+    "unsupported-binary-operation",
+    "unsupported-delete-operation",
+    "unsupported-membership-test",
+    "used-before-assignment",
+    "using-final-decorator-in-unsupported-version",
+    "wrong-exception-operation",
 ]
 enable = [
     #"useless-suppression",  # temporarily every now and then to clean them up
@@ -241,25 +434,63 @@ filterwarnings = ["error::sqlalchemy.exc.SAWarning"]
 target-version = "py310"
 
 select = [
+    "B002", # Python does not support the unary prefix increment
     "B007", # Loop control variable {name} not used within loop body
     "B014", # Exception handler with duplicate exception
+    "B023", # Function definition does not bind loop variable {name}
+    "B026", # Star-arg unpacking after a keyword argument is strongly discouraged
     "C",  # complexity
+    "COM818", # Trailing comma on bare tuple prohibited
     "D",  # docstrings
     "E",  # pycodestyle
     "F",  # pyflakes/autoflake
+    "G", # flake8-logging-format
+    "I",  # isort
     "ICN001", # import concentions; {name} should be imported as {asname}
+    "ISC001", # Implicitly concatenated string literals on one line
+    "N804", # First argument of a class method should be named cls
+    "N805", # First argument of a method should be named self
+    "N815", # Variable {name} in class scope should not be mixedCase
+    "PGH001", # No builtin eval() allowed
     "PGH004",  # Use specific rule codes when using noqa
     "PLC0414", # Useless import alias. Import alias does not rename original package.
+    "PLC", # pylint
+    "PLE", # pylint
+    "PLR", # pylint
+    "PLW", # pylint
+    "Q000", # Double quotes found but single quotes preferred
+    "RUF006", # Store a reference to the return value of asyncio.create_task
+    "S102", # Use of exec detected
+    "S103",  # bad-file-permissions
+    "S108",  # hardcoded-temp-file
+    "S306",  # suspicious-mktemp-usage
+    "S307",  # suspicious-eval-usage
+    "S313",  # suspicious-xmlc-element-tree-usage
+    "S314",  # suspicious-xml-element-tree-usage
+    "S315",  # suspicious-xml-expat-reader-usage
+    "S316",  # suspicious-xml-expat-builder-usage
+    "S317",  # suspicious-xml-sax-usage
+    "S318",  # suspicious-xml-mini-dom-usage
+    "S319",  # suspicious-xml-pull-dom-usage
+    "S320",  # suspicious-xmle-tree-usage
+    "S601",  # paramiko-call
+    "S602",  # subprocess-popen-with-shell-equals-true
+    "S604",  # call-with-shell-equals-true
+    "S608",  # hardcoded-sql-expression
+    "S609",  # unix-command-wildcard-injection
     "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass
     "SIM117", # Merge with-statements that use the same scope
     "SIM118", # Use {key} in {dict} instead of {key} in {dict}.keys()
     "SIM201", # Use {left} != {right} instead of not {left} == {right}
+    "SIM208", # Use {expr} instead of not (not {expr})
     "SIM212", # Use {a} if {a} else {b} instead of {b} if not {a} else {a}
     "SIM300", # Yoda conditions. Use 'age == 42' instead of '42 == age'.
     "SIM401", # Use get from dict with default instead of an if block
+    "T100", # Trace found: {name} used
     "T20",  # flake8-print
     "TRY004", # Prefer TypeError exception for invalid type
-    "RUF006", # Store a reference to the return value of asyncio.create_task
+    "TRY200", # Use raise from to specify exception cause
+    "TRY302", # Remove exception handler; error is immediately re-raised
     "UP",  # pyupgrade
     "W",  # pycodestyle
 ]
@@ -272,8 +503,20 @@ ignore = [
     "D407",  # Section name underlining
     "E501",  # line too long
     "E731",  # do not assign a lambda expression, use a def
+    "PLC1901", # Lots of false positives
+    # False positives https://github.com/astral-sh/ruff/issues/5386
+    "PLC0208", # Use a sequence type instead of a `set` when iterating over values
+    "PLR0911", # Too many return statements ({returns} > {max_returns})
+    "PLR0912", # Too many branches ({branches} > {max_branches})
+    "PLR0913", # Too many arguments to function call ({c_args} > {max_args})
+    "PLR0915", # Too many statements ({statements} > {max_statements})
+    "PLR2004",  # Magic value used in comparison, consider replacing {value} with a constant variable
+    "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
+    "UP006", # keep type annotation style as is
+    "UP007", # keep type annotation style as is
     # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
     "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
+
 ]
 
 [tool.ruff.flake8-import-conventions.extend-aliases]
@@ -283,12 +526,17 @@ voluptuous = "vol"
 "homeassistant.helpers.device_registry" = "dr"
 "homeassistant.helpers.entity_registry" = "er"
 "homeassistant.helpers.issue_registry" = "ir"
+"homeassistant.util.dt" = "dt_util"
 
 [tool.ruff.flake8-pytest-style]
 fixture-parentheses = false
 
-[tool.ruff.pyupgrade]
-keep-runtime-typing = true
+[tool.ruff.isort]
+force-sort-within-sections = true
+known-first-party = [
+    "homeassistant",
+]
+combine-as-imports = true
 
 [tool.ruff.per-file-ignores]
 
diff --git a/requirements.txt b/requirements.txt
index ca8bd2631593cc..31e5812dadf759 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,27 +3,27 @@
 # Home Assistant Core
 aiohttp==3.8.4
 astral==2.2
-async_timeout==4.0.2
+async-timeout==4.0.2
 attrs==22.2.0
 atomicwrites-homeassistant==1.4.1
 awesomeversion==22.9.0
 bcrypt==4.0.1
 certifi>=2021.5.30
 ciso8601==2.3.0
-httpx==0.24.0
+httpx==0.24.1
 home-assistant-bluetooth==1.10.0
 ifaddr==0.2.0
-jinja2==3.1.2
-lru-dict==1.1.8
+Jinja2==3.1.2
+lru-dict==1.2.0
 PyJWT==2.7.0
-cryptography==40.0.2
-pyOpenSSL==23.1.0
-orjson==3.8.12
-pip>=21.0,<23.2
+cryptography==41.0.1
+pyOpenSSL==23.2.0
+orjson==3.9.1
+pip>=21.3.1,<23.2
 python-slugify==4.0.1
-pyyaml==6.0
+PyYAML==6.0
 requests==2.31.0
-typing-extensions>=4.5.0,<5.0
+typing-extensions>=4.7.0,<5.0
 ulid-transform==0.7.2
 voluptuous==0.13.1
 voluptuous-serialize==2.6.0
diff --git a/requirements_all.txt b/requirements_all.txt
index 1c7e3e96618bcf..cc0922a033781a 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -7,24 +7,83 @@ AEMET-OpenData==0.2.2
 # homeassistant.components.aladdin_connect
 AIOAladdinConnect==0.1.56
 
+# homeassistant.components.honeywell
+AIOSomecomfort==0.0.14
+
 # homeassistant.components.adax
 Adax-local==0.1.5
 
+# homeassistant.components.ambiclimate
+Ambiclimate==0.2.1
+
+# homeassistant.components.blinksticklight
+BlinkStick==1.2.0
+
+# homeassistant.components.co2signal
+CO2Signal==0.4.2
+
+# homeassistant.components.doorbird
+DoorBirdPy==2.1.0
+
 # homeassistant.components.homekit
-HAP-python==4.6.0
+HAP-python==4.7.0
+
+# homeassistant.components.tasmota
+HATasmota==0.6.5
+
+# homeassistant.components.hydrawise
+Hydrawiser==0.2
 
 # homeassistant.components.mastodon
 Mastodon.py==1.5.1
 
+# homeassistant.components.doods
+# homeassistant.components.generic
+# homeassistant.components.image_upload
+# homeassistant.components.proxy
+# homeassistant.components.qrcode
+# homeassistant.components.seven_segments
+# homeassistant.components.sighthound
+# homeassistant.components.tensorflow
+Pillow==9.5.0
+
+# homeassistant.components.plex
+PlexAPI==4.13.2
+
+# homeassistant.components.progettihwsw
+ProgettiHWSW==0.1.1
+
+# homeassistant.components.bluetooth_tracker
+# PyBluez==0.22
+
+# homeassistant.components.cast
+PyChromecast==13.0.7
+
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
 
+# homeassistant.components.flume
+PyFlume==0.6.5
+
+# homeassistant.components.fronius
+PyFronius==0.7.1
+
 # homeassistant.components.mvglive
 PyMVGLive==1.1.4
 
+# homeassistant.components.met_eireann
+PyMetEireann==2021.8.0
+
+# homeassistant.components.met
+# homeassistant.components.norway_air
+PyMetno==0.10.0
+
 # homeassistant.components.keymitt_ble
 PyMicroBot==0.0.9
 
+# homeassistant.components.nina
+PyNINA==0.3.0
+
 # homeassistant.components.mobile_app
 # homeassistant.components.owntracks
 PyNaCl==1.5.0
@@ -40,14 +99,20 @@ PyRMVtransport==0.3.3
 PySocks==1.7.1
 
 # homeassistant.components.switchbot
-PySwitchbot==0.37.6
+PySwitchbot==0.38.0
+
+# homeassistant.components.switchmate
+PySwitchmate==0.5.1
+
+# homeassistant.components.syncthru
+PySyncThru==0.7.10
 
 # homeassistant.components.transport_nsw
 PyTransportNSW==0.1.1
 
 # homeassistant.components.camera
 # homeassistant.components.stream
-PyTurboJPEG==1.6.7
+PyTurboJPEG==1.7.1
 
 # homeassistant.components.vicare
 PyViCare==2.25.0
@@ -55,9 +120,19 @@ PyViCare==2.25.0
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
 
+# homeassistant.components.rachio
+RachioPy==1.0.3
+
+# homeassistant.components.python_script
+RestrictedPython==6.0
+
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
+# homeassistant.components.recorder
+# homeassistant.components.sql
+SQLAlchemy==2.0.15
+
 # homeassistant.components.travisci
 TravisPy==0.3.5
 
@@ -86,7 +161,7 @@ adext==0.4.2
 adguardhome==0.6.1
 
 # homeassistant.components.advantage_air
-advantage_air==0.4.4
+advantage-air==0.4.4
 
 # homeassistant.components.frontier_silicon
 afsapi==0.2.7
@@ -95,28 +170,31 @@ afsapi==0.2.7
 agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
-aio_geojson_generic_client==0.3
+aio-geojson-generic-client==0.3
 
 # homeassistant.components.geonetnz_quakes
-aio_geojson_geonetnz_quakes==0.15
+aio-geojson-geonetnz-quakes==0.15
 
 # homeassistant.components.geonetnz_volcano
-aio_geojson_geonetnz_volcano==0.8
+aio-geojson-geonetnz-volcano==0.8
 
 # homeassistant.components.nsw_rural_fire_service_feed
-aio_geojson_nsw_rfs_incidents==0.6
+aio-geojson-nsw-rfs-incidents==0.6
 
 # homeassistant.components.usgs_earthquakes_feed
-aio_geojson_usgs_earthquakes==0.2
+aio-geojson-usgs-earthquakes==0.2
 
 # homeassistant.components.gdacs
-aio_georss_gdacs==0.8
+aio-georss-gdacs==0.8
 
 # homeassistant.components.airq
 aioairq==0.2.4
 
+# homeassistant.components.airzone_cloud
+aioairzone-cloud==0.2.0
+
 # homeassistant.components.airzone
-aioairzone==0.5.6
+aioairzone==0.6.4
 
 # homeassistant.components.ambient_station
 aioambient==2023.04.0
@@ -131,7 +209,7 @@ aioasuswrt==1.4.0
 aioazuredevops==1.3.5
 
 # homeassistant.components.baf
-aiobafi6==0.8.0
+aiobafi6==0.8.2
 
 # homeassistant.components.aws
 aiobotocore==2.1.0
@@ -156,7 +234,7 @@ aioecowitt==2023.5.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==13.7.5
+aioesphomeapi==15.1.3
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -174,11 +252,11 @@ aioguardian==2022.07.0
 aioharmony==0.2.10
 
 # homeassistant.components.homekit_controller
-aiohomekit==2.6.3
+aiohomekit==2.6.5
 
 # homeassistant.components.emulated_hue
 # homeassistant.components.http
-aiohttp_cors==0.7.0
+aiohttp-cors==0.7.0
 
 # homeassistant.components.hue
 aiohue==4.6.2
@@ -193,13 +271,13 @@ aiokafka==0.7.2
 aiokef==0.2.16
 
 # homeassistant.components.lifx
-aiolifx==0.8.10
+aiolifx-effects==0.3.2
 
 # homeassistant.components.lifx
-aiolifx_effects==0.3.2
+aiolifx-themes==0.4.5
 
 # homeassistant.components.lifx
-aiolifx_themes==0.4.5
+aiolifx==0.8.10
 
 # homeassistant.components.livisi
 aiolivisi==0.0.19
@@ -219,14 +297,11 @@ aiomusiccast==0.14.8
 # homeassistant.components.nanoleaf
 aionanoleaf==0.2.1
 
-# homeassistant.components.keyboard_remote
-aionotify==0.2.0
-
 # homeassistant.components.notion
 aionotion==2023.05.5
 
 # homeassistant.components.oncue
-aiooncue==0.3.4
+aiooncue==0.3.5
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.4.0
@@ -260,23 +335,17 @@ aioridwell==2023.01.0
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
 
-# homeassistant.components.senseme
-aiosenseme==0.6.1
-
 # homeassistant.components.senz
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==5.3.2
+aioshelly==5.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
 
 # homeassistant.components.slimproto
-aioslimproto==2.1.1
-
-# homeassistant.components.honeywell
-aiosomecomfort==0.0.14
+aioslimproto==2.3.2
 
 # homeassistant.components.steamist
 aiosteamist==0.3.2
@@ -291,7 +360,7 @@ aiosyncthing==0.5.1
 aiotractive==0.5.5
 
 # homeassistant.components.unifi
-aiounifi==47
+aiounifi==49
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.1.0
@@ -312,20 +381,17 @@ airly==1.1.0
 airthings-ble==0.5.3
 
 # homeassistant.components.airthings
-airthings_cloud==0.1.0
+airthings-cloud==0.1.0
 
 # homeassistant.components.airtouch4
 airtouch4pyapi==1.0.5
 
 # homeassistant.components.alpha_vantage
-alpha_vantage==2.3.1
+alpha-vantage==2.3.1
 
 # homeassistant.components.amberelectric
 amberelectric==1.0.4
 
-# homeassistant.components.ambiclimate
-ambiclimate==0.2.1
-
 # homeassistant.components.amcrest
 amcrest==1.9.7
 
@@ -333,10 +399,10 @@ amcrest==1.9.7
 androidtv[async]==0.0.70
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.0.8
+androidtvremote2==0.0.9
 
 # homeassistant.components.anel_pwrctrl
-anel_pwrctrl-homeassistant==0.0.1.dev2
+anel-pwrctrl-homeassistant==0.0.1.dev2
 
 # homeassistant.components.anova
 anova-wifi==0.10.0
@@ -348,7 +414,7 @@ anthemav==1.4.1
 apcaccess==0.0.13
 
 # homeassistant.components.apprise
-apprise==1.4.0
+apprise==1.4.5
 
 # homeassistant.components.aprs
 aprslib==0.7.0
@@ -360,7 +426,7 @@ aqualogic==2.6
 aranet4==2.1.3
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.3.0
+arcam-fmj==1.4.0
 
 # homeassistant.components.arris_tg2492lg
 arris-tg2492lg==1.2.1
@@ -369,7 +435,7 @@ arris-tg2492lg==1.2.1
 asmog==0.0.6
 
 # homeassistant.components.asterisk_mbox
-asterisk_mbox==0.5.0
+asterisk-mbox==0.5.0
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.dlna_dms
@@ -379,6 +445,9 @@ asterisk_mbox==0.5.0
 # homeassistant.components.yeelight
 async-upnp-client==0.33.2
 
+# homeassistant.components.keyboard_remote
+asyncinotify==4.0.2
+
 # homeassistant.components.supla
 asyncpysupla==0.0.5
 
@@ -425,13 +494,13 @@ batinfo==0.4.2
 beautifulsoup4==4.11.1
 
 # homeassistant.components.beewi_smartclim
-# beewi_smartclim==0.0.10
+# beewi-smartclim==0.0.10
 
 # homeassistant.components.zha
-bellows==0.35.5
+bellows==0.35.8
 
 # homeassistant.components.bmw_connected_drive
-bimmer_connected==0.13.6
+bimmer-connected==0.13.8
 
 # homeassistant.components.bizkaibus
 bizkaibus==0.1.1
@@ -443,13 +512,10 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 
 # homeassistant.components.blebox
-blebox_uniapi==2.1.4
+blebox-uniapi==2.1.4
 
 # homeassistant.components.blink
-blinkpy==0.19.2
-
-# homeassistant.components.blinksticklight
-blinkstick==1.2.0
+blinkpy==0.21.0
 
 # homeassistant.components.bitcoin
 blockchain==1.4.4
@@ -471,13 +537,13 @@ bluetooth-auto-recovery==1.2.0
 # homeassistant.components.esphome
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 
 # homeassistant.components.bond
 bond-async==0.1.23
 
 # homeassistant.components.bosch_shc
-boschshcpy==0.2.35
+boschshcpy==0.2.57
 
 # homeassistant.components.amazon_polly
 # homeassistant.components.route53
@@ -496,16 +562,16 @@ brottsplatskartan==0.0.1
 brunt==1.2.0
 
 # homeassistant.components.bluetooth_tracker
-bt_proximity==0.2.1
+bt-proximity==0.2.1
 
 # homeassistant.components.bthome
-bthome-ble==2.11.3
+bthome-ble==2.12.0
 
 # homeassistant.components.bt_home_hub_5
 bthomehub5-devicelist==0.1.1
 
 # homeassistant.components.bt_smarthub
-btsmarthub_devicelist==0.2.3
+btsmarthub-devicelist==0.2.3
 
 # homeassistant.components.buienradar
 buienradar==1.0.5
@@ -525,9 +591,6 @@ clearpasspy==1.0.2
 # homeassistant.components.sinch
 clx-sdk-xms==1.0.0
 
-# homeassistant.components.co2signal
-co2signal==0.4.2
-
 # homeassistant.components.coinbase
 coinbase==2.1.0
 
@@ -543,7 +606,6 @@ concord232==0.15
 # homeassistant.components.upc_connect
 connect-box==0.2.8
 
-# homeassistant.components.eddystone_temperature
 # homeassistant.components.eq3btsmart
 # homeassistant.components.xiaomi_miio
 construct==2.10.56
@@ -572,12 +634,12 @@ dbus-fast==1.86.0
 # homeassistant.components.debugpy
 debugpy==1.6.7
 
+# homeassistant.components.decora_wifi
+# decora-wifi==1.4
+
 # homeassistant.components.decora
 # decora==0.6
 
-# homeassistant.components.decora_wifi
-# decora_wifi==1.4
-
 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
 # homeassistant.components.ohmconnect
@@ -602,19 +664,19 @@ devolo-plc-api==1.3.1
 directv==0.4.0
 
 # homeassistant.components.discogs
-discogs_client==2.3.0
+discogs-client==2.3.0
 
 # homeassistant.components.steamist
 discovery30303==0.2.1
 
-# homeassistant.components.doorbird
-doorbirdpy==2.1.0
-
 # homeassistant.components.dovado
 dovado==0.4.1
 
+# homeassistant.components.dremel_3d_printer
+dremel3dpy==2.1.1
+
 # homeassistant.components.dsmr
-dsmr_parser==0.33
+dsmr-parser==0.33
 
 # homeassistant.components.dwd_weather_warnings
 dwdwfsapi==1.0.6
@@ -623,10 +685,10 @@ dwdwfsapi==1.0.6
 dweepy==0.3.0
 
 # homeassistant.components.dynalite
-dynalite_devices==0.1.47
+dynalite-devices==0.1.47
 
 # homeassistant.components.dynalite
-dynalite_panel==0.0.4
+dynalite-panel==0.0.4
 
 # homeassistant.components.rainforest_eagle
 eagle100==0.1.1
@@ -647,13 +709,13 @@ elgato==4.0.1
 eliqonline==1.2.2
 
 # homeassistant.components.elkm1
-elkm1-lib==2.2.2
+elkm1-lib==2.2.5
 
 # homeassistant.components.elmax
-elmax_api==0.0.4
+elmax-api==0.0.4
 
 # homeassistant.components.emulated_roku
-emulated_roku==0.2.1
+emulated-roku==0.2.1
 
 # homeassistant.components.huisbaasje
 energyflip-client==0.2.2
@@ -668,10 +730,10 @@ enocean==0.50
 enturclient==0.2.4
 
 # homeassistant.components.environment_canada
-env_canada==0.5.34
+env-canada==0.5.35
 
 # homeassistant.components.enphase_envoy
-envoy_reader==0.20.1
+envoy-reader==0.20.1
 
 # homeassistant.components.season
 ephem==4.1.2
@@ -689,10 +751,10 @@ esphome-dashboard-api==1.2.3
 eternalegypt==0.0.16
 
 # homeassistant.components.eufylife_ble
-eufylife_ble_client==0.1.7
+eufylife-ble-client==0.1.7
 
 # homeassistant.components.keyboard_remote
-# evdev==1.4.0
+# evdev==1.6.1
 
 # homeassistant.components.evohome
 evohome-async==0.3.15
@@ -702,7 +764,7 @@ faadelays==0.0.7
 
 # homeassistant.components.dlib_face_detect
 # homeassistant.components.dlib_face_identify
-# face_recognition==1.2.3
+# face-recognition==1.2.3
 
 # homeassistant.components.fastdotcom
 fastdotcom==0.0.3
@@ -732,17 +794,17 @@ fjaraskupan==2.2.0
 flipr-api==1.5.0
 
 # homeassistant.components.flux_led
-flux_led==0.28.37
+flux-led==0.28.37
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
 fnv-hash-fast==0.3.1
 
 # homeassistant.components.foobot
-foobot_async==1.0.0
+foobot-async==1.0.0
 
 # homeassistant.components.forecast_solar
-forecast_solar==3.0.0
+forecast-solar==3.0.0
 
 # homeassistant.components.fortios
 fortiosapi==1.0.5
@@ -755,7 +817,7 @@ freesms==0.2.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.12.0
+fritzconnection[qr]==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
@@ -776,13 +838,13 @@ geocachingapi==0.2.1
 geopy==2.3.0
 
 # homeassistant.components.geo_rss_events
-georss_generic_client==0.6
+georss-generic-client==0.6
 
 # homeassistant.components.ign_sismologia
-georss_ign_sismologia_client==0.6
+georss-ign-sismologia-client==0.6
 
 # homeassistant.components.qld_bushfire
-georss_qld_bushfire_alert_client==0.5
+georss-qld-bushfire-alert-client==0.5
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.kef
@@ -799,15 +861,16 @@ gios==3.1.0
 gitterpy==0.1.7
 
 # homeassistant.components.glances
-glances_api==0.4.2
+glances-api==0.4.3
 
 # homeassistant.components.goalzero
-goalzero==0.2.1
+goalzero==0.2.2
 
 # homeassistant.components.goodwe
 goodwe==0.2.31
 
 # homeassistant.components.google_mail
+# homeassistant.components.youtube
 google-api-python-client==2.71.0
 
 # homeassistant.components.google_pubsub
@@ -817,10 +880,10 @@ google-cloud-pubsub==2.13.11
 google-cloud-texttospeech==2.12.3
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.1.0rc2
+google-generativeai==0.1.0
 
 # homeassistant.components.nest
-google-nest-sdm==2.2.4
+google-nest-sdm==2.2.5
 
 # homeassistant.components.google_travel_time
 googlemaps==2.5.1
@@ -841,7 +904,7 @@ gps3==0.33.3
 greeclimate==1.4.1
 
 # homeassistant.components.greeneye_monitor
-greeneye_monitor==3.0.3
+greeneye-monitor==3.0.3
 
 # homeassistant.components.greenwave
 greenwavereality==0.5.1
@@ -866,29 +929,29 @@ h2==4.1.0
 
 # homeassistant.components.generic
 # homeassistant.components.stream
-ha-av==10.0.0
+ha-av==10.1.0
 
 # homeassistant.components.ffmpeg
 ha-ffmpeg==3.1.0
 
+# homeassistant.components.iotawatt
+ha-iotawattpy==0.1.1
+
 # homeassistant.components.philips_js
-ha-philipsjs==3.0.0
+ha-philipsjs==3.1.0
 
 # homeassistant.components.habitica
 habitipy==0.2.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.67.1
+hass-nabucasa==0.69.0
 
 # homeassistant.components.splunk
-hass_splunk==0.1.1
+hass-splunk==0.1.1
 
 # homeassistant.components.conversation
 hassil==1.0.6
 
-# homeassistant.components.tasmota
-hatasmota==0.6.5
-
 # homeassistant.components.jewish_calendar
 hdate==0.10.4
 
@@ -896,10 +959,10 @@ hdate==0.10.4
 heatmiserV3==1.1.18
 
 # homeassistant.components.here_travel_time
-here_routing==0.2.0
+here-routing==0.2.0
 
 # homeassistant.components.here_travel_time
-here_transit==1.2.0
+here-transit==1.2.0
 
 # homeassistant.components.hikvisioncam
 hikvision==0.4
@@ -917,10 +980,10 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230503.3
+home-assistant-frontend==20230705.1
 
 # homeassistant.components.conversation
-home-assistant-intents==2023.4.26
+home-assistant-intents==2023.6.28
 
 # homeassistant.components.home_connect
 homeconnect==0.7.2
@@ -940,9 +1003,6 @@ httplib2==0.20.4
 # homeassistant.components.huawei_lte
 huawei-lte-api==1.6.11
 
-# homeassistant.components.hydrawise
-hydrawiser==0.2
-
 # homeassistant.components.hyperion
 hyperion-py==0.7.5
 
@@ -953,13 +1013,13 @@ iammeter==0.1.7
 iaqualink==0.5.0
 
 # homeassistant.components.ibeacon
-ibeacon_ble==1.0.1
+ibeacon-ble==1.0.1
 
 # homeassistant.components.watson_iot
 ibmiotf==0.3.4
 
 # homeassistant.components.local_calendar
-ical==4.5.1
+ical==4.5.4
 
 # homeassistant.components.ping
 icmplib==3.0
@@ -991,9 +1051,6 @@ insteon-frontend-home-assistant==0.3.5
 # homeassistant.components.intellifire
 intellifire4py==2.2.2
 
-# homeassistant.components.iotawatt
-iotawattpy==0.1.0
-
 # homeassistant.components.iperf3
 iperf3==0.1.11
 
@@ -1028,7 +1085,7 @@ kegtron-ble==0.4.0
 kiwiki-client==0.1.1
 
 # homeassistant.components.knx
-knx_frontend==2023.5.16.204359
+knx-frontend==2023.6.23.191712
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1043,7 +1100,7 @@ lacrosse-view==1.0.1
 lakeside==0.13
 
 # homeassistant.components.laundrify
-laundrify_aio==1.1.2
+laundrify-aio==1.1.2
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -1070,7 +1127,7 @@ life360==5.5.0
 lightify==1.0.7.3
 
 # homeassistant.components.lightwave
-lightwave==0.20
+lightwave==0.24
 
 # homeassistant.components.limitlessled
 limitlessled==1.1.3
@@ -1082,11 +1139,14 @@ linode-api==4.1.9b1
 locationsharinglib==5.0.1
 
 # homeassistant.components.logi_circle
-logi_circle==0.2.3
+logi-circle==0.2.3
 
 # homeassistant.components.london_underground
 london-tube-status==0.5
 
+# homeassistant.components.loqed
+loqedAPI==2.1.7
+
 # homeassistant.components.luftdaten
 luftdaten==0.7.4
 
@@ -1118,7 +1178,7 @@ mcstatus==6.0.0
 meater-python==0.0.8
 
 # homeassistant.components.melnor
-melnor-bluetooth==0.0.20
+melnor-bluetooth==0.0.25
 
 # homeassistant.components.message_bird
 messagebird==1.2.0
@@ -1151,7 +1211,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.0
 
 # homeassistant.components.mopeka
-mopeka_iot_ble==0.4.1
+mopeka-iot-ble==0.4.1
 
 # homeassistant.components.motion_blinds
 motionblinds==0.6.18
@@ -1169,16 +1229,16 @@ mutagen==1.46.0
 mutesync==0.0.1
 
 # homeassistant.components.nad
-nad_receiver==0.3.0
+nad-receiver==0.3.0
 
 # homeassistant.components.keenetic_ndms2
-ndms2_client==0.1.2
+ndms2-client==0.1.2
 
 # homeassistant.components.ness_alarm
 nessclient==0.10.0
 
 # homeassistant.components.netdata
-netdata==1.0.1
+netdata==1.1.0
 
 # homeassistant.components.discovery
 netdisco==3.0.0
@@ -1214,7 +1274,7 @@ niko-home-control==0.2.1
 niluclient==0.1.2
 
 # homeassistant.components.noaa_tides
-noaa-coops==0.1.8
+noaa-coops==0.1.9
 
 # homeassistant.components.nfandroidtv
 notifications-android-tv==0.1.5
@@ -1267,7 +1327,7 @@ ondilo==0.2.0
 onkyo-eiscp==1.2.7
 
 # homeassistant.components.onvif
-onvif-zeep-async==3.1.7
+onvif-zeep-async==3.1.9
 
 # homeassistant.components.opengarage
 open-garage==0.2.0
@@ -1288,7 +1348,7 @@ openerz-api==0.2.0
 openevsewifi==1.1.2
 
 # homeassistant.components.openhome
-openhomedevice==2.0.2
+openhomedevice==2.2.0
 
 # homeassistant.components.opensensemap
 opensensemap-api==0.2.0
@@ -1302,6 +1362,9 @@ openwrt-luci-rpc==1.1.16
 # homeassistant.components.ubus
 openwrt-ubus-rpc==0.0.2
 
+# homeassistant.components.opower
+opower==0.0.12
+
 # homeassistant.components.oralb
 oralb-ble==0.17.6
 
@@ -1325,7 +1388,7 @@ paho-mqtt==1.6.1
 panacotta==0.2
 
 # homeassistant.components.panasonic_viera
-panasonic_viera==0.3.6
+panasonic-viera==0.3.6
 
 # homeassistant.components.dunehd
 pdunehd==1.3.2
@@ -1346,7 +1409,7 @@ pescea==1.0.12
 pexpect==4.6.0
 
 # homeassistant.components.modem_callerid
-phone_modem==0.1.1
+phone-modem==0.1.1
 
 # homeassistant.components.remote_rpi_gpio
 pigpio==1.78
@@ -1354,22 +1417,9 @@ pigpio==1.78
 # homeassistant.components.pilight
 pilight==0.1.1
 
-# homeassistant.components.doods
-# homeassistant.components.generic
-# homeassistant.components.image_upload
-# homeassistant.components.proxy
-# homeassistant.components.qrcode
-# homeassistant.components.seven_segments
-# homeassistant.components.sighthound
-# homeassistant.components.tensorflow
-pillow==9.5.0
-
 # homeassistant.components.dominos
 pizzapi==0.0.3
 
-# homeassistant.components.plex
-plexapi==4.13.2
-
 # homeassistant.components.plex
 plexauth==0.0.6
 
@@ -1392,16 +1442,13 @@ poolsense==0.0.8
 praw==7.5.0
 
 # homeassistant.components.islamic_prayer_times
-prayer_times_calculator==0.0.6
-
-# homeassistant.components.progettihwsw
-progettihwsw==0.1.1
+prayer-times-calculator==0.0.6
 
 # homeassistant.components.proliphix
 proliphix==0.4.1
 
 # homeassistant.components.prometheus
-prometheus_client==0.7.1
+prometheus-client==0.7.1
 
 # homeassistant.components.proxmoxve
 proxmoxer==2.0.1
@@ -1414,7 +1461,7 @@ psutil-home-assistant==0.0.1
 psutil==5.9.5
 
 # homeassistant.components.pulseaudio_loopback
-pulsectl==20.2.4
+pulsectl==23.5.2
 
 # homeassistant.components.androidtv
 pure-python-adb[async]==0.3.0.dev0
@@ -1423,7 +1470,7 @@ pure-python-adb[async]==0.3.0.dev0
 pushbullet.py==0.11.0
 
 # homeassistant.components.pushover
-pushover_complete==1.1.1
+pushover-complete==1.1.1
 
 # homeassistant.components.pvoutput
 pvo==1.0.0
@@ -1440,6 +1487,9 @@ py-dormakaba-dkey==1.0.4
 # homeassistant.components.melissa
 py-melissa-climate==2.1.4
 
+# homeassistant.components.nextbus
+py-nextbusnext==0.1.5
+
 # homeassistant.components.nightscout
 py-nightscout==1.2.2
 
@@ -1458,24 +1508,32 @@ py-zabbix==1.1.7
 # homeassistant.components.seventeentrack
 py17track==2021.12.2
 
+# homeassistant.components.atome
+pyAtome==0.1.1
+
 # homeassistant.components.hdmi_cec
 pyCEC==0.5.2
 
 # homeassistant.components.control4
 pyControl4==1.1.0
 
-# homeassistant.components.met_eireann
-pyMetEireann==2021.8.0
+# homeassistant.components.eight_sleep
+pyEight==0.3.2
 
-# homeassistant.components.met
-# homeassistant.components.norway_air
-pyMetno==0.9.0
+# homeassistant.components.electrasmart
+pyElectra==1.2.0
+
+# homeassistant.components.emby
+pyEmby==1.9
+
+# homeassistant.components.hikvision
+pyHik==0.3.2
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.30.1
 
-# homeassistant.components.switchmate
-pySwitchmate==0.5.1
+# homeassistant.components.sony_projector
+pySDCP==1
 
 # homeassistant.components.tibber
 pyTibber==0.27.2
@@ -1486,9 +1544,6 @@ pyW215==0.7.0
 # homeassistant.components.w800rf32
 pyW800rf32==0.1
 
-# homeassistant.components.nextbus
-py_nextbusnext==0.1.5
-
 # homeassistant.components.ads
 pyads==3.2.2
 
@@ -1511,11 +1566,8 @@ pyatag==0.3.5.3
 # homeassistant.components.netatmo
 pyatmo==7.5.0
 
-# homeassistant.components.atome
-pyatome==0.1.1
-
 # homeassistant.components.apple_tv
-pyatv==0.11.0
+pyatv==0.13.2
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15
@@ -1529,9 +1581,6 @@ pybbox==0.0.5-alpha
 # homeassistant.components.blackbird
 pyblackbird==0.6
 
-# homeassistant.components.bluetooth_tracker
-# pybluez==0.22
-
 # homeassistant.components.neato
 pybotvac==0.0.23
 
@@ -1547,9 +1596,6 @@ pycfdns==2.0.1
 # homeassistant.components.channels
 pychannels==1.2.3
 
-# homeassistant.components.cast
-pychromecast==13.0.7
-
 # homeassistant.components.pocketcasts
 pycketcasts==1.0.1
 
@@ -1572,20 +1618,23 @@ pycsspeechtts==1.0.8
 # pycups==1.9.73
 
 # homeassistant.components.daikin
-pydaikin==2.9.0
+pydaikin==2.10.5
 
 # homeassistant.components.danfoss_air
 pydanfossair==0.1.0
 
 # homeassistant.components.deconz
-pydeconz==111
+pydeconz==113
 
 # homeassistant.components.delijn
-pydelijn==1.0.0
+pydelijn==1.1.0
 
 # homeassistant.components.dexcom
 pydexcom==0.2.3
 
+# homeassistant.components.discovergy
+pydiscovergy==1.2.1
+
 # homeassistant.components.doods
 pydoods==1.0.2
 
@@ -1604,15 +1653,6 @@ pyedimax==0.2.1
 # homeassistant.components.efergy
 pyefergy==22.1.1
 
-# homeassistant.components.eight_sleep
-pyeight==0.3.2
-
-# homeassistant.components.electrasmart
-pyelectra==1.2.0
-
-# homeassistant.components.emby
-pyemby==1.8
-
 # homeassistant.components.envisalink
 pyenvisalink==4.6
 
@@ -1626,7 +1666,7 @@ pyeverlights==0.1.0
 pyevilgenius==2.0.0
 
 # homeassistant.components.ezviz
-pyezviz==0.2.0.12
+pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
 pyfibaro==0.7.1
@@ -1640,9 +1680,6 @@ pyfireservicerota==0.0.43
 # homeassistant.components.flic
 pyflic==2.0.3
 
-# homeassistant.components.flume
-pyflume==0.6.5
-
 # homeassistant.components.futurenow
 pyfnip==0.2
 
@@ -1655,9 +1692,6 @@ pyfreedompro==1.1.0
 # homeassistant.components.fritzbox
 pyfritzhome==0.6.8
 
-# homeassistant.components.fronius
-pyfronius==0.7.1
-
 # homeassistant.components.ifttt
 pyfttt==0.3
 
@@ -1668,7 +1702,7 @@ pygatt[GATTTOOL]==4.0.5
 pygtfs==0.1.7
 
 # homeassistant.components.hvv_departures
-pygti==0.9.3
+pygti==0.9.4
 
 # homeassistant.components.version
 pyhaversion==22.8.0
@@ -1676,9 +1710,6 @@ pyhaversion==22.8.0
 # homeassistant.components.heos
 pyheos==0.7.2
 
-# homeassistant.components.hikvision
-pyhik==0.3.2
-
 # homeassistant.components.hive
 pyhiveapi==0.5.14
 
@@ -1695,7 +1726,7 @@ pyialarm==2.2.0
 pyicloud==1.0.0
 
 # homeassistant.components.insteon
-pyinsteon==1.4.2
+pyinsteon==1.4.3
 
 # homeassistant.components.intesishome
 pyintesishome==1.8.0
@@ -1704,7 +1735,7 @@ pyintesishome==1.8.0
 pyipma==3.0.6
 
 # homeassistant.components.ipp
-pyipp==0.12.1
+pyipp==0.14.0
 
 # homeassistant.components.iqvia
 pyiqvia==2022.04.0
@@ -1767,7 +1798,7 @@ pylibrespot-java==0.1.1
 pylitejet==0.5.0
 
 # homeassistant.components.litterrobot
-pylitterbot==2023.4.0
+pylitterbot==2023.4.2
 
 # homeassistant.components.lutron_caseta
 pylutron-caseta==0.18.1
@@ -1782,7 +1813,7 @@ pymailgunner==1.4
 pymata-express==1.19
 
 # homeassistant.components.mazda
-pymazda==0.3.8
+pymazda==0.3.9
 
 # homeassistant.components.mediaroom
 pymediaroom==0.6.5.4
@@ -1800,7 +1831,7 @@ pymitv==1.4.3
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.1.3
+pymodbus==3.3.1
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
@@ -1820,20 +1851,17 @@ pynetgear==0.10.9
 # homeassistant.components.netio
 pynetio==0.1.9.1
 
-# homeassistant.components.nina
-pynina==0.3.0
-
 # homeassistant.components.nobo_hub
 pynobo==1.6.0
 
 # homeassistant.components.nuki
-pynuki==1.6.1
+pynuki==1.6.2
 
 # homeassistant.components.nut
 pynut2==2.1.2
 
 # homeassistant.components.nws
-pynws==1.4.1
+pynws==1.5.0
 
 # homeassistant.components.nx584
 pynx584==0.5
@@ -1842,7 +1870,7 @@ pynx584==0.5
 pynzbgetapi==0.2.0
 
 # homeassistant.components.obihai
-pyobihai==1.3.2
+pyobihai==1.4.2
 
 # homeassistant.components.octoprint
 pyoctoprintapi==0.1.11
@@ -1854,10 +1882,10 @@ pyombi==0.1.10
 pyopenuv==2023.02.0
 
 # homeassistant.components.opnsense
-pyopnsense==0.2.0
+pyopnsense==0.4.0
 
 # homeassistant.components.opple
-pyoppleio==1.0.5
+pyoppleio-legacy==1.0.8
 
 # homeassistant.components.opentherm_gw
 pyotgw==2.1.3
@@ -1868,7 +1896,7 @@ pyotgw==2.1.3
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.7.9
+pyoverkiz==1.9.0
 
 # homeassistant.components.openweathermap
 pyowm==3.2.0
@@ -1913,7 +1941,7 @@ pyqwikswitch==0.93
 pyrail==0.0.3
 
 # homeassistant.components.rainbird
-pyrainbird==2.0.0
+pyrainbird==2.1.0
 
 # homeassistant.components.recswitch
 pyrecswitch==1.0.2
@@ -1942,9 +1970,6 @@ pysabnzbd==1.1.1
 # homeassistant.components.saj
 pysaj==0.0.16
 
-# homeassistant.components.sony_projector
-pysdcp==1
-
 # homeassistant.components.sensibo
 pysensibo==1.0.28
 
@@ -1962,9 +1987,6 @@ pyserial==3.5
 # homeassistant.components.sesame
 pysesame2==1.0.1
 
-# homeassistant.components.goalfeed
-pysher==1.0.7
-
 # homeassistant.components.sia
 pysiaalarm==3.1.1
 
@@ -1987,7 +2009,7 @@ pysmartapp==0.3.3
 pysmartthings==0.7.6
 
 # homeassistant.components.edl21
-pysml==0.0.11
+pysml==0.0.12
 
 # homeassistant.components.snmp
 pysnmplib==5.0.21
@@ -2002,7 +2024,7 @@ pysoma==0.0.12
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.6.1
+pysqueezebox==0.6.3
 
 # homeassistant.components.stiebel_eltron
 pystiebeleltron==0.0.1.dev2
@@ -2011,10 +2033,7 @@ pystiebeleltron==0.0.1.dev2
 pysuez==0.1.19
 
 # homeassistant.components.switchbee
-pyswitchbee==1.7.19
-
-# homeassistant.components.syncthru
-pysyncthru==0.7.10
+pyswitchbee==1.8.0
 
 # homeassistant.components.tankerkoenig
 pytankerkoenig==0.0.6
@@ -2028,6 +2047,9 @@ pytfiac==0.4
 # homeassistant.components.thinkingcleaner
 pythinkingcleaner==0.0.3
 
+# homeassistant.components.awair
+python-awair==0.2.4
+
 # homeassistant.components.blockchain
 python-blockchain-api==0.0.2
 
@@ -2080,13 +2102,13 @@ python-join-api==0.0.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa==0.5.1
+python-kasa[speedups]==0.5.2
 
 # homeassistant.components.lirc
 # python-lirc==1.2.3
 
 # homeassistant.components.matter
-python-matter-server==3.2.0
+python-matter-server==3.6.3
 
 # homeassistant.components.xiaomi_miio
 python-miio==0.5.12
@@ -2100,21 +2122,27 @@ python-mystrom==2.2.0
 # homeassistant.components.nest
 python-nest==4.2.0
 
+# homeassistant.components.swiss_public_transport
+python-opendata-transport==0.3.0
+
+# homeassistant.components.opensky
+python-opensky==0.0.10
+
 # homeassistant.components.otbr
 # homeassistant.components.thread
-python-otbr-api==1.0.9
+python-otbr-api==2.2.0
 
 # homeassistant.components.picnic
 python-picnic-api==1.1.0
 
 # homeassistant.components.qbittorrent
-python-qbittorrent==0.4.2
+python-qbittorrent==0.4.3
 
 # homeassistant.components.ripple
 python-ripple-api==0.0.3
 
 # homeassistant.components.roborock
-python-roborock==0.17.0
+python-roborock==0.29.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.33
@@ -2123,7 +2151,7 @@ python-smarttub==0.0.33
 python-songpal==0.15.2
 
 # homeassistant.components.tado
-python-tado==0.12.0
+python-tado==0.15.0
 
 # homeassistant.components.telegram_bot
 python-telegram-bot==13.1
@@ -2131,12 +2159,6 @@ python-telegram-bot==13.1
 # homeassistant.components.vlc
 python-vlc==1.1.2
 
-# homeassistant.components.awair
-python_awair==0.2.4
-
-# homeassistant.components.swiss_public_transport
-python_opendata_transport==0.3.0
-
 # homeassistant.components.egardia
 pythonegardia==1.0.52
 
@@ -2164,7 +2186,7 @@ pytrafikverket==0.3.3
 pyudev==0.23.2
 
 # homeassistant.components.unifiprotect
-pyunifiprotect==4.9.0
+pyunifiprotect==4.10.3
 
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0
@@ -2194,7 +2216,7 @@ pyvolumio==0.1.5
 pywebpush==1.9.2
 
 # homeassistant.components.wemo
-pywemo==0.9.1
+pywemo==1.1.0
 
 # homeassistant.components.wilight
 pywilight==0.0.74
@@ -2223,9 +2245,6 @@ qnapstats==0.4.0
 # homeassistant.components.quantum_gateway
 quantum-gateway==0.0.8
 
-# homeassistant.components.rachio
-rachiopy==1.0.3
-
 # homeassistant.components.radio_browser
 radios==0.1.1
 
@@ -2236,22 +2255,22 @@ radiotherm==2.1.0
 raincloudy==0.0.7
 
 # homeassistant.components.rapt_ble
-rapt-ble==0.1.1
+rapt-ble==0.1.2
 
 # homeassistant.components.raspyrfm
 raspyrfm-client==1.2.8
 
 # homeassistant.components.rainmachine
-regenmaschine==2023.05.1
+regenmaschine==2023.06.0
 
 # homeassistant.components.renault
 renault-api==0.1.13
 
-# homeassistant.components.reolink
-reolink-aio==0.5.15
+# homeassistant.components.renson
+renson-endura-delta==1.5.0
 
-# homeassistant.components.python_script
-restrictedpython==6.0
+# homeassistant.components.reolink
+reolink-aio==0.7.1
 
 # homeassistant.components.idteck_prox
 rfk101py==0.0.1
@@ -2260,7 +2279,7 @@ rfk101py==0.0.1
 rflink==0.0.65
 
 # homeassistant.components.ring
-ring_doorbell==0.7.2
+ring-doorbell==0.7.2
 
 # homeassistant.components.fleetgo
 ritassist==0.9.2
@@ -2272,7 +2291,7 @@ rjpl==0.3.6
 rocketchat-API==0.6.1
 
 # homeassistant.components.roku
-rokuecp==0.17.1
+rokuecp==0.18.0
 
 # homeassistant.components.roomba
 roombapy==1.6.8
@@ -2289,14 +2308,14 @@ rpi-bad-power==0.1.0
 # homeassistant.components.rtsp_to_webrtc
 rtsp-to-webrtc==0.5.1
 
+# homeassistant.components.russound_rio
+russound-rio==1.0.0
+
 # homeassistant.components.russound_rnet
 russound==0.1.9
 
-# homeassistant.components.russound_rio
-russound_rio==0.1.8
-
 # homeassistant.components.ruuvitag_ble
-ruuvitag-ble==0.1.1
+ruuvitag-ble==0.1.2
 
 # homeassistant.components.yamaha
 rxv==0.7.0
@@ -2308,7 +2327,7 @@ samsungctl[websocket]==0.7.1
 samsungtvws[async,encrypted]==2.6.0
 
 # homeassistant.components.satel_integra
-satel_integra==0.3.7
+satel-integra==0.3.7
 
 # homeassistant.components.dhcp
 scapy==2.5.0
@@ -2325,12 +2344,14 @@ securetar==2023.3.0
 # homeassistant.components.sendgrid
 sendgrid==6.8.2
 
-# homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.11.2
+sense-energy==0.12.0
+
+# homeassistant.components.emulated_kasa
+sense_energy==0.12.0
 
 # homeassistant.components.sensirion_ble
-sensirion-ble==0.0.1
+sensirion-ble==0.1.0
 
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
@@ -2339,7 +2360,7 @@ sensorpro-ble==0.5.3
 sensorpush-ble==1.5.5
 
 # homeassistant.components.sentry
-sentry-sdk==1.23.1
+sentry-sdk==1.27.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.6
@@ -2348,7 +2369,7 @@ sfrbox-api==0.0.6
 sharkiq==1.0.2
 
 # homeassistant.components.aquostv
-sharp_aquos_rc==0.3.2
+sharp-aquos-rc==0.3.2
 
 # homeassistant.components.shodan
 shodan==1.28.0
@@ -2363,13 +2384,13 @@ simplepush==2.1.1
 simplisafe-python==2023.05.0
 
 # homeassistant.components.sisyphus
-sisyphus-control==3.1.2
+sisyphus-control==3.1.3
 
 # homeassistant.components.slack
 slackclient==2.5.0
 
 # homeassistant.components.xmpp
-slixmpp==1.8.3
+slixmpp==1.8.4
 
 # homeassistant.components.smart_meter_texas
 smart-meter-texas==0.4.7
@@ -2390,13 +2411,13 @@ solaredge-local==0.2.3
 solaredge==0.0.2
 
 # homeassistant.components.solax
-solax==0.3.0
+solax==0.3.2
 
 # homeassistant.components.somfy_mylink
 somfy-mylink-synergy==1.0.6
 
 # homeassistant.components.sonos
-sonos-websocket==0.1.1
+sonos-websocket==0.1.2
 
 # homeassistant.components.marytts
 speak2mary==1.4.0
@@ -2410,10 +2431,6 @@ spiderpy==1.6.1
 # homeassistant.components.spotify
 spotipy==2.23.0
 
-# homeassistant.components.recorder
-# homeassistant.components.sql
-sqlalchemy==2.0.15
-
 # homeassistant.components.srp_energy
 srpenergy==1.3.6
 
@@ -2463,13 +2480,13 @@ swisshydrodata==0.1.0
 synology-srm==0.2.0
 
 # homeassistant.components.system_bridge
-systembridgeconnector==3.4.8
+systembridgeconnector==3.4.9
 
 # homeassistant.components.tailscale
 tailscale==0.2.0
 
 # homeassistant.components.tank_utility
-tank_utility==1.4.1
+tank-utility==1.4.1
 
 # homeassistant.components.tapsaff
 tapsaff==0.2.1
@@ -2508,7 +2525,7 @@ thermobeacon-ble==0.6.0
 thermopro-ble==0.4.5
 
 # homeassistant.components.thermoworks_smoke
-thermoworks_smoke==0.1.8
+thermoworks-smoke==0.1.8
 
 # homeassistant.components.thingspeak
 thingspeak==1.0.0
@@ -2532,13 +2549,13 @@ tololib==0.1.0b4
 toonapi==0.2.1
 
 # homeassistant.components.totalconnect
-total_connect_client==2023.2
+total-connect-client==2023.2
 
 # homeassistant.components.tplink_lte
 tp-connected==0.0.4
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.2.4
+tplink_omada_client==1.2.4
 
 # homeassistant.components.transmission
 transmission-rpc==4.1.5
@@ -2571,7 +2588,7 @@ unifi-discovery==1.1.7
 unifiled==0.11
 
 # homeassistant.components.upb
-upb_lib==0.5.4
+upb-lib==0.5.4
 
 # homeassistant.components.upcloud
 upcloud-api==2.0.0
@@ -2597,10 +2614,10 @@ velbus-aio==2023.2.0
 venstarcolortouch==0.19
 
 # homeassistant.components.vilfo
-vilfo-api-client==0.3.2
+vilfo-api-client==0.4.1
 
 # homeassistant.components.voip
-voip-utils==0.0.7
+voip-utils==0.1.0
 
 # homeassistant.components.volkszaehler
 volkszaehler==0.4.0
@@ -2628,7 +2645,7 @@ wakeonlan==2.1.0
 wallbox==0.4.12
 
 # homeassistant.components.waqi
-waqiasync==1.0.0
+waqiasync==1.1.0
 
 # homeassistant.components.folder_watcher
 watchdog==2.3.1
@@ -2661,7 +2678,7 @@ withings-api==2.4.0
 wled==0.16.0
 
 # homeassistant.components.wolflink
-wolf_smartset==0.1.11
+wolf-smartset==0.1.11
 
 # homeassistant.components.wyoming
 wyoming==0.0.1
@@ -2670,13 +2687,13 @@ wyoming==0.0.1
 xbox-webapi==2.0.11
 
 # homeassistant.components.xiaomi_ble
-xiaomi-ble==0.17.0
+xiaomi-ble==0.17.2
 
 # homeassistant.components.knx
-xknx==2.9.0
+xknx==2.11.1
 
 # homeassistant.components.knx
-xknxproject==3.1.0
+xknxproject==3.2.0
 
 # homeassistant.components.bluesound
 # homeassistant.components.fritz
@@ -2694,43 +2711,43 @@ yalesmartalarmclient==0.3.9
 
 # homeassistant.components.august
 # homeassistant.components.yalexs_ble
-yalexs-ble==2.1.17
+yalexs-ble==2.1.18
 
 # homeassistant.components.august
 yalexs==1.5.1
 
 # homeassistant.components.yeelight
-yeelight==0.7.10
+yeelight==0.7.11
 
 # homeassistant.components.yeelightsunflower
 yeelightsunflower==0.0.10
 
 # homeassistant.components.yolink
-yolink-api==0.2.8
+yolink-api==0.2.9
 
 # homeassistant.components.youless
 youless-api==1.0.1
 
 # homeassistant.components.media_extractor
-youtube_dl==2021.12.17
+yt-dlp==2023.3.4
 
 # homeassistant.components.zamg
-zamg==0.2.2
+zamg==0.2.4
 
 # homeassistant.components.zengge
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.62.0
+zeroconf==0.70.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha-quirks==0.0.99
+zha-quirks==0.0.101
 
 # homeassistant.components.zhong_hong
-zhong_hong_hvac==1.0.9
+zhong-hong-hvac==1.0.9
 
 # homeassistant.components.ziggo_mediabox_xl
 ziggo-mediabox-xl==1.1.0
@@ -2739,22 +2756,22 @@ ziggo-mediabox-xl==1.1.0
 zigpy-deconz==0.21.0
 
 # homeassistant.components.zha
-zigpy-xbee==0.18.0
+zigpy-xbee==0.18.1
 
 # homeassistant.components.zha
 zigpy-zigate==0.11.0
 
 # homeassistant.components.zha
-zigpy-znp==0.11.1
+zigpy-znp==0.11.2
 
 # homeassistant.components.zha
-zigpy==0.55.0
+zigpy==0.56.1
 
 # homeassistant.components.zoneminder
 zm-py==0.5.2
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.48.1
+zwave-js-server-python==0.49.0
 
 # homeassistant.components.zwave_me
-zwave_me_ws==0.4.3
+zwave-me-ws==0.4.3
diff --git a/requirements_test.txt b/requirements_test.txt
index 6a3c3b7e0be889..2ea19443aa40c5 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -11,12 +11,12 @@ astroid==2.15.4
 coverage==7.2.4
 freezegun==1.2.2
 mock-open==1.4.0
-mypy==1.3.0
+mypy==1.4.1
 pre-commit==3.1.0
-pydantic==1.10.7
+pydantic==1.10.9
 pylint==2.17.4
 pylint-per-file-ignores==1.1.0
-pipdeptree==2.7.0
+pipdeptree==2.9.4
 pytest-asyncio==0.20.3
 pytest-aiohttp==1.0.4
 pytest-cov==3.0.0
@@ -29,23 +29,23 @@ pytest-unordered==0.5.2
 pytest-picked==0.4.6
 pytest-xdist==3.2.1
 pytest==7.3.1
-requests_mock==1.10.0
+requests_mock==1.11.0
 respx==0.20.1
 syrupy==4.0.2
 tomli==2.0.1;python_version<"3.11"
 tqdm==4.64.0
-types-atomicwrites==1.4.1
+types-atomicwrites==1.4.5.1
 types-croniter==1.0.6
 types-backports==0.1.3
 types-chardet==0.1.5
-types-decorator==5.1.1
+types-decorator==5.1.8.3
 types-enum34==1.1.8
 types-ipaddress==1.0.8
-types-paho-mqtt==1.6.0.1
+types-paho-mqtt==1.6.0.6
 types-pkg-resources==0.1.3
-types-python-dateutil==2.8.19.5
+types-python-dateutil==2.8.19.13
 types-python-slugify==0.1.2
-types-pytz==2022.7.0.0
+types-pytz==2023.3.0.0
 types-PyYAML==6.0.12.2
-types-requests==2.30.0.0
-types-toml==0.10.8.1
+types-requests==2.31.0.1
+types-toml==0.10.8.6
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index cf4f88351a32a5..e6a3baf8136430 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -9,18 +9,68 @@ AEMET-OpenData==0.2.2
 # homeassistant.components.aladdin_connect
 AIOAladdinConnect==0.1.56
 
+# homeassistant.components.honeywell
+AIOSomecomfort==0.0.14
+
 # homeassistant.components.adax
 Adax-local==0.1.5
 
+# homeassistant.components.ambiclimate
+Ambiclimate==0.2.1
+
+# homeassistant.components.co2signal
+CO2Signal==0.4.2
+
+# homeassistant.components.doorbird
+DoorBirdPy==2.1.0
+
 # homeassistant.components.homekit
-HAP-python==4.6.0
+HAP-python==4.7.0
+
+# homeassistant.components.tasmota
+HATasmota==0.6.5
+
+# homeassistant.components.doods
+# homeassistant.components.generic
+# homeassistant.components.image_upload
+# homeassistant.components.proxy
+# homeassistant.components.qrcode
+# homeassistant.components.seven_segments
+# homeassistant.components.sighthound
+# homeassistant.components.tensorflow
+Pillow==9.5.0
+
+# homeassistant.components.plex
+PlexAPI==4.13.2
+
+# homeassistant.components.progettihwsw
+ProgettiHWSW==0.1.1
+
+# homeassistant.components.cast
+PyChromecast==13.0.7
 
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
 
+# homeassistant.components.flume
+PyFlume==0.6.5
+
+# homeassistant.components.fronius
+PyFronius==0.7.1
+
+# homeassistant.components.met_eireann
+PyMetEireann==2021.8.0
+
+# homeassistant.components.met
+# homeassistant.components.norway_air
+PyMetno==0.10.0
+
 # homeassistant.components.keymitt_ble
 PyMicroBot==0.0.9
 
+# homeassistant.components.nina
+PyNINA==0.3.0
+
 # homeassistant.components.mobile_app
 # homeassistant.components.owntracks
 PyNaCl==1.5.0
@@ -36,14 +86,17 @@ PyRMVtransport==0.3.3
 PySocks==1.7.1
 
 # homeassistant.components.switchbot
-PySwitchbot==0.37.6
+PySwitchbot==0.38.0
+
+# homeassistant.components.syncthru
+PySyncThru==0.7.10
 
 # homeassistant.components.transport_nsw
 PyTransportNSW==0.1.1
 
 # homeassistant.components.camera
 # homeassistant.components.stream
-PyTurboJPEG==1.6.7
+PyTurboJPEG==1.7.1
 
 # homeassistant.components.vicare
 PyViCare==2.25.0
@@ -51,9 +104,19 @@ PyViCare==2.25.0
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.14.3
 
+# homeassistant.components.rachio
+RachioPy==1.0.3
+
+# homeassistant.components.python_script
+RestrictedPython==6.0
+
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.2
 
+# homeassistant.components.recorder
+# homeassistant.components.sql
+SQLAlchemy==2.0.15
+
 # homeassistant.components.onvif
 WSDiscovery==2.0.0
 
@@ -76,7 +139,7 @@ adext==0.4.2
 adguardhome==0.6.1
 
 # homeassistant.components.advantage_air
-advantage_air==0.4.4
+advantage-air==0.4.4
 
 # homeassistant.components.frontier_silicon
 afsapi==0.2.7
@@ -85,28 +148,31 @@ afsapi==0.2.7
 agent-py==0.0.23
 
 # homeassistant.components.geo_json_events
-aio_geojson_generic_client==0.3
+aio-geojson-generic-client==0.3
 
 # homeassistant.components.geonetnz_quakes
-aio_geojson_geonetnz_quakes==0.15
+aio-geojson-geonetnz-quakes==0.15
 
 # homeassistant.components.geonetnz_volcano
-aio_geojson_geonetnz_volcano==0.8
+aio-geojson-geonetnz-volcano==0.8
 
 # homeassistant.components.nsw_rural_fire_service_feed
-aio_geojson_nsw_rfs_incidents==0.6
+aio-geojson-nsw-rfs-incidents==0.6
 
 # homeassistant.components.usgs_earthquakes_feed
-aio_geojson_usgs_earthquakes==0.2
+aio-geojson-usgs-earthquakes==0.2
 
 # homeassistant.components.gdacs
-aio_georss_gdacs==0.8
+aio-georss-gdacs==0.8
 
 # homeassistant.components.airq
 aioairq==0.2.4
 
+# homeassistant.components.airzone_cloud
+aioairzone-cloud==0.2.0
+
 # homeassistant.components.airzone
-aioairzone==0.5.6
+aioairzone==0.6.4
 
 # homeassistant.components.ambient_station
 aioambient==2023.04.0
@@ -121,7 +187,7 @@ aioasuswrt==1.4.0
 aioazuredevops==1.3.5
 
 # homeassistant.components.baf
-aiobafi6==0.8.0
+aiobafi6==0.8.2
 
 # homeassistant.components.aws
 aiobotocore==2.1.0
@@ -146,7 +212,7 @@ aioecowitt==2023.5.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==13.7.5
+aioesphomeapi==15.1.3
 
 # homeassistant.components.flo
 aioflo==2021.11.0
@@ -161,11 +227,11 @@ aioguardian==2022.07.0
 aioharmony==0.2.10
 
 # homeassistant.components.homekit_controller
-aiohomekit==2.6.3
+aiohomekit==2.6.5
 
 # homeassistant.components.emulated_hue
 # homeassistant.components.http
-aiohttp_cors==0.7.0
+aiohttp-cors==0.7.0
 
 # homeassistant.components.hue
 aiohue==4.6.2
@@ -177,13 +243,13 @@ aioimaplib==1.0.1
 aiokafka==0.7.2
 
 # homeassistant.components.lifx
-aiolifx==0.8.10
+aiolifx-effects==0.3.2
 
 # homeassistant.components.lifx
-aiolifx_effects==0.3.2
+aiolifx-themes==0.4.5
 
 # homeassistant.components.lifx
-aiolifx_themes==0.4.5
+aiolifx==0.8.10
 
 # homeassistant.components.livisi
 aiolivisi==0.0.19
@@ -207,7 +273,7 @@ aionanoleaf==0.2.1
 aionotion==2023.05.5
 
 # homeassistant.components.oncue
-aiooncue==0.3.4
+aiooncue==0.3.5
 
 # homeassistant.components.openexchangerates
 aioopenexchangerates==0.4.0
@@ -241,23 +307,17 @@ aioridwell==2023.01.0
 # homeassistant.components.ruuvi_gateway
 aioruuvigateway==0.1.0
 
-# homeassistant.components.senseme
-aiosenseme==0.6.1
-
 # homeassistant.components.senz
 aiosenz==1.0.0
 
 # homeassistant.components.shelly
-aioshelly==5.3.2
+aioshelly==5.4.0
 
 # homeassistant.components.skybell
 aioskybell==22.7.0
 
 # homeassistant.components.slimproto
-aioslimproto==2.1.1
-
-# homeassistant.components.honeywell
-aiosomecomfort==0.0.14
+aioslimproto==2.3.2
 
 # homeassistant.components.steamist
 aiosteamist==0.3.2
@@ -272,7 +332,7 @@ aiosyncthing==0.5.1
 aiotractive==0.5.5
 
 # homeassistant.components.unifi
-aiounifi==47
+aiounifi==49
 
 # homeassistant.components.vlc_telnet
 aiovlc==0.1.0
@@ -293,7 +353,7 @@ airly==1.1.0
 airthings-ble==0.5.3
 
 # homeassistant.components.airthings
-airthings_cloud==0.1.0
+airthings-cloud==0.1.0
 
 # homeassistant.components.airtouch4
 airtouch4pyapi==1.0.5
@@ -301,14 +361,11 @@ airtouch4pyapi==1.0.5
 # homeassistant.components.amberelectric
 amberelectric==1.0.4
 
-# homeassistant.components.ambiclimate
-ambiclimate==0.2.1
-
 # homeassistant.components.androidtv
 androidtv[async]==0.0.70
 
 # homeassistant.components.androidtv_remote
-androidtvremote2==0.0.8
+androidtvremote2==0.0.9
 
 # homeassistant.components.anova
 anova-wifi==0.10.0
@@ -320,7 +377,7 @@ anthemav==1.4.1
 apcaccess==0.0.13
 
 # homeassistant.components.apprise
-apprise==1.4.0
+apprise==1.4.5
 
 # homeassistant.components.aprs
 aprslib==0.7.0
@@ -329,7 +386,7 @@ aprslib==0.7.0
 aranet4==2.1.3
 
 # homeassistant.components.arcam_fmj
-arcam-fmj==1.3.0
+arcam-fmj==1.4.0
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.dlna_dms
@@ -361,10 +418,10 @@ base36==0.1.1
 beautifulsoup4==4.11.1
 
 # homeassistant.components.zha
-bellows==0.35.5
+bellows==0.35.8
 
 # homeassistant.components.bmw_connected_drive
-bimmer_connected==0.13.6
+bimmer-connected==0.13.8
 
 # homeassistant.components.bluetooth
 bleak-retry-connector==3.0.2
@@ -373,10 +430,10 @@ bleak-retry-connector==3.0.2
 bleak==0.20.2
 
 # homeassistant.components.blebox
-blebox_uniapi==2.1.4
+blebox-uniapi==2.1.4
 
 # homeassistant.components.blink
-blinkpy==0.19.2
+blinkpy==0.21.0
 
 # homeassistant.components.bluemaestro
 bluemaestro-ble==0.2.3
@@ -391,13 +448,13 @@ bluetooth-auto-recovery==1.2.0
 # homeassistant.components.esphome
 # homeassistant.components.ld2410_ble
 # homeassistant.components.led_ble
-bluetooth-data-tools==0.4.0
+bluetooth-data-tools==1.3.0
 
 # homeassistant.components.bond
 bond-async==0.1.23
 
 # homeassistant.components.bosch_shc
-boschshcpy==0.2.35
+boschshcpy==0.2.57
 
 # homeassistant.components.broadlink
 broadlink==0.18.3
@@ -412,7 +469,7 @@ brottsplatskartan==0.0.1
 brunt==1.2.0
 
 # homeassistant.components.bthome
-bthome-ble==2.11.3
+bthome-ble==2.12.0
 
 # homeassistant.components.buienradar
 buienradar==1.0.5
@@ -420,9 +477,6 @@ buienradar==1.0.5
 # homeassistant.components.caldav
 caldav==1.2.0
 
-# homeassistant.components.co2signal
-co2signal==0.4.2
-
 # homeassistant.components.coinbase
 coinbase==2.1.0
 
@@ -432,7 +486,6 @@ colorlog==6.6.0
 # homeassistant.components.color_extractor
 colorthief==0.2.1
 
-# homeassistant.components.eddystone_temperature
 # homeassistant.components.eq3btsmart
 # homeassistant.components.xiaomi_miio
 construct==2.10.56
@@ -487,20 +540,20 @@ directv==0.4.0
 # homeassistant.components.steamist
 discovery30303==0.2.1
 
-# homeassistant.components.doorbird
-doorbirdpy==2.1.0
+# homeassistant.components.dremel_3d_printer
+dremel3dpy==2.1.1
 
 # homeassistant.components.dsmr
-dsmr_parser==0.33
+dsmr-parser==0.33
 
 # homeassistant.components.dwd_weather_warnings
 dwdwfsapi==1.0.6
 
 # homeassistant.components.dynalite
-dynalite_devices==0.1.47
+dynalite-devices==0.1.47
 
 # homeassistant.components.dynalite
-dynalite_panel==0.0.4
+dynalite-panel==0.0.4
 
 # homeassistant.components.rainforest_eagle
 eagle100==0.1.1
@@ -512,13 +565,13 @@ easyenergy==0.3.0
 elgato==4.0.1
 
 # homeassistant.components.elkm1
-elkm1-lib==2.2.2
+elkm1-lib==2.2.5
 
 # homeassistant.components.elmax
-elmax_api==0.0.4
+elmax-api==0.0.4
 
 # homeassistant.components.emulated_roku
-emulated_roku==0.2.1
+emulated-roku==0.2.1
 
 # homeassistant.components.huisbaasje
 energyflip-client==0.2.2
@@ -530,10 +583,10 @@ energyzero==0.4.1
 enocean==0.50
 
 # homeassistant.components.environment_canada
-env_canada==0.5.34
+env-canada==0.5.35
 
 # homeassistant.components.enphase_envoy
-envoy_reader==0.20.1
+envoy-reader==0.20.1
 
 # homeassistant.components.season
 ephem==4.1.2
@@ -545,7 +598,7 @@ epson-projector==0.5.0
 esphome-dashboard-api==1.2.3
 
 # homeassistant.components.eufylife_ble
-eufylife_ble_client==0.1.7
+eufylife-ble-client==0.1.7
 
 # homeassistant.components.faa_delays
 faadelays==0.0.7
@@ -566,24 +619,24 @@ fjaraskupan==2.2.0
 flipr-api==1.5.0
 
 # homeassistant.components.flux_led
-flux_led==0.28.37
+flux-led==0.28.37
 
 # homeassistant.components.homekit
 # homeassistant.components.recorder
 fnv-hash-fast==0.3.1
 
 # homeassistant.components.foobot
-foobot_async==1.0.0
+foobot-async==1.0.0
 
 # homeassistant.components.forecast_solar
-forecast_solar==3.0.0
+forecast-solar==3.0.0
 
 # homeassistant.components.freebox
 freebox-api==1.1.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.12.0
+fritzconnection[qr]==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
@@ -601,13 +654,13 @@ geocachingapi==0.2.1
 geopy==2.3.0
 
 # homeassistant.components.geo_rss_events
-georss_generic_client==0.6
+georss-generic-client==0.6
 
 # homeassistant.components.ign_sismologia
-georss_ign_sismologia_client==0.6
+georss-ign-sismologia-client==0.6
 
 # homeassistant.components.qld_bushfire
-georss_qld_bushfire_alert_client==0.5
+georss-qld-bushfire-alert-client==0.5
 
 # homeassistant.components.dlna_dmr
 # homeassistant.components.kef
@@ -621,25 +674,26 @@ getmac==0.8.2
 gios==3.1.0
 
 # homeassistant.components.glances
-glances_api==0.4.2
+glances-api==0.4.3
 
 # homeassistant.components.goalzero
-goalzero==0.2.1
+goalzero==0.2.2
 
 # homeassistant.components.goodwe
 goodwe==0.2.31
 
 # homeassistant.components.google_mail
+# homeassistant.components.youtube
 google-api-python-client==2.71.0
 
 # homeassistant.components.google_pubsub
 google-cloud-pubsub==2.13.11
 
 # homeassistant.components.google_generative_ai_conversation
-google-generativeai==0.1.0rc2
+google-generativeai==0.1.0
 
 # homeassistant.components.nest
-google-nest-sdm==2.2.4
+google-nest-sdm==2.2.5
 
 # homeassistant.components.google_travel_time
 googlemaps==2.5.1
@@ -651,7 +705,7 @@ govee-ble==0.23.0
 greeclimate==1.4.1
 
 # homeassistant.components.greeneye_monitor
-greeneye_monitor==3.0.3
+greeneye-monitor==3.0.3
 
 # homeassistant.components.pure_energie
 gridnet==4.2.0
@@ -670,34 +724,34 @@ h2==4.1.0
 
 # homeassistant.components.generic
 # homeassistant.components.stream
-ha-av==10.0.0
+ha-av==10.1.0
 
 # homeassistant.components.ffmpeg
 ha-ffmpeg==3.1.0
 
+# homeassistant.components.iotawatt
+ha-iotawattpy==0.1.1
+
 # homeassistant.components.philips_js
-ha-philipsjs==3.0.0
+ha-philipsjs==3.1.0
 
 # homeassistant.components.habitica
 habitipy==0.2.0
 
 # homeassistant.components.cloud
-hass-nabucasa==0.67.1
+hass-nabucasa==0.69.0
 
 # homeassistant.components.conversation
 hassil==1.0.6
 
-# homeassistant.components.tasmota
-hatasmota==0.6.5
-
 # homeassistant.components.jewish_calendar
 hdate==0.10.4
 
 # homeassistant.components.here_travel_time
-here_routing==0.2.0
+here-routing==0.2.0
 
 # homeassistant.components.here_travel_time
-here_transit==1.2.0
+here-transit==1.2.0
 
 # homeassistant.components.hlk_sw16
 hlk-sw16==0.0.9
@@ -709,10 +763,10 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230503.3
+home-assistant-frontend==20230705.1
 
 # homeassistant.components.conversation
-home-assistant-intents==2023.4.26
+home-assistant-intents==2023.6.28
 
 # homeassistant.components.home_connect
 homeconnect==0.7.2
@@ -736,10 +790,10 @@ hyperion-py==0.7.5
 iaqualink==0.5.0
 
 # homeassistant.components.ibeacon
-ibeacon_ble==1.0.1
+ibeacon-ble==1.0.1
 
 # homeassistant.components.local_calendar
-ical==4.5.1
+ical==4.5.4
 
 # homeassistant.components.ping
 icmplib==3.0
@@ -762,9 +816,6 @@ insteon-frontend-home-assistant==0.3.5
 # homeassistant.components.intellifire
 intellifire4py==2.2.2
 
-# homeassistant.components.iotawatt
-iotawattpy==0.1.0
-
 # homeassistant.components.gogogate2
 ismartgate==5.0.0
 
@@ -787,7 +838,7 @@ justnimbus==0.6.0
 kegtron-ble==0.4.0
 
 # homeassistant.components.knx
-knx_frontend==2023.5.16.204359
+knx-frontend==2023.6.23.191712
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -799,7 +850,7 @@ krakenex==2.1.0
 lacrosse-view==1.0.1
 
 # homeassistant.components.laundrify
-laundrify_aio==1.1.2
+laundrify-aio==1.1.2
 
 # homeassistant.components.ld2410_ble
 ld2410-ble==0.1.1
@@ -820,7 +871,10 @@ libsoundtouch==0.8
 life360==5.5.0
 
 # homeassistant.components.logi_circle
-logi_circle==0.2.3
+logi-circle==0.2.3
+
+# homeassistant.components.loqed
+loqedAPI==2.1.7
 
 # homeassistant.components.luftdaten
 luftdaten==0.7.4
@@ -844,7 +898,7 @@ mcstatus==6.0.0
 meater-python==0.0.8
 
 # homeassistant.components.melnor
-melnor-bluetooth==0.0.20
+melnor-bluetooth==0.0.25
 
 # homeassistant.components.meteo_france
 meteofrance-api==1.2.0
@@ -871,7 +925,7 @@ moat-ble==0.1.1
 moehlenhoff-alpha2==1.3.0
 
 # homeassistant.components.mopeka
-mopeka_iot_ble==0.4.1
+mopeka-iot-ble==0.4.1
 
 # homeassistant.components.motion_blinds
 motionblinds==0.6.18
@@ -889,7 +943,7 @@ mutagen==1.46.0
 mutesync==0.0.1
 
 # homeassistant.components.keenetic_ndms2
-ndms2_client==0.1.2
+ndms2-client==0.1.2
 
 # homeassistant.components.ness_alarm
 nessclient==0.10.0
@@ -957,7 +1011,7 @@ omnilogic==0.4.5
 ondilo==0.2.0
 
 # homeassistant.components.onvif
-onvif-zeep-async==3.1.7
+onvif-zeep-async==3.1.9
 
 # homeassistant.components.opengarage
 open-garage==0.2.0
@@ -971,6 +1025,12 @@ openai==0.27.2
 # homeassistant.components.openerz
 openerz-api==0.2.0
 
+# homeassistant.components.openhome
+openhomedevice==2.2.0
+
+# homeassistant.components.opower
+opower==0.0.12
+
 # homeassistant.components.oralb
 oralb-ble==0.17.6
 
@@ -985,7 +1045,7 @@ p1monitor==2.1.1
 paho-mqtt==1.6.1
 
 # homeassistant.components.panasonic_viera
-panasonic_viera==0.3.6
+panasonic-viera==0.3.6
 
 # homeassistant.components.dunehd
 pdunehd==1.3.2
@@ -1003,24 +1063,11 @@ pescea==1.0.12
 pexpect==4.6.0
 
 # homeassistant.components.modem_callerid
-phone_modem==0.1.1
+phone-modem==0.1.1
 
 # homeassistant.components.pilight
 pilight==0.1.1
 
-# homeassistant.components.doods
-# homeassistant.components.generic
-# homeassistant.components.image_upload
-# homeassistant.components.proxy
-# homeassistant.components.qrcode
-# homeassistant.components.seven_segments
-# homeassistant.components.sighthound
-# homeassistant.components.tensorflow
-pillow==9.5.0
-
-# homeassistant.components.plex
-plexapi==4.13.2
-
 # homeassistant.components.plex
 plexauth==0.0.6
 
@@ -1040,13 +1087,10 @@ poolsense==0.0.8
 praw==7.5.0
 
 # homeassistant.components.islamic_prayer_times
-prayer_times_calculator==0.0.6
-
-# homeassistant.components.progettihwsw
-progettihwsw==0.1.1
+prayer-times-calculator==0.0.6
 
 # homeassistant.components.prometheus
-prometheus_client==0.7.1
+prometheus-client==0.7.1
 
 # homeassistant.components.hardware
 # homeassistant.components.recorder
@@ -1059,7 +1103,7 @@ pure-python-adb[async]==0.3.0.dev0
 pushbullet.py==0.11.0
 
 # homeassistant.components.pushover
-pushover_complete==1.1.1
+pushover-complete==1.1.1
 
 # homeassistant.components.pvoutput
 pvo==1.0.0
@@ -1076,6 +1120,9 @@ py-dormakaba-dkey==1.0.4
 # homeassistant.components.melissa
 py-melissa-climate==2.1.4
 
+# homeassistant.components.nextbus
+py-nextbusnext==0.1.5
+
 # homeassistant.components.nightscout
 py-nightscout==1.2.2
 
@@ -1091,12 +1138,11 @@ pyCEC==0.5.2
 # homeassistant.components.control4
 pyControl4==1.1.0
 
-# homeassistant.components.met_eireann
-pyMetEireann==2021.8.0
+# homeassistant.components.eight_sleep
+pyEight==0.3.2
 
-# homeassistant.components.met
-# homeassistant.components.norway_air
-pyMetno==0.9.0
+# homeassistant.components.electrasmart
+pyElectra==1.2.0
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.30.1
@@ -1107,9 +1153,6 @@ pyTibber==0.27.2
 # homeassistant.components.dlink
 pyW215==0.7.0
 
-# homeassistant.components.nextbus
-py_nextbusnext==0.1.5
-
 # homeassistant.components.hisense_aehw4a1
 pyaehw4a1==0.3.9
 
@@ -1127,7 +1170,7 @@ pyatag==0.3.5.3
 pyatmo==7.5.0
 
 # homeassistant.components.apple_tv
-pyatv==0.11.0
+pyatv==0.13.2
 
 # homeassistant.components.aussie_broadband
 pyaussiebb==0.0.15
@@ -1147,24 +1190,27 @@ pybravia==0.3.3
 # homeassistant.components.cloudflare
 pycfdns==2.0.1
 
-# homeassistant.components.cast
-pychromecast==13.0.7
-
 # homeassistant.components.comfoconnect
 pycomfoconnect==0.5.1
 
 # homeassistant.components.coolmaster
 pycoolmasternet-async==0.1.5
 
+# homeassistant.components.microsoft
+pycsspeechtts==1.0.8
+
 # homeassistant.components.daikin
-pydaikin==2.9.0
+pydaikin==2.10.5
 
 # homeassistant.components.deconz
-pydeconz==111
+pydeconz==113
 
 # homeassistant.components.dexcom
 pydexcom==0.2.3
 
+# homeassistant.components.discovergy
+pydiscovergy==1.2.1
+
 # homeassistant.components.android_ip_webcam
 pydroid-ipcam==2.0.0
 
@@ -1174,12 +1220,6 @@ pyeconet==0.1.20
 # homeassistant.components.efergy
 pyefergy==22.1.1
 
-# homeassistant.components.eight_sleep
-pyeight==0.3.2
-
-# homeassistant.components.electrasmart
-pyelectra==1.2.0
-
 # homeassistant.components.everlights
 pyeverlights==0.1.0
 
@@ -1187,7 +1227,7 @@ pyeverlights==0.1.0
 pyevilgenius==2.0.0
 
 # homeassistant.components.ezviz
-pyezviz==0.2.0.12
+pyezviz==0.2.1.2
 
 # homeassistant.components.fibaro
 pyfibaro==0.7.1
@@ -1201,9 +1241,6 @@ pyfireservicerota==0.0.43
 # homeassistant.components.flic
 pyflic==2.0.3
 
-# homeassistant.components.flume
-pyflume==0.6.5
-
 # homeassistant.components.forked_daapd
 pyforked-daapd==0.1.14
 
@@ -1213,14 +1250,11 @@ pyfreedompro==1.1.0
 # homeassistant.components.fritzbox
 pyfritzhome==0.6.8
 
-# homeassistant.components.fronius
-pyfronius==0.7.1
-
 # homeassistant.components.ifttt
 pyfttt==0.3
 
 # homeassistant.components.hvv_departures
-pygti==0.9.3
+pygti==0.9.4
 
 # homeassistant.components.version
 pyhaversion==22.8.0
@@ -1241,13 +1275,13 @@ pyialarm==2.2.0
 pyicloud==1.0.0
 
 # homeassistant.components.insteon
-pyinsteon==1.4.2
+pyinsteon==1.4.3
 
 # homeassistant.components.ipma
 pyipma==3.0.6
 
 # homeassistant.components.ipp
-pyipp==0.12.1
+pyipp==0.14.0
 
 # homeassistant.components.iqvia
 pyiqvia==2022.04.0
@@ -1295,7 +1329,7 @@ pylibrespot-java==0.1.1
 pylitejet==0.5.0
 
 # homeassistant.components.litterrobot
-pylitterbot==2023.4.0
+pylitterbot==2023.4.2
 
 # homeassistant.components.lutron_caseta
 pylutron-caseta==0.18.1
@@ -1307,7 +1341,7 @@ pymailgunner==1.4
 pymata-express==1.19
 
 # homeassistant.components.mazda
-pymazda==0.3.8
+pymazda==0.3.9
 
 # homeassistant.components.melcloud
 pymelcloud==2.5.8
@@ -1319,7 +1353,7 @@ pymeteoclimatic==0.0.6
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.1.3
+pymodbus==3.3.1
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
@@ -1333,20 +1367,17 @@ pymysensors==0.24.0
 # homeassistant.components.netgear
 pynetgear==0.10.9
 
-# homeassistant.components.nina
-pynina==0.3.0
-
 # homeassistant.components.nobo_hub
 pynobo==1.6.0
 
 # homeassistant.components.nuki
-pynuki==1.6.1
+pynuki==1.6.2
 
 # homeassistant.components.nut
 pynut2==2.1.2
 
 # homeassistant.components.nws
-pynws==1.4.1
+pynws==1.5.0
 
 # homeassistant.components.nx584
 pynx584==0.5
@@ -1355,7 +1386,7 @@ pynx584==0.5
 pynzbgetapi==0.2.0
 
 # homeassistant.components.obihai
-pyobihai==1.3.2
+pyobihai==1.4.2
 
 # homeassistant.components.octoprint
 pyoctoprintapi==0.1.11
@@ -1364,7 +1395,7 @@ pyoctoprintapi==0.1.11
 pyopenuv==2023.02.0
 
 # homeassistant.components.opnsense
-pyopnsense==0.2.0
+pyopnsense==0.4.0
 
 # homeassistant.components.opentherm_gw
 pyotgw==2.1.3
@@ -1375,7 +1406,7 @@ pyotgw==2.1.3
 pyotp==2.8.0
 
 # homeassistant.components.overkiz
-pyoverkiz==1.7.9
+pyoverkiz==1.9.0
 
 # homeassistant.components.openweathermap
 pyowm==3.2.0
@@ -1411,7 +1442,7 @@ pyps4-2ndscreen==1.3.1
 pyqwikswitch==0.93
 
 # homeassistant.components.rainbird
-pyrainbird==2.0.0
+pyrainbird==2.1.0
 
 # homeassistant.components.risco
 pyrisco==0.5.7
@@ -1464,7 +1495,7 @@ pysmartapp==0.3.3
 pysmartthings==0.7.6
 
 # homeassistant.components.edl21
-pysml==0.0.11
+pysml==0.0.12
 
 # homeassistant.components.snmp
 pysnmplib==5.0.21
@@ -1479,13 +1510,10 @@ pysoma==0.0.12
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.6.1
+pysqueezebox==0.6.3
 
 # homeassistant.components.switchbee
-pyswitchbee==1.7.19
-
-# homeassistant.components.syncthru
-pysyncthru==0.7.10
+pyswitchbee==1.8.0
 
 # homeassistant.components.tankerkoenig
 pytankerkoenig==0.0.6
@@ -1493,6 +1521,9 @@ pytankerkoenig==0.0.6
 # homeassistant.components.tautulli
 pytautulli==23.1.1
 
+# homeassistant.components.awair
+python-awair==0.2.4
+
 # homeassistant.components.bsblan
 python-bsblan==0.5.11
 
@@ -1512,29 +1543,32 @@ python-izone==1.2.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa==0.5.1
+python-kasa[speedups]==0.5.2
 
 # homeassistant.components.matter
-python-matter-server==3.2.0
+python-matter-server==3.6.3
 
 # homeassistant.components.xiaomi_miio
 python-miio==0.5.12
 
+# homeassistant.components.mystrom
+python-mystrom==2.2.0
+
 # homeassistant.components.nest
 python-nest==4.2.0
 
 # homeassistant.components.otbr
 # homeassistant.components.thread
-python-otbr-api==1.0.9
+python-otbr-api==2.2.0
 
 # homeassistant.components.picnic
 python-picnic-api==1.1.0
 
 # homeassistant.components.qbittorrent
-python-qbittorrent==0.4.2
+python-qbittorrent==0.4.3
 
 # homeassistant.components.roborock
-python-roborock==0.17.0
+python-roborock==0.29.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.33
@@ -1543,14 +1577,11 @@ python-smarttub==0.0.33
 python-songpal==0.15.2
 
 # homeassistant.components.tado
-python-tado==0.12.0
+python-tado==0.15.0
 
 # homeassistant.components.telegram_bot
 python-telegram-bot==13.1
 
-# homeassistant.components.awair
-python_awair==0.2.4
-
 # homeassistant.components.tile
 pytile==2023.04.0
 
@@ -1572,7 +1603,7 @@ pytrafikverket==0.3.3
 pyudev==0.23.2
 
 # homeassistant.components.unifiprotect
-pyunifiprotect==4.9.0
+pyunifiprotect==4.10.3
 
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0
@@ -1593,7 +1624,7 @@ pyvolumio==0.1.5
 pywebpush==1.9.2
 
 # homeassistant.components.wemo
-pywemo==0.9.1
+pywemo==1.1.0
 
 # homeassistant.components.wilight
 pywilight==0.0.74
@@ -1610,8 +1641,8 @@ pyzerproc==0.4.8
 # homeassistant.components.qingping
 qingping-ble==0.8.2
 
-# homeassistant.components.rachio
-rachiopy==1.0.3
+# homeassistant.components.qnap
+qnapstats==0.4.0
 
 # homeassistant.components.radio_browser
 radios==0.1.1
@@ -1620,28 +1651,28 @@ radios==0.1.1
 radiotherm==2.1.0
 
 # homeassistant.components.rapt_ble
-rapt-ble==0.1.1
+rapt-ble==0.1.2
 
 # homeassistant.components.rainmachine
-regenmaschine==2023.05.1
+regenmaschine==2023.06.0
 
 # homeassistant.components.renault
 renault-api==0.1.13
 
-# homeassistant.components.reolink
-reolink-aio==0.5.15
+# homeassistant.components.renson
+renson-endura-delta==1.5.0
 
-# homeassistant.components.python_script
-restrictedpython==6.0
+# homeassistant.components.reolink
+reolink-aio==0.7.1
 
 # homeassistant.components.rflink
 rflink==0.0.65
 
 # homeassistant.components.ring
-ring_doorbell==0.7.2
+ring-doorbell==0.7.2
 
 # homeassistant.components.roku
-rokuecp==0.17.1
+rokuecp==0.18.0
 
 # homeassistant.components.roomba
 roombapy==1.6.8
@@ -1656,7 +1687,7 @@ rpi-bad-power==0.1.0
 rtsp-to-webrtc==0.5.1
 
 # homeassistant.components.ruuvitag_ble
-ruuvitag-ble==0.1.1
+ruuvitag-ble==0.1.2
 
 # homeassistant.components.yamaha
 rxv==0.7.0
@@ -1676,12 +1707,14 @@ screenlogicpy==0.8.2
 # homeassistant.components.backup
 securetar==2023.3.0
 
-# homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.11.2
+sense-energy==0.12.0
+
+# homeassistant.components.emulated_kasa
+sense_energy==0.12.0
 
 # homeassistant.components.sensirion_ble
-sensirion-ble==0.0.1
+sensirion-ble==0.1.0
 
 # homeassistant.components.sensorpro
 sensorpro-ble==0.5.3
@@ -1690,7 +1723,7 @@ sensorpro-ble==0.5.3
 sensorpush-ble==1.5.5
 
 # homeassistant.components.sentry
-sentry-sdk==1.23.1
+sentry-sdk==1.27.1
 
 # homeassistant.components.sfr_box
 sfrbox-api==0.0.6
@@ -1726,13 +1759,13 @@ soco==0.29.1
 solaredge==0.0.2
 
 # homeassistant.components.solax
-solax==0.3.0
+solax==0.3.2
 
 # homeassistant.components.somfy_mylink
 somfy-mylink-synergy==1.0.6
 
 # homeassistant.components.sonos
-sonos-websocket==0.1.1
+sonos-websocket==0.1.2
 
 # homeassistant.components.marytts
 speak2mary==1.4.0
@@ -1746,10 +1779,6 @@ spiderpy==1.6.1
 # homeassistant.components.spotify
 spotipy==2.23.0
 
-# homeassistant.components.recorder
-# homeassistant.components.sql
-sqlalchemy==2.0.15
-
 # homeassistant.components.srp_energy
 srpenergy==1.3.6
 
@@ -1787,7 +1816,7 @@ sunwatcher==0.2.1
 surepy==0.8.0
 
 # homeassistant.components.system_bridge
-systembridgeconnector==3.4.8
+systembridgeconnector==3.4.9
 
 # homeassistant.components.tailscale
 tailscale==0.2.0
@@ -1826,10 +1855,10 @@ tololib==0.1.0b4
 toonapi==0.2.1
 
 # homeassistant.components.totalconnect
-total_connect_client==2023.2
+total-connect-client==2023.2
 
 # homeassistant.components.tplink_omada
-tplink-omada-client==1.2.4
+tplink_omada_client==1.2.4
 
 # homeassistant.components.transmission
 transmission-rpc==4.1.5
@@ -1859,7 +1888,7 @@ ultraheat-api==0.5.1
 unifi-discovery==1.1.7
 
 # homeassistant.components.upb
-upb_lib==0.5.4
+upb-lib==0.5.4
 
 # homeassistant.components.upcloud
 upcloud-api==2.0.0
@@ -1885,10 +1914,10 @@ velbus-aio==2023.2.0
 venstarcolortouch==0.19
 
 # homeassistant.components.vilfo
-vilfo-api-client==0.3.2
+vilfo-api-client==0.4.1
 
 # homeassistant.components.voip
-voip-utils==0.0.7
+voip-utils==0.1.0
 
 # homeassistant.components.volvooncall
 volvooncall==0.10.3
@@ -1931,7 +1960,7 @@ withings-api==2.4.0
 wled==0.16.0
 
 # homeassistant.components.wolflink
-wolf_smartset==0.1.11
+wolf-smartset==0.1.11
 
 # homeassistant.components.wyoming
 wyoming==0.0.1
@@ -1940,13 +1969,13 @@ wyoming==0.0.1
 xbox-webapi==2.0.11
 
 # homeassistant.components.xiaomi_ble
-xiaomi-ble==0.17.0
+xiaomi-ble==0.17.2
 
 # homeassistant.components.knx
-xknx==2.9.0
+xknx==2.11.1
 
 # homeassistant.components.knx
-xknxproject==3.1.0
+xknxproject==3.2.0
 
 # homeassistant.components.bluesound
 # homeassistant.components.fritz
@@ -1961,49 +1990,49 @@ yalesmartalarmclient==0.3.9
 
 # homeassistant.components.august
 # homeassistant.components.yalexs_ble
-yalexs-ble==2.1.17
+yalexs-ble==2.1.18
 
 # homeassistant.components.august
 yalexs==1.5.1
 
 # homeassistant.components.yeelight
-yeelight==0.7.10
+yeelight==0.7.11
 
 # homeassistant.components.yolink
-yolink-api==0.2.8
+yolink-api==0.2.9
 
 # homeassistant.components.youless
 youless-api==1.0.1
 
 # homeassistant.components.zamg
-zamg==0.2.2
+zamg==0.2.4
 
 # homeassistant.components.zeroconf
-zeroconf==0.62.0
+zeroconf==0.70.0
 
 # homeassistant.components.zeversolar
 zeversolar==0.3.1
 
 # homeassistant.components.zha
-zha-quirks==0.0.99
+zha-quirks==0.0.101
 
 # homeassistant.components.zha
 zigpy-deconz==0.21.0
 
 # homeassistant.components.zha
-zigpy-xbee==0.18.0
+zigpy-xbee==0.18.1
 
 # homeassistant.components.zha
 zigpy-zigate==0.11.0
 
 # homeassistant.components.zha
-zigpy-znp==0.11.1
+zigpy-znp==0.11.2
 
 # homeassistant.components.zha
-zigpy==0.55.0
+zigpy==0.56.1
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.48.1
+zwave-js-server-python==0.49.0
 
 # homeassistant.components.zwave_me
-zwave_me_ws==0.4.3
+zwave-me-ws==0.4.3
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 9954e97da97c96..eff26bcfe82e74 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,8 +1,6 @@
 # Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit
 
-bandit==1.7.4
 black==23.3.0
 codespell==2.2.2
-isort==5.12.0
-ruff==0.0.262
+ruff==0.0.272
 yamllint==1.28.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 43aff2566fc7f1..d36b3f61d9db85 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -20,17 +20,17 @@
     import tomli as tomllib
 
 COMMENT_REQUIREMENTS = (
-    "Adafruit_BBIO",
+    "Adafruit-BBIO",
     "atenpdu",  # depends on pysnmp which is not maintained at this time
     "avea",  # depends on bluepy
     "avion",
     "beacontools",
-    "beewi_smartclim",  # depends on bluepy
+    "beewi-smartclim",  # depends on bluepy
     "bluepy",
     "decora",
-    "decora_wifi",
+    "decora-wifi",
     "evdev",
-    "face_recognition",
+    "face-recognition",
     "opencv-python-headless",
     "pybluez",
     "pycups",
@@ -104,9 +104,9 @@
 # these requirements are quite loose. As the entire stack has some outstanding issues, and
 # even newer versions seem to introduce new issues, it's useful for us to pin all these
 # requirements so we can directly link HA versions to these library versions.
-anyio==3.6.2
+anyio==3.7.0
 h11==0.14.0
-httpcore==0.17.0
+httpcore==0.17.2
 
 # Ensure we have a hyperframe version that works in Python 3.10
 # 5.2.0 fixed a collections abc deprecation
@@ -132,9 +132,8 @@
 # Version 2.0 added typing, prevent accidental fallbacks
 backoff>=2.0
 
-# Breaking change in version
-# https://github.com/samuelcolvin/pydantic/issues/4092
-pydantic!=1.9.1
+# Require to avoid issues with decorators (#93904). v2 has breaking changes.
+pydantic>=1.10.8,<2.0
 
 # Breaks asyncio
 # https://github.com/pubnub/python/issues/130
@@ -158,7 +157,7 @@
 
 # protobuf must be in package constraints for the wheel
 # builder to build binary wheels
-protobuf==4.23.1
+protobuf==4.23.3
 
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
@@ -179,6 +178,10 @@
 # pysnmp is no longer maintained and does not work with newer
 # python
 pysnmp==1000000000.0.0
+
+# The get-mac package has been replaced with getmac. Installing get-mac alongside getmac
+# breaks getmac due to them both sharing the same python package name inside 'getmac'.
+get-mac==1000000000.0.0
 """
 
 IGNORE_PRE_COMMIT_HOOK_ID = (
@@ -430,7 +433,8 @@ def gather_constraints() -> str:
                     *core_requirements(),
                     *gather_recursive_requirements("default_config"),
                     *gather_recursive_requirements("mqtt"),
-                }
+                },
+                key=lambda name: name.lower(),
             )
             + [""]
         )
diff --git a/script/hassfest/__main__.py b/script/hassfest/__main__.py
index 8702461976545c..1c626ac3c5b88f 100644
--- a/script/hassfest/__main__.py
+++ b/script/hassfest/__main__.py
@@ -11,6 +11,7 @@
     bluetooth,
     codeowners,
     config_flow,
+    config_schema,
     coverage,
     dependencies,
     dhcp,
@@ -32,6 +33,7 @@
     application_credentials,
     bluetooth,
     codeowners,
+    config_schema,
     dependencies,
     dhcp,
     json,
@@ -43,7 +45,7 @@
     translations,
     usb,
     zeroconf,
-    config_flow,
+    config_flow,  # This needs to run last, after translations are processed
 ]
 HASS_PLUGINS = [
     coverage,
diff --git a/script/hassfest/config_schema.py b/script/hassfest/config_schema.py
new file mode 100644
index 00000000000000..b794834161d16f
--- /dev/null
+++ b/script/hassfest/config_schema.py
@@ -0,0 +1,108 @@
+"""Validate integrations which can be setup from YAML have config schemas."""
+from __future__ import annotations
+
+import ast
+
+from .model import Config, Integration
+
+CONFIG_SCHEMA_IGNORE = {
+    # Configuration under the homeassistant key is a special case, it's handled by
+    # conf_util.async_process_ha_core_config already during bootstrapping, not by
+    # a schema in the homeassistant integration.
+    "homeassistant",
+}
+
+
+def _has_assignment(module: ast.Module, name: str) -> bool:
+    """Test if the module assigns to a name."""
+    for item in module.body:
+        if type(item) not in (ast.Assign, ast.AnnAssign, ast.AugAssign):
+            continue
+        if type(item) == ast.Assign:
+            for target in item.targets:
+                if target.id == name:
+                    return True
+            continue
+        if item.target.id == name:
+            return True
+    return False
+
+
+def _has_function(
+    module: ast.Module, _type: ast.AsyncFunctionDef | ast.FunctionDef, name: str
+) -> bool:
+    """Test if the module defines a function."""
+    for item in module.body:
+        if type(item) == _type and item.name == name:
+            return True
+    return False
+
+
+def _has_import(module: ast.Module, name: str) -> bool:
+    """Test if the module imports to a name."""
+    for item in module.body:
+        if type(item) not in (ast.Import, ast.ImportFrom):
+            continue
+        for alias in item.names:
+            if alias.asname == name or (alias.asname is None and alias.name == name):
+                return True
+    return False
+
+
+def _validate_integration(config: Config, integration: Integration) -> None:
+    """Validate integration has has a configuration schema."""
+    if integration.domain in CONFIG_SCHEMA_IGNORE:
+        return
+
+    init_file = integration.path / "__init__.py"
+
+    if not init_file.is_file():
+        # Virtual integrations don't have any implementation
+        return
+
+    init = ast.parse(init_file.read_text())
+
+    # No YAML Support
+    if not _has_function(
+        init, ast.AsyncFunctionDef, "async_setup"
+    ) and not _has_function(init, ast.FunctionDef, "setup"):
+        return
+
+    # No schema
+    if (
+        _has_assignment(init, "CONFIG_SCHEMA")
+        or _has_assignment(init, "PLATFORM_SCHEMA")
+        or _has_assignment(init, "PLATFORM_SCHEMA_BASE")
+        or _has_import(init, "CONFIG_SCHEMA")
+        or _has_import(init, "PLATFORM_SCHEMA")
+        or _has_import(init, "PLATFORM_SCHEMA_BASE")
+    ):
+        return
+
+    config_file = integration.path / "config.py"
+    if config_file.is_file():
+        config_module = ast.parse(config_file.read_text())
+        if _has_function(config_module, ast.AsyncFunctionDef, "async_validate_config"):
+            return
+
+    if config.specific_integrations:
+        notice_method = integration.add_warning
+    else:
+        notice_method = integration.add_error
+
+    notice_method(
+        "config_schema",
+        "Integrations which implement 'async_setup' or 'setup' must define either "
+        "'CONFIG_SCHEMA', 'PLATFORM_SCHEMA' or 'PLATFORM_SCHEMA_BASE'. If the "
+        "integration has no configuration parameters, can only be set up from platforms"
+        " or can only be set up from config entries, one of the helpers "
+        "cv.empty_config_schema, cv.platform_only_config_schema or "
+        "cv.config_entry_only_config_schema can be used.",
+    )
+
+
+def validate(integrations: dict[str, Integration], config: Config) -> None:
+    """Validate integrations have configuration schemas."""
+    for domain in sorted(integrations):
+        integration = integrations[domain]
+        _validate_integration(config, integration)
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index 89a3d70afc77f4..9a7caec925bee3 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -161,8 +161,8 @@ def verify_version(value: str) -> str:
                 AwesomeVersionStrategy.PEP440,
             ],
         )
-    except AwesomeVersionException:
-        raise vol.Invalid(f"'{value}' is not a valid version.")
+    except AwesomeVersionException as err:
+        raise vol.Invalid(f"'{value}' is not a valid version.") from err
     return value
 
 
diff --git a/script/hassfest/serializer.py b/script/hassfest/serializer.py
index 0dd3d35bb154cb..499ee9d51d91e1 100644
--- a/script/hassfest/serializer.py
+++ b/script/hassfest/serializer.py
@@ -91,7 +91,7 @@ def _get_annotation(key: str) -> str:
         return f": {annotation}" if annotation else ""
 
     code = "\n\n".join(
-        f"{key}{_get_annotation(key)}" f" = {to_string(value)}"
+        f"{key}{_get_annotation(key)} = {to_string(value)}"
         for key, value in sorted(content.items())
     )
     if annotations:
diff --git a/script/hassfest/translations.py b/script/hassfest/translations.py
index 9efe01cf962346..9f464fd4147d6f 100644
--- a/script/hassfest/translations.py
+++ b/script/hassfest/translations.py
@@ -34,6 +34,7 @@
     "google_travel_time",
     "homekit_controller",
     "islamic_prayer_times",
+    "local_calendar",
     "local_ip",
     "nmap_tracker",
     "rpi_power",
diff --git a/script/languages.py b/script/languages.py
index ad88a31b0b6696..f55fc21db93537 100644
--- a/script/languages.py
+++ b/script/languages.py
@@ -15,10 +15,61 @@
 data = json.loads(req.content)
 languages = set(data.keys())
 
+# Languages which can be used for entity IDs.
+# Languages in the set are those which use a writing system based on the Latin
+# script. Languages not in this set will instead base the entity ID on English.
+
+# Note: Although vietnamese writing is based on the Latin script, it's too ambiguous
+# after accents and diacritics have been removed by slugify
+NATIVE_ENTITY_IDS = {
+    "af",  # Afrikaans
+    "bs",  # Bosanski
+    "ca",  # Català
+    "cs",  # Čeština
+    "cy",  # Cymraeg
+    "da",  # Dansk
+    "de",  # Deutsch
+    "en",  # English
+    "en-GB",  # English (GB)
+    "eo",  # Esperanto
+    "es",  # Español
+    "es-419",  # Español (Latin America)
+    "et",  # Eesti
+    "eu",  # Euskara
+    "fi",  # Suomi
+    "fr",  # Français
+    "fy",  # Frysk
+    "gl",  # Galego
+    "gsw",  # Schwiizerdütsch
+    "hr",  # Hrvatski
+    "hu",  # Magyar
+    "id",  # Indonesia
+    "is",  # Íslenska
+    "it",  # Italiano
+    "ka",  # Kartuli
+    "lb",  # Lëtzebuergesch
+    "lt",  # Lietuvių
+    "lv",  # Latviešu
+    "nb",  # Nederlands
+    "nl",  # Norsk Bokmål
+    "nn",  # Norsk Nynorsk"
+    "pl",  # Polski
+    "pt",  # Português
+    "pt-BR",  # Português (BR)
+    "ro",  # Română
+    "sk",  # Slovenčina
+    "sl",  # Slovenščina
+    "sr-Latn",  # Srpski
+    "sv",  # Svenska
+    "tr",  # Türkçe
+}
+
 Path("homeassistant/generated/languages.py").write_text(
     format_python_namespace(
         {
+            "DEFAULT_LANGUAGE": "en",
             "LANGUAGES": languages,
+            "NATIVE_ENTITY_IDS": NATIVE_ENTITY_IDS,
         },
         generator="script.languages [frontend_tag]",
     )
diff --git a/script/microsoft_tts.py b/script/microsoft_tts.py
new file mode 100644
index 00000000000000..bc0b577c97c525
--- /dev/null
+++ b/script/microsoft_tts.py
@@ -0,0 +1,25 @@
+"""Helper script to update supported languages for Microsoft text-to-speech (TTS)."""
+from pathlib import Path
+
+from lxml import html
+import requests
+
+from .hassfest.serializer import format_python_namespace
+
+URL = "https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/language-support"
+XPATH_QUERY = "//section[@data-tab='tts']/table[1]/tbody/tr/td[1]/code/text()"
+
+req = requests.get(URL)
+req.raise_for_status()
+tree = html.fromstring(req.content)
+supported_languages_raw = tree.xpath(XPATH_QUERY)
+supported_languages = {s.lower() for s in supported_languages_raw}
+
+Path("homeassistant/generated/microsoft_tts.py").write_text(
+    format_python_namespace(
+        {
+            "SUPPORTED_LANGUAGES": supported_languages,
+        },
+        generator="script.microsoft_tts",
+    )
+)
diff --git a/script/ruff.toml b/script/ruff.toml
new file mode 100644
index 00000000000000..9d77bf60af9518
--- /dev/null
+++ b/script/ruff.toml
@@ -0,0 +1,7 @@
+# This extend our general Ruff rules specifically for tests
+extend = "../pyproject.toml"
+
+[isort]
+forced-separate = [
+    "tests",
+]
\ No newline at end of file
diff --git a/script/scaffold/gather_info.py b/script/scaffold/gather_info.py
index 85a94459d06515..47106e7f9566c3 100644
--- a/script/scaffold/gather_info.py
+++ b/script/scaffold/gather_info.py
@@ -162,8 +162,8 @@ def _gather_info(fields) -> dict:
                 if "default" in info:
                     msg += f" [{info['default']}]"
                 value = input(f"{msg}\n> ")
-            except (KeyboardInterrupt, EOFError):
-                raise ExitApp("Interrupted!", 1)
+            except (KeyboardInterrupt, EOFError) as err:
+                raise ExitApp("Interrupted!", 1) from err
 
             value = value.strip()
 
diff --git a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
index bc087119c6e085..d0000b800df145 100644
--- a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
@@ -5,15 +5,15 @@
 import pytest
 
 from homeassistant import config_entries
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.components.NEW_DOMAIN.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,
     OAUTH2_TOKEN,
 )
-from homeassistant.components.application_credentials import (
-    ClientCredential,
-    async_import_client_credential,
-)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.setup import async_setup_component
diff --git a/script/scaffold/templates/device_action/tests/test_device_action.py b/script/scaffold/templates/device_action/tests/test_device_action.py
index ce3f907b47b9c2..a6e8f99854a433 100644
--- a/script/scaffold/templates/device_action/tests/test_device_action.py
+++ b/script/scaffold/templates/device_action/tests/test_device_action.py
@@ -1,9 +1,10 @@
 """The tests for NEW_NAME device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -11,7 +12,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -44,7 +44,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -91,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(hass: HomeAssistant) -> None:
diff --git a/script/scaffold/templates/device_condition/tests/test_device_condition.py b/script/scaffold/templates/device_condition/tests/test_device_condition.py
index 59781e24fe6381..1f6e0ffde3ce5d 100644
--- a/script/scaffold/templates/device_condition/tests/test_device_condition.py
+++ b/script/scaffold/templates/device_condition/tests/test_device_condition.py
@@ -2,10 +2,11 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -13,7 +14,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -59,7 +59,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
diff --git a/script/scaffold/templates/device_trigger/integration/device_trigger.py b/script/scaffold/templates/device_trigger/integration/device_trigger.py
index 1fd8810bd88b35..4179bf5248a48a 100644
--- a/script/scaffold/templates/device_trigger/integration/device_trigger.py
+++ b/script/scaffold/templates/device_trigger/integration/device_trigger.py
@@ -5,10 +5,6 @@
 
 import voluptuous as vol
 
-from homeassistant.components.automation import (
-    AutomationActionType,
-    AutomationTriggerInfo,
-)
 from homeassistant.components.device_automation import DEVICE_TRIGGER_BASE_SCHEMA
 from homeassistant.components.homeassistant.triggers import state as state_trigger
 from homeassistant.const import (
@@ -22,6 +18,7 @@
 )
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
 from . import DOMAIN
@@ -73,8 +70,8 @@ async def async_get_triggers(
 async def async_attach_trigger(
     hass: HomeAssistant,
     config: ConfigType,
-    action: AutomationActionType,
-    automation_info: AutomationTriggerInfo,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
     # TODO Implement your own logic to attach triggers.
@@ -92,5 +89,5 @@ async def async_attach_trigger(
     }
     state_config = await state_trigger.async_validate_trigger_config(hass, state_config)
     return await state_trigger.async_attach_trigger(
-        hass, state_config, action, automation_info, platform_type="device"
+        hass, state_config, action, trigger_info, platform_type="device"
     )
diff --git a/script/scaffold/templates/device_trigger/tests/test_device_trigger.py b/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
index 8cfaa6f64a9414..177c095b6011ae 100644
--- a/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
+++ b/script/scaffold/templates/device_trigger/tests/test_device_trigger.py
@@ -1,9 +1,10 @@
 """The tests for NEW_NAME device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
-from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.NEW_DOMAIN import DOMAIN
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -11,7 +12,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -57,7 +57,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_state_change(
diff --git a/script/setup b/script/setup
index e68ec72cbbae05..a5c2d48b2b3d25 100755
--- a/script/setup
+++ b/script/setup
@@ -24,7 +24,7 @@ fi
 script/bootstrap
 
 pre-commit install
-python3 -m pip install -e . --constraint homeassistant/package_constraints.txt
+python3 -m pip install -e . --config-settings editable_mode=compat --constraint homeassistant/package_constraints.txt
 python3 -m script.translations develop --all
 
 hass --script ensure_config -c config
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 29713b6df46cac..00000000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Setuptools v62.3 doesn't support editable installs with just 'pyproject.toml' (PEP 660).
-# Keep this file until it does!
-
-[metadata]
-url = https://www.home-assistant.io/
diff --git a/tests/auth/providers/test_trusted_networks.py b/tests/auth/providers/test_trusted_networks.py
index 53d1f0a9fa76fb..a098eea28e07ae 100644
--- a/tests/auth/providers/test_trusted_networks.py
+++ b/tests/auth/providers/test_trusted_networks.py
@@ -116,6 +116,32 @@ def manager_bypass_login(hass, store, provider_bypass_login):
     )
 
 
+async def test_config_schema():
+    """Test CONFIG_SCHEMA."""
+    # Valid configuration
+    tn_auth.CONFIG_SCHEMA(
+        {
+            "type": "trusted_networks",
+            "trusted_networks": ["192.168.0.1"],
+            "trusted_users": {
+                "192.168.0.1": [
+                    "a1ab982744b64757bf80515589258924",
+                    {"group": "system-group"},
+                ]
+            },
+        }
+    )
+    # Wrong user id format
+    with pytest.raises(vol.Invalid):
+        tn_auth.CONFIG_SCHEMA(
+            {
+                "type": "trusted_networks",
+                "trusted_networks": ["192.168.0.1"],
+                "trusted_users": {"192.168.0.1": ["abcde"]},
+            }
+        )
+
+
 async def test_trusted_networks_credentials(manager, provider) -> None:
     """Test trusted_networks credentials related functions."""
     owner = await manager.async_create_user("test-owner")
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 83c08dd73ee819..3cead230b1b861 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -1,7 +1,7 @@
 """Tests for the Home Assistant auth module."""
 from datetime import timedelta
 from typing import Any
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 from freezegun import freeze_time
 import jwt
@@ -31,10 +31,8 @@
 
 
 @pytest.fixture
-def mock_hass(event_loop):
+def mock_hass(hass: HomeAssistant) -> HomeAssistant:
     """Home Assistant mock with minimum amount of data set to make it work with auth."""
-    hass = Mock()
-    hass.config.skip_pip = True
     return hass
 
 
diff --git a/tests/bandit.yaml b/tests/bandit.yaml
deleted file mode 100644
index 568f77d622ae25..00000000000000
--- a/tests/bandit.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# https://bandit.readthedocs.io/en/latest/config.html
-
-tests:
-  - B103
-  - B108
-  - B306
-  - B307
-  - B313
-  - B314
-  - B315
-  - B316
-  - B317
-  - B318
-  - B319
-  - B320
-  - B325
-  - B601
-  - B602
-  - B604
-  - B608
-  - B609
diff --git a/tests/common.py b/tests/common.py
index 632294a50fbc0b..4fdccced3703f9 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -29,7 +29,7 @@
     providers as auth_providers,
 )
 from homeassistant.auth.permissions import system_policies
-from homeassistant.components import device_automation
+from homeassistant.components import device_automation, persistent_notification as pn
 from homeassistant.components.device_automation import (  # noqa: F401
     _async_get_device_automation_capabilities as async_get_device_automation_capabilities,
 )
@@ -48,7 +48,9 @@
     Event,
     HomeAssistant,
     ServiceCall,
+    ServiceResponse,
     State,
+    SupportsResponse,
     callback,
 )
 from homeassistant.helpers import (
@@ -61,6 +63,7 @@
     issue_registry as ir,
     recorder as recorder_helper,
     restore_state,
+    restore_state as rs,
     storage,
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -68,7 +71,7 @@
 from homeassistant.helpers.typing import ConfigType, StateType
 from homeassistant.setup import setup_component
 from homeassistant.util.async_ import run_callback_threadsafe
-import homeassistant.util.dt as date_util
+import homeassistant.util.dt as dt_util
 from homeassistant.util.json import (
     JsonArrayType,
     JsonObjectType,
@@ -247,16 +250,27 @@ def async_create_task(coroutine, name=None):
             )
         },
     )
+    hass.bus.async_listen_once(
+        EVENT_HOMEASSISTANT_STOP, hass.config_entries._async_shutdown
+    )
 
     # Load the registries
     entity.async_setup(hass)
     if load_registries:
-        with patch("homeassistant.helpers.storage.Store.async_load", return_value=None):
+        with patch(
+            "homeassistant.helpers.storage.Store.async_load", return_value=None
+        ), patch(
+            "homeassistant.helpers.restore_state.RestoreStateData.async_setup_dump",
+            return_value=None,
+        ), patch(
+            "homeassistant.helpers.restore_state.start.async_at_start"
+        ):
             await asyncio.gather(
                 ar.async_load(hass),
                 dr.async_load(hass),
                 er.async_load(hass),
                 ir.async_load(hass),
+                rs.async_load(hass),
             )
         hass.data[bootstrap.DATA_REGISTRIES_LOADED] = None
 
@@ -273,7 +287,12 @@ def clear_instance(event):
 
 
 def async_mock_service(
-    hass: HomeAssistant, domain: str, service: str, schema: vol.Schema | None = None
+    hass: HomeAssistant,
+    domain: str,
+    service: str,
+    schema: vol.Schema | None = None,
+    response: ServiceResponse = None,
+    supports_response: SupportsResponse | None = None,
 ) -> list[ServiceCall]:
     """Set up a fake service & return a calls log list to this service."""
     calls = []
@@ -282,8 +301,18 @@ def async_mock_service(
     def mock_service_log(call):  # pylint: disable=unnecessary-lambda
         """Mock service call."""
         calls.append(call)
+        return response
+
+    if supports_response is None and response is not None:
+        supports_response = SupportsResponse.OPTIONAL
 
-    hass.services.async_register(domain, service, mock_service_log, schema=schema)
+    hass.services.async_register(
+        domain,
+        service,
+        mock_service_log,
+        schema=schema,
+        supports_response=supports_response,
+    )
 
     return calls
 
@@ -357,7 +386,7 @@ def async_fire_time_changed_exact(
     if datetime_ is None:
         utc_datetime = datetime.now(timezone.utc)
     else:
-        utc_datetime = date_util.as_utc(datetime_)
+        utc_datetime = dt_util.as_utc(datetime_)
 
     _async_fire_time_changed(hass, utc_datetime, fire_all)
 
@@ -379,7 +408,7 @@ def async_fire_time_changed(
     if datetime_ is None:
         utc_datetime = datetime.now(timezone.utc)
     else:
-        utc_datetime = date_util.as_utc(datetime_)
+        utc_datetime = dt_util.as_utc(datetime_)
 
     if utc_datetime.microsecond < 500000:
         # Allow up to 500000 microseconds to be added to the time
@@ -395,7 +424,7 @@ def async_fire_time_changed(
 def _async_fire_time_changed(
     hass: HomeAssistant, utc_datetime: datetime | None, fire_all: bool
 ) -> None:
-    timestamp = date_util.utc_to_timestamp(utc_datetime)
+    timestamp = dt_util.utc_to_timestamp(utc_datetime)
     for task in list(hass.loop._scheduled):
         if not isinstance(task, asyncio.TimerHandle):
             continue
@@ -499,7 +528,9 @@ def mock_registry(
     registry = er.EntityRegistry(hass)
     if mock_entries is None:
         mock_entries = {}
+    registry.deleted_entities = {}
     registry.entities = er.EntityRegistryItems()
+    registry._entities_data = registry.entities.data
     for key, entry in mock_entries.items():
         registry.entities[key] = entry
 
@@ -545,6 +576,7 @@ def mock_device_registry(
     """
     registry = dr.DeviceRegistry(hass)
     registry.devices = dr.DeviceRegistryItems()
+    registry._device_data = registry.devices.data
     if mock_entries is None:
         mock_entries = {}
     for key, entry in mock_entries.items():
@@ -1010,9 +1042,9 @@ def init_recorder_component(hass, add_config=None, db_url="sqlite://"):
 
 def mock_restore_cache(hass: HomeAssistant, states: Sequence[State]) -> None:
     """Mock the DATA_RESTORE_CACHE."""
-    key = restore_state.DATA_RESTORE_STATE_TASK
+    key = restore_state.DATA_RESTORE_STATE
     data = restore_state.RestoreStateData(hass)
-    now = date_util.utcnow()
+    now = dt_util.utcnow()
 
     last_states = {}
     for state in states:
@@ -1037,9 +1069,9 @@ def mock_restore_cache_with_extra_data(
     hass: HomeAssistant, states: Sequence[tuple[State, Mapping[str, Any]]]
 ) -> None:
     """Mock the DATA_RESTORE_CACHE."""
-    key = restore_state.DATA_RESTORE_STATE_TASK
+    key = restore_state.DATA_RESTORE_STATE
     data = restore_state.RestoreStateData(hass)
-    now = date_util.utcnow()
+    now = dt_util.utcnow()
 
     last_states = {}
     for state, extra_data in states:
@@ -1060,6 +1092,26 @@ def mock_restore_cache_with_extra_data(
     hass.data[key] = data
 
 
+async def async_mock_restore_state_shutdown_restart(
+    hass: HomeAssistant,
+) -> restore_state.RestoreStateData:
+    """Mock shutting down and saving restore state and restoring."""
+    data = restore_state.async_get(hass)
+    await data.async_dump_states()
+    await async_mock_load_restore_state_from_storage(hass)
+    return data
+
+
+async def async_mock_load_restore_state_from_storage(
+    hass: HomeAssistant,
+) -> None:
+    """Mock loading restore state from storage.
+
+    hass_storage must already be mocked.
+    """
+    await restore_state.async_get(hass).async_load()
+
+
 class MockEntity(entity.Entity):
     """Mock Entity class."""
 
@@ -1184,6 +1236,8 @@ async def mock_async_load(
         if store._data is None:
             # No data to load
             if store.key not in data:
+                # Make sure the next attempt will still load
+                store._load_task = None
                 return None
 
             mock_data = data.get(store.key)
@@ -1319,7 +1373,7 @@ def async_capture_events(hass: HomeAssistant, event_name: str) -> list[Event]:
     def capture_events(event: Event) -> None:
         events.append(event)
 
-    hass.bus.async_listen(event_name, capture_events)
+    hass.bus.async_listen(event_name, capture_events, run_immediately=True)
 
     return events
 
@@ -1339,19 +1393,6 @@ def mock_signal_handler(*args: Any) -> None:
     return calls
 
 
-def assert_lists_same(a: list[Any], b: list[Any]) -> None:
-    """Compare two lists, ignoring order.
-
-    Check both that all items in a are in b and that all items in b are in a,
-    otherwise assert_lists_same(["1", "1"], ["1", "2"]) could be True.
-    """
-    assert len(a) == len(b)
-    for i in a:
-        assert i in b
-    for i in b:
-        assert i in a
-
-
 _SENTINEL = object()
 
 
@@ -1396,3 +1437,11 @@ def raise_contains_mocks(val: Any) -> None:
     if isinstance(val, list):
         for dict_value in val:
             raise_contains_mocks(dict_value)
+
+
+@callback
+def async_get_persistent_notifications(
+    hass: HomeAssistant,
+) -> dict[str, pn.Notification]:
+    """Get the current persistent notifications."""
+    return pn._async_get_or_create_notifications(hass)
diff --git a/tests/components/abode/test_light.py b/tests/components/abode/test_light.py
index 5716a18f195fbf..56a924c1226ad3 100644
--- a/tests/components/abode/test_light.py
+++ b/tests/components/abode/test_light.py
@@ -63,7 +63,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     await setup_platform(hass, LIGHT_DOMAIN)
 
     with patch("jaraco.abode.devices.light.Light.switch_off") as mock_switch_off:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
diff --git a/tests/components/abode/test_sensor.py b/tests/components/abode/test_sensor.py
index 5d074de214fac4..755dfbf584e5ac 100644
--- a/tests/components/abode/test_sensor.py
+++ b/tests/components/abode/test_sensor.py
@@ -37,9 +37,9 @@ async def test_attributes(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Environment Sensor Humidity"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.HUMIDITY
 
-    state = hass.states.get("sensor.environment_sensor_lux")
+    state = hass.states.get("sensor.environment_sensor_illuminance")
     assert state.state == "1.0"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "lux"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "lx"
 
     state = hass.states.get("sensor.environment_sensor_temperature")
     # Abodepy device JSON reports 19.5, but Home Assistant shows 19.4
diff --git a/tests/components/abode/test_switch.py b/tests/components/abode/test_switch.py
index bd9a5f8d72dff4..a18e554aa39d82 100644
--- a/tests/components/abode/test_switch.py
+++ b/tests/components/abode/test_switch.py
@@ -49,7 +49,7 @@ async def test_switch_on(hass: HomeAssistant) -> None:
     await setup_platform(hass, SWITCH_DOMAIN)
 
     with patch("jaraco.abode.devices.switch.Switch.switch_on") as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
@@ -62,7 +62,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     await setup_platform(hass, SWITCH_DOMAIN)
 
     with patch("jaraco.abode.devices.switch.Switch.switch_off") as mock_switch_off:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: DEVICE_ID}, blocking=True
         )
         await hass.async_block_till_done()
diff --git a/tests/components/accuweather/test_weather.py b/tests/components/accuweather/test_weather.py
index de1703128ddcd3..dd5dca8c06985a 100644
--- a/tests/components/accuweather/test_weather.py
+++ b/tests/components/accuweather/test_weather.py
@@ -5,6 +5,8 @@
 from homeassistant.components.accuweather.const import ATTRIBUTION
 from homeassistant.components.weather import (
     ATTR_FORECAST,
+    ATTR_FORECAST_APPARENT_TEMP,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
@@ -12,12 +14,17 @@
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
 )
 from homeassistant.const import ATTR_ATTRIBUTION, ATTR_ENTITY_ID, STATE_UNAVAILABLE
@@ -50,6 +57,10 @@ async def test_weather_without_forecast(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_WEATHER_VISIBILITY) == 16.1
     assert state.attributes.get(ATTR_WEATHER_WIND_BEARING) == 180
     assert state.attributes.get(ATTR_WEATHER_WIND_SPEED) == 14.5  # 4.03 m/s -> km/h
+    assert state.attributes.get(ATTR_WEATHER_APPARENT_TEMPERATURE) == 22.8
+    assert state.attributes.get(ATTR_WEATHER_DEW_POINT) == 16.2
+    assert state.attributes.get(ATTR_WEATHER_CLOUD_COVERAGE) == 10
+    assert state.attributes.get(ATTR_WEATHER_WIND_GUST_SPEED) == 20.3
     assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION
 
     entry = registry.async_get("weather.home")
@@ -71,6 +82,10 @@ async def test_weather_with_forecast(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_WEATHER_VISIBILITY) == 16.1
     assert state.attributes.get(ATTR_WEATHER_WIND_BEARING) == 180
     assert state.attributes.get(ATTR_WEATHER_WIND_SPEED) == 14.5  # 4.03 m/s -> km/h
+    assert state.attributes.get(ATTR_WEATHER_APPARENT_TEMPERATURE) == 22.8
+    assert state.attributes.get(ATTR_WEATHER_DEW_POINT) == 16.2
+    assert state.attributes.get(ATTR_WEATHER_CLOUD_COVERAGE) == 10
+    assert state.attributes.get(ATTR_WEATHER_WIND_GUST_SPEED) == 20.3
     assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION
     forecast = state.attributes.get(ATTR_FORECAST)[0]
     assert forecast.get(ATTR_FORECAST_CONDITION) == "lightning-rainy"
@@ -81,6 +96,9 @@ async def test_weather_with_forecast(hass: HomeAssistant) -> None:
     assert forecast.get(ATTR_FORECAST_TIME) == "2020-07-26T05:00:00+00:00"
     assert forecast.get(ATTR_FORECAST_WIND_BEARING) == 166
     assert forecast.get(ATTR_FORECAST_WIND_SPEED) == 13.0  # 3.61 m/s -> km/h
+    assert forecast.get(ATTR_FORECAST_CLOUD_COVERAGE) == 58
+    assert forecast.get(ATTR_FORECAST_APPARENT_TEMP) == 29.8
+    assert forecast.get(ATTR_FORECAST_WIND_GUST_SPEED) == 29.6
 
     entry = registry.async_get("weather.home")
     assert entry
diff --git a/tests/components/advantage_air/snapshots/test_diagnostics.ambr b/tests/components/advantage_air/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000000..a472d4fa1fccff
--- /dev/null
+++ b/tests/components/advantage_air/snapshots/test_diagnostics.ambr
@@ -0,0 +1,292 @@
+# serializer version: 1
+# name: test_select_async_setup_entry
+  dict({
+    'aircons': dict({
+      'ac1': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': False,
+          'climateControlModeEnabled': False,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 10,
+          'countDownToOn': 0,
+          'fan': 'high',
+          'filterCleanStatus': 0,
+          'freshAirStatus': 'off',
+          'mode': 'vent',
+          'myAutoModeEnabled': False,
+          'myAutoModeIsRunning': False,
+          'myZone': 1,
+          'name': 'myzone',
+          'setTemp': 24,
+          'state': 'on',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 20,
+            'motionConfig': 2,
+            'name': 'Zone open with Sensor',
+            'number': 1,
+            'rssi': 40,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 1,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 21,
+            'motionConfig': 2,
+            'name': 'Zone closed with Sensor',
+            'number': 2,
+            'rssi': 10,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z03': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 22,
+            'motionConfig': 2,
+            'name': 'Zone 3',
+            'number': 3,
+            'rssi': 25,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z04': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 1,
+            'motionConfig': 1,
+            'name': 'Zone 4',
+            'number': 4,
+            'rssi': 75,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+          'z05': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 5,
+            'motionConfig': 1,
+            'name': 'Zone 5',
+            'number': 5,
+            'rssi': 100,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 1,
+            'value': 0,
+          }),
+        }),
+      }),
+      'ac2': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': True,
+          'climateControlModeEnabled': True,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 0,
+          'countDownToOn': 20,
+          'fan': 'autoAA',
+          'filterCleanStatus': 1,
+          'freshAirStatus': 'none',
+          'mode': 'cool',
+          'myAutoModeCurrentSetMode': 'cool',
+          'myAutoModeEnabled': False,
+          'myAutoModeIsRunning': False,
+          'myZone': 1,
+          'name': 'mytemp',
+          'setTemp': 24,
+          'state': 'off',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 25,
+            'minDamper': 0,
+            'motion': 20,
+            'motionConfig': 2,
+            'name': 'Zone A',
+            'number': 1,
+            'rssi': 40,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 1,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 26,
+            'minDamper': 0,
+            'motion': 21,
+            'motionConfig': 2,
+            'name': 'Zone B',
+            'number': 2,
+            'rssi': 10,
+            'setTemp': 23,
+            'state': 'open',
+            'type': 1,
+            'value': 50,
+          }),
+        }),
+      }),
+      'ac3': dict({
+        'info': dict({
+          'aaAutoFanModeEnabled': True,
+          'climateControlModeEnabled': False,
+          'climateControlModeIsRunning': False,
+          'countDownToOff': 0,
+          'countDownToOn': 0,
+          'fan': 'autoAA',
+          'filterCleanStatus': 1,
+          'freshAirStatus': 'none',
+          'mode': 'myauto',
+          'myAutoCoolTargetTemp': 24,
+          'myAutoHeatTargetTemp': 20,
+          'myAutoModeCurrentSetMode': 'cool',
+          'myAutoModeEnabled': True,
+          'myAutoModeIsRunning': True,
+          'myZone': 0,
+          'name': 'myauto',
+          'setTemp': 24,
+          'state': 'on',
+        }),
+        'zones': dict({
+          'z01': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 0,
+            'minDamper': 0,
+            'motion': 0,
+            'motionConfig': 0,
+            'name': 'Zone Y',
+            'number': 1,
+            'rssi': 0,
+            'setTemp': 24,
+            'state': 'open',
+            'type': 0,
+            'value': 100,
+          }),
+          'z02': dict({
+            'error': 0,
+            'maxDamper': 100,
+            'measuredTemp': 0,
+            'minDamper': 0,
+            'motion': 0,
+            'motionConfig': 0,
+            'name': 'Zone Z',
+            'number': 2,
+            'rssi': 0,
+            'setTemp': 24,
+            'state': 'close',
+            'type': 0,
+            'value': 0,
+          }),
+        }),
+      }),
+    }),
+    'myLights': dict({
+      'lights': dict({
+        '100': dict({
+          'id': '100',
+          'moduleType': 'RM2',
+          'name': 'Light A',
+          'relay': True,
+          'state': 'off',
+        }),
+        '101': dict({
+          'id': '101',
+          'name': 'Light B',
+          'state': 'on',
+          'value': 50,
+        }),
+      }),
+    }),
+    'myThings': dict({
+      'things': dict({
+        '200': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 1,
+          'id': '200',
+          'name': 'Blind 1',
+          'value': 100,
+        }),
+        '201': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 2,
+          'id': '201',
+          'name': 'Blind 2',
+          'value': 0,
+        }),
+        '202': dict({
+          'buttonType': 'openClose',
+          'channelDipState': 3,
+          'id': '202',
+          'name': 'Garage',
+          'value': 100,
+        }),
+        '203': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 4,
+          'id': '203',
+          'name': 'Thing Light',
+          'value': 100,
+        }),
+        '204': dict({
+          'buttonType': 'upDown',
+          'channelDipState': 5,
+          'id': '204',
+          'name': 'Thing Light Dimmable',
+          'value': 100,
+        }),
+        '205': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 8,
+          'id': '205',
+          'name': 'Relay',
+          'value': 100,
+        }),
+        '206': dict({
+          'buttonType': 'onOff',
+          'channelDipState': 9,
+          'id': '206',
+          'name': 'Fan',
+          'value': 100,
+        }),
+      }),
+    }),
+    'system': dict({
+      'hasAircons': True,
+      'hasLights': True,
+      'hasSensors': False,
+      'hasThings': True,
+      'hasThingsBOG': False,
+      'hasThingsLight': False,
+      'myAppRev': '1.234',
+      'name': 'testname',
+      'needsUpdate': False,
+      'rid': '**REDACTED**',
+      'sysType': 'e-zone',
+    }),
+  })
+# ---
diff --git a/tests/components/advantage_air/test_binary_sensor.py b/tests/components/advantage_air/test_binary_sensor.py
index 37e816b366b066..8f2183d49c5f60 100644
--- a/tests/components/advantage_air/test_binary_sensor.py
+++ b/tests/components/advantage_air/test_binary_sensor.py
@@ -5,7 +5,7 @@
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import (
     TEST_SET_RESPONSE,
@@ -88,7 +88,7 @@ async def test_binary_sensor_async_setup_entry(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
@@ -110,7 +110,7 @@ async def test_binary_sensor_async_setup_entry(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/advantage_air/test_diagnostics.py b/tests/components/advantage_air/test_diagnostics.py
new file mode 100644
index 00000000000000..ebd026c6cc7ae1
--- /dev/null
+++ b/tests/components/advantage_air/test_diagnostics.py
@@ -0,0 +1,32 @@
+"""Test the Advantage Air Diagnostics."""
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from . import (
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+
+async def test_select_async_setup_entry(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test select platform."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+
+    entry = await add_mock_config(hass)
+    diag = await get_diagnostics_for_config_entry(hass, hass_client, entry)
+    assert diag == snapshot
diff --git a/tests/components/advantage_air/test_sensor.py b/tests/components/advantage_air/test_sensor.py
index 2a7be320be627f..d2c290a97dee41 100644
--- a/tests/components/advantage_air/test_sensor.py
+++ b/tests/components/advantage_air/test_sensor.py
@@ -11,7 +11,7 @@
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import (
     TEST_SET_RESPONSE,
@@ -144,7 +144,7 @@ async def test_sensor_platform(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/airzone/test_climate.py b/tests/components/airzone/test_climate.py
index 0baac5c9d71aea..f7cc7806bcbcbd 100644
--- a/tests/components/airzone/test_climate.py
+++ b/tests/components/airzone/test_climate.py
@@ -1,22 +1,24 @@
 """The climate tests for the Airzone platform."""
 from unittest.mock import patch
 
-from aioairzone.common import OperationMode
 from aioairzone.const import (
     API_COOL_SET_POINT,
     API_DATA,
     API_HEAT_SET_POINT,
-    API_MODE,
+    API_MAX_TEMP,
+    API_MIN_TEMP,
     API_ON,
     API_SET_POINT,
     API_SPEED,
     API_SYSTEM_ID,
+    API_SYSTEMS,
     API_ZONE_ID,
 )
 from aioairzone.exceptions import AirzoneError
 import pytest
 
 from homeassistant.components.airzone.const import API_TEMPERATURE_STEP
+from homeassistant.components.airzone.coordinator import SCAN_INTERVAL
 from homeassistant.components.climate import (
     ATTR_CURRENT_HUMIDITY,
     ATTR_CURRENT_TEMPERATURE,
@@ -49,8 +51,16 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.util.dt import utcnow
 
-from .util import async_init_integration
+from .util import (
+    HVAC_MOCK,
+    HVAC_SYSTEMS_MOCK,
+    HVAC_WEBSERVER_MOCK,
+    async_init_integration,
+)
+
+from tests.common import async_fire_time_changed
 
 
 async def test_airzone_create_climates(hass: HomeAssistant) -> None:
@@ -211,6 +221,27 @@ async def test_airzone_create_climates(hass: HomeAssistant) -> None:
     assert state.attributes.get(ATTR_TARGET_TEMP_STEP) == API_TEMPERATURE_STEP
     assert state.attributes.get(ATTR_TEMPERATURE) == 22.8
 
+    HVAC_MOCK_CHANGED = {**HVAC_MOCK}
+    HVAC_MOCK_CHANGED[API_SYSTEMS][0][API_DATA][0][API_MAX_TEMP] = 25
+    HVAC_MOCK_CHANGED[API_SYSTEMS][0][API_DATA][0][API_MIN_TEMP] = 10
+
+    with patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_hvac",
+        return_value=HVAC_MOCK_CHANGED,
+    ), patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_hvac_systems",
+        return_value=HVAC_SYSTEMS_MOCK,
+    ), patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_webserver",
+        return_value=HVAC_WEBSERVER_MOCK,
+    ):
+        async_fire_time_changed(hass, utcnow() + SCAN_INTERVAL)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("climate.salon")
+    assert state.attributes.get(ATTR_MAX_TEMP) == 25
+    assert state.attributes.get(ATTR_MIN_TEMP) == 10
+
 
 async def test_airzone_climate_turn_on_off(hass: HomeAssistant) -> None:
     """Test turning on."""
@@ -303,7 +334,6 @@ async def test_airzone_climate_set_hvac_mode(hass: HomeAssistant) -> None:
             {
                 API_SYSTEM_ID: 1,
                 API_ZONE_ID: 1,
-                API_MODE: OperationMode.COOLING.value,
                 API_ON: 1,
             }
         ]
@@ -408,7 +438,7 @@ async def test_airzone_climate_set_hvac_slave_error(hass: HomeAssistant) -> None
         )
 
     state = hass.states.get("climate.dorm_2")
-    assert state.state == HVACMode.OFF
+    assert state.state == HVACMode.HEAT
 
 
 async def test_airzone_climate_set_fan_mode(hass: HomeAssistant) -> None:
diff --git a/tests/components/airzone/test_diagnostics.py b/tests/components/airzone/test_diagnostics.py
index 2fa5a7d566a25e..33f0175bdb70bb 100644
--- a/tests/components/airzone/test_diagnostics.py
+++ b/tests/components/airzone/test_diagnostics.py
@@ -14,7 +14,6 @@
     AZD_SYSTEM,
     AZD_SYSTEMS,
     AZD_ZONES,
-    AZD_ZONES_NUM,
     RAW_HVAC,
     RAW_VERSION,
     RAW_WEBSERVER,
@@ -93,7 +92,6 @@ async def test_config_entry_diagnostics(
         diag["coord_data"][AZD_SYSTEMS]["1"].items()
         >= {
             AZD_ID: 1,
-            AZD_ZONES_NUM: 5,
         }.items()
     )
 
diff --git a/tests/components/airzone/test_select.py b/tests/components/airzone/test_select.py
index 545a45508de440..c7c32022123648 100644
--- a/tests/components/airzone/test_select.py
+++ b/tests/components/airzone/test_select.py
@@ -25,49 +25,49 @@ async def test_airzone_create_selects(hass: HomeAssistant) -> None:
     await async_init_integration(hass)
 
     state = hass.states.get("select.despacho_cold_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.despacho_heat_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.despacho_sleep")
-    assert state.state == "Off"
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_1_cold_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_1_heat_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_1_sleep")
-    assert state.state == "Off"
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_2_cold_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_2_heat_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_2_sleep")
-    assert state.state == "Off"
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_ppal_cold_angle")
-    assert state.state == "45º"
+    assert state.state == "45deg"
 
     state = hass.states.get("select.dorm_ppal_heat_angle")
-    assert state.state == "50º"
+    assert state.state == "50deg"
 
     state = hass.states.get("select.dorm_ppal_sleep")
     assert state.state == "30m"
 
     state = hass.states.get("select.salon_cold_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.salon_heat_angle")
-    assert state.state == "90º"
+    assert state.state == "90deg"
 
     state = hass.states.get("select.salon_sleep")
-    assert state.state == "Off"
+    assert state.state == "off"
 
 
 async def test_airzone_select_sleep(hass: HomeAssistant) -> None:
@@ -140,13 +140,13 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: "select.dorm_1_cold_angle",
-                ATTR_OPTION: "50º",
+                ATTR_OPTION: "50deg",
             },
             blocking=True,
         )
 
     state = hass.states.get("select.dorm_1_cold_angle")
-    assert state.state == "50º"
+    assert state.state == "50deg"
 
     # Heat Angle
 
@@ -168,10 +168,10 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: "select.dorm_1_heat_angle",
-                ATTR_OPTION: "45º",
+                ATTR_OPTION: "45deg",
             },
             blocking=True,
         )
 
     state = hass.states.get("select.dorm_1_heat_angle")
-    assert state.state == "45º"
+    assert state.state == "45deg"
diff --git a/tests/components/airzone/test_sensor.py b/tests/components/airzone/test_sensor.py
index c72c083039e1df..1d778761ee18ed 100644
--- a/tests/components/airzone/test_sensor.py
+++ b/tests/components/airzone/test_sensor.py
@@ -1,8 +1,23 @@
 """The sensor tests for the Airzone platform."""
 
+from unittest.mock import patch
+
+from aioairzone.const import API_DATA, API_SYSTEMS
+
+from homeassistant.components.airzone.coordinator import SCAN_INTERVAL
+from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
+from homeassistant.util.dt import utcnow
 
-from .util import async_init_integration
+from .util import (
+    HVAC_MOCK,
+    HVAC_SYSTEMS_MOCK,
+    HVAC_VERSION_MOCK,
+    HVAC_WEBSERVER_MOCK,
+    async_init_integration,
+)
+
+from tests.common import async_fire_time_changed
 
 
 async def test_airzone_create_sensors(
@@ -58,3 +73,36 @@ async def test_airzone_create_sensors(
 
     state = hass.states.get("sensor.dkn_plus_humidity")
     assert state is None
+
+
+async def test_airzone_sensors_availability(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
+    """Test sensors availability."""
+
+    await async_init_integration(hass)
+
+    HVAC_MOCK_UNAVAILABLE_ZONE = {**HVAC_MOCK}
+    del HVAC_MOCK_UNAVAILABLE_ZONE[API_SYSTEMS][0][API_DATA][1]
+
+    with patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_hvac",
+        return_value=HVAC_MOCK_UNAVAILABLE_ZONE,
+    ), patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_hvac_systems",
+        return_value=HVAC_SYSTEMS_MOCK,
+    ), patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_version",
+        return_value=HVAC_VERSION_MOCK,
+    ), patch(
+        "homeassistant.components.airzone.AirzoneLocalApi.get_webserver",
+        return_value=HVAC_WEBSERVER_MOCK,
+    ):
+        async_fire_time_changed(hass, utcnow() + SCAN_INTERVAL)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.dorm_ppal_temperature")
+    assert state.state == STATE_UNAVAILABLE
+
+    state = hass.states.get("sensor.dorm_ppal_humidity")
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/airzone_cloud/__init__.py b/tests/components/airzone_cloud/__init__.py
new file mode 100644
index 00000000000000..a00eeb760ebf79
--- /dev/null
+++ b/tests/components/airzone_cloud/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Airzone Cloud integration."""
diff --git a/tests/components/airzone_cloud/test_binary_sensor.py b/tests/components/airzone_cloud/test_binary_sensor.py
new file mode 100644
index 00000000000000..37357bf59da94a
--- /dev/null
+++ b/tests/components/airzone_cloud/test_binary_sensor.py
@@ -0,0 +1,27 @@
+"""The binary sensor tests for the Airzone Cloud platform."""
+
+from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from .util import async_init_integration
+
+
+async def test_airzone_create_binary_sensors(hass: HomeAssistant) -> None:
+    """Test creation of binary sensors."""
+
+    await async_init_integration(hass)
+
+    # Zones
+    state = hass.states.get("binary_sensor.dormitorio_problem")
+    assert state.state == STATE_OFF
+    assert state.attributes.get("warnings") is None
+
+    state = hass.states.get("binary_sensor.dormitorio_running")
+    assert state.state == STATE_OFF
+
+    state = hass.states.get("binary_sensor.salon_problem")
+    assert state.state == STATE_OFF
+    assert state.attributes.get("warnings") is None
+
+    state = hass.states.get("binary_sensor.salon_running")
+    assert state.state == STATE_ON
diff --git a/tests/components/airzone_cloud/test_config_flow.py b/tests/components/airzone_cloud/test_config_flow.py
new file mode 100644
index 00000000000000..ec031d4bf257a6
--- /dev/null
+++ b/tests/components/airzone_cloud/test_config_flow.py
@@ -0,0 +1,143 @@
+"""Define tests for the Airzone Cloud config flow."""
+
+from unittest.mock import patch
+
+from aioairzone_cloud.exceptions import AirzoneCloudError, LoginError
+
+from homeassistant import data_entry_flow
+from homeassistant.components.airzone_cloud.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER, ConfigEntryState
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from .util import (
+    CONFIG,
+    GET_INSTALLATION_MOCK,
+    GET_INSTALLATIONS_MOCK,
+    WS_ID,
+    mock_get_device_status,
+    mock_get_webserver,
+)
+
+
+async def test_form(hass: HomeAssistant) -> None:
+    """Test that the form is served with valid input."""
+
+    with patch(
+        "homeassistant.components.airzone_cloud.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry, patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_device_status",
+        side_effect=mock_get_device_status,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installation",
+        return_value=GET_INSTALLATION_MOCK,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installations",
+        return_value=GET_INSTALLATIONS_MOCK,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_webserver",
+        side_effect=mock_get_webserver,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        return_value=None,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "user"
+        assert result["errors"] == {}
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_USERNAME: CONFIG[CONF_USERNAME],
+                CONF_PASSWORD: CONFIG[CONF_PASSWORD],
+            },
+        )
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "user"
+        assert result["errors"] == {}
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_ID: CONFIG[CONF_ID],
+            },
+        )
+
+        await hass.async_block_till_done()
+
+        conf_entries = hass.config_entries.async_entries(DOMAIN)
+        entry = conf_entries[0]
+        assert entry.state is ConfigEntryState.LOADED
+
+        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["title"] == f"House {WS_ID} ({CONFIG[CONF_ID]})"
+        assert result["data"][CONF_ID] == CONFIG[CONF_ID]
+        assert result["data"][CONF_USERNAME] == CONFIG[CONF_USERNAME]
+        assert result["data"][CONF_PASSWORD] == CONFIG[CONF_PASSWORD]
+
+        assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_installations_list_error(hass: HomeAssistant) -> None:
+    """Test connection error."""
+
+    with patch(
+        "homeassistant.components.airzone_cloud.async_setup_entry",
+        return_value=True,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_device_status",
+        side_effect=mock_get_device_status,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installations",
+        side_effect=AirzoneCloudError,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_webserver",
+        side_effect=mock_get_webserver,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        return_value=None,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}
+        )
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "user"
+        assert result["errors"] == {}
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_USERNAME: CONFIG[CONF_USERNAME],
+                CONF_PASSWORD: CONFIG[CONF_PASSWORD],
+            },
+        )
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "user"
+        assert result["errors"] == {"base": "cannot_connect"}
+
+
+async def test_login_error(hass: HomeAssistant) -> None:
+    """Test login error."""
+
+    with patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        side_effect=LoginError,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+            data={
+                CONF_USERNAME: CONFIG[CONF_USERNAME],
+                CONF_PASSWORD: CONFIG[CONF_PASSWORD],
+            },
+        )
+
+        assert result["errors"] == {"base": "cannot_connect"}
diff --git a/tests/components/airzone_cloud/test_coordinator.py b/tests/components/airzone_cloud/test_coordinator.py
new file mode 100644
index 00000000000000..40b6c937ed2ad0
--- /dev/null
+++ b/tests/components/airzone_cloud/test_coordinator.py
@@ -0,0 +1,70 @@
+"""Define tests for the Airzone Cloud coordinator."""
+
+from unittest.mock import patch
+
+from aioairzone_cloud.exceptions import AirzoneCloudError
+
+from homeassistant.components.airzone_cloud.const import DOMAIN
+from homeassistant.components.airzone_cloud.coordinator import SCAN_INTERVAL
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.util.dt import utcnow
+
+from .util import (
+    CONFIG,
+    GET_INSTALLATION_MOCK,
+    GET_INSTALLATIONS_MOCK,
+    mock_get_device_status,
+    mock_get_webserver,
+)
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+async def test_coordinator_client_connector_error(hass: HomeAssistant) -> None:
+    """Test ClientConnectorError on coordinator update."""
+
+    config_entry = MockConfigEntry(
+        data=CONFIG,
+        domain=DOMAIN,
+        unique_id="airzone_cloud_unique_id",
+    )
+    config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_device_status",
+        side_effect=mock_get_device_status,
+    ) as mock_device_status, patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installation",
+        return_value=GET_INSTALLATION_MOCK,
+    ) as mock_installation, patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installations",
+        return_value=GET_INSTALLATIONS_MOCK,
+    ) as mock_installations, patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_webserver",
+        side_effect=mock_get_webserver,
+    ) as mock_webserver, patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        return_value=None,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+        mock_device_status.assert_called()
+        mock_installation.assert_awaited_once()
+        mock_installations.assert_called_once()
+        mock_webserver.assert_called()
+
+        mock_device_status.reset_mock()
+        mock_installation.reset_mock()
+        mock_installations.reset_mock()
+        mock_webserver.reset_mock()
+
+        mock_device_status.side_effect = AirzoneCloudError
+        async_fire_time_changed(hass, utcnow() + SCAN_INTERVAL)
+        await hass.async_block_till_done()
+
+        mock_device_status.assert_called()
+
+        state = hass.states.get("sensor.salon_temperature")
+        assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/airzone_cloud/test_diagnostics.py b/tests/components/airzone_cloud/test_diagnostics.py
new file mode 100644
index 00000000000000..730ac27325aa60
--- /dev/null
+++ b/tests/components/airzone_cloud/test_diagnostics.py
@@ -0,0 +1,118 @@
+"""The diagnostics tests for the Airzone Cloud platform."""
+
+from unittest.mock import patch
+
+from aioairzone_cloud.const import (
+    API_DEVICE_ID,
+    API_DEVICES,
+    API_GROUPS,
+    API_WS_ID,
+    AZD_AIDOOS,
+    AZD_INSTALLATIONS,
+    AZD_SYSTEMS,
+    AZD_WEBSERVERS,
+    AZD_ZONES,
+    RAW_DEVICES_CONFIG,
+    RAW_DEVICES_STATUS,
+    RAW_INSTALLATIONS,
+    RAW_INSTALLATIONS_LIST,
+    RAW_WEBSERVERS,
+)
+
+from homeassistant.components.airzone_cloud.const import DOMAIN
+from homeassistant.components.diagnostics import REDACTED
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from .util import CONFIG, WS_ID, async_init_integration
+
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+RAW_DATA_MOCK = {
+    RAW_DEVICES_CONFIG: {
+        "dev1": {},
+    },
+    RAW_DEVICES_STATUS: {
+        "dev1": {},
+    },
+    RAW_INSTALLATIONS: {
+        CONFIG[CONF_ID]: {
+            API_GROUPS: [
+                {
+                    API_DEVICES: [
+                        {
+                            API_DEVICE_ID: "device1",
+                            API_WS_ID: WS_ID,
+                        },
+                    ],
+                },
+            ],
+            "plugins": {
+                "schedules": {
+                    "calendar_ws_ids": [
+                        WS_ID,
+                    ],
+                },
+            },
+        },
+    },
+    RAW_INSTALLATIONS_LIST: {},
+    RAW_WEBSERVERS: {
+        WS_ID: {},
+    },
+    "test_cov": {
+        "1": None,
+        "2": ["foo", "bar"],
+        "3": [
+            [
+                "foo",
+                "bar",
+            ],
+        ],
+    },
+}
+
+
+async def test_config_entry_diagnostics(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test config entry diagnostics."""
+    await async_init_integration(hass)
+    assert hass.data[DOMAIN]
+
+    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
+    with patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.raw_data",
+        return_value=RAW_DATA_MOCK,
+    ):
+        diag = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
+
+    assert list(diag["api_data"]) >= list(RAW_DATA_MOCK)
+    assert "dev1" not in diag["api_data"][RAW_DEVICES_CONFIG]
+    assert "device1" in diag["api_data"][RAW_DEVICES_CONFIG]
+    assert "inst1" not in diag["api_data"][RAW_INSTALLATIONS]
+    assert "installation1" in diag["api_data"][RAW_INSTALLATIONS]
+    assert WS_ID not in diag["api_data"][RAW_WEBSERVERS]
+    assert "webserver1" in diag["api_data"][RAW_WEBSERVERS]
+
+    assert (
+        diag["config_entry"].items()
+        >= {
+            "data": {
+                CONF_ID: "installation1",
+                CONF_PASSWORD: REDACTED,
+                CONF_USERNAME: REDACTED,
+            },
+            "domain": DOMAIN,
+            "unique_id": "installation1",
+        }.items()
+    )
+
+    assert list(diag["coord_data"]) >= [
+        AZD_AIDOOS,
+        AZD_INSTALLATIONS,
+        AZD_SYSTEMS,
+        AZD_WEBSERVERS,
+        AZD_ZONES,
+    ]
diff --git a/tests/components/airzone_cloud/test_init.py b/tests/components/airzone_cloud/test_init.py
new file mode 100644
index 00000000000000..3a6497fdebac64
--- /dev/null
+++ b/tests/components/airzone_cloud/test_init.py
@@ -0,0 +1,43 @@
+"""Define tests for the Airzone Cloud init."""
+
+from unittest.mock import patch
+
+from homeassistant.components.airzone_cloud.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from .util import CONFIG
+
+from tests.common import MockConfigEntry
+
+
+async def test_unload_entry(hass: HomeAssistant) -> None:
+    """Test unload."""
+
+    config_entry = MockConfigEntry(
+        data=CONFIG,
+        domain=DOMAIN,
+        unique_id="airzone_cloud_unique_id",
+    )
+    config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.list_installations",
+        return_value=[],
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.update_installation",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.update",
+        return_value=None,
+    ):
+        assert await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert config_entry.state is ConfigEntryState.LOADED
+
+        await hass.config_entries.async_unload(config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert config_entry.state is ConfigEntryState.NOT_LOADED
diff --git a/tests/components/airzone_cloud/test_sensor.py b/tests/components/airzone_cloud/test_sensor.py
new file mode 100644
index 00000000000000..d9b19f93f7dc35
--- /dev/null
+++ b/tests/components/airzone_cloud/test_sensor.py
@@ -0,0 +1,37 @@
+"""The sensor tests for the Airzone Cloud platform."""
+
+from homeassistant.core import HomeAssistant
+
+from .util import async_init_integration
+
+
+async def test_airzone_create_sensors(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
+    """Test creation of sensors."""
+
+    await async_init_integration(hass)
+
+    # Aidoos
+    state = hass.states.get("sensor.bron_temperature")
+    assert state.state == "21.0"
+
+    # WebServers
+    state = hass.states.get("sensor.webserver_11_22_33_44_55_66_signal_strength")
+    assert state.state == "-56"
+
+    state = hass.states.get("sensor.webserver_11_22_33_44_55_67_signal_strength")
+    assert state.state == "-77"
+
+    # Zones
+    state = hass.states.get("sensor.dormitorio_temperature")
+    assert state.state == "25.0"
+
+    state = hass.states.get("sensor.dormitorio_humidity")
+    assert state.state == "24"
+
+    state = hass.states.get("sensor.salon_temperature")
+    assert state.state == "20.0"
+
+    state = hass.states.get("sensor.salon_humidity")
+    assert state.state == "30"
diff --git a/tests/components/airzone_cloud/util.py b/tests/components/airzone_cloud/util.py
new file mode 100644
index 00000000000000..80c0b4ae02731e
--- /dev/null
+++ b/tests/components/airzone_cloud/util.py
@@ -0,0 +1,242 @@
+"""Tests for the Airzone integration."""
+
+from typing import Any
+from unittest.mock import patch
+
+from aioairzone_cloud.const import (
+    API_ACTIVE,
+    API_AZ_AIDOO,
+    API_AZ_SYSTEM,
+    API_AZ_ZONE,
+    API_CELSIUS,
+    API_CONFIG,
+    API_CONNECTION_DATE,
+    API_DEVICE_ID,
+    API_DEVICES,
+    API_DISCONNECTION_DATE,
+    API_ERRORS,
+    API_FAH,
+    API_GROUPS,
+    API_HUMIDITY,
+    API_INSTALLATION_ID,
+    API_INSTALLATIONS,
+    API_IS_CONNECTED,
+    API_LOCAL_TEMP,
+    API_META,
+    API_NAME,
+    API_STAT_AP_MAC,
+    API_STAT_CHANNEL,
+    API_STAT_QUALITY,
+    API_STAT_RSSI,
+    API_STAT_SSID,
+    API_STATUS,
+    API_SYSTEM_NUMBER,
+    API_TYPE,
+    API_WARNINGS,
+    API_WS_CONNECTED,
+    API_WS_FW,
+    API_WS_ID,
+    API_WS_IDS,
+    API_WS_TYPE,
+    API_ZONE_NUMBER,
+)
+from aioairzone_cloud.device import Device
+from aioairzone_cloud.webserver import WebServer
+
+from homeassistant.components.airzone_cloud import DOMAIN
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+WS_ID = "11:22:33:44:55:66"
+WS_ID_AIDOO = "11:22:33:44:55:67"
+
+CONFIG = {
+    CONF_ID: "inst1",
+    CONF_USERNAME: "user",
+    CONF_PASSWORD: "pass",
+}
+
+GET_INSTALLATION_MOCK = {
+    API_GROUPS: [
+        {
+            API_NAME: "Group",
+            API_DEVICES: [
+                {
+                    API_DEVICE_ID: "system1",
+                    API_TYPE: API_AZ_SYSTEM,
+                    API_META: {
+                        API_SYSTEM_NUMBER: 1,
+                    },
+                    API_WS_ID: WS_ID,
+                },
+                {
+                    API_DEVICE_ID: "zone1",
+                    API_NAME: "Salon",
+                    API_TYPE: API_AZ_ZONE,
+                    API_META: {
+                        API_SYSTEM_NUMBER: 1,
+                        API_ZONE_NUMBER: 1,
+                    },
+                    API_WS_ID: WS_ID,
+                },
+                {
+                    API_DEVICE_ID: "zone2",
+                    API_NAME: "Dormitorio",
+                    API_TYPE: API_AZ_ZONE,
+                    API_META: {
+                        API_SYSTEM_NUMBER: 1,
+                        API_ZONE_NUMBER: 2,
+                    },
+                    API_WS_ID: WS_ID,
+                },
+            ],
+        },
+        {
+            API_NAME: "Aidoo Group",
+            API_DEVICES: [
+                {
+                    API_DEVICE_ID: "aidoo1",
+                    API_NAME: "Bron",
+                    API_TYPE: API_AZ_AIDOO,
+                    API_WS_ID: WS_ID_AIDOO,
+                },
+            ],
+        },
+    ],
+}
+
+GET_INSTALLATIONS_MOCK = {
+    API_INSTALLATIONS: [
+        {
+            API_INSTALLATION_ID: CONFIG[CONF_ID],
+            API_NAME: "House",
+            API_WS_IDS: [
+                WS_ID,
+                WS_ID_AIDOO,
+            ],
+        },
+    ],
+}
+
+GET_WEBSERVER_MOCK = {
+    API_WS_TYPE: "ws_az",
+    API_CONFIG: {
+        API_WS_FW: "3.44",
+        API_STAT_SSID: "Wifi",
+        API_STAT_CHANNEL: 36,
+        API_STAT_AP_MAC: "00:00:00:00:00:00",
+    },
+    API_STATUS: {
+        API_IS_CONNECTED: True,
+        API_STAT_QUALITY: 4,
+        API_STAT_RSSI: -56,
+        API_CONNECTION_DATE: "2023-05-07T12:55:51.000Z",
+        API_DISCONNECTION_DATE: "2023-01-01T22:26:55.376Z",
+    },
+}
+
+GET_WEBSERVER_MOCK_AIDOO = {
+    API_WS_TYPE: "ws_aidoo",
+    API_CONFIG: {
+        API_WS_FW: "3.13",
+        API_STAT_SSID: "Wifi",
+        API_STAT_CHANNEL: 1,
+        API_STAT_AP_MAC: "00:00:00:00:00:01",
+    },
+    API_STATUS: {
+        API_IS_CONNECTED: True,
+        API_STAT_QUALITY: 4,
+        API_STAT_RSSI: -77,
+        API_CONNECTION_DATE: "2023-05-24 17:00:52 +0200",
+        API_DISCONNECTION_DATE: "2023-05-24 17:00:25 +0200",
+    },
+}
+
+
+def mock_get_device_status(device: Device) -> dict[str, Any]:
+    """Mock API device status."""
+
+    if device.get_id() == "aidoo1":
+        return {
+            API_ERRORS: [],
+            API_IS_CONNECTED: True,
+            API_WS_CONNECTED: True,
+            API_LOCAL_TEMP: {
+                API_CELSIUS: 21,
+                API_FAH: 70,
+            },
+            API_WARNINGS: [],
+        }
+    if device.get_id() == "system1":
+        return {
+            API_ERRORS: [],
+            API_IS_CONNECTED: True,
+            API_WS_CONNECTED: True,
+            API_WARNINGS: [],
+        }
+    if device.get_id() == "zone2":
+        return {
+            API_ACTIVE: False,
+            API_HUMIDITY: 24,
+            API_IS_CONNECTED: True,
+            API_WS_CONNECTED: True,
+            API_LOCAL_TEMP: {
+                API_FAH: 77,
+                API_CELSIUS: 25,
+            },
+            API_WARNINGS: [],
+        }
+    return {
+        API_ACTIVE: True,
+        API_HUMIDITY: 30,
+        API_IS_CONNECTED: True,
+        API_WS_CONNECTED: True,
+        API_LOCAL_TEMP: {
+            API_FAH: 68,
+            API_CELSIUS: 20,
+        },
+        API_WARNINGS: [],
+    }
+
+
+def mock_get_webserver(webserver: WebServer, devices: bool) -> dict[str, Any]:
+    """Mock API get webserver."""
+
+    if webserver.get_id() == WS_ID_AIDOO:
+        return GET_WEBSERVER_MOCK_AIDOO
+
+    return GET_WEBSERVER_MOCK
+
+
+async def async_init_integration(
+    hass: HomeAssistant,
+) -> None:
+    """Set up the Airzone integration in Home Assistant."""
+
+    config_entry = MockConfigEntry(
+        data=CONFIG,
+        domain=DOMAIN,
+        unique_id=CONFIG[CONF_ID],
+    )
+    config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_device_status",
+        side_effect=mock_get_device_status,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installation",
+        return_value=GET_INSTALLATION_MOCK,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_installations",
+        return_value=GET_INSTALLATIONS_MOCK,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.api_get_webserver",
+        side_effect=mock_get_webserver,
+    ), patch(
+        "homeassistant.components.airzone_cloud.AirzoneCloudApi.login",
+        return_value=None,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
diff --git a/tests/components/aladdin_connect/test_sensor.py b/tests/components/aladdin_connect/test_sensor.py
index c01d6c5c7811c9..dca8ecaa5133c8 100644
--- a/tests/components/aladdin_connect/test_sensor.py
+++ b/tests/components/aladdin_connect/test_sensor.py
@@ -47,7 +47,7 @@ async def test_sensors(
         await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
-        entry = entity_registry.async_get("sensor.home_battery_level")
+        entry = entity_registry.async_get("sensor.home_battery")
         assert entry
         assert entry.disabled
         assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
@@ -57,7 +57,7 @@ async def test_sensors(
         await hass.async_block_till_done()
         assert update_entry != entry
         assert update_entry.disabled is False
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state is None
 
         async_fire_time_changed(
@@ -65,7 +65,7 @@ async def test_sensors(
             utcnow() + SCAN_INTERVAL,
         )
         await hass.async_block_till_done()
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state
 
         entry = entity_registry.async_get("sensor.home_wi_fi_rssi")
@@ -121,11 +121,11 @@ async def test_sensors_model_01(
         await hass.config_entries.async_setup(config_entry.entry_id)
         await hass.async_block_till_done()
 
-        entry = entity_registry.async_get("sensor.home_battery_level")
+        entry = entity_registry.async_get("sensor.home_battery")
         assert entry
         assert entry.disabled is False
         assert entry.disabled_by is None
-        state = hass.states.get("sensor.home_battery_level")
+        state = hass.states.get("sensor.home_battery")
         assert state
 
         entry = entity_registry.async_get("sensor.home_wi_fi_rssi")
diff --git a/tests/components/alarm_control_panel/test_device_action.py b/tests/components/alarm_control_panel/test_device_action.py
index 0c6731c92be7a1..8ba196de54532d 100644
--- a/tests/components/alarm_control_panel/test_device_action.py
+++ b/tests/components/alarm_control_panel/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Alarm control panel device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -24,11 +25,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.mark.parametrize(
@@ -98,7 +102,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -109,13 +113,12 @@ async def test_get_actions(
         hass.states.async_set(
             f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
         )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -123,7 +126,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -149,7 +152,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -164,7 +167,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["disarm", "arm_away"]
@@ -172,7 +175,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_actions_arm_night_only(
@@ -187,7 +190,7 @@ async def test_get_actions_arm_night_only(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set(
@@ -198,21 +201,21 @@ async def test_get_actions_arm_night_only(
             "domain": DOMAIN,
             "type": "arm_night",
             "device_id": device_entry.id,
-            "entity_id": "alarm_control_panel.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": DOMAIN,
             "type": "disarm",
             "device_id": device_entry.id,
-            "entity_id": "alarm_control_panel.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -262,6 +265,54 @@ async def test_get_action_capabilities(
         assert capabilities == expected_capabilities[action["type"]]
 
 
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
+        device_id=device_entry.id,
+    )
+
+    expected_capabilities = {
+        "arm_away": {"extra_fields": []},
+        "arm_home": {"extra_fields": []},
+        "arm_night": {"extra_fields": []},
+        "arm_vacation": {"extra_fields": []},
+        "disarm": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "trigger": {"extra_fields": []},
+    }
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 6
+    assert {action["type"] for action in actions} == set(expected_capabilities)
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == expected_capabilities[action["type"]]
+
+
 async def test_get_action_capabilities_arm_code(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -317,11 +368,77 @@ async def test_get_action_capabilities_arm_code(
         assert capabilities == expected_capabilities[action["type"]]
 
 
-async def test_action(hass: HomeAssistant, enable_custom_integrations: None) -> None:
+async def test_get_action_capabilities_arm_code_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["arm_code"].unique_id,
+        device_id=device_entry.id,
+    )
+
+    expected_capabilities = {
+        "arm_away": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_home": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_night": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "arm_vacation": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "disarm": {
+            "extra_fields": [{"name": "code", "optional": True, "type": "string"}]
+        },
+        "trigger": {"extra_fields": []},
+    }
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 6
+    assert {action["type"] for action in actions} == set(expected_capabilities)
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == expected_capabilities[action["type"]]
+
+
+async def test_action(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
     """Test for turn_on and turn_off actions."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
 
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
+    )
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -335,7 +452,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_away",
                     },
                 },
@@ -347,7 +464,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_home",
                     },
                 },
@@ -359,7 +476,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_night",
                     },
                 },
@@ -371,7 +488,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "arm_vacation",
                     },
                 },
@@ -380,7 +497,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "disarm",
                         "code": "1234",
                     },
@@ -393,7 +510,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "alarm_control_panel.alarm_no_arm_code",
+                        "entity_id": entity_entry.id,
                         "type": "trigger",
                     },
                 },
@@ -403,48 +520,73 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state == STATE_UNKNOWN
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_UNKNOWN
 
     hass.bus.async_fire("test_event_arm_away")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_AWAY
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_AWAY
 
     hass.bus.async_fire("test_event_arm_home")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_HOME
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_HOME
 
     hass.bus.async_fire("test_event_arm_vacation")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_VACATION
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_VACATION
 
     hass.bus.async_fire("test_event_arm_night")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_ARMED_NIGHT
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_NIGHT
 
     hass.bus.async_fire("test_event_disarm")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_DISARMED
-    )
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_DISARMED
 
     hass.bus.async_fire("test_event_trigger")
     await hass.async_block_till_done()
-    assert (
-        hass.states.get("alarm_control_panel.alarm_no_arm_code").state
-        == STATE_ALARM_TRIGGERED
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_TRIGGERED
+
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["no_arm_code"].unique_id,
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_arm_away",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entity_entry.entity_id,
+                        "type": "arm_away",
+                    },
+                },
+            ]
+        },
     )
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_entry.entity_id).state == STATE_UNKNOWN
+
+    hass.bus.async_fire("test_event_arm_away")
+    await hass.async_block_till_done()
+    assert hass.states.get(entity_entry.entity_id).state == STATE_ALARM_ARMED_AWAY
diff --git a/tests/components/alarm_control_panel/test_device_condition.py b/tests/components/alarm_control_panel/test_device_condition.py
index 7a3ca14e0cc311..f1719b83d38f10 100644
--- a/tests/components/alarm_control_panel/test_device_condition.py
+++ b/tests/components/alarm_control_panel/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Alarm control panel device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -23,11 +24,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -89,7 +93,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -110,7 +114,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in basic_condition_types
@@ -121,7 +125,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -129,7 +133,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -155,7 +159,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -169,7 +173,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_disarmed", "is_triggered"]
@@ -177,11 +181,15 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
     """Test for all conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -194,7 +202,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_triggered",
                         }
                     ],
@@ -216,7 +224,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_disarmed",
                         }
                     ],
@@ -238,7 +246,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_home",
                         }
                     ],
@@ -260,7 +268,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_away",
                         }
                     ],
@@ -282,7 +290,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_night",
                         }
                     ],
@@ -304,7 +312,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_vacation",
                         }
                     ],
@@ -326,7 +334,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "alarm_control_panel.entity",
+                            "entity_id": entry.id,
                             "type": "is_armed_custom_bypass",
                         }
                     ],
@@ -344,7 +352,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
             ]
         },
     )
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -356,7 +364,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_triggered - event - test_event1"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -368,7 +376,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_disarmed - event - test_event2"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_HOME)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -380,7 +388,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_armed_home - event - test_event3"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_AWAY)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -392,7 +400,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_armed_away - event - test_event4"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_NIGHT)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -404,7 +412,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_armed_night - event - test_event5"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_VACATION)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -416,7 +424,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     assert len(calls) == 6
     assert calls[5].data["some"] == "is_armed_vacation - event - test_event6"
 
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_CUSTOM_BYPASS)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_CUSTOM_BYPASS)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -427,3 +435,46 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
     await hass.async_block_till_done()
     assert len(calls) == 7
     assert calls[6].data["some"] == "is_armed_custom_bypass - event - test_event7"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
+    """Test for all conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_triggered",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_triggered "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_triggered - event - test_event1"
diff --git a/tests/components/alarm_control_panel/test_device_trigger.py b/tests/components/alarm_control_panel/test_device_trigger.py
index f6eeef952bdd63..57b9f8125c2472 100644
--- a/tests/components/alarm_control_panel/test_device_trigger.py
+++ b/tests/components/alarm_control_panel/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.alarm_control_panel import (
     DOMAIN,
@@ -26,13 +27,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -92,7 +96,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -101,7 +105,7 @@ async def test_get_triggers(
     )
     if set_state:
         hass.states.async_set(
-            "alarm_control_panel.test_5678",
+            entry.entity_id,
             "attributes",
             {"supported_features": features_state},
         )
@@ -113,7 +117,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in expected_trigger_types
@@ -121,7 +125,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -147,7 +151,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -161,7 +165,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["triggered", "disarmed", "arming"]
@@ -169,7 +173,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -206,11 +210,48 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls: list[ServiceCall]
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
+    """Test we get the expected capabilities from an alarm_control_panel."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    hass.states.async_set(
+        "alarm_control_panel.test_5678", "attributes", {"supported_features": 15}
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 6
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+):
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_PENDING)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_PENDING)
 
     assert await async_setup_component(
         hass,
@@ -222,7 +263,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "triggered",
                     },
                     "action": {
@@ -244,7 +285,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "disarmed",
                     },
                     "action": {
@@ -266,7 +307,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_home",
                     },
                     "action": {
@@ -288,7 +329,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_away",
                     },
                     "action": {
@@ -310,7 +351,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_night",
                     },
                     "action": {
@@ -332,7 +373,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "alarm_control_panel.entity",
+                        "entity_id": entry.id,
                         "type": "armed_vacation",
                     },
                     "action": {
@@ -354,72 +395,67 @@ async def test_if_fires_on_state_change(
     )
 
     # Fake that the entity is triggered.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert (
         calls[0].data["some"]
-        == "triggered - device - alarm_control_panel.entity - pending - triggered -"
-        " None"
+        == f"triggered - device - {entry.entity_id} - pending - triggered - None"
     )
 
     # Fake that the entity is disarmed.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_DISARMED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert (
         calls[1].data["some"]
-        == "disarmed - device - alarm_control_panel.entity - triggered - disarmed -"
-        " None"
+        == f"disarmed - device - {entry.entity_id} - triggered - disarmed - None"
     )
 
     # Fake that the entity is armed home.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_HOME)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert (
         calls[2].data["some"]
-        == "armed_home - device - alarm_control_panel.entity - disarmed - armed_home -"
-        " None"
+        == f"armed_home - device - {entry.entity_id} - disarmed - armed_home - None"
     )
 
     # Fake that the entity is armed away.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_AWAY)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert (
         calls[3].data["some"]
-        == "armed_away - device - alarm_control_panel.entity - armed_home - armed_away"
-        " - None"
+        == f"armed_away - device - {entry.entity_id} - armed_home - armed_away - None"
     )
 
     # Fake that the entity is armed night.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_NIGHT)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
     await hass.async_block_till_done()
     assert len(calls) == 5
     assert (
         calls[4].data["some"]
-        == "armed_night - device - alarm_control_panel.entity - armed_away -"
-        " armed_night - None"
+        == f"armed_night - device - {entry.entity_id} - armed_away - armed_night - None"
     )
 
     # Fake that the entity is armed vacation.
-    hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_VACATION)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert (
         calls[5].data["some"]
-        == "armed_vacation - device - alarm_control_panel.entity - armed_night -"
-        " armed_vacation - None"
+        == f"armed_vacation - device - {entry.entity_id} - armed_night - armed_vacation - None"
     )
 
 
 async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
 ) -> None:
     """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_ALARM_DISARMED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
 
     assert await async_setup_component(
         hass,
@@ -431,7 +467,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "triggered",
                         "for": {"seconds": 5},
                     },
@@ -455,10 +491,9 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_ALARM_TRIGGERED)
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -467,5 +502,57 @@ async def test_if_fires_on_state_change_with_for(
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - disarmed - triggered - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - disarmed - triggered - 0:00:05"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "triggered",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - disarmed - triggered - None"
     )
diff --git a/tests/components/analytics/test_analytics.py b/tests/components/analytics/test_analytics.py
index 412553e81ccc2a..4e51880c75419a 100644
--- a/tests/components/analytics/test_analytics.py
+++ b/tests/components/analytics/test_analytics.py
@@ -1,5 +1,7 @@
 """The tests for the analytics ."""
-from unittest.mock import AsyncMock, Mock, PropertyMock, patch
+import asyncio
+from typing import Any
+from unittest.mock import ANY, AsyncMock, Mock, PropertyMock, patch
 
 import aiohttp
 import pytest
@@ -14,11 +16,14 @@
     ATTR_USAGE,
 )
 from homeassistant.components.recorder import Recorder
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_DOMAIN
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import IntegrationNotFound
 from homeassistant.setup import async_setup_component
 
+from tests.common import MockConfigEntry, MockModule, mock_integration
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 MOCK_UUID = "abcdefg"
@@ -27,6 +32,11 @@
 MOCK_VERSION_NIGHTLY = "1970.1.0.dev19700101"
 
 
+def _last_call_payload(aioclient: AiohttpClientMocker) -> dict[str, Any]:
+    """Return the payload of the last call."""
+    return aioclient.mock_calls[-1][2]
+
+
 async def test_no_send(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
@@ -206,18 +216,36 @@ async def test_send_usage(
     assert analytics.preferences[ATTR_USAGE]
     hass.config.components = ["default_config"]
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ), patch(
+        "homeassistant.components.analytics.analytics.async_get_system_info",
+        return_value={"installation_type": "Home Assistant Tests"},
+    ):
         await analytics.send_analytics()
 
-    assert "'integrations': ['default_config']" in caplog.text
-    assert "'integration_count':" not in caplog.text
-    assert "'certificate': False" in caplog.text
+    assert (
+        "Submitted analytics to Home Assistant servers. Information submitted includes"
+        in caplog.text
+    )
+    assert _last_call_payload(aioclient_mock) == {
+        "uuid": ANY,
+        "version": MOCK_VERSION,
+        "installation_type": "Home Assistant Tests",
+        "certificate": False,
+        "integrations": ["default_config"],
+        "custom_integrations": [],
+    }
 
 
 async def test_send_usage_with_supervisor(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send usage with supervisor preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -284,7 +312,12 @@ async def test_send_statistics(
     assert analytics.preferences[ATTR_STATISTICS]
     hass.config.components = ["default_config"]
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ):
         await analytics.send_analytics()
     assert (
         "'state_count': 0, 'automation_count': 0, 'integration_count': 1,"
@@ -297,6 +330,7 @@ async def test_send_statistics_one_integration_fails(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -317,10 +351,85 @@ async def test_send_statistics_one_integration_fails(
     assert post_call[2]["integration_count"] == 0
 
 
+async def test_send_statistics_disabled_integration(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test send statistics with disabled integration."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_STATISTICS: True})
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+    hass.config.components = ["default_config"]
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "disabled_integration_manifest": mock_integration(
+                hass,
+                MockModule(
+                    "disabled_integration",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"disabled": "system"},
+                ),
+            )
+        },
+    ), patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert "uuid" in payload
+    assert payload["integration_count"] == 0
+
+
+async def test_send_statistics_ignored_integration(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test send statistics with ignored integration."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_STATISTICS: True})
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+
+    mock_config_entry = MockConfigEntry(
+        domain="ignored_integration",
+        state=ConfigEntryState.LOADED,
+        source="ignore",
+    )
+    mock_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "ignored_integration": mock_integration(
+                hass,
+                MockModule(
+                    "ignored_integration",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"config_flow": True},
+                ),
+            ),
+        },
+    ), patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert "uuid" in payload
+    assert payload["integration_count"] == 0
+
+
 async def test_send_statistics_async_get_integration_unknown_exception(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -341,6 +450,7 @@ async def test_send_statistics_with_supervisor(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send statistics preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -421,7 +531,12 @@ async def test_custom_integrations(
     assert await async_setup_component(hass, "test_package", {"test_package": {}})
     await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"test_package": {}},
+    ):
         await analytics.send_analytics()
 
     payload = aioclient_mock.mock_calls[0][2]
@@ -486,7 +601,9 @@ async def test_nightly_endpoint(
 
 
 async def test_send_with_no_energy(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -510,7 +627,10 @@ async def test_send_with_no_energy(
 
 
 async def test_send_with_no_energy_config(
-    recorder_mock: Recorder, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -534,7 +654,10 @@ async def test_send_with_no_energy_config(
 
 
 async def test_send_with_energy_config(
-    recorder_mock: Recorder, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send base preferences are defined."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -561,6 +684,7 @@ async def test_send_usage_with_certificate(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
 ) -> None:
     """Test send usage preferences with certificate."""
     aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
@@ -570,7 +694,6 @@ async def test_send_usage_with_certificate(
 
     assert analytics.preferences[ATTR_BASE]
     assert analytics.preferences[ATTR_USAGE]
-    hass.config.components = ["default_config"]
 
     with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
         await analytics.send_analytics()
@@ -590,8 +713,101 @@ async def test_send_with_recorder(
 
     await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
 
-    with patch("homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION):
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"recorder": {}},
+    ):
         await analytics.send_analytics()
 
-    postdata = aioclient_mock.mock_calls[-1][2]
+    postdata = _last_call_payload(aioclient_mock)
     assert postdata["recorder"]["engine"] == "sqlite"
+
+
+async def test_send_with_problems_loading_yaml(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test error loading YAML configuration."""
+    analytics = Analytics(hass)
+
+    await analytics.save_preferences({ATTR_BASE: True, ATTR_USAGE: True})
+    with patch(
+        "homeassistant.config.load_yaml_config_file",
+        side_effect=HomeAssistantError("Error loading YAML file"),
+    ):
+        await analytics.send_analytics()
+
+    assert "Error loading YAML file" in caplog.text
+    assert len(aioclient_mock.mock_calls) == 0
+
+
+async def test_timeout_while_sending(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+    mock_hass_config: None,
+) -> None:
+    """Test timeout error while sending analytics."""
+    analytics = Analytics(hass)
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL_DEV, exc=asyncio.TimeoutError())
+
+    await analytics.save_preferences({ATTR_BASE: True})
+    with patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION_DEV
+    ):
+        await analytics.send_analytics()
+
+    assert "Timeout sending analytics" in caplog.text
+
+
+async def test_not_check_config_entries_if_yaml(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test skip config entry check if defined in yaml."""
+    aioclient_mock.post(ANALYTICS_ENDPOINT_URL, status=200)
+    analytics = Analytics(hass)
+    hass.http = Mock(ssl_certificate="/some/path/to/cert.pem")
+
+    await analytics.save_preferences(
+        {ATTR_BASE: True, ATTR_STATISTICS: True, ATTR_USAGE: True}
+    )
+    assert analytics.preferences[ATTR_BASE]
+    assert analytics.preferences[ATTR_STATISTICS]
+    hass.config.components = ["default_config"]
+
+    mock_config_entry = MockConfigEntry(
+        domain="ignored_integration",
+        state=ConfigEntryState.LOADED,
+        source="ignore",
+        disabled_by="user",
+    )
+    mock_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.analytics.analytics.async_get_integrations",
+        return_value={
+            "default_config": mock_integration(
+                hass,
+                MockModule(
+                    "default_config",
+                    async_setup=AsyncMock(return_value=True),
+                    partial_manifest={"config_flow": True},
+                ),
+            ),
+        },
+    ), patch(
+        "homeassistant.components.analytics.analytics.HA_VERSION", MOCK_VERSION
+    ), patch(
+        "homeassistant.config.load_yaml_config_file",
+        return_value={"default_config": {}},
+    ):
+        await analytics.send_analytics()
+
+    payload = _last_call_payload(aioclient_mock)
+    assert payload["integration_count"] == 1
+    assert payload["integrations"] == ["default_config"]
diff --git a/tests/components/androidtv_remote/test_config_flow.py b/tests/components/androidtv_remote/test_config_flow.py
index ea1f4abfc1db74..ec368081a95d72 100644
--- a/tests/components/androidtv_remote/test_config_flow.py
+++ b/tests/components/androidtv_remote/test_config_flow.py
@@ -712,6 +712,30 @@ async def test_zeroconf_flow_already_configured_host_not_changed_no_reload_entry
     assert len(mock_setup_entry.mock_calls) == 0
 
 
+async def test_zeroconf_flow_abort_if_mac_is_missing(
+    hass: HomeAssistant,
+) -> None:
+    """Test when mac is missing in the zeroconf discovery we abort."""
+    host = "1.2.3.4"
+    name = "My Android TV"
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_ZEROCONF},
+        data=zeroconf.ZeroconfServiceInfo(
+            host=host,
+            addresses=[host],
+            port=6466,
+            hostname=host,
+            type="mock_type",
+            name=name + "._androidtvremote2._tcp.local.",
+            properties={},
+        ),
+    )
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "cannot_connect"
+
+
 async def test_reauth_flow_success(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
diff --git a/tests/components/androidtv_remote/test_media_player.py b/tests/components/androidtv_remote/test_media_player.py
index c716b0f8689ce3..efb3fa97a2253f 100644
--- a/tests/components/androidtv_remote/test_media_player.py
+++ b/tests/components/androidtv_remote/test_media_player.py
@@ -1,4 +1,5 @@
 """Tests for the Android TV Remote remote platform."""
+import asyncio
 from unittest.mock import MagicMock, call
 
 from androidtvremote2 import ConnectionClosed
@@ -66,7 +67,7 @@ async def test_media_player_toggles(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "turn_off",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -76,7 +77,7 @@ async def test_media_player_toggles(
 
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "turn_on",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -95,7 +96,7 @@ async def test_media_player_volume(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_up",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -105,7 +106,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_UP", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_down",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -115,7 +116,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_DOWN", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_mute",
         {"entity_id": MEDIA_PLAYER_ENTITY, "is_volume_muted": True},
@@ -125,7 +126,7 @@ async def test_media_player_volume(
 
     mock_api.send_key_command.assert_called_with("VOLUME_MUTE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "volume_mute",
         {"entity_id": MEDIA_PLAYER_ENTITY, "is_volume_muted": False},
@@ -144,7 +145,7 @@ async def test_media_player_controls(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_play",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -153,7 +154,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PLAY", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_pause",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -162,7 +163,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PAUSE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_play_pause",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -171,7 +172,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PLAY_PAUSE", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_stop",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -180,7 +181,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_STOP", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_previous_track",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -189,7 +190,7 @@ async def test_media_player_controls(
 
     mock_api.send_key_command.assert_called_with("MEDIA_PREVIOUS", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "media_next_track",
         {"entity_id": MEDIA_PLAYER_ENTITY},
@@ -207,7 +208,7 @@ async def test_media_player_play_media(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "play_media",
         {
@@ -234,6 +235,10 @@ async def test_media_player_play_media(
         },
         blocking=False,
     )
+
+    # Give background task time to run
+    await asyncio.sleep(0)
+
     await hass.services.async_call(
         "media_player",
         "play_media",
@@ -246,7 +251,7 @@ async def test_media_player_play_media(
     )
     assert mock_api.send_key_command.call_count == 2
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "media_player",
         "play_media",
         {
@@ -259,7 +264,7 @@ async def test_media_player_play_media(
     mock_api.send_launch_app_command.assert_called_with("https://www.youtube.com")
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "media_player",
             "play_media",
             {
@@ -271,7 +276,7 @@ async def test_media_player_play_media(
         )
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "media_player",
             "play_media",
             {
diff --git a/tests/components/androidtv_remote/test_remote.py b/tests/components/androidtv_remote/test_remote.py
index cc1d8973d494a2..5157361a158b6b 100644
--- a/tests/components/androidtv_remote/test_remote.py
+++ b/tests/components/androidtv_remote/test_remote.py
@@ -48,7 +48,7 @@ async def test_remote_toggles(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_off",
         {"entity_id": REMOTE_ENTITY},
@@ -58,7 +58,7 @@ async def test_remote_toggles(
 
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_on",
         {"entity_id": REMOTE_ENTITY},
@@ -69,7 +69,7 @@ async def test_remote_toggles(
     mock_api.send_key_command.assert_called_with("POWER", "SHORT")
     assert mock_api.send_key_command.call_count == 2
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "turn_on",
         {"entity_id": REMOTE_ENTITY, "activity": "activity1"},
@@ -89,7 +89,7 @@ async def test_remote_send_command(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
@@ -112,7 +112,7 @@ async def test_remote_send_command_multiple(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
@@ -136,7 +136,7 @@ async def test_remote_send_command_with_hold_secs(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "remote",
         "send_command",
         {
diff --git a/tests/components/anova/test_sensor.py b/tests/components/anova/test_sensor.py
index 94ce61e5b2112a..0ce5c7a4d0a546 100644
--- a/tests/components/anova/test_sensor.py
+++ b/tests/components/anova/test_sensor.py
@@ -8,7 +8,7 @@
 
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import async_init_integration
 
@@ -54,7 +54,7 @@ async def test_update_failed(hass: HomeAssistant, anova_api: AnovaApi) -> None:
         "homeassistant.components.anova.AnovaPrecisionCooker.update",
         side_effect=AnovaOffline(),
     ):
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=61))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=61))
         await hass.async_block_till_done()
 
         state = hass.states.get("sensor.anova_precision_cooker_water_temperature")
diff --git a/tests/components/apcupsd/__init__.py b/tests/components/apcupsd/__init__.py
index 64547822b4282c..f5c3f573030414 100644
--- a/tests/components/apcupsd/__init__.py
+++ b/tests/components/apcupsd/__init__.py
@@ -26,6 +26,8 @@
         ("LOADPCT", "14.0 Percent"),
         ("BCHARGE", "100.0 Percent"),
         ("TIMELEFT", "51.0 Minutes"),
+        ("NOMAPNT", "60.0 VA"),
+        ("ITEMP", "34.6 C Internal"),
         ("MBATTCHG", "5 Percent"),
         ("MINTIMEL", "3 Minutes"),
         ("MAXTIME", "0 Seconds"),
@@ -34,6 +36,7 @@
         ("HITRANS", "139.0 Volts"),
         ("ALARMDEL", "30 Seconds"),
         ("BATTV", "13.7 Volts"),
+        ("OUTCURNT", "0.88 Amps"),
         ("LASTXFER", "Automatic or explicit self test"),
         ("NUMXFERS", "1"),
         ("XONBATT", "1970-01-01 00:00:00 0000"),
@@ -42,6 +45,7 @@
         ("XOFFBATT", "1970-01-01 00:00:00 0000"),
         ("LASTSTEST", "1970-01-01 00:00:00 0000"),
         ("SELFTEST", "NO"),
+        ("STESTI", "7 days"),
         ("STATFLAG", "0x05000008"),
         ("SERIALNO", "XXXXXXXXXXXX"),
         ("BATTDATE", "1970-01-01"),
@@ -72,7 +76,7 @@
 )
 
 
-async def init_integration(
+async def async_init_integration(
     hass: HomeAssistant, host: str = "test", status=None
 ) -> MockConfigEntry:
     """Set up the APC UPS Daemon integration in HomeAssistant."""
@@ -93,7 +97,7 @@ async def init_integration(
     with patch("apcaccess.status.parse", return_value=status), patch(
         "apcaccess.status.get", return_value=b""
     ):
-        await hass.config_entries.async_setup(entry.entry_id)
+        assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
     return entry
diff --git a/tests/components/apcupsd/test_binary_sensor.py b/tests/components/apcupsd/test_binary_sensor.py
index c00707b7ff139d..6ba9a09f837012 100644
--- a/tests/components/apcupsd/test_binary_sensor.py
+++ b/tests/components/apcupsd/test_binary_sensor.py
@@ -2,12 +2,12 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import MOCK_STATUS, init_integration
+from . import MOCK_STATUS, async_init_integration
 
 
 async def test_binary_sensor(hass: HomeAssistant) -> None:
     """Test states of binary sensor."""
-    await init_integration(hass, status=MOCK_STATUS)
+    await async_init_integration(hass, status=MOCK_STATUS)
     registry = er.async_get(hass)
 
     state = hass.states.get("binary_sensor.ups_online_status")
@@ -22,7 +22,7 @@ async def test_no_binary_sensor(hass: HomeAssistant) -> None:
     """Test binary sensor when STATFLAG is not available."""
     status = MOCK_STATUS.copy()
     status.pop("STATFLAG")
-    await init_integration(hass, status=status)
+    await async_init_integration(hass, status=status)
 
     state = hass.states.get("binary_sensor.ups_online_status")
     assert state is None
diff --git a/tests/components/apcupsd/test_init.py b/tests/components/apcupsd/test_init.py
index eae5df9b0c1e7b..6e00a382e79f28 100644
--- a/tests/components/apcupsd/test_init.py
+++ b/tests/components/apcupsd/test_init.py
@@ -9,7 +9,7 @@
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 
-from . import CONF_DATA, MOCK_MINIMAL_STATUS, MOCK_STATUS, init_integration
+from . import CONF_DATA, MOCK_MINIMAL_STATUS, MOCK_STATUS, async_init_integration
 
 from tests.common import MockConfigEntry
 
@@ -19,7 +19,7 @@ async def test_async_setup_entry(hass: HomeAssistant, status: OrderedDict) -> No
     """Test a successful setup entry."""
     # Minimal status does not contain "SERIALNO" field, which is used to determine the
     # unique ID of this integration. But, the integration should work fine without it.
-    await init_integration(hass, status=status)
+    await async_init_integration(hass, status=status)
 
     # Verify successful setup by querying the status sensor.
     state = hass.states.get("binary_sensor.ups_online_status")
@@ -34,8 +34,8 @@ async def test_multiple_integrations(hass: HomeAssistant) -> None:
     status1 = MOCK_STATUS | {"LOADPCT": "15.0 Percent", "SERIALNO": "XXXXX1"}
     status2 = MOCK_STATUS | {"LOADPCT": "16.0 Percent", "SERIALNO": "XXXXX2"}
     entries = (
-        await init_integration(hass, host="test1", status=status1),
-        await init_integration(hass, host="test2", status=status2),
+        await async_init_integration(hass, host="test1", status=status1),
+        await async_init_integration(hass, host="test2", status=status2),
     )
 
     assert len(hass.config_entries.async_entries(DOMAIN)) == 2
@@ -70,8 +70,8 @@ async def test_unload_remove(hass: HomeAssistant) -> None:
     """Test successful unload of entry."""
     # Load two integrations from two mock hosts.
     entries = (
-        await init_integration(hass, host="test1", status=MOCK_STATUS),
-        await init_integration(hass, host="test2", status=MOCK_MINIMAL_STATUS),
+        await async_init_integration(hass, host="test1", status=MOCK_STATUS),
+        await async_init_integration(hass, host="test2", status=MOCK_MINIMAL_STATUS),
     )
 
     # Assert they are loaded.
diff --git a/tests/components/apcupsd/test_sensor.py b/tests/components/apcupsd/test_sensor.py
index bf797db7dbe81e..1b09e107682ca8 100644
--- a/tests/components/apcupsd/test_sensor.py
+++ b/tests/components/apcupsd/test_sensor.py
@@ -1,5 +1,4 @@
 """Test sensors of APCUPSd integration."""
-import pytest
 
 from homeassistant.components.sensor import (
     ATTR_STATE_CLASS,
@@ -12,16 +11,17 @@
     PERCENTAGE,
     UnitOfElectricPotential,
     UnitOfPower,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import MOCK_STATUS, init_integration
+from . import MOCK_STATUS, async_init_integration
 
 
 async def test_sensor(hass: HomeAssistant) -> None:
     """Test states of sensor."""
-    await init_integration(hass, status=MOCK_STATUS)
+    await async_init_integration(hass, status=MOCK_STATUS)
     registry = er.async_get(hass)
 
     # Test a representative string sensor.
@@ -35,7 +35,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
     # Test two representative voltage sensors.
     state = hass.states.get("sensor.ups_input_voltage")
     assert state
-    assert pytest.approx(float(state.state)) == 124.0
+    assert state.state == "124.0"
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricPotential.VOLT
     )
@@ -47,7 +47,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
 
     state = hass.states.get("sensor.ups_battery_voltage")
     assert state
-    assert pytest.approx(float(state.state)) == 13.7
+    assert state.state == "13.7"
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricPotential.VOLT
     )
@@ -57,10 +57,19 @@ async def test_sensor(hass: HomeAssistant) -> None:
     assert entry
     assert entry.unique_id == "XXXXXXXXXXXX_battv"
 
+    # test a representative time sensor.
+    state = hass.states.get("sensor.ups_self_test_interval")
+    assert state
+    assert state.state == "7"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.DAYS
+    entry = registry.async_get("sensor.ups_self_test_interval")
+    assert entry
+    assert entry.unique_id == "XXXXXXXXXXXX_stesti"
+
     # Test a representative percentage sensor.
     state = hass.states.get("sensor.ups_load")
     assert state
-    assert pytest.approx(float(state.state)) == 14.0
+    assert state.state == "14.0"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     entry = registry.async_get("sensor.ups_load")
@@ -70,7 +79,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
     # Test a representative wattage sensor.
     state = hass.states.get("sensor.ups_nominal_output_power")
     assert state
-    assert pytest.approx(float(state.state)) == 330.0
+    assert state.state == "330"
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     entry = registry.async_get("sensor.ups_nominal_output_power")
@@ -80,7 +89,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
 
 async def test_sensor_disabled(hass: HomeAssistant) -> None:
     """Test sensor disabled by default."""
-    await init_integration(hass)
+    await async_init_integration(hass)
     registry = er.async_get(hass)
 
     # Test a representative integration-disabled sensor.
diff --git a/tests/components/aranet/test_sensor.py b/tests/components/aranet/test_sensor.py
index 3de7267f1305e8..7d531bf6111d76 100644
--- a/tests/components/aranet/test_sensor.py
+++ b/tests/components/aranet/test_sensor.py
@@ -10,7 +10,9 @@
 from tests.components.bluetooth import inject_bluetooth_service_info
 
 
-async def test_sensors(hass: HomeAssistant) -> None:
+async def test_sensors(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
     """Test setting up creates the sensors."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -24,7 +26,7 @@ async def test_sensors(hass: HomeAssistant) -> None:
     assert len(hass.states.async_all("sensor")) == 0
     inject_bluetooth_service_info(hass, VALID_DATA_SERVICE_INFO)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all("sensor")) == 5
+    assert len(hass.states.async_all("sensor")) == 6
 
     batt_sensor = hass.states.get("sensor.aranet4_12345_battery")
     batt_sensor_attrs = batt_sensor.attributes
@@ -61,11 +63,20 @@ async def test_sensors(hass: HomeAssistant) -> None:
     assert press_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "hPa"
     assert press_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
 
+    interval_sensor = hass.states.get("sensor.aranet4_12345_update_interval")
+    interval_sensor_attrs = interval_sensor.attributes
+    assert interval_sensor.state == "300"
+    assert interval_sensor_attrs[ATTR_FRIENDLY_NAME] == "Aranet4 12345 Update Interval"
+    assert interval_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "s"
+    assert interval_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
 
 
-async def test_smart_home_integration_disabled(hass: HomeAssistant) -> None:
+async def test_smart_home_integration_disabled(
+    hass: HomeAssistant, entity_registry_enabled_by_default: None
+) -> None:
     """Test disabling smart home integration marks entities as unavailable."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -79,7 +90,7 @@ async def test_smart_home_integration_disabled(hass: HomeAssistant) -> None:
     assert len(hass.states.async_all("sensor")) == 0
     inject_bluetooth_service_info(hass, DISABLED_INTEGRATIONS_SERVICE_INFO)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all("sensor")) == 5
+    assert len(hass.states.async_all("sensor")) == 6
 
     batt_sensor = hass.states.get("sensor.aranet4_12345_battery")
     assert batt_sensor.state == "unavailable"
diff --git a/tests/components/arcam_fmj/conftest.py b/tests/components/arcam_fmj/conftest.py
index 39b44d2ad9ed96..693cdc685c985f 100644
--- a/tests/components/arcam_fmj/conftest.py
+++ b/tests/components/arcam_fmj/conftest.py
@@ -9,7 +9,7 @@
 from homeassistant.components.arcam_fmj.media_player import ArcamFmj
 from homeassistant.const import CONF_HOST, CONF_PORT
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, MockEntityPlatform
 
 MOCK_HOST = "127.0.0.1"
 MOCK_PORT = 50000
@@ -75,6 +75,7 @@ def player_fixture(hass, state):
     player = ArcamFmj(MOCK_NAME, state, MOCK_UUID)
     player.entity_id = MOCK_ENTITY_ID
     player.hass = hass
+    player.platform = MockEntityPlatform(hass)
     player.async_write_ha_state = Mock()
     return player
 
diff --git a/tests/components/arcam_fmj/test_device_trigger.py b/tests/components/arcam_fmj/test_device_trigger.py
index 64eef53c31ad51..7caba687ff2246 100644
--- a/tests/components/arcam_fmj/test_device_trigger.py
+++ b/tests/components/arcam_fmj/test_device_trigger.py
@@ -13,7 +13,11 @@
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -34,7 +38,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         identifiers={(DOMAIN, "host", 1234)},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "media_player", DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -43,7 +47,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "turn_on",
             "device_id": device_entry.id,
-            "entity_id": "media_player.arcam_fmj_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -62,9 +66,57 @@ async def test_get_triggers(
 
 
 async def test_if_fires_on_turn_on_request(
-    hass: HomeAssistant, calls, player_setup, state
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, player_setup, state
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(player_setup)
+
+    state.get_power.return_value = None
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "turn_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "{{ trigger.entity_id }}",
+                            "id": "{{ trigger.id }}",
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    await hass.services.async_call(
+        "media_player",
+        "turn_on",
+        {"entity_id": player_setup},
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == player_setup
+    assert calls[0].data["id"] == 0
+
+
+async def test_if_fires_on_turn_on_request_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, player_setup, state
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(player_setup)
+
     state.get_power.return_value = None
 
     assert await async_setup_component(
@@ -77,7 +129,7 @@ async def test_if_fires_on_turn_on_request(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": player_setup,
+                        "entity_id": entry.entity_id,
                         "type": "turn_on",
                     },
                     "action": {
diff --git a/tests/components/assist_pipeline/conftest.py b/tests/components/assist_pipeline/conftest.py
index 54dc3705d2af91..5aa760cc606809 100644
--- a/tests/components/assist_pipeline/conftest.py
+++ b/tests/components/assist_pipeline/conftest.py
@@ -9,7 +9,10 @@
 
 from homeassistant.components import stt, tts
 from homeassistant.components.assist_pipeline import DOMAIN
-from homeassistant.components.assist_pipeline.pipeline import PipelineStorageCollection
+from homeassistant.components.assist_pipeline.pipeline import (
+    PipelineData,
+    PipelineStorageCollection,
+)
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -23,15 +26,16 @@
     mock_integration,
     mock_platform,
 )
-from tests.components.tts.conftest import (  # noqa: F401, pylint: disable=unused-import
-    init_cache_dir_side_effect,
-    mock_get_cache_files,
-    mock_init_cache_dir,
-)
 
 _TRANSCRIPT = "test transcript"
 
 
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
+
+
 class BaseProvider:
     """Mock STT provider."""
 
@@ -126,7 +130,7 @@ def supported_options(self) -> list[str]:
         return ["voice", "age", tts.ATTR_AUDIO_OUTPUT]
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> tts.TtsAudioType:
         """Load TTS data."""
         return ("mp3", b"")
@@ -190,9 +194,6 @@ async def init_supporting_components(
     mock_stt_provider_entity: MockSttProviderEntity,
     mock_tts_provider: MockTTSProvider,
     config_flow_fixture,
-    init_cache_dir_side_effect,  # noqa: F811
-    mock_get_cache_files,  # noqa: F811
-    mock_init_cache_dir,  # noqa: F811
 ):
     """Initialize relevant components with empty configs."""
 
@@ -262,6 +263,12 @@ async def init_components(hass: HomeAssistant, init_supporting_components):
 
 
 @pytest.fixture
-def pipeline_storage(hass: HomeAssistant, init_components) -> PipelineStorageCollection:
+def pipeline_data(hass: HomeAssistant, init_components) -> PipelineData:
+    """Return pipeline data."""
+    return hass.data[DOMAIN]
+
+
+@pytest.fixture
+def pipeline_storage(pipeline_data) -> PipelineStorageCollection:
     """Return pipeline storage collection."""
-    return hass.data[DOMAIN].pipeline_store
+    return pipeline_data.pipeline_store
diff --git a/tests/components/assist_pipeline/snapshots/test_init.ambr b/tests/components/assist_pipeline/snapshots/test_init.ambr
index 619c59606ed3fc..d8858cec4b6220 100644
--- a/tests/components/assist_pipeline/snapshots/test_init.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_init.ambr
@@ -32,6 +32,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en',
@@ -119,6 +121,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en-US',
@@ -206,6 +210,8 @@
     }),
     dict({
       'data': dict({
+        'conversation_id': None,
+        'device_id': None,
         'engine': 'homeassistant',
         'intent_input': 'test transcript',
         'language': 'en-US',
diff --git a/tests/components/assist_pipeline/snapshots/test_websocket.ambr b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
index a2e5ac72b07571..12a4d766f06839 100644
--- a/tests/components/assist_pipeline/snapshots/test_websocket.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
@@ -31,6 +31,8 @@
 # ---
 # name: test_audio_pipeline.3
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'test transcript',
     'language': 'en',
@@ -107,6 +109,8 @@
 # ---
 # name: test_audio_pipeline_debug.3
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'test transcript',
     'language': 'en',
@@ -163,6 +167,8 @@
 # ---
 # name: test_intent_failed.1
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
@@ -180,6 +186,8 @@
 # ---
 # name: test_intent_timeout.1
   dict({
+    'conversation_id': None,
+    'device_id': None,
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
@@ -249,6 +257,8 @@
 # ---
 # name: test_text_only_pipeline.1
   dict({
+    'conversation_id': 'mock-conversation-id',
+    'device_id': 'mock-device-id',
     'engine': 'homeassistant',
     'intent_input': 'Are the lights on?',
     'language': 'en',
diff --git a/tests/components/assist_pipeline/test_select.py b/tests/components/assist_pipeline/test_select.py
index 30874e7b75628f..bb9c4d45a32abc 100644
--- a/tests/components/assist_pipeline/test_select.py
+++ b/tests/components/assist_pipeline/test_select.py
@@ -5,10 +5,19 @@
 import pytest
 
 from homeassistant.components.assist_pipeline import Pipeline
-from homeassistant.components.assist_pipeline.pipeline import PipelineStorageCollection
-from homeassistant.components.assist_pipeline.select import AssistPipelineSelect
+from homeassistant.components.assist_pipeline.pipeline import (
+    PipelineData,
+    PipelineStorageCollection,
+)
+from homeassistant.components.assist_pipeline.select import (
+    AssistPipelineSelect,
+    VadSensitivitySelect,
+)
+from homeassistant.components.assist_pipeline.vad import VadSensitivity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from tests.common import MockConfigEntry, MockPlatform, mock_entity_platform
@@ -25,7 +34,15 @@ async def async_setup_entry(
         async_add_entities: AddEntitiesCallback,
     ) -> None:
         """Set up fake select platform."""
-        async_add_entities([AssistPipelineSelect(hass, "test")])
+        pipeline_entity = AssistPipelineSelect(hass, "test")
+        pipeline_entity._attr_device_info = DeviceInfo(
+            identifiers={("test", "test")},
+        )
+        sensitivity_entity = VadSensitivitySelect(hass, "test")
+        sensitivity_entity._attr_device_info = DeviceInfo(
+            identifiers={("test", "test")},
+        )
+        async_add_entities([pipeline_entity, sensitivity_entity])
 
 
 @pytest.fixture
@@ -33,6 +50,7 @@ async def init_select(hass: HomeAssistant, init_components) -> ConfigEntry:
     """Initialize select entity."""
     mock_entity_platform(hass, "select.assist_pipeline", SelectPlatform())
     config_entry = MockConfigEntry(domain="assist_pipeline")
+    config_entry.add_to_hass(hass)
     assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
     return config_entry
 
@@ -77,6 +95,26 @@ async def pipeline_2(
     )
 
 
+async def test_select_entity_registering_device(
+    hass: HomeAssistant,
+    init_select: ConfigEntry,
+    pipeline_data: PipelineData,
+) -> None:
+    """Test entity registering as an assist device."""
+    dev_reg = dr.async_get(hass)
+    device = dev_reg.async_get_device({("test", "test")})
+    assert device is not None
+
+    # Test device is registered
+    assert pipeline_data.pipeline_devices == {device.id}
+
+    await hass.config_entries.async_remove(init_select.entry_id)
+    await hass.async_block_till_done()
+
+    # Test device is removed
+    assert pipeline_data.pipeline_devices == set()
+
+
 async def test_select_entity_changing_pipelines(
     hass: HomeAssistant,
     init_select: ConfigEntry,
@@ -109,6 +147,7 @@ async def test_select_entity_changing_pipelines(
     )
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == pipeline_2.name
 
     # Reload config entry to test selected option persists
@@ -116,15 +155,52 @@ async def test_select_entity_changing_pipelines(
     assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == pipeline_2.name
 
     # Remove selected pipeline
     await pipeline_storage.async_delete_item(pipeline_2.id)
 
     state = hass.states.get("select.assist_pipeline_test_pipeline")
+    assert state is not None
     assert state.state == "preferred"
     assert state.attributes["options"] == [
         "preferred",
         "Home Assistant",
         pipeline_1.name,
     ]
+
+
+async def test_select_entity_changing_vad_sensitivity(
+    hass: HomeAssistant,
+    init_select: ConfigEntry,
+) -> None:
+    """Test entity tracking pipeline changes."""
+    config_entry = init_select  # nicer naming
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.DEFAULT.value
+
+    # Change select to new pipeline
+    await hass.services.async_call(
+        "select",
+        "select_option",
+        {
+            "entity_id": "select.assist_pipeline_test_vad_sensitivity",
+            "option": VadSensitivity.AGGRESSIVE.value,
+        },
+        blocking=True,
+    )
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.AGGRESSIVE.value
+
+    # Reload config entry to test selected option persists
+    assert await hass.config_entries.async_forward_entry_unload(config_entry, "select")
+    assert await hass.config_entries.async_forward_entry_setup(config_entry, "select")
+
+    state = hass.states.get("select.assist_pipeline_test_vad_sensitivity")
+    assert state is not None
+    assert state.state == VadSensitivity.AGGRESSIVE.value
diff --git a/tests/components/assist_pipeline/test_websocket.py b/tests/components/assist_pipeline/test_websocket.py
index 95e2c33ef5b296..4ebf0a1fb98a9e 100644
--- a/tests/components/assist_pipeline/test_websocket.py
+++ b/tests/components/assist_pipeline/test_websocket.py
@@ -28,6 +28,8 @@ async def test_text_only_pipeline(
             "start_stage": "intent",
             "end_stage": "intent",
             "input": {"text": "Are the lights on?"},
+            "conversation_id": "mock-conversation-id",
+            "device_id": "mock-device-id",
         }
     )
 
@@ -132,7 +134,7 @@ async def test_audio_pipeline(
     assert msg["event"]["data"] == snapshot
     events.append(msg["event"])
 
-    # text to speech
+    # text-to-speech
     msg = await client.receive_json()
     assert msg["event"]["type"] == "tts-start"
     assert msg["event"]["data"] == snapshot
@@ -532,7 +534,7 @@ async def test_tts_failed(
     init_components,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test pipeline run with text to speech error."""
+    """Test pipeline run with text-to-speech error."""
     events = []
     client = await hass_ws_client(hass)
 
@@ -595,7 +597,7 @@ async def test_tts_provider_missing(
     mock_tts_provider,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test pipeline run with text to speech error."""
+    """Test pipeline run with text-to-speech error."""
     client = await hass_ws_client(hass)
 
     with patch(
@@ -624,7 +626,7 @@ async def test_tts_provider_bad_options(
     mock_tts_provider,
     snapshot: SnapshotAssertion,
 ) -> None:
-    """Test pipeline run with text to speech error."""
+    """Test pipeline run with text-to-speech error."""
     client = await hass_ws_client(hass)
 
     with patch(
@@ -954,7 +956,6 @@ async def test_list_pipelines(
 ) -> None:
     """Test we can list pipelines."""
     client = await hass_ws_client(hass)
-    hass.data[DOMAIN]
 
     await client.send_json_auto_id({"type": "assist_pipeline/pipeline/list"})
     msg = await client.receive_json()
@@ -1227,7 +1228,7 @@ async def test_audio_pipeline_debug(
     assert msg["event"]["data"] == snapshot
     events.append(msg["event"])
 
-    # text to speech
+    # text-to-speech
     msg = await client.receive_json()
     assert msg["event"]["type"] == "tts-start"
     assert msg["event"]["data"] == snapshot
diff --git a/tests/components/asuswrt/test_config_flow.py b/tests/components/asuswrt/test_config_flow.py
index aabf5d6d46bb75..bdee4f82f90f83 100644
--- a/tests/components/asuswrt/test_config_flow.py
+++ b/tests/components/asuswrt/test_config_flow.py
@@ -62,7 +62,7 @@ def mock_unique_id_fixture():
 @pytest.fixture(name="connect")
 def mock_controller_connect(mock_unique_id):
     """Mock a successful connection."""
-    with patch("homeassistant.components.asuswrt.router.AsusWrt") as service_mock:
+    with patch("homeassistant.components.asuswrt.bridge.AsusWrtLegacy") as service_mock:
         service_mock.return_value.connection.async_connect = AsyncMock()
         service_mock.return_value.is_connected = True
         service_mock.return_value.connection.disconnect = Mock()
@@ -236,11 +236,12 @@ async def test_on_connect_failed(hass: HomeAssistant, side_effect, error) -> Non
     )
 
     with PATCH_GET_HOST, patch(
-        "homeassistant.components.asuswrt.router.AsusWrt"
+        "homeassistant.components.asuswrt.bridge.AsusWrtLegacy"
     ) as asus_wrt:
         asus_wrt.return_value.connection.async_connect = AsyncMock(
             side_effect=side_effect
         )
+        asus_wrt.return_value.async_get_nvram = AsyncMock(return_value={})
         asus_wrt.return_value.is_connected = False
 
         result = await hass.config_entries.flow.async_configure(
diff --git a/tests/components/asuswrt/test_sensor.py b/tests/components/asuswrt/test_sensor.py
index 553902b66fd911..c28d71c1a293e6 100644
--- a/tests/components/asuswrt/test_sensor.py
+++ b/tests/components/asuswrt/test_sensor.py
@@ -32,7 +32,7 @@
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
-ASUSWRT_LIB = "homeassistant.components.asuswrt.router.AsusWrt"
+ASUSWRT_LIB = "homeassistant.components.asuswrt.bridge.AsusWrtLegacy"
 
 HOST = "myrouter.asuswrt.com"
 IP_ADDRESS = "192.168.1.1"
@@ -311,28 +311,6 @@ async def test_loadavg_sensors(
     assert hass.states.get(f"{sensor_prefix}_load_avg_15m").state == "1.3"
 
 
-async def test_temperature_sensors_fail(
-    hass: HomeAssistant,
-    connect,
-    mock_available_temps,
-) -> None:
-    """Test fail creating AsusWRT temperature sensors."""
-    config_entry, sensor_prefix = _setup_entry(hass, CONFIG_DATA, SENSORS_TEMP)
-    config_entry.add_to_hass(hass)
-
-    # Only length of 3 booleans is valid. Checking the exception handling.
-    mock_available_temps.pop(2)
-
-    # initial devices setup
-    assert await hass.config_entries.async_setup(config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    # assert temperature availability exception is handled correctly
-    assert not hass.states.get(f"{sensor_prefix}_2_4ghz_temperature")
-    assert not hass.states.get(f"{sensor_prefix}_5ghz_temperature")
-    assert not hass.states.get(f"{sensor_prefix}_cpu_temperature")
-
-
 async def test_temperature_sensors(
     hass: HomeAssistant,
     connect,
diff --git a/tests/components/august/test_binary_sensor.py b/tests/components/august/test_binary_sensor.py
index e3c876645aa202..f66ba73cebc0ee 100644
--- a/tests/components/august/test_binary_sensor.py
+++ b/tests/components/august/test_binary_sensor.py
@@ -46,9 +46,7 @@ async def test_doorsense(hass: HomeAssistant) -> None:
     assert binary_sensor_online_with_doorsense_name.state == STATE_ON
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     binary_sensor_online_with_doorsense_name = hass.states.get(
@@ -56,9 +54,7 @@ async def test_doorsense(hass: HomeAssistant) -> None:
     )
     assert binary_sensor_online_with_doorsense_name.state == STATE_ON
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     binary_sensor_online_with_doorsense_name = hass.states.get(
diff --git a/tests/components/august/test_button.py b/tests/components/august/test_button.py
index 07d2bf1f4ae12a..eb0bce2facae41 100644
--- a/tests/components/august/test_button.py
+++ b/tests/components/august/test_button.py
@@ -16,7 +16,7 @@ async def test_wake_lock(hass: HomeAssistant) -> None:
     binary_sensor_online_with_doorsense_name = hass.states.get(entity_id)
     assert binary_sensor_online_with_doorsense_name is not None
     api_instance.async_status_async.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         BUTTON_DOMAIN, SERVICE_PRESS, {ATTR_ENTITY_ID: entity_id}, blocking=True
     )
     await hass.async_block_till_done()
diff --git a/tests/components/august/test_gateway.py b/tests/components/august/test_gateway.py
index d0e18c0bed460c..2a364304c4b32e 100644
--- a/tests/components/august/test_gateway.py
+++ b/tests/components/august/test_gateway.py
@@ -35,7 +35,7 @@ async def _patched_refresh_access_token(
             "original_token", 1234, AuthenticationState.AUTHENTICATED
         )
     )
-    august_gateway = AugustGateway(hass)
+    august_gateway = AugustGateway(hass, MagicMock())
     mocked_config = _mock_get_config()
     await august_gateway.async_setup(mocked_config[DOMAIN])
     await august_gateway.async_authenticate()
diff --git a/tests/components/august/test_lock.py b/tests/components/august/test_lock.py
index 8d04e4d0f991e8..d1e60951c2016d 100644
--- a/tests/components/august/test_lock.py
+++ b/tests/components/august/test_lock.py
@@ -122,9 +122,7 @@ async def test_one_lock_operation(hass: HomeAssistant) -> None:
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -136,9 +134,7 @@ async def test_one_lock_operation(hass: HomeAssistant) -> None:
         == "online_with_doorsense Name"
     )
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -176,9 +172,7 @@ async def test_one_lock_operation_pubnub_connected(hass: HomeAssistant) -> None:
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     pubnub.message(
@@ -203,9 +197,7 @@ async def test_one_lock_operation_pubnub_connected(hass: HomeAssistant) -> None:
         == "online_with_doorsense Name"
     )
 
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_LOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     pubnub.message(
@@ -262,9 +254,7 @@ def _unlock_return_activities_side_effect(access_token, device_id):
     )
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
-    assert await hass.services.async_call(
-        LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-    )
+    await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
     await hass.async_block_till_done()
 
     lock_online_with_doorsense_name = hass.states.get("lock.online_with_doorsense_name")
@@ -300,9 +290,7 @@ def _unlock_return_activities_side_effect(access_token, device_id):
 
     data = {ATTR_ENTITY_ID: "lock.online_with_doorsense_name"}
     with pytest.raises(ClientResponseError):
-        assert await hass.services.async_call(
-            LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True
-        )
+        await hass.services.async_call(LOCK_DOMAIN, SERVICE_UNLOCK, data, blocking=True)
         await hass.async_block_till_done()
 
 
diff --git a/tests/components/aurora_abb_powerone/test_sensor.py b/tests/components/aurora_abb_powerone/test_sensor.py
index 6449a95db65d82..8fbe29f99794d0 100644
--- a/tests/components/aurora_abb_powerone/test_sensor.py
+++ b/tests/components/aurora_abb_powerone/test_sensor.py
@@ -82,15 +82,15 @@ async def test_sensors(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
 
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power
         assert power.state == "45.7"
 
-        temperature = hass.states.get("sensor.temperature")
+        temperature = hass.states.get("sensor.mydevicename_temperature")
         assert temperature
         assert temperature.state == "9.9"
 
-        energy = hass.states.get("sensor.total_energy")
+        energy = hass.states.get("sensor.mydevicename_total_energy")
         assert energy
         assert energy.state == "12.35"
 
@@ -120,7 +120,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
 
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is not None
         assert power.state == "45.7"
 
@@ -131,7 +131,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power.state == "unknown"
     # sun rose again
     with patch("aurorapy.client.AuroraSerialClient.connect", return_value=None), patch(
@@ -139,7 +139,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is not None
         assert power.state == "45.7"
     # sunset
@@ -149,7 +149,7 @@ async def test_sensor_dark(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(hass, utcnow + timedelta(seconds=60))
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power.state == "unknown"  # should this be 'available'?
 
 
@@ -164,5 +164,5 @@ async def test_sensor_unknown_error(hass: HomeAssistant) -> None:
         mock_entry.add_to_hass(hass)
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
-        power = hass.states.get("sensor.power_output")
+        power = hass.states.get("sensor.mydevicename_power_output")
         assert power is None
diff --git a/tests/components/automation/conftest.py b/tests/components/automation/conftest.py
index 438948e84754fb..1d2d39a463d603 100644
--- a/tests/components/automation/conftest.py
+++ b/tests/components/automation/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for automation tests."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index 3859e0c857c917..0d983864e44c6d 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -25,6 +25,7 @@
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import (
     Context,
@@ -1428,8 +1429,13 @@ async def test_automation_bad_config_validation(
         f" {details}"
     ) in caplog.text
 
-    # Make sure one bad automation does not prevent other automations from setting up
-    assert hass.states.async_entity_ids("automation") == ["automation.good_automation"]
+    # Make sure both automations are setup
+    assert set(hass.states.async_entity_ids("automation")) == {
+        "automation.bad_automation",
+        "automation.good_automation",
+    }
+    # The automation failing validation should be unavailable
+    assert hass.states.get("automation.bad_automation").state == STATE_UNAVAILABLE
 
 
 async def test_automation_with_error_in_script(
@@ -1537,6 +1543,52 @@ async def test_automation_restore_last_triggered_with_initial_state(
     assert state.attributes["last_triggered"] == time
 
 
+async def test_extraction_functions_not_setup(hass: HomeAssistant) -> None:
+    """Test extraction functions when automation is not setup."""
+    assert automation.automations_with_area(hass, "area-in-both") == []
+    assert automation.areas_in_automation(hass, "automation.test") == []
+    assert automation.automations_with_blueprint(hass, "blabla.yaml") == []
+    assert automation.blueprint_in_automation(hass, "automation.test") is None
+    assert automation.automations_with_device(hass, "device-in-both") == []
+    assert automation.devices_in_automation(hass, "automation.test") == []
+    assert automation.automations_with_entity(hass, "light.in_both") == []
+    assert automation.entities_in_automation(hass, "automation.test") == []
+
+
+async def test_extraction_functions_unknown_automation(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert automation.areas_in_automation(hass, "automation.unknown") == []
+    assert automation.blueprint_in_automation(hass, "automation.unknown") is None
+    assert automation.devices_in_automation(hass, "automation.unknown") == []
+    assert automation.entities_in_automation(hass, "automation.unknown") == []
+
+
+async def test_extraction_functions_unavailable_automation(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    entity_id = "automation.test1"
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            DOMAIN: [
+                {
+                    "alias": "test1",
+                }
+            ]
+        },
+    )
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert automation.automations_with_area(hass, "area-in-both") == []
+    assert automation.areas_in_automation(hass, entity_id) == []
+    assert automation.automations_with_blueprint(hass, "blabla.yaml") == []
+    assert automation.blueprint_in_automation(hass, entity_id) is None
+    assert automation.automations_with_device(hass, "device-in-both") == []
+    assert automation.devices_in_automation(hass, entity_id) == []
+    assert automation.automations_with_entity(hass, "light.in_both") == []
+    assert automation.entities_in_automation(hass, entity_id) == []
+
+
 async def test_extraction_functions(hass: HomeAssistant) -> None:
     """Test extraction functions."""
     await async_setup_component(hass, "homeassistant", {})
@@ -1604,6 +1656,10 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                             "entity_id": "light.bla",
                             "type": "turn_on",
                         },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
                     ],
                 },
                 {
@@ -1635,7 +1691,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         {
                             "platform": "event",
                             "event_type": "esphome.button_pressed",
-                            "event_data": {"device_id": ["device-trigger-event"]},
+                            "event_data": {"device_id": ["device-trigger-event2"]},
                         },
                         # device_id is not a string
                         {
@@ -1676,6 +1732,55 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         },
                     ],
                 },
+                {
+                    "alias": "test3",
+                    "trigger": [
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": "area-trigger-event"},
+                        },
+                        # area_id is a list of strings (not supported)
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": ["area-trigger-event2"]},
+                        },
+                        # area_id is not a string
+                        {
+                            "platform": "event",
+                            "event_type": "esphome.button_pressed",
+                            "event_data": {"area_id": 123},
+                        },
+                    ],
+                    "condition": {
+                        "condition": "device",
+                        "device_id": "condition-device",
+                        "domain": "light",
+                        "type": "is_on",
+                        "entity_id": "light.bla",
+                    },
+                    "action": [
+                        {
+                            "service": "test.script",
+                            "data": {"entity_id": "light.in_both"},
+                        },
+                        {
+                            "condition": "state",
+                            "entity_id": "sensor.condition",
+                            "state": "100",
+                        },
+                        {"scene": "scene.hello"},
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-last"},
+                        },
+                    ],
+                },
             ]
         },
     )
@@ -1683,6 +1788,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
     assert set(automation.automations_with_entity(hass, "light.in_both")) == {
         "automation.test1",
         "automation.test2",
+        "automation.test3",
     }
     assert set(automation.entities_in_automation(hass, "automation.test1")) == {
         "calendar.trigger_calendar",
@@ -1707,6 +1813,15 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
         "device-trigger-tag2",
         "device-trigger-tag3",
     }
+    assert set(automation.automations_with_area(hass, "area-in-both")) == {
+        "automation.test1",
+        "automation.test3",
+    }
+    assert set(automation.areas_in_automation(hass, "automation.test3")) == {
+        "area-in-both",
+        "area-in-last",
+    }
+    assert automation.blueprint_in_automation(hass, "automation.test3") is None
 
 
 async def test_logbook_humanify_automation_triggered_event(hass: HomeAssistant) -> None:
@@ -1980,6 +2095,13 @@ async def test_blueprint_automation(hass: HomeAssistant, calls) -> None:
     assert automation.entities_in_automation(hass, "automation.automation_0") == [
         "light.kitchen"
     ]
+    assert (
+        automation.blueprint_in_automation(hass, "automation.automation_0")
+        == "test_event_service.yaml"
+    )
+    assert automation.automations_with_blueprint(hass, "test_event_service.yaml") == [
+        "automation.automation_0"
+    ]
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/awair/test_sensor.py b/tests/components/awair/test_sensor.py
index 287eb72d21ec21..24bbb40d9cfc0c 100644
--- a/tests/components/awair/test_sensor.py
+++ b/tests/components/awair/test_sensor.py
@@ -11,6 +11,8 @@
     API_SPL_A,
     API_TEMP,
     API_VOC,
+)
+from homeassistant.components.awair.sensor import (
     SENSOR_TYPE_SCORE,
     SENSOR_TYPES,
     SENSOR_TYPES_DUST,
@@ -113,7 +115,7 @@ async def test_awair_gen1_sensors(
     assert_expected_properties(
         hass,
         registry,
-        "sensor.living_room_volatile_organic_compounds",
+        "sensor.living_room_vocs",
         f"{AWAIR_UUID}_{SENSOR_TYPES_MAP[API_VOC].unique_id_tag}",
         "366",
         {
diff --git a/tests/components/binary_sensor/test_device_condition.py b/tests/components/binary_sensor/test_device_condition.py
index d476d965144cfa..b25ab7877915c6 100644
--- a/tests/components/binary_sensor/test_device_condition.py
+++ b/tests/components/binary_sensor/test_device_condition.py
@@ -1,8 +1,9 @@
 """The test for binary_sensor device automation."""
 from datetime import timedelta
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDeviceClass
@@ -16,12 +17,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -41,6 +45,7 @@ async def test_get_conditions(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    binary_sensor_entries = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -49,7 +54,7 @@ async def test_get_conditions(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_registry.async_get_or_create(
+        binary_sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -62,7 +67,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": binary_sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -71,7 +76,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -97,7 +102,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -111,7 +116,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_on", "is_off"]
@@ -119,7 +124,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_conditions_no_state(
@@ -134,15 +139,15 @@ async def test_get_conditions_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_ids = {}
+    binary_sensor_entries = {}
     for device_class in BinarySensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        binary_sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -152,7 +157,7 @@ async def test_get_conditions_no_state(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": binary_sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -194,8 +199,44 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a binary_sensor condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -204,7 +245,7 @@ async def test_if_state(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
 
     assert await async_setup_component(
         hass,
@@ -218,7 +259,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_bat_low",
                         }
                     ],
@@ -237,7 +278,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_not_bat_low",
                         }
                     ],
@@ -253,7 +294,7 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -261,7 +302,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -269,8 +310,63 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_bat_low",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(entry.entity_id).state == STATE_ON
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
@@ -283,10 +379,9 @@ async def test_if_fires_on_for_condition(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get(platform.ENTITIES["battery"].entity_id)
 
-    with patch("homeassistant.core.dt_util.utcnow") as mock_utcnow:
-        mock_utcnow.return_value = point1
+    with freeze_time(point1) as time_freeze:
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -298,7 +393,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_not_bat_low",
                             "for": {"seconds": 5},
                         },
@@ -316,7 +411,7 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(sensor1.entity_id).state == STATE_ON
+        assert hass.states.get(entry.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -324,18 +419,18 @@ async def test_if_fires_on_for_condition(
         assert len(calls) == 0
 
         # Time travel 10 secs into the future
-        mock_utcnow.return_value = point2
+        time_freeze.move_to(point2)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(sensor1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
         # Time travel 20 secs into the future
-        mock_utcnow.return_value = point3
+        time_freeze.move_to(point3)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 1
diff --git a/tests/components/binary_sensor/test_device_trigger.py b/tests/components/binary_sensor/test_device_trigger.py
index 1866b155da3852..4b8318e2d79623 100644
--- a/tests/components/binary_sensor/test_device_trigger.py
+++ b/tests/components/binary_sensor/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDeviceClass
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -37,6 +41,7 @@ async def test_get_triggers(
     enable_custom_integrations: None,
 ) -> None:
     """Test we get the expected triggers from a binary_sensor."""
+    registry_entries: dict[BinarySensorDeviceClass, er.RegistryEntry] = {}
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
@@ -49,7 +54,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_registry.async_get_or_create(
+        registry_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -62,7 +67,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": registry_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -71,7 +76,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -97,7 +102,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -111,7 +116,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["turned_on", "turned_off"]
@@ -119,7 +124,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_no_state(
@@ -128,9 +133,9 @@ async def test_get_triggers_no_state(
     entity_registry: er.EntityRegistry,
 ) -> None:
     """Test we get the expected triggers from a binary_sensor."""
+    registry_entries: dict[BinarySensorDeviceClass, er.RegistryEntry] = {}
     platform = getattr(hass.components, f"test.{DOMAIN}")
     platform.init()
-    entity_ids = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -139,13 +144,13 @@ async def test_get_triggers_no_state(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in BinarySensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        registry_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -155,7 +160,7 @@ async def test_get_triggers_no_state(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": registry_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in BinarySensorDeviceClass
@@ -164,7 +169,7 @@ async def test_get_triggers_no_state(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -197,8 +202,42 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a binary_sensor trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for on and off triggers firing."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -206,7 +245,11 @@ async def test_if_fires_on_state_change(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
 
     assert await async_setup_component(
         hass,
@@ -218,7 +261,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "bat_low",
                     },
                     "action": {
@@ -242,7 +285,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "not_bat_low",
                     },
                     "action": {
@@ -265,26 +308,30 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "not_bat_low device - {} - on - off - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"not_bat_low device - {entry.entity_id} - on - off - None"
     )
 
-    hass.states.async_set(sensor1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "bat_low device - {} - off - on - None".format(
-        sensor1.entity_id
+    assert (
+        calls[1].data["some"] == f"bat_low device - {entry.entity_id} - off - on - None"
     )
 
 
 async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for triggers firing with delay."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -293,7 +340,11 @@ async def test_if_fires_on_state_change_with_for(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
 
     assert await async_setup_component(
         hass,
@@ -305,7 +356,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -329,16 +380,80 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_ON
+    assert hass.states.get(entry.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(entry.entity_id).state == STATE_ON
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "turn_off device - {} - on - off - None".format(
+        entry.entity_id
     )
diff --git a/tests/components/binary_sensor/test_init.py b/tests/components/binary_sensor/test_init.py
index 79596d95d98eb9..a35a6c906df43b 100644
--- a/tests/components/binary_sensor/test_init.py
+++ b/tests/components/binary_sensor/test_init.py
@@ -1,8 +1,25 @@
 """The tests for the Binary sensor component."""
+from collections.abc import Generator
 from unittest import mock
 
+import pytest
+
 from homeassistant.components import binary_sensor
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+)
+
+TEST_DOMAIN = "test"
 
 
 def test_state() -> None:
@@ -19,3 +36,93 @@ def test_state() -> None:
         new=True,
     ):
         assert binary_sensor.BinarySensorEntity().state == STATE_ON
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test binary sensor name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(
+            config_entry, binary_sensor.DOMAIN
+        )
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed binary sensor without device class -> no name
+    entity1 = binary_sensor.BinarySensorEntity()
+    entity1.entity_id = "binary_sensor.test1"
+
+    # Unnamed binary sensor with device class but has_entity_name False -> no name
+    entity2 = binary_sensor.BinarySensorEntity()
+    entity2.entity_id = "binary_sensor.test2"
+    entity2._attr_device_class = binary_sensor.BinarySensorDeviceClass.BATTERY
+
+    # Unnamed binary sensor with device class and has_entity_name True -> named
+    entity3 = binary_sensor.BinarySensorEntity()
+    entity3.entity_id = "binary_sensor.test3"
+    entity3._attr_device_class = binary_sensor.BinarySensorDeviceClass.BATTERY
+    entity3._attr_has_entity_name = True
+
+    # Unnamed binary sensor with device class and has_entity_name True -> named
+    entity4 = binary_sensor.BinarySensorEntity()
+    entity4.entity_id = "binary_sensor.test4"
+    entity4.entity_description = binary_sensor.BinarySensorEntityDescription(
+        "test",
+        binary_sensor.BinarySensorDeviceClass.BATTERY,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test stt platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{binary_sensor.DOMAIN}",
+        MockPlatform(async_setup_entry=async_setup_entry_platform),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state.attributes == {"device_class": "battery"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
diff --git a/tests/components/blueprint/common.py b/tests/components/blueprint/common.py
new file mode 100644
index 00000000000000..f1ccf63b26a654
--- /dev/null
+++ b/tests/components/blueprint/common.py
@@ -0,0 +1,13 @@
+"""Blueprints test helpers."""
+
+from collections.abc import Generator
+from typing import Any
+from unittest.mock import patch
+
+
+def stub_blueprint_populate_fixture_helper() -> Generator[None, Any, None]:
+    """Stub copying the blueprints to the config folder."""
+    with patch(
+        "homeassistant.components.blueprint.models.DomainBlueprints.async_populate"
+    ):
+        yield
diff --git a/tests/components/blueprint/conftest.py b/tests/components/blueprint/conftest.py
index fe0df5d826078b..21cc17ef1ba634 100644
--- a/tests/components/blueprint/conftest.py
+++ b/tests/components/blueprint/conftest.py
@@ -1,14 +1,8 @@
 """Blueprints conftest."""
 
-from unittest.mock import patch
-
 import pytest
 
 
-@pytest.fixture(autouse=True)
-def stub_blueprint_populate():
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
     """Stub copying the blueprints to the config folder."""
-    with patch(
-        "homeassistant.components.blueprint.models.DomainBlueprints.async_populate"
-    ):
-        yield
diff --git a/tests/components/blueprint/test_importer.py b/tests/components/blueprint/test_importer.py
index cdec562b99ff73..d41c8417b57a11 100644
--- a/tests/components/blueprint/test_importer.py
+++ b/tests/components/blueprint/test_importer.py
@@ -162,3 +162,30 @@ async def test_fetch_blueprint_from_github_gist_url(
     assert imported_blueprint.blueprint.inputs == snapshot
     assert imported_blueprint.suggested_filename == "balloob/motion_light"
     assert imported_blueprint.blueprint.metadata["source_url"] == url
+
+
+async def test_fetch_blueprint_from_website_url(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test fetching blueprint from url."""
+    aioclient_mock.get(
+        "https://www.home-assistant.io/blueprints/awesome.yaml",
+        text=Path(
+            hass.config.path("blueprints/automation/test_event_service.yaml")
+        ).read_text(),
+    )
+
+    url = "https://www.home-assistant.io/blueprints/awesome.yaml"
+    imported_blueprint = await importer.fetch_blueprint_from_url(hass, url)
+    assert isinstance(imported_blueprint, importer.ImportedBlueprint)
+    assert imported_blueprint.blueprint.domain == "automation"
+    assert imported_blueprint.suggested_filename == "homeassistant/awesome"
+    assert imported_blueprint.blueprint.metadata["source_url"] == url
+
+
+async def test_fetch_blueprint_from_unsupported_url(hass: HomeAssistant) -> None:
+    """Test fetching blueprint from an unsupported URL."""
+    url = "https://example.com/unsupported.yaml"
+
+    with pytest.raises(HomeAssistantError, match=r"^Unsupported URL$"):
+        await importer.fetch_blueprint_from_url(hass, url)
diff --git a/tests/components/bluetooth/test_api.py b/tests/components/bluetooth/test_api.py
index 77d802264e19f9..63b60c8f487f26 100644
--- a/tests/components/bluetooth/test_api.py
+++ b/tests/components/bluetooth/test_api.py
@@ -1,8 +1,12 @@
 """Tests for the Bluetooth integration API."""
+import time
+
 from bleak.backends.scanner import AdvertisementData, BLEDevice
+import pytest
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BaseHaScanner,
     HaBluetoothConnector,
@@ -31,6 +35,11 @@ async def test_scanner_by_source(hass: HomeAssistant, enable_bluetooth: None) ->
     assert async_scanner_by_source(hass, "hci2") is None
 
 
+async def test_monotonic_time() -> None:
+    """Test monotonic time."""
+    assert MONOTONIC_TIME() == pytest.approx(time.monotonic(), abs=0.1)
+
+
 async def test_async_scanner_devices_by_address_connectable(
     hass: HomeAssistant, enable_bluetooth: None
 ) -> None:
@@ -51,6 +60,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
diff --git a/tests/components/bluetooth/test_base_scanner.py b/tests/components/bluetooth/test_base_scanner.py
index 8817acad468497..5662bc6324b0da 100644
--- a/tests/components/bluetooth/test_base_scanner.py
+++ b/tests/components/bluetooth/test_base_scanner.py
@@ -12,6 +12,7 @@
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     HaBluetoothConnector,
     storage,
@@ -84,6 +85,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -158,6 +160,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -232,6 +235,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -329,6 +333,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
@@ -452,6 +457,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = manager.scanner_adv_received
diff --git a/tests/components/bluetooth/test_config_flow.py b/tests/components/bluetooth/test_config_flow.py
index 16fe9602d39ebe..1489f349cf4020 100644
--- a/tests/components/bluetooth/test_config_flow.py
+++ b/tests/components/bluetooth/test_config_flow.py
@@ -36,7 +36,7 @@ async def test_options_flow_disabled_not_setup(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "bluetooth",
         }
     )
@@ -370,7 +370,7 @@ async def test_options_flow_disabled_macos(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "bluetooth",
         }
     )
@@ -403,7 +403,7 @@ async def test_options_flow_enabled_linux(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "bluetooth",
         }
     )
diff --git a/tests/components/bluetooth/test_diagnostics.py b/tests/components/bluetooth/test_diagnostics.py
index 7ffd3f00131214..765e2a9a61224e 100644
--- a/tests/components/bluetooth/test_diagnostics.py
+++ b/tests/components/bluetooth/test_diagnostics.py
@@ -5,7 +5,11 @@
 from bluetooth_adapters import DEFAULT_ADDRESS
 
 from homeassistant.components import bluetooth
-from homeassistant.components.bluetooth import BaseHaRemoteScanner, HaBluetoothConnector
+from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
+    BaseHaRemoteScanner,
+    HaBluetoothConnector,
+)
 from homeassistant.core import HomeAssistant
 
 from . import (
@@ -450,6 +454,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     with patch(
diff --git a/tests/components/bluetooth/test_init.py b/tests/components/bluetooth/test_init.py
index d9901a68b0fdb5..24f1039175b8c0 100644
--- a/tests/components/bluetooth/test_init.py
+++ b/tests/components/bluetooth/test_init.py
@@ -8,7 +8,6 @@
 from bleak.backends.scanner import AdvertisementData, BLEDevice
 from bluetooth_adapters import DEFAULT_ADDRESS
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
@@ -2922,35 +2921,13 @@ def _async_register_scan_request_callback(_hass, _callback):
     assert len(hass.config_entries.flow.async_progress(DOMAIN)) == 1
 
 
-async def test_issue_outdated_haos(
-    hass: HomeAssistant,
-    mock_bleak_scanner_start: MagicMock,
-    one_adapter: None,
-    operating_system_85: None,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test we create an issue on outdated haos."""
-    entry = MockConfigEntry(
-        domain=bluetooth.DOMAIN, data={}, unique_id="00:00:00:00:00:01"
-    )
-    entry.add_to_hass(hass)
-    assert await async_setup_component(hass, bluetooth.DOMAIN, {})
-    await hass.async_block_till_done()
-    hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
-    await hass.async_block_till_done()
-    registry = async_get_issue_registry(hass)
-    issue = registry.async_get_issue(DOMAIN, "haos_outdated")
-    assert issue is not None
-    assert issue == snapshot
-
-
-async def test_issue_outdated_haos_no_adapters(
+async def test_issue_outdated_haos_removed(
     hass: HomeAssistant,
     mock_bleak_scanner_start: MagicMock,
     no_adapters: None,
     operating_system_85: None,
 ) -> None:
-    """Test we do not create an issue on outdated haos if there are no adapters."""
+    """Test we do not create an issue on outdated haos anymore."""
     assert await async_setup_component(hass, bluetooth.DOMAIN, {})
     await hass.async_block_till_done()
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
diff --git a/tests/components/bluetooth/test_manager.py b/tests/components/bluetooth/test_manager.py
index 85da27b027e1a8..f637ee3a27a59e 100644
--- a/tests/components/bluetooth/test_manager.py
+++ b/tests/components/bluetooth/test_manager.py
@@ -11,6 +11,7 @@
 
 from homeassistant.components import bluetooth
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BluetoothChange,
     BluetoothScanningMode,
@@ -711,6 +712,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
     new_info_callback = async_get_advertisement_callback(hass)
@@ -883,6 +885,7 @@ def inject_advertisement(
                 advertisement_data.manufacturer_data,
                 advertisement_data.tx_power,
                 {"scanner_specific_data": "test"},
+                MONOTONIC_TIME(),
             )
 
         def clear_all_devices(self) -> None:
@@ -1008,6 +1011,7 @@ async def test_debug_logging(
         {"homeassistant.components.bluetooth": "DEBUG"},
         blocking=True,
     )
+    await hass.async_block_till_done()
 
     address = "44:44:33:11:23:41"
     start_time_monotonic = 50.0
diff --git a/tests/components/bluetooth/test_wrappers.py b/tests/components/bluetooth/test_wrappers.py
index e1656b39c18488..de646f8ef9c178 100644
--- a/tests/components/bluetooth/test_wrappers.py
+++ b/tests/components/bluetooth/test_wrappers.py
@@ -10,6 +10,7 @@
 import pytest
 
 from homeassistant.components.bluetooth import (
+    MONOTONIC_TIME,
     BaseHaRemoteScanner,
     BluetoothServiceInfoBleak,
     HaBluetoothConnector,
@@ -59,6 +60,7 @@ def inject_advertisement(
             advertisement_data.manufacturer_data,
             advertisement_data.tx_power,
             device.details | {"scanner_specific_data": "test"},
+            MONOTONIC_TIME(),
         )
 
 
diff --git a/tests/components/bmw_connected_drive/__init__.py b/tests/components/bmw_connected_drive/__init__.py
index b1f1db305b890c..89a34682c1bca7 100644
--- a/tests/components/bmw_connected_drive/__init__.py
+++ b/tests/components/bmw_connected_drive/__init__.py
@@ -1,9 +1,11 @@
 """Tests for the for the BMW Connected Drive integration."""
 
 from pathlib import Path
+from urllib.parse import urlparse
 
 from bimmer_connected.api.authentication import MyBMWAuthentication
 from bimmer_connected.const import (
+    REMOTE_SERVICE_POSITION_URL,
     VEHICLE_CHARGING_DETAILS_URL,
     VEHICLE_STATE_URL,
     VEHICLES_URL,
@@ -115,6 +117,18 @@ def mock_vehicles() -> respx.Router:
     router.get(VEHICLE_CHARGING_DETAILS_URL).mock(
         side_effect=vehicle_charging_sideeffect
     )
+
+    # Get vehicle position after remote service
+    router.post(urlparse(REMOTE_SERVICE_POSITION_URL).netloc).mock(
+        httpx.Response(
+            200,
+            json=load_json_object_fixture(
+                FIXTURE_PATH / "remote_service" / "eventposition.json",
+                integration=BMW_DOMAIN,
+            ),
+        )
+    )
+
     return router
 
 
diff --git a/tests/components/bmw_connected_drive/conftest.py b/tests/components/bmw_connected_drive/conftest.py
index 73e8f9a9b92183..b65adb5b2c07b4 100644
--- a/tests/components/bmw_connected_drive/conftest.py
+++ b/tests/components/bmw_connected_drive/conftest.py
@@ -1,11 +1,15 @@
 """Fixtures for BMW tests."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, Mock
 
 from bimmer_connected.api.authentication import MyBMWAuthentication
 from bimmer_connected.vehicle.remote_services import RemoteServices, RemoteServiceStatus
 import pytest
 
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
+
 from . import mock_login, mock_vehicles
 
 
@@ -20,5 +24,11 @@ async def bmw_fixture(monkeypatch):
         AsyncMock(return_value=RemoteServiceStatus({"eventStatus": "EXECUTED"})),
     )
 
+    monkeypatch.setattr(
+        BMWDataUpdateCoordinator,
+        "async_update_listeners",
+        Mock(),
+    )
+
     with mock_vehicles():
         yield mock_vehicles
diff --git a/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json b/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json
new file mode 100644
index 00000000000000..92d1a6a9db0b6e
--- /dev/null
+++ b/tests/components/bmw_connected_drive/fixtures/remote_service/eventposition.json
@@ -0,0 +1,12 @@
+{
+  "positionData": {
+    "status": "OK",
+    "position": {
+      "latitude": 123.456,
+      "longitude": 34.5678,
+      "formattedAddress": "some_formatted_address",
+      "heading": 121
+    }
+  },
+  "errorDetails": null
+}
diff --git a/tests/components/bmw_connected_drive/fixtures/vehicles/G26/bmw-eadrax-vcs_v4_vehicles_state_WBA00000000DEMO02.json b/tests/components/bmw_connected_drive/fixtures/vehicles/G26/bmw-eadrax-vcs_v4_vehicles_state_WBA00000000DEMO02.json
index 8a0be88edfe8f5..a097485429537f 100644
--- a/tests/components/bmw_connected_drive/fixtures/vehicles/G26/bmw-eadrax-vcs_v4_vehicles_state_WBA00000000DEMO02.json
+++ b/tests/components/bmw_connected_drive/fixtures/vehicles/G26/bmw-eadrax-vcs_v4_vehicles_state_WBA00000000DEMO02.json
@@ -43,7 +43,11 @@
     "lights": true,
     "lock": true,
     "remote360": true,
-    "remoteChargingCommands": {},
+    "remoteChargingCommands": {
+      "chargingControl": ["START", "STOP"],
+      "flapControl": ["NOT_SUPPORTED"],
+      "plugControl": ["NOT_SUPPORTED"]
+    },
     "remoteSoftwareUpgrade": true,
     "sendPoi": true,
     "specialThemeSupport": [],
@@ -159,9 +163,9 @@
     "electricChargingState": {
       "chargingConnectionType": "UNKNOWN",
       "chargingLevelPercent": 80,
-      "chargingStatus": "INVALID",
+      "chargingStatus": "CHARGING",
       "chargingTarget": 80,
-      "isChargerConnected": false,
+      "isChargerConnected": true,
       "range": 472,
       "remainingChargingMinutes": 10
     },
diff --git a/tests/components/bmw_connected_drive/snapshots/test_button.ambr b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
new file mode 100644
index 00000000000000..a7520a6bce0566
--- /dev/null
+++ b/tests/components/bmw_connected_drive/snapshots/test_button.ambr
@@ -0,0 +1,137 @@
+# serializer version: 1
+# name: test_entity_state_attrs
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Flash lights',
+        'icon': 'mdi:car-light-alert',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_flash_lights',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Sound horn',
+        'icon': 'mdi:bullhorn',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_sound_horn',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Activate air conditioning',
+        'icon': 'mdi:hvac',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_activate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Deactivate air conditioning',
+        'icon': 'mdi:hvac-off',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_deactivate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Find vehicle',
+        'icon': 'mdi:crosshairs-question',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_find_vehicle',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Refresh from cloud',
+        'icon': 'mdi:refresh',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i4_edrive40_refresh_from_cloud',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Flash lights',
+        'icon': 'mdi:car-light-alert',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_flash_lights',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Sound horn',
+        'icon': 'mdi:bullhorn',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_sound_horn',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Activate air conditioning',
+        'icon': 'mdi:hvac',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_activate_air_conditioning',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Find vehicle',
+        'icon': 'mdi:crosshairs-question',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_find_vehicle',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i3 (+ REX) Refresh from cloud',
+        'icon': 'mdi:refresh',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.i3_rex_refresh_from_cloud',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
diff --git a/tests/components/bmw_connected_drive/snapshots/test_diagnostics.ambr b/tests/components/bmw_connected_drive/snapshots/test_diagnostics.ambr
index f5966afb32eba6..5befe3f0dcfe3c 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_diagnostics.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_diagnostics.ambr
@@ -289,6 +289,16 @@
             'lock': True,
             'remote360': True,
             'remoteChargingCommands': dict({
+              'chargingControl': list([
+                'START',
+                'STOP',
+              ]),
+              'flapControl': list([
+                'NOT_SUPPORTED',
+              ]),
+              'plugControl': list([
+                'NOT_SUPPORTED',
+              ]),
             }),
             'remoteSoftwareUpgrade': True,
             'sendPoi': True,
@@ -524,9 +534,9 @@
             'electricChargingState': dict({
               'chargingConnectionType': 'UNKNOWN',
               'chargingLevelPercent': 80,
-              'chargingStatus': 'INVALID',
+              'chargingStatus': 'CHARGING',
               'chargingTarget': 80,
-              'isChargerConnected': False,
+              'isChargerConnected': True,
               'range': 472,
               'remainingChargingMinutes': 10,
             }),
@@ -778,9 +788,9 @@
           'charging_end_time': '2022-07-10T11:10:00+00:00',
           'charging_start_time': None,
           'charging_start_time_no_tz': None,
-          'charging_status': 'NOT_CHARGING',
+          'charging_status': 'CHARGING',
           'charging_target': 80,
-          'is_charger_connected': False,
+          'is_charger_connected': True,
           'remaining_battery_percent': 80,
           'remaining_fuel': list([
             None,
@@ -804,8 +814,8 @@
         'has_electric_drivetrain': True,
         'is_charging_plan_supported': True,
         'is_lsc_enabled': True,
-        'is_remote_charge_start_enabled': False,
-        'is_remote_charge_stop_enabled': False,
+        'is_remote_charge_start_enabled': True,
+        'is_remote_charge_stop_enabled': True,
         'is_remote_climate_start_enabled': True,
         'is_remote_climate_stop_enabled': True,
         'is_remote_horn_enabled': True,
@@ -1687,6 +1697,16 @@
             'lock': True,
             'remote360': True,
             'remoteChargingCommands': dict({
+              'chargingControl': list([
+                'START',
+                'STOP',
+              ]),
+              'flapControl': list([
+                'NOT_SUPPORTED',
+              ]),
+              'plugControl': list([
+                'NOT_SUPPORTED',
+              ]),
             }),
             'remoteSoftwareUpgrade': True,
             'sendPoi': True,
@@ -1812,9 +1832,9 @@
             'electricChargingState': dict({
               'chargingConnectionType': 'UNKNOWN',
               'chargingLevelPercent': 80,
-              'chargingStatus': 'INVALID',
+              'chargingStatus': 'CHARGING',
               'chargingTarget': 80,
-              'isChargerConnected': False,
+              'isChargerConnected': True,
               'range': 472,
               'remainingChargingMinutes': 10,
             }),
@@ -3191,6 +3211,16 @@
             'lock': True,
             'remote360': True,
             'remoteChargingCommands': dict({
+              'chargingControl': list([
+                'START',
+                'STOP',
+              ]),
+              'flapControl': list([
+                'NOT_SUPPORTED',
+              ]),
+              'plugControl': list([
+                'NOT_SUPPORTED',
+              ]),
             }),
             'remoteSoftwareUpgrade': True,
             'sendPoi': True,
@@ -3316,9 +3346,9 @@
             'electricChargingState': dict({
               'chargingConnectionType': 'UNKNOWN',
               'chargingLevelPercent': 80,
-              'chargingStatus': 'INVALID',
+              'chargingStatus': 'CHARGING',
               'chargingTarget': 80,
-              'isChargerConnected': False,
+              'isChargerConnected': True,
               'range': 472,
               'remainingChargingMinutes': 10,
             }),
@@ -4024,6 +4054,16 @@
             'lock': True,
             'remote360': True,
             'remoteChargingCommands': dict({
+              'chargingControl': list([
+                'START',
+                'STOP',
+              ]),
+              'flapControl': list([
+                'NOT_SUPPORTED',
+              ]),
+              'plugControl': list([
+                'NOT_SUPPORTED',
+              ]),
             }),
             'remoteSoftwareUpgrade': True,
             'sendPoi': True,
@@ -4149,9 +4189,9 @@
             'electricChargingState': dict({
               'chargingConnectionType': 'UNKNOWN',
               'chargingLevelPercent': 80,
-              'chargingStatus': 'INVALID',
+              'chargingStatus': 'CHARGING',
               'chargingTarget': 80,
-              'isChargerConnected': False,
+              'isChargerConnected': True,
               'range': 472,
               'remainingChargingMinutes': 10,
             }),
diff --git a/tests/components/bmw_connected_drive/snapshots/test_switch.ambr b/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
index 23d7ec2e833512..de5a44637c380d 100644
--- a/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
+++ b/tests/components/bmw_connected_drive/snapshots/test_switch.ambr
@@ -13,5 +13,17 @@
       'last_updated': <ANY>,
       'state': 'off',
     }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'attribution': 'Data provided by MyBMW',
+        'friendly_name': 'i4 eDrive40 Charging',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'switch.i4_edrive40_charging',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'on',
+    }),
   ])
 # ---
diff --git a/tests/components/bmw_connected_drive/test_button.py b/tests/components/bmw_connected_drive/test_button.py
new file mode 100644
index 00000000000000..236dd76ce9f3e6
--- /dev/null
+++ b/tests/components/bmw_connected_drive/test_button.py
@@ -0,0 +1,79 @@
+"""Test BMW buttons."""
+from bimmer_connected.vehicle.remote_services import RemoteServices
+import pytest
+import respx
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
+from homeassistant.core import HomeAssistant
+
+from . import setup_mocked_integration
+
+
+async def test_entity_state_attrs(
+    hass: HomeAssistant,
+    bmw_fixture: respx.Router,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test button options and values."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+
+    # Get all button entities
+    assert hass.states.async_all("button") == snapshot
+
+
+@pytest.mark.parametrize(
+    ("entity_id"),
+    [
+        ("button.i4_edrive40_flash_lights"),
+        ("button.i4_edrive40_sound_horn"),
+        ("button.i4_edrive40_activate_air_conditioning"),
+        ("button.i4_edrive40_deactivate_air_conditioning"),
+        ("button.i4_edrive40_find_vehicle"),
+    ],
+)
+async def test_update_triggers_success(
+    hass: HomeAssistant,
+    entity_id: str,
+    bmw_fixture: respx.Router,
+) -> None:
+    """Test button press."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
+
+    # Test
+    await hass.services.async_call(
+        "button",
+        "press",
+        blocking=True,
+        target={"entity_id": entity_id},
+    )
+    assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 1
+
+
+async def test_refresh_from_cloud(
+    hass: HomeAssistant,
+    bmw_fixture: respx.Router,
+) -> None:
+    """Test button press for deprecated service."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
+
+    # Test
+    await hass.services.async_call(
+        "button",
+        "press",
+        blocking=True,
+        target={"entity_id": "button.i4_edrive40_refresh_from_cloud"},
+    )
+    assert RemoteServices.trigger_remote_service.call_count == 0
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 2
diff --git a/tests/components/bmw_connected_drive/test_number.py b/tests/components/bmw_connected_drive/test_number.py
index b6c16af3e03fe7..d8cd5d47867cd8 100644
--- a/tests/components/bmw_connected_drive/test_number.py
+++ b/tests/components/bmw_connected_drive/test_number.py
@@ -7,6 +7,9 @@
 import respx
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
@@ -43,6 +46,7 @@ async def test_update_triggers_success(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Test
     await hass.services.async_call(
@@ -53,6 +57,7 @@ async def test_update_triggers_success(
         target={"entity_id": entity_id},
     )
     assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 1
 
 
 @pytest.mark.parametrize(
@@ -71,6 +76,7 @@ async def test_update_triggers_fail(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Test
     with pytest.raises(ValueError):
@@ -82,6 +88,7 @@ async def test_update_triggers_fail(
             target={"entity_id": entity_id},
         )
     assert RemoteServices.trigger_remote_service.call_count == 0
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 0
 
 
 @pytest.mark.parametrize(
@@ -103,6 +110,7 @@ async def test_update_triggers_exceptions(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Setup exception
     monkeypatch.setattr(
@@ -121,3 +129,4 @@ async def test_update_triggers_exceptions(
             target={"entity_id": "number.i4_edrive40_target_soc"},
         )
     assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 0
diff --git a/tests/components/bmw_connected_drive/test_select.py b/tests/components/bmw_connected_drive/test_select.py
index bbef62b14edae4..97da6f81d6e560 100644
--- a/tests/components/bmw_connected_drive/test_select.py
+++ b/tests/components/bmw_connected_drive/test_select.py
@@ -1,10 +1,17 @@
 """Test BMW selects."""
+from unittest.mock import AsyncMock
+
+from bimmer_connected.models import MyBMWAPIError, MyBMWRemoteServiceError
 from bimmer_connected.vehicle.remote_services import RemoteServices
 import pytest
 import respx
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 
 from . import setup_mocked_integration
 
@@ -41,6 +48,7 @@ async def test_update_triggers_success(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Test
     await hass.services.async_call(
@@ -51,6 +59,7 @@ async def test_update_triggers_success(
         target={"entity_id": entity_id},
     )
     assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 1
 
 
 @pytest.mark.parametrize(
@@ -69,6 +78,7 @@ async def test_update_triggers_fail(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Test
     with pytest.raises(ValueError):
@@ -80,3 +90,43 @@ async def test_update_triggers_fail(
             target={"entity_id": entity_id},
         )
     assert RemoteServices.trigger_remote_service.call_count == 0
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 0
+
+
+@pytest.mark.parametrize(
+    ("raised", "expected"),
+    [
+        (MyBMWRemoteServiceError, HomeAssistantError),
+        (MyBMWAPIError, HomeAssistantError),
+        (ValueError, ValueError),
+    ],
+)
+async def test_remote_service_exceptions(
+    hass: HomeAssistant,
+    raised: Exception,
+    expected: Exception,
+    bmw_fixture: respx.Router,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test exception handling for remote services."""
+
+    # Setup component
+    assert await setup_mocked_integration(hass)
+
+    # Setup exception
+    monkeypatch.setattr(
+        RemoteServices,
+        "trigger_remote_service",
+        AsyncMock(side_effect=raised),
+    )
+
+    # Test
+    with pytest.raises(expected):
+        await hass.services.async_call(
+            "select",
+            "select_option",
+            service_data={"option": "16"},
+            blocking=True,
+            target={"entity_id": "select.i4_edrive40_ac_charging_limit"},
+        )
+    assert RemoteServices.trigger_remote_service.call_count == 1
diff --git a/tests/components/bmw_connected_drive/test_switch.py b/tests/components/bmw_connected_drive/test_switch.py
index fd9871dfecdef5..26de4d3b6e8c85 100644
--- a/tests/components/bmw_connected_drive/test_switch.py
+++ b/tests/components/bmw_connected_drive/test_switch.py
@@ -7,6 +7,9 @@
 import respx
 from syrupy.assertion import SnapshotAssertion
 
+from homeassistant.components.bmw_connected_drive.coordinator import (
+    BMWDataUpdateCoordinator,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
@@ -22,6 +25,7 @@ async def test_entity_state_attrs(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Get all switch entities
     assert hass.states.async_all("switch") == snapshot
@@ -32,6 +36,8 @@ async def test_entity_state_attrs(
     [
         ("switch.i4_edrive40_climate", "ON"),
         ("switch.i4_edrive40_climate", "OFF"),
+        ("switch.i4_edrive40_charging", "ON"),
+        ("switch.i4_edrive40_charging", "OFF"),
     ],
 )
 async def test_update_triggers_success(
@@ -44,6 +50,7 @@ async def test_update_triggers_success(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Test
     await hass.services.async_call(
@@ -53,6 +60,7 @@ async def test_update_triggers_success(
         target={"entity_id": entity_id},
     )
     assert RemoteServices.trigger_remote_service.call_count == 1
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 1
 
 
 @pytest.mark.parametrize(
@@ -74,6 +82,7 @@ async def test_update_triggers_exceptions(
 
     # Setup component
     assert await setup_mocked_integration(hass)
+    BMWDataUpdateCoordinator.async_update_listeners.reset_mock()
 
     # Setup exception
     monkeypatch.setattr(
@@ -98,3 +107,4 @@ async def test_update_triggers_exceptions(
             target={"entity_id": "switch.i4_edrive40_climate"},
         )
     assert RemoteServices.trigger_remote_service.call_count == 2
+    assert BMWDataUpdateCoordinator.async_update_listeners.call_count == 0
diff --git a/tests/components/broadlink/test_heartbeat.py b/tests/components/broadlink/test_heartbeat.py
index e56cbc5e2ac43c..566dd4ba86fe33 100644
--- a/tests/components/broadlink/test_heartbeat.py
+++ b/tests/components/broadlink/test_heartbeat.py
@@ -5,7 +5,7 @@
 
 from homeassistant.components.broadlink.heartbeat import BroadlinkHeartbeat
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import get_device
 
@@ -48,7 +48,7 @@ async def test_heartbeat_trigger_right_time(hass: HomeAssistant) -> None:
 
     with patch(DEVICE_PING) as mock_ping:
         async_fire_time_changed(
-            hass, dt.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
+            hass, dt_util.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
         )
         await hass.async_block_till_done()
 
@@ -66,7 +66,7 @@ async def test_heartbeat_do_not_trigger_before_time(hass: HomeAssistant) -> None
     with patch(DEVICE_PING) as mock_ping:
         async_fire_time_changed(
             hass,
-            dt.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL // 2,
+            dt_util.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL // 2,
         )
         await hass.async_block_till_done()
 
@@ -85,7 +85,7 @@ async def test_heartbeat_unload(hass: HomeAssistant) -> None:
 
     with patch(DEVICE_PING) as mock_ping:
         async_fire_time_changed(
-            hass, dt.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
+            hass, dt_util.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
         )
 
     assert mock_ping.call_count == 0
@@ -105,7 +105,7 @@ async def test_heartbeat_do_not_unload(hass: HomeAssistant) -> None:
 
     with patch(DEVICE_PING) as mock_ping:
         async_fire_time_changed(
-            hass, dt.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
+            hass, dt_util.utcnow() + BroadlinkHeartbeat.HEARTBEAT_INTERVAL
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/broadlink/test_sensors.py b/tests/components/broadlink/test_sensors.py
index 43529fae63169e..f1802ce51aa3f3 100644
--- a/tests/components/broadlink/test_sensors.py
+++ b/tests/components/broadlink/test_sensors.py
@@ -7,7 +7,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import get_device
 
@@ -384,7 +384,9 @@ async def test_scb1e_sensor_update(
     }
 
     target_time = (
-        dt.utcnow() + BroadlinkSP4UpdateManager.SCAN_INTERVAL * 3 + timedelta(seconds=1)
+        dt_util.utcnow()
+        + BroadlinkSP4UpdateManager.SCAN_INTERVAL * 3
+        + timedelta(seconds=1)
     )
 
     mock_setup = await device.setup_entry(hass, mock_api=mock_api)
diff --git a/tests/components/bthome/test_sensor.py b/tests/components/bthome/test_sensor.py
index 7aafe7ba7a9d70..4450bfcc936711 100644
--- a/tests/components/bthome/test_sensor.py
+++ b/tests/components/bthome/test_sensor.py
@@ -858,6 +858,57 @@ async def test_v1_sensors(
                 },
             ],
         ),
+        (
+            "A4:C1:38:8D:18:B2",
+            make_bthome_v2_adv(
+                "A4:C1:38:8D:18:B2",
+                b"\x44\x50\x5D\x39\x61\x64",
+            ),
+            None,
+            [
+                {
+                    "sensor_entity": "sensor.test_device_18b2_timestamp",
+                    "friendly_name": "Test Device 18B2 Timestamp",
+                    "unit_of_measurement": "s",
+                    "state_class": "measurement",
+                    "expected_state": "2023-05-14T19:41:17+00:00",
+                },
+            ],
+        ),
+        (
+            "A4:C1:38:8D:18:B2",
+            make_bthome_v2_adv(
+                "A4:C1:38:8D:18:B2",
+                b"\x44\x51\x87\x56",
+            ),
+            None,
+            [
+                {
+                    "sensor_entity": "sensor.test_device_18b2_acceleration",
+                    "friendly_name": "Test Device 18B2 Acceleration",
+                    "unit_of_measurement": "m/s²",
+                    "state_class": "measurement",
+                    "expected_state": "22.151",
+                },
+            ],
+        ),
+        (
+            "A4:C1:38:8D:18:B2",
+            make_bthome_v2_adv(
+                "A4:C1:38:8D:18:B2",
+                b"\x44\x52\x87\x56",
+            ),
+            None,
+            [
+                {
+                    "sensor_entity": "sensor.test_device_18b2_gyroscope",
+                    "friendly_name": "Test Device 18B2 Gyroscope",
+                    "unit_of_measurement": "°/s",
+                    "state_class": "measurement",
+                    "expected_state": "22.151",
+                },
+            ],
+        ),
         (
             "A4:C1:38:8D:18:B2",
             make_bthome_v2_adv(
diff --git a/tests/components/button/test_device_action.py b/tests/components/button/test_device_action.py
index 4c84faf18af5f1..43e2d3f855f863 100644
--- a/tests/components/button/test_device_action.py
+++ b/tests/components/button/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Button device actions."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.button import DOMAIN
@@ -11,7 +12,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -29,7 +29,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -37,14 +37,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "press",
             "device_id": device_entry.id,
-            "entity_id": "button.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -70,7 +70,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -84,7 +84,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["press"]
@@ -92,11 +92,50 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for press action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
+                        "type": "press",
+                    },
+                },
+            ]
+        },
+    )
+
+    press_calls = async_mock_service(hass, DOMAIN, "press")
+
+    hass.bus.async_fire("test_event")
+    await hass.async_block_till_done()
+    assert len(press_calls) == 1
+    assert press_calls[0].domain == DOMAIN
+    assert press_calls[0].service == "press"
+    assert press_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for press action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -110,7 +149,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "button.entity",
+                        "entity_id": entry.entity_id,
                         "type": "press",
                     },
                 },
@@ -125,4 +164,4 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(press_calls) == 1
     assert press_calls[0].domain == DOMAIN
     assert press_calls[0].service == "press"
-    assert press_calls[0].data == {"entity_id": "button.entity"}
+    assert press_calls[0].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/button/test_device_trigger.py b/tests/components/button/test_device_trigger.py
index 0987a7753be15f..32f10044206799 100644
--- a/tests/components/button/test_device_trigger.py
+++ b/tests/components/button/test_device_trigger.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.button import DOMAIN
@@ -13,7 +14,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -37,7 +37,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -46,14 +46,14 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "pressed",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -79,7 +79,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -93,7 +93,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["pressed"]
@@ -101,12 +101,65 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, "unknown")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "pressed",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "some": (
+                                "to - {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }} "
+                                "- {{ trigger.id }}"
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    # Test triggering device trigger with a to state
+    hass.states.async_set(entry.entity_id, "2021-01-01T23:59:59+00:00")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - unknown - 2021-01-01T23:59:59+00:00 - None - 0"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("button.entity", "unknown")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, "unknown")
 
     assert await async_setup_component(
         hass,
@@ -118,7 +171,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "button.entity",
+                        "entity_id": entry.entity_id,
                         "type": "pressed",
                     },
                     "action": {
@@ -140,11 +193,10 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Test triggering device trigger with a to state
-    hass.states.async_set("button.entity", "2021-01-01T23:59:59+00:00")
+    hass.states.async_set(entry.entity_id, "2021-01-01T23:59:59+00:00")
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "to - device - {} - unknown - 2021-01-01T23:59:59+00:00 - None - 0".format(
-        "button.entity"
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - unknown - 2021-01-01T23:59:59+00:00 - None - 0"
     )
diff --git a/tests/components/button/test_init.py b/tests/components/button/test_init.py
index 94b2bae88e0214..24f893578cec88 100644
--- a/tests/components/button/test_init.py
+++ b/tests/components/button/test_init.py
@@ -1,15 +1,34 @@
 """The tests for the Button component."""
+from collections.abc import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
 
-from homeassistant.components.button import DOMAIN, SERVICE_PRESS, ButtonEntity
+from homeassistant.components.button import (
+    DOMAIN,
+    SERVICE_PRESS,
+    ButtonDeviceClass,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import mock_restore_cache
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+    mock_restore_cache,
+)
+
+TEST_DOMAIN = "test"
 
 
 async def test_button(hass: HomeAssistant) -> None:
@@ -68,3 +87,95 @@ async def test_restore_state(
     await hass.async_block_till_done()
 
     assert hass.states.get("button.button_1").state == "2021-01-01T23:59:59+00:00"
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test button name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed button without device class -> no name
+    entity1 = ButtonEntity()
+    entity1.entity_id = "button.test1"
+
+    # Unnamed button with device class but has_entity_name False -> no name
+    entity2 = ButtonEntity()
+    entity2.entity_id = "button.test2"
+    entity2._attr_device_class = ButtonDeviceClass.RESTART
+
+    # Unnamed button with device class and has_entity_name True -> named
+    entity3 = ButtonEntity()
+    entity3.entity_id = "button.test3"
+    entity3._attr_device_class = ButtonDeviceClass.RESTART
+    entity3._attr_has_entity_name = True
+
+    # Unnamed button with device class and has_entity_name True -> named
+    entity4 = ButtonEntity()
+    entity4.entity_id = "sensor.test4"
+    entity4.entity_description = ButtonEntityDescription(
+        "test",
+        ButtonDeviceClass.RESTART,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test button platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{DOMAIN}",
+        MockPlatform(async_setup_entry=async_setup_entry_platform),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart", "friendly_name": "Restart"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state
+    assert state.attributes == {"device_class": "restart", "friendly_name": "Restart"}
diff --git a/tests/components/caldav/test_calendar.py b/tests/components/caldav/test_calendar.py
index 87aec3a6f5d1a8..ddf089c10c0849 100644
--- a/tests/components/caldav/test_calendar.py
+++ b/tests/components/caldav/test_calendar.py
@@ -9,7 +9,7 @@
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 DEVICE_DATA = {"name": "Private Calendar", "device_id": "Private Calendar"}
 
@@ -360,7 +360,7 @@ async def api_call(entity_id):
 
 def _local_datetime(hours, minutes):
     """Build a datetime object for testing in the correct timezone."""
-    return dt.as_local(datetime.datetime(2017, 11, 27, hours, minutes, 0))
+    return dt_util.as_local(datetime.datetime(2017, 11, 27, hours, minutes, 0))
 
 
 def _mocked_dav_client(*names, calendars=None):
@@ -693,7 +693,9 @@ async def test_all_day_event_returned_early(
         hass,
         calendar,
         config,
-        datetime.datetime(2017, 11, 27, 0, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2017, 11, 27, 0, 30).replace(
+            tzinfo=dt_util.DEFAULT_TIME_ZONE
+        ),
     )
 
 
@@ -711,7 +713,9 @@ async def test_all_day_event_returned_mid(
         hass,
         calendar,
         config,
-        datetime.datetime(2017, 11, 27, 12, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2017, 11, 27, 12, 30).replace(
+            tzinfo=dt_util.DEFAULT_TIME_ZONE
+        ),
     )
 
 
@@ -729,7 +733,9 @@ async def test_all_day_event_returned_late(
         hass,
         calendar,
         config,
-        datetime.datetime(2017, 11, 27, 23, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2017, 11, 27, 23, 30).replace(
+            tzinfo=dt_util.DEFAULT_TIME_ZONE
+        ),
     )
 
 
@@ -883,7 +889,7 @@ async def test_event_rrule_all_day_early(hass: HomeAssistant, calendar, set_tz)
         hass,
         calendar,
         config,
-        datetime.datetime(2016, 12, 1, 0, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2016, 12, 1, 0, 30).replace(tzinfo=dt_util.DEFAULT_TIME_ZONE),
     )
 
 
@@ -899,7 +905,9 @@ async def test_event_rrule_all_day_mid(hass: HomeAssistant, calendar, set_tz) ->
         hass,
         calendar,
         config,
-        datetime.datetime(2016, 12, 1, 17, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2016, 12, 1, 17, 30).replace(
+            tzinfo=dt_util.DEFAULT_TIME_ZONE
+        ),
     )
 
 
@@ -915,14 +923,16 @@ async def test_event_rrule_all_day_late(hass: HomeAssistant, calendar, set_tz) -
         hass,
         calendar,
         config,
-        datetime.datetime(2016, 12, 1, 23, 30).replace(tzinfo=dt.DEFAULT_TIME_ZONE),
+        datetime.datetime(2016, 12, 1, 23, 30).replace(
+            tzinfo=dt_util.DEFAULT_TIME_ZONE
+        ),
     )
 
 
 @pytest.mark.parametrize("set_tz", ["utc"], indirect=True)
 @patch(
     "homeassistant.util.dt.now",
-    return_value=dt.as_local(datetime.datetime(2015, 11, 27, 0, 15)),
+    return_value=dt_util.as_local(datetime.datetime(2015, 11, 27, 0, 15)),
 )
 async def test_event_rrule_hourly_on_first(
     mock_now, hass: HomeAssistant, calendar, set_tz
@@ -949,7 +959,7 @@ async def test_event_rrule_hourly_on_first(
 @pytest.mark.parametrize("set_tz", ["utc"], indirect=True)
 @patch(
     "homeassistant.util.dt.now",
-    return_value=dt.as_local(datetime.datetime(2015, 11, 27, 11, 15)),
+    return_value=dt_util.as_local(datetime.datetime(2015, 11, 27, 11, 15)),
 )
 async def test_event_rrule_hourly_on_last(
     mock_now, hass: HomeAssistant, calendar, set_tz
@@ -975,7 +985,7 @@ async def test_event_rrule_hourly_on_last(
 
 @patch(
     "homeassistant.util.dt.now",
-    return_value=dt.as_local(datetime.datetime(2015, 11, 27, 0, 45)),
+    return_value=dt_util.as_local(datetime.datetime(2015, 11, 27, 0, 45)),
 )
 async def test_event_rrule_hourly_off_first(
     mock_now, hass: HomeAssistant, calendar
@@ -991,7 +1001,7 @@ async def test_event_rrule_hourly_off_first(
 
 @patch(
     "homeassistant.util.dt.now",
-    return_value=dt.as_local(datetime.datetime(2015, 11, 27, 11, 45)),
+    return_value=dt_util.as_local(datetime.datetime(2015, 11, 27, 11, 45)),
 )
 async def test_event_rrule_hourly_off_last(
     mock_now, hass: HomeAssistant, calendar
@@ -1007,7 +1017,7 @@ async def test_event_rrule_hourly_off_last(
 
 @patch(
     "homeassistant.util.dt.now",
-    return_value=dt.as_local(datetime.datetime(2015, 11, 27, 12, 15)),
+    return_value=dt_util.as_local(datetime.datetime(2015, 11, 27, 12, 15)),
 )
 async def test_event_rrule_hourly_ended(
     mock_now, hass: HomeAssistant, calendar
diff --git a/tests/components/calendar/conftest.py b/tests/components/calendar/conftest.py
index 4d6b5adfde701b..5d506d67c6f991 100644
--- a/tests/components/calendar/conftest.py
+++ b/tests/components/calendar/conftest.py
@@ -9,3 +9,11 @@
 async def setup_homeassistant(hass: HomeAssistant):
     """Set up the homeassistant integration."""
     await async_setup_component(hass, "homeassistant", {})
+
+
+@pytest.fixture
+def set_time_zone(hass: HomeAssistant) -> None:
+    """Set the time zone for the tests."""
+    # Set our timezone to CST/Regina so we can check calculations
+    # This keeps UTC-6 all year round
+    hass.config.set_time_zone("America/Regina")
diff --git a/tests/components/calendar/test_init.py b/tests/components/calendar/test_init.py
index d58932ce898912..e0fbbf0cdeb879 100644
--- a/tests/components/calendar/test_init.py
+++ b/tests/components/calendar/test_init.py
@@ -6,11 +6,12 @@
 from typing import Any
 from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
 from homeassistant.bootstrap import async_setup_component
-from homeassistant.components.calendar import DOMAIN
+from homeassistant.components.calendar import DOMAIN, SERVICE_LIST_EVENTS
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.util.dt as dt_util
@@ -384,3 +385,141 @@ async def test_create_event_service_invalid_params(
             target={"entity_id": "calendar.calendar_1"},
             blocking=True,
         )
+
+
+@freeze_time("2023-06-22 10:30:00+00:00")
+@pytest.mark.parametrize(
+    ("start_time", "end_time"),
+    [
+        ("2023-06-22T04:30:00-06:00", "2023-06-22T06:30:00-06:00"),
+        ("2023-06-22T04:30:00", "2023-06-22T06:30:00"),
+        ("2023-06-22T10:30:00Z", "2023-06-22T12:30:00Z"),
+    ],
+)
+async def test_list_events_service(
+    hass: HomeAssistant, set_time_zone: None, start_time: str, end_time: str
+) -> None:
+    """Test listing events from the service call using exlplicit start and end time.
+
+    This test uses a fixed date/time so that it can deterministically test the
+    string output values.
+    """
+
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_LIST_EVENTS,
+        {
+            "entity_id": "calendar.calendar_1",
+            "start_date_time": start_time,
+            "end_date_time": end_time,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    assert response == {
+        "events": [
+            {
+                "start": "2023-06-22T05:00:00-06:00",
+                "end": "2023-06-22T06:00:00-06:00",
+                "summary": "Future Event",
+                "description": "Future Description",
+                "location": "Future Location",
+            }
+        ]
+    }
+
+
+@pytest.mark.parametrize(
+    ("entity", "duration", "expected_events"),
+    [
+        # Calendar 1 has an hour long event starting in 30 minutes. No events in the
+        # next 15 minutes, but it shows up an hour from now.
+        ("calendar.calendar_1", "00:15:00", []),
+        ("calendar.calendar_1", "01:00:00", ["Future Event"]),
+        # Calendar 2 has a active event right now
+        ("calendar.calendar_2", "00:15:00", ["Current Event"]),
+    ],
+)
+async def test_list_events_service_duration(
+    hass: HomeAssistant,
+    entity: str,
+    duration: str,
+    expected_events: list[str],
+) -> None:
+    """Test listing events using a time duration."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    response = await hass.services.async_call(
+        DOMAIN,
+        SERVICE_LIST_EVENTS,
+        {
+            "entity_id": entity,
+            "duration": duration,
+        },
+        blocking=True,
+        return_response=True,
+    )
+    assert response
+    assert "events" in response
+    events = response["events"]
+    assert [event["summary"] for event in events] == expected_events
+
+
+async def test_list_events_positive_duration(hass: HomeAssistant) -> None:
+    """Test listing events requires a positive duration."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    with pytest.raises(vol.Invalid, match="should be positive"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+                "duration": "-01:00:00",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_list_events_exclusive_fields(hass: HomeAssistant) -> None:
+    """Test listing events specifying fields that are exclusive."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    end = dt_util.now() + timedelta(days=1)
+
+    with pytest.raises(vol.Invalid, match="at most one of"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+                "end_date_time": end,
+                "duration": "01:00:00",
+            },
+            blocking=True,
+            return_response=True,
+        )
+
+
+async def test_list_events_missing_fields(hass: HomeAssistant) -> None:
+    """Test listing events missing some required fields."""
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    with pytest.raises(vol.Invalid, match="at least one of"):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LIST_EVENTS,
+            {
+                "entity_id": "calendar.calendar_1",
+            },
+            blocking=True,
+            return_response=True,
+        )
diff --git a/tests/components/calendar/test_recorder.py b/tests/components/calendar/test_recorder.py
index d99a50bd286cb3..c529789b5968b0 100644
--- a/tests/components/calendar/test_recorder.py
+++ b/tests/components/calendar/test_recorder.py
@@ -1,11 +1,12 @@
 """The tests for calendar recorder."""
 from datetime import timedelta
+from unittest.mock import patch
 
 import pytest
 
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -19,6 +20,16 @@ async def setup_homeassistant():
     """Override the fixture in calendar.conftest."""
 
 
+@pytest.fixture(autouse=True)
+async def calendar_only() -> None:
+    """Enable only the calendar platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CALENDAR],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test sensor attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/calendar/test_trigger.py b/tests/components/calendar/test_trigger.py
index 05c7d95d8ad976..45dd9d6afe146f 100644
--- a/tests/components/calendar/test_trigger.py
+++ b/tests/components/calendar/test_trigger.py
@@ -121,14 +121,6 @@ async def fire_until(self, end: datetime.datetime) -> None:
             await self.fire_time(dt_util.utcnow())
 
 
-@pytest.fixture
-def set_time_zone(hass: HomeAssistant) -> None:
-    """Set the time zone for the tests."""
-    # Set our timezone to CST/Regina so we can check calculations
-    # This keeps UTC-6 all year round
-    hass.config.set_time_zone("America/Regina")
-
-
 @pytest.fixture
 def fake_schedule(
     hass: HomeAssistant, freezer: FrozenDateTimeFactory
diff --git a/tests/components/camera/conftest.py b/tests/components/camera/conftest.py
index 8953158e423404..217373236710c9 100644
--- a/tests/components/camera/conftest.py
+++ b/tests/components/camera/conftest.py
@@ -5,6 +5,7 @@
 
 from homeassistant.components import camera
 from homeassistant.components.camera.const import StreamType
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -17,6 +18,16 @@ async def setup_homeassistant(hass: HomeAssistant):
     await async_setup_component(hass, "homeassistant", {})
 
 
+@pytest.fixture(autouse=True)
+async def camera_only() -> None:
+    """Enable only the camera platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CAMERA],
+    ):
+        yield
+
+
 @pytest.fixture(name="mock_camera")
 async def mock_camera_fixture(hass):
     """Initialize a demo camera platform."""
diff --git a/tests/components/cast/conftest.py b/tests/components/cast/conftest.py
index dc50e42e458b31..bd1dc00659e6d1 100644
--- a/tests/components/cast/conftest.py
+++ b/tests/components/cast/conftest.py
@@ -3,6 +3,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pychromecast
+from pychromecast.controllers import multizone
 import pytest
 
 
@@ -30,7 +31,7 @@ def castbrowser_mock():
 @pytest.fixture
 def mz_mock():
     """Mock pychromecast MultizoneManager."""
-    return MagicMock(spec_set=pychromecast.controllers.multizone.MultizoneManager)
+    return MagicMock(spec_set=multizone.MultizoneManager)
 
 
 @pytest.fixture
diff --git a/tests/components/cast/test_config_flow.py b/tests/components/cast/test_config_flow.py
index c1ecedcf5515a3..2d688489d39c4a 100644
--- a/tests/components/cast/test_config_flow.py
+++ b/tests/components/cast/test_config_flow.py
@@ -39,7 +39,6 @@ async def test_creating_entry_sets_up_media_player(hass: HomeAssistant) -> None:
 @pytest.mark.parametrize(
     "source",
     [
-        config_entries.SOURCE_IMPORT,
         config_entries.SOURCE_USER,
         config_entries.SOURCE_ZEROCONF,
     ],
diff --git a/tests/components/cast/test_init.py b/tests/components/cast/test_init.py
deleted file mode 100644
index 69640e29cef10b..00000000000000
--- a/tests/components/cast/test_init.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""Tests for the Cast integration."""
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant.components import cast
-from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
-
-
-async def test_import(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -> None:
-    """Test that specifying config will create an entry."""
-    with patch(
-        "homeassistant.components.cast.async_setup_entry", return_value=True
-    ) as mock_setup:
-        await async_setup_component(
-            hass,
-            cast.DOMAIN,
-            {
-                "cast": {
-                    "media_player": [
-                        {"uuid": "abcd"},
-                        {"uuid": "abcd", "ignore_cec": "milk"},
-                        {"uuid": "efgh", "ignore_cec": "beer"},
-                        {"incorrect": "config"},
-                    ]
-                }
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert len(mock_setup.mock_calls) == 1
-
-    assert len(hass.config_entries.async_entries("cast")) == 1
-    entry = hass.config_entries.async_entries("cast")[0]
-    assert set(entry.data["ignore_cec"]) == {"milk", "beer"}
-    assert set(entry.data["uuid"]) == {"abcd", "efgh"}
-
-    assert "Invalid config '{'incorrect': 'config'}'" in caplog.text
-
-
-async def test_not_configuring_cast_not_creates_entry(hass: HomeAssistant) -> None:
-    """Test that an empty config does not create an entry."""
-    with patch(
-        "homeassistant.components.cast.async_setup_entry", return_value=True
-    ) as mock_setup:
-        await async_setup_component(hass, cast.DOMAIN, {})
-        await hass.async_block_till_done()
-
-    assert len(mock_setup.mock_calls) == 0
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index 46a778f5e3147d..6f7a13b47afca2 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -181,7 +181,7 @@ def remove_chromecast(service_name: str, info: ChromecastInfo) -> None:
 
 
 async def async_setup_media_player_cast(hass: HomeAssistant, info: ChromecastInfo):
-    """Set up the cast platform with async_setup_component."""
+    """Set up a cast config entry."""
     browser = MagicMock(devices={}, zc={})
     chromecast = get_fake_chromecast(info)
     zconf = get_fake_zconf(host=info.cast_info.host, port=info.cast_info.port)
@@ -196,9 +196,10 @@ async def async_setup_media_player_cast(hass: HomeAssistant, info: ChromecastInf
         "homeassistant.components.cast.discovery.ChromeCastZeroconf.get_zeroconf",
         return_value=zconf,
     ):
-        await async_setup_component(
-            hass, "cast", {"cast": {"media_player": {"uuid": info.uuid}}}
-        )
+        data = {"ignore_cec": [], "known_hosts": [], "uuid": [str(info.uuid)]}
+        entry = MockConfigEntry(data=data, domain="cast")
+        entry.add_to_hass(hass)
+        assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
         await hass.async_block_till_done()
 
@@ -1893,7 +1894,7 @@ async def test_failed_cast_other_url(
         assert await async_setup_component(
             hass,
             tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.local:8123"}},
+            {tts.DOMAIN: {"platform": "demo"}},
         )
 
     info = get_fake_chromecast_info()
@@ -1950,7 +1951,7 @@ async def test_failed_cast_external_url(
         assert await async_setup_component(
             hass,
             tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.com:8123"}},
+            {tts.DOMAIN: {"platform": "demo"}},
         )
 
     info = get_fake_chromecast_info()
@@ -1968,33 +1969,6 @@ async def test_failed_cast_external_url(
     )
 
 
-async def test_failed_cast_tts_base_url(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test warning when casting from tts.base_url fails."""
-    await async_setup_component(hass, "homeassistant", {})
-    with assert_setup_component(1, tts.DOMAIN):
-        assert await async_setup_component(
-            hass,
-            tts.DOMAIN,
-            {tts.DOMAIN: {"platform": "demo", "base_url": "http://example.local:8123"}},
-        )
-
-    info = get_fake_chromecast_info()
-    chromecast, _ = await async_setup_media_player_cast(hass, info)
-    _, _, media_status_cb = get_status_callbacks(chromecast)
-
-    media_status = MagicMock(images=None)
-    media_status.player_is_idle = True
-    media_status.idle_reason = "ERROR"
-    media_status.content_id = "http://example.local:8123/tts.mp3"
-    media_status_cb(media_status)
-    assert (
-        "Failed to cast media http://example.local:8123/tts.mp3 from tts.base_url"
-        in caplog.text
-    )
-
-
 async def test_disconnect_on_stop(hass: HomeAssistant) -> None:
     """Test cast device disconnects socket on stop."""
     info = get_fake_chromecast_info()
@@ -2014,52 +1988,6 @@ async def test_entry_setup_no_config(hass: HomeAssistant) -> None:
     assert not hass.config_entries.async_entries("cast")
 
 
-async def test_entry_setup_empty_config(hass: HomeAssistant) -> None:
-    """Test deprecated empty yaml config.."""
-    await async_setup_component(hass, "cast", {"cast": {}})
-    await hass.async_block_till_done()
-
-    config_entry = hass.config_entries.async_entries("cast")[0]
-    assert config_entry.data["uuid"] == []
-    assert config_entry.data["ignore_cec"] == []
-
-
-async def test_entry_setup_single_config(hass: HomeAssistant) -> None:
-    """Test deprecated yaml config with a single config media_player."""
-    await async_setup_component(
-        hass, "cast", {"cast": {"media_player": {"uuid": "bla", "ignore_cec": "cast1"}}}
-    )
-    await hass.async_block_till_done()
-
-    config_entry = hass.config_entries.async_entries("cast")[0]
-    assert config_entry.data["uuid"] == ["bla"]
-    assert config_entry.data["ignore_cec"] == ["cast1"]
-
-    assert ["cast1"] == pychromecast.IGNORE_CEC
-
-
-async def test_entry_setup_list_config(hass: HomeAssistant) -> None:
-    """Test deprecated yaml config with multiple media_players."""
-    await async_setup_component(
-        hass,
-        "cast",
-        {
-            "cast": {
-                "media_player": [
-                    {"uuid": "bla", "ignore_cec": "cast1"},
-                    {"uuid": "blu", "ignore_cec": ["cast2", "cast3"]},
-                ]
-            }
-        },
-    )
-    await hass.async_block_till_done()
-
-    config_entry = hass.config_entries.async_entries("cast")[0]
-    assert set(config_entry.data["uuid"]) == {"bla", "blu"}
-    assert set(config_entry.data["ignore_cec"]) == {"cast1", "cast2", "cast3"}
-    assert set(pychromecast.IGNORE_CEC) == {"cast1", "cast2", "cast3"}
-
-
 async def test_invalid_cast_platform(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/cert_expiry/helpers.py b/tests/components/cert_expiry/helpers.py
index 222f07b7803a52..cf7cff511f7fd1 100644
--- a/tests/components/cert_expiry/helpers.py
+++ b/tests/components/cert_expiry/helpers.py
@@ -1,12 +1,12 @@
 """Helpers for Cert Expiry tests."""
 from datetime import datetime, timedelta
 
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 
 def static_datetime():
     """Build a datetime object for testing in the correct timezone."""
-    return dt.as_utc(datetime(2020, 6, 12, 8, 0, 0))
+    return dt_util.as_utc(datetime(2020, 6, 12, 8, 0, 0))
 
 
 def future_timestamp(days):
diff --git a/tests/components/climate/test_device_action.py b/tests/components/climate/test_device_action.py
index cec7722ddc81fa..05c5c4cdebb15c 100644
--- a/tests/components/climate/test_device_action.py
+++ b/tests/components/climate/test_device_action.py
@@ -1,10 +1,13 @@
 """The tests for Climate device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
 from homeassistant.components.climate import DOMAIN, HVACMode, const, device_action
-from homeassistant.components.device_automation import DeviceAutomationType
+from homeassistant.components.device_automation import (
+    DeviceAutomationType,
+)
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
@@ -17,11 +20,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.mark.parametrize(
@@ -59,7 +65,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -78,7 +84,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -87,7 +93,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -113,7 +119,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -128,7 +134,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_hvac_mode"]
@@ -136,13 +142,15 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF],
@@ -163,7 +171,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "set_hvac_mode",
                         "hvac_mode": HVACMode.OFF,
                     },
@@ -176,7 +184,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "set_preset_mode",
                         "preset_mode": const.PRESET_AWAY,
                     },
@@ -198,6 +206,70 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(set_hvac_mode_calls) == 1
     assert len(set_preset_mode_calls) == 1
 
+    assert set_hvac_mode_calls[0].domain == DOMAIN
+    assert set_hvac_mode_calls[0].service == "set_hvac_mode"
+    assert set_hvac_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "hvac_mode": const.HVAC_MODE_OFF,
+    }
+    assert set_preset_mode_calls[0].domain == DOMAIN
+    assert set_preset_mode_calls[0].service == "set_preset_mode"
+    assert set_preset_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "preset_mode": const.PRESET_AWAY,
+    }
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+        {
+            const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF],
+            const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY],
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_hvac_mode",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_hvac_mode",
+                        "hvac_mode": HVACMode.OFF,
+                    },
+                },
+            ]
+        },
+    )
+
+    set_hvac_mode_calls = async_mock_service(hass, "climate", "set_hvac_mode")
+
+    hass.bus.async_fire("test_event_set_hvac_mode")
+    await hass.async_block_till_done()
+    assert len(set_hvac_mode_calls) == 1
+
+    assert set_hvac_mode_calls[0].domain == DOMAIN
+    assert set_hvac_mode_calls[0].service == "set_hvac_mode"
+    assert set_hvac_mode_calls[0].data == {
+        "entity_id": entry.entity_id,
+        "hvac_mode": const.HVAC_MODE_OFF,
+    }
+
 
 @pytest.mark.parametrize(
     (
@@ -283,7 +355,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -302,7 +374,125 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": action,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "action",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            {},
+            "set_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            {},
+            "set_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            "set_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            "set_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    action,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            f"{DOMAIN}.test_5678",
+            HVACMode.COOL,
+            capabilities_state,
+        )
+
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": action,
         },
     )
diff --git a/tests/components/climate/test_device_condition.py b/tests/components/climate/test_device_condition.py
index 44ce904bf9ea18..33df78bf3470f2 100644
--- a/tests/components/climate/test_device_condition.py
+++ b/tests/components/climate/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Climate device conditions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -65,7 +69,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -83,7 +87,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -91,7 +95,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -117,7 +121,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -131,7 +135,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_hvac_mode"]
@@ -139,11 +143,15 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -156,7 +164,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "climate.entity",
+                            "entity_id": entry.id,
                             "type": "is_hvac_mode",
                             "hvac_mode": "cool",
                         }
@@ -178,7 +186,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "climate.entity",
+                            "entity_id": entry.id,
                             "type": "is_preset_mode",
                             "preset_mode": "away",
                         }
@@ -203,7 +211,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 0
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_PRESET_MODE: const.PRESET_AWAY,
@@ -216,7 +224,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[0].data["some"] == "is_hvac_mode - event - test_event1"
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_PRESET_MODE: const.PRESET_AWAY,
@@ -235,7 +243,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[1].data["some"] == "is_preset_mode - event - test_event2"
 
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_PRESET_MODE: const.PRESET_HOME,
@@ -248,6 +256,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 2
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_hvac_mode",
+                            "hvac_mode": "cool",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_hvac_mode - {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+    )
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_hvac_mode - event - test_event1"
+
+
 @pytest.mark.parametrize(
     (
         "set_state",
@@ -332,7 +388,126 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            entity_entry.entity_id,
+            HVACMode.COOL,
+            capabilities_state,
+        )
+
+    capabilities = await device_condition.async_get_condition_capabilities(
+        hass,
+        {
+            "condition": "device",
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.id,
+            "type": condition,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "condition",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            {},
+            "is_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            {},
+            "is_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_HVAC_MODES: [HVACMode.COOL, HVACMode.OFF]},
+            "is_hvac_mode",
+            [
+                {
+                    "name": "hvac_mode",
+                    "options": [("cool", "cool"), ("off", "off")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_PRESET_MODES: [const.PRESET_HOME, const.PRESET_AWAY]},
+            "is_preset_mode",
+            [
+                {
+                    "name": "preset_mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    condition,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -341,7 +516,7 @@ async def test_capabilities(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             HVACMode.COOL,
             capabilities_state,
         )
@@ -352,7 +527,7 @@ async def test_capabilities(
             "condition": "device",
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.entity_id,
             "type": condition,
         },
     )
@@ -384,7 +559,7 @@ async def test_capabilities_missing_entity(
             "condition": "device",
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": "01234567890123456789012345678901",
             "type": condition,
         },
     )
diff --git a/tests/components/climate/test_device_trigger.py b/tests/components/climate/test_device_trigger.py
index 54f89290a45bbf..c600e4004e8baf 100644
--- a/tests/components/climate/test_device_trigger.py
+++ b/tests/components/climate/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Climate device triggers."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -23,11 +24,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -48,13 +52,12 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
-        HVACMode.COOL,
+        entity_entry.entity_id,
+        const.HVAC_MODE_COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
             const.ATTR_CURRENT_HUMIDITY: 23,
@@ -67,7 +70,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": entity_id,
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in [
@@ -79,7 +82,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -105,7 +108,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -113,9 +116,8 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
+        entity_entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
@@ -129,7 +131,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in [
@@ -141,13 +143,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.COOL,
         {
             const.ATTR_HVAC_ACTION: HVACAction.IDLE,
@@ -166,7 +172,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "hvac_mode_changed",
                         "to": HVACMode.AUTO,
                     },
@@ -180,7 +186,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "current_temperature_changed",
                         "above": 20,
                     },
@@ -194,7 +200,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "climate.entity",
+                        "entity_id": entry.id,
                         "type": "current_humidity_changed",
                         "below": 10,
                     },
@@ -209,7 +215,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the HVAC mode is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -223,7 +229,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the temperature is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -237,7 +243,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the humidity is changing
     hass.states.async_set(
-        "climate.entity",
+        entry.entity_id,
         HVACMode.AUTO,
         {
             const.ATTR_HVAC_ACTION: HVACAction.COOLING,
@@ -250,6 +256,60 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     assert calls[2].data["some"] == "current_humidity_changed"
 
 
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.COOL,
+        {
+            const.ATTR_HVAC_ACTION: HVACAction.IDLE,
+            const.ATTR_CURRENT_HUMIDITY: 23,
+            const.ATTR_CURRENT_TEMPERATURE: 18,
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "hvac_mode_changed",
+                        "to": HVACMode.AUTO,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "hvac_mode_changed"},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the HVAC mode is changing
+    hass.states.async_set(
+        entry.entity_id,
+        HVACMode.AUTO,
+        {
+            const.ATTR_HVAC_ACTION: HVACAction.COOLING,
+            const.ATTR_CURRENT_HUMIDITY: 23,
+            const.ATTR_CURRENT_TEMPERATURE: 18,
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "hvac_mode_changed"
+
+
 async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
     """Test we get the expected capabilities from a climate trigger."""
     capabilities = await device_trigger.async_get_trigger_capabilities(
@@ -258,7 +318,7 @@ async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "climate",
             "type": "hvac_mode_changed",
-            "entity_id": "climate.upstairs",
+            "entity_id": "01234567890123456789012345678901",
             "to": "heat",
         },
     )
@@ -286,17 +346,23 @@ async def test_get_trigger_capabilities_hvac_mode(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    "type", ["current_temperature_changed", "current_humidity_changed"]
+    ("type", "suffix"),
+    [
+        ("current_temperature_changed", UnitOfTemperature.CELSIUS),
+        ("current_humidity_changed", "%"),
+    ],
 )
-async def test_get_trigger_capabilities_temp_humid(hass: HomeAssistant, type) -> None:
+async def test_get_trigger_capabilities_temp_humid(
+    hass: HomeAssistant, type, suffix
+) -> None:
     """Test we get the expected capabilities from a climate trigger."""
     capabilities = await device_trigger.async_get_trigger_capabilities(
         hass,
         {
             "platform": "device",
             "domain": "climate",
-            "type": "current_temperature_changed",
-            "entity_id": "climate.upstairs",
+            "type": type,
+            "entity_id": "01234567890123456789012345678901",
             "above": "23",
         },
     )
@@ -307,13 +373,13 @@ async def test_get_trigger_capabilities_temp_humid(hass: HomeAssistant, type) ->
         capabilities["extra_fields"], custom_serializer=cv.custom_serializer
     ) == [
         {
-            "description": {"suffix": UnitOfTemperature.CELSIUS},
+            "description": {"suffix": suffix},
             "name": "above",
             "optional": True,
             "type": "float",
         },
         {
-            "description": {"suffix": UnitOfTemperature.CELSIUS},
+            "description": {"suffix": suffix},
             "name": "below",
             "optional": True,
             "type": "float",
diff --git a/tests/components/climate/test_recorder.py b/tests/components/climate/test_recorder.py
index b6acf375f2e18e..150d70d1dba542 100644
--- a/tests/components/climate/test_recorder.py
+++ b/tests/components/climate/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import climate
 from homeassistant.components.climate import (
@@ -17,7 +20,7 @@
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -26,6 +29,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def climate_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CLIMATE],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test climate registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/cloud/conftest.py b/tests/components/cloud/conftest.py
index 93d3dc35bc34f2..221267c59fb0a4 100644
--- a/tests/components/cloud/conftest.py
+++ b/tests/components/cloud/conftest.py
@@ -8,12 +8,11 @@
 
 from . import mock_cloud, mock_cloud_prefs
 
-# Prevent TTS cache from being created
-from tests.components.tts.conftest import (  # noqa: F401, pylint: disable=unused-import
-    init_cache_dir_side_effect,
-    mock_get_cache_files,
-    mock_init_cache_dir,
-)
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/components/cloud/test_client.py b/tests/components/cloud/test_client.py
index 534456896b4c7f..50cfce3f9a9d74 100644
--- a/tests/components/cloud/test_client.py
+++ b/tests/components/cloud/test_client.py
@@ -18,7 +18,7 @@
     ExposedEntities,
     async_expose_entity,
 )
-from homeassistant.const import CONTENT_TYPE_JSON
+from homeassistant.const import CONTENT_TYPE_JSON, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -306,7 +306,7 @@ async def test_set_username(hass: HomeAssistant) -> None:
     )
     client = CloudClient(hass, prefs, None, {}, {})
     client.cloud = MagicMock(is_logged_in=True, username="mock-username")
-    await client.on_cloud_connected()
+    await client.cloud_connected()
 
     assert len(prefs.async_set_username.mock_calls) == 1
     assert prefs.async_set_username.mock_calls[0][1][0] == "mock-username"
@@ -326,7 +326,7 @@ async def test_login_recovers_bad_internet(
     client._alexa_config = Mock(
         async_enable_proactive_mode=Mock(side_effect=aiohttp.ClientError)
     )
-    await client.on_cloud_connected()
+    await client.cloud_connected()
     assert len(client._alexa_config.async_enable_proactive_mode.mock_calls) == 1
     assert "Unable to activate Alexa Report State" in caplog.text
 
@@ -353,3 +353,18 @@ async def test_system_msg(hass: HomeAssistant) -> None:
 
     assert response is None
     assert cloud.client.relayer_region == "xx-earth-616"
+
+
+async def test_cloud_connection_info(hass: HomeAssistant) -> None:
+    """Test connection info msg."""
+    with patch("hass_nabucasa.Cloud.initialize"):
+        setup = await async_setup_component(hass, "cloud", {"cloud": {}})
+        assert setup
+    cloud = hass.data["cloud"]
+
+    response = await cloud.client.async_cloud_connection_info({})
+
+    assert response == {
+        "remote": {"connected": False, "enabled": False, "instance_domain": None},
+        "version": HA_VERSION,
+    }
diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py
index bd0a4972241ee0..28b531b608c5c0 100644
--- a/tests/components/cloud/test_init.py
+++ b/tests/components/cloud/test_init.py
@@ -135,9 +135,9 @@ async def test_setup_existing_cloud_user(
 
 async def test_on_connect(hass: HomeAssistant, mock_cloud_fixture) -> None:
     """Test cloud on connect triggers."""
-    cl: Cloud = hass.data["cloud"]
+    cl: Cloud[cloud.client.CloudClient] = hass.data["cloud"]
 
-    assert len(cl.iot._on_connect) == 4
+    assert len(cl.iot._on_connect) == 3
 
     assert len(hass.states.async_entity_ids("binary_sensor")) == 0
 
diff --git a/tests/components/cloud/test_repairs.py b/tests/components/cloud/test_repairs.py
index 3cfe93ad5d0743..d010cac77addde 100644
--- a/tests/components/cloud/test_repairs.py
+++ b/tests/components/cloud/test_repairs.py
@@ -10,7 +10,7 @@
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.issue_registry as ir
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import mock_cloud
 
@@ -28,7 +28,7 @@ async def test_do_not_create_repair_issues_at_startup_if_not_logged_in(
     with patch("homeassistant.components.cloud.Cloud.is_logged_in", False):
         await mock_cloud(hass)
 
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(hours=1))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(hours=1))
         await hass.async_block_till_done()
 
     assert not issue_registry.async_get_issue(
@@ -51,7 +51,7 @@ async def test_create_repair_issues_at_startup_if_logged_in(
     with patch("homeassistant.components.cloud.Cloud.is_logged_in", True):
         await mock_cloud(hass)
 
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(hours=1))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(hours=1))
         await hass.async_block_till_done()
 
     assert issue_registry.async_get_issue(
diff --git a/tests/components/color_extractor/test_service.py b/tests/components/color_extractor/test_service.py
index b1236af89fb532..312183878586f1 100644
--- a/tests/components/color_extractor/test_service.py
+++ b/tests/components/color_extractor/test_service.py
@@ -139,9 +139,7 @@ async def _async_load_color_extractor_url(hass, service_data):
     assert state.state == STATE_OFF
 
     # Call the shared service, our above mock should return the base64 decoded fixture 1x1 pixel
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_TURN_ON, service_data, blocking=True
-    )
+    await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, service_data, blocking=True)
 
     await hass.async_block_till_done()
 
diff --git a/tests/components/command_line/conftest.py b/tests/components/command_line/conftest.py
new file mode 100644
index 00000000000000..5dc4152f8f2341
--- /dev/null
+++ b/tests/components/command_line/conftest.py
@@ -0,0 +1,72 @@
+"""Fixtures for command_line."""
+
+from typing import Any
+
+import pytest
+
+from homeassistant import setup
+from homeassistant.components.command_line.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+
+@pytest.fixture(name="get_config")
+async def get_config_to_integration_load() -> dict[str, Any]:
+    """Return default minimal configuration.
+
+    To override the config, tests can be marked with:
+    @pytest.mark.parametrize("get_config", [{...}])
+    """
+
+    return {
+        "command_line": [
+            {
+                "binary_sensor": {
+                    "name": "Test",
+                    "command": "echo 1",
+                    "payload_on": "1",
+                    "payload_off": "0",
+                    "command_timeout": 15,
+                }
+            },
+            {
+                "cover": {
+                    "name": "Test",
+                    "command_state": "echo 1",
+                    "command_timeout": 15,
+                }
+            },
+            {
+                "notify": {
+                    "name": "Test",
+                    "command": "echo 1",
+                    "command_timeout": 15,
+                }
+            },
+            {
+                "sensor": {
+                    "name": "Test",
+                    "command": "echo 5",
+                    "unit_of_measurement": "in",
+                    "command_timeout": 15,
+                }
+            },
+            {
+                "switch": {
+                    "name": "Test",
+                    "command_state": "echo 1",
+                    "command_timeout": 15,
+                }
+            },
+        ]
+    }
+
+
+@pytest.fixture(name="load_yaml_integration")
+async def load_int(hass: HomeAssistant, get_config: dict[str, Any]) -> None:
+    """Set up the Command Line integration in Home Assistant."""
+    await setup.async_setup_component(
+        hass,
+        DOMAIN,
+        get_config,
+    )
+    await hass.async_block_till_done()
diff --git a/tests/components/command_line/fixtures/configuration.yaml b/tests/components/command_line/fixtures/configuration.yaml
index f210b640338562..43e6f641966f11 100644
--- a/tests/components/command_line/fixtures/configuration.yaml
+++ b/tests/components/command_line/fixtures/configuration.yaml
@@ -1,6 +1,7 @@
-cover:
-  - platform: command_line
-    covers:
-      from_yaml:
-        command_state: "echo closed"
-        value_template: "{{ value }}"
+command_line:
+  - "binary_sensor":
+      "name": "Test"
+      "command": "echo 1"
+      "payload_on": "1"
+      "payload_off": "0"
+      "command_timeout": 15
diff --git a/tests/components/command_line/fixtures/configuration_empty.yaml b/tests/components/command_line/fixtures/configuration_empty.yaml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/components/command_line/test_binary_sensor.py b/tests/components/command_line/test_binary_sensor.py
index a6486b40040ea5..9e97f053e07778 100644
--- a/tests/components/command_line/test_binary_sensor.py
+++ b/tests/components/command_line/test_binary_sensor.py
@@ -1,105 +1,168 @@
 """The tests for the Command line Binary sensor platform."""
 from __future__ import annotations
 
+import asyncio
+from datetime import timedelta
 from typing import Any
+from unittest.mock import patch
 
 import pytest
 
 from homeassistant import setup
-from homeassistant.components.binary_sensor import DOMAIN
-from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.command_line.binary_sensor import CommandBinarySensor
+from homeassistant.components.command_line.const import DOMAIN
+from homeassistant.components.homeassistant import (
+    DOMAIN as HA_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+import homeassistant.helpers.issue_registry as ir
+from homeassistant.util import dt as dt_util
 
+from tests.common import async_fire_time_changed
 
-async def setup_test_entity(hass: HomeAssistant, config_dict: dict[str, Any]) -> None:
-    """Set up a test command line binary_sensor entity."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
-        {DOMAIN: {"platform": "command_line", "name": "Test", **config_dict}},
-    )
-    await hass.async_block_till_done()
 
-
-async def test_setup(hass: HomeAssistant) -> None:
+async def test_setup_platform_yaml(hass: HomeAssistant) -> None:
     """Test sensor setup."""
-    await setup_test_entity(
+    assert await setup.async_setup_component(
         hass,
+        BINARY_SENSOR_DOMAIN,
         {
-            "command": "echo 1",
-            "payload_on": "1",
-            "payload_off": "0",
+            BINARY_SENSOR_DOMAIN: {
+                "platform": "command_line",
+                "name": "Test",
+                "command": "echo 1",
+                "payload_on": "1",
+                "payload_off": "0",
+            }
         },
     )
+    await hass.async_block_till_done()
 
     entity_state = hass.states.get("binary_sensor.test")
     assert entity_state
     assert entity_state.state == STATE_ON
     assert entity_state.name == "Test"
 
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, "deprecated_yaml_binary_sensor")
+    assert issue.translation_key == "deprecated_platform_yaml"
 
-async def test_template(hass: HomeAssistant) -> None:
-    """Test setting the state with a template."""
 
-    await setup_test_entity(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "echo 10",
-            "payload_on": "1.0",
-            "payload_off": "0",
-            "value_template": "{{ value | multiply(0.1) }}",
-        },
-    )
+            "command_line": [
+                {
+                    "binary_sensor": {
+                        "name": "Test",
+                        "command": "echo 1",
+                        "payload_on": "1",
+                        "payload_off": "0",
+                        "command_timeout": 15,
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_setup_integration_yaml(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Test sensor setup."""
 
     entity_state = hass.states.get("binary_sensor.test")
     assert entity_state
     assert entity_state.state == STATE_ON
+    assert entity_state.name == "Test"
 
 
-async def test_sensor_off(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "binary_sensor": {
+                        "name": "Test",
+                        "command": "echo 10",
+                        "payload_on": "1.0",
+                        "payload_off": "0",
+                        "value_template": "{{ value | multiply(0.1) }}",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_template(hass: HomeAssistant, load_yaml_integration: None) -> None:
     """Test setting the state with a template."""
-    await setup_test_entity(
-        hass,
+
+    entity_state = hass.states.get("binary_sensor.test")
+    assert entity_state
+    assert entity_state.state == STATE_ON
+
+
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "echo 0",
-            "payload_on": "1",
-            "payload_off": "0",
-        },
-    )
+            "command_line": [
+                {
+                    "binary_sensor": {
+                        "name": "Test",
+                        "command": "echo 0",
+                        "payload_on": "1",
+                        "payload_off": "0",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_sensor_off(hass: HomeAssistant, load_yaml_integration: None) -> None:
+    """Test setting the state with a template."""
+
     entity_state = hass.states.get("binary_sensor.test")
     assert entity_state
     assert entity_state.state == STATE_OFF
 
 
-async def test_unique_id(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry
-) -> None:
-    """Test unique_id option and if it only creates one binary sensor per id."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            DOMAIN: [
+            "command_line": [
                 {
-                    "platform": "command_line",
-                    "unique_id": "unique",
-                    "command": "echo 0",
+                    "binary_sensor": {
+                        "unique_id": "unique",
+                        "command": "echo 0",
+                    }
                 },
                 {
-                    "platform": "command_line",
-                    "unique_id": "not-so-unique-anymore",
-                    "command": "echo 1",
+                    "binary_sensor": {
+                        "unique_id": "not-so-unique-anymore",
+                        "command": "echo 1",
+                    }
                 },
                 {
-                    "platform": "command_line",
-                    "unique_id": "not-so-unique-anymore",
-                    "command": "echo 2",
+                    "binary_sensor": {
+                        "unique_id": "not-so-unique-anymore",
+                        "command": "echo 2",
+                    }
                 },
             ]
-        },
-    )
-    await hass.async_block_till_done()
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, load_yaml_integration: None
+) -> None:
+    """Test unique_id option and if it only creates one binary sensor per id."""
 
     assert len(hass.states.async_all()) == 2
 
@@ -112,14 +175,137 @@ async def test_unique_id(
     )
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "binary_sensor": {
+                        "command": "exit 33",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_return_code(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, get_config: dict[str, Any]
 ) -> None:
     """Test setting the state with a template."""
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "exit 33",
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
     assert "return code 33" in caplog.text
+
+
+async def test_updating_to_often(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling updating when command already running."""
+    called = []
+
+    class MockCommandBinarySensor(CommandBinarySensor):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.binary_sensor.CommandBinarySensor",
+        side_effect=MockCommandBinarySensor,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "binary_sensor": {
+                            "name": "Test",
+                            "command": "echo 1",
+                            "payload_on": "1",
+                            "payload_off": "0",
+                            "scan_interval": 0.1,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 1
+    assert (
+        "Updating Command Line Binary Sensor Test took longer than the scheduled update interval"
+        not in caplog.text
+    )
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+
+    assert len(called) == 2
+    assert (
+        "Updating Command Line Binary Sensor Test took longer than the scheduled update interval"
+        in caplog.text
+    )
+
+    await asyncio.sleep(0.2)
+
+
+async def test_updating_manually(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling manual updating using homeassistant udate_entity service."""
+    await setup.async_setup_component(hass, HA_DOMAIN, {})
+    called = []
+
+    class MockCommandBinarySensor(CommandBinarySensor):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.binary_sensor.CommandBinarySensor",
+        side_effect=MockCommandBinarySensor,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "binary_sensor": {
+                            "name": "Test",
+                            "command": "echo 1",
+                            "payload_on": "1",
+                            "payload_off": "0",
+                            "scan_interval": 10,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 1
+
+    await hass.services.async_call(
+        HA_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ["binary_sensor.test"]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert len(called) == 2
+
+    await asyncio.sleep(0.2)
diff --git a/tests/components/command_line/test_cover.py b/tests/components/command_line/test_cover.py
index a650bd6c4fbf31..ac0a33fc7a979c 100644
--- a/tests/components/command_line/test_cover.py
+++ b/tests/components/command_line/test_cover.py
@@ -1,53 +1,103 @@
 """The tests the cover command line platform."""
 from __future__ import annotations
 
+import asyncio
+from datetime import timedelta
 import os
 import tempfile
-from typing import Any
 from unittest.mock import patch
 
 import pytest
 
-from homeassistant import config as hass_config, setup
-from homeassistant.components.cover import DOMAIN, SCAN_INTERVAL
+from homeassistant import setup
+from homeassistant.components.command_line import DOMAIN
+from homeassistant.components.command_line.cover import CommandCover
+from homeassistant.components.cover import DOMAIN as COVER_DOMAIN, SCAN_INTERVAL
+from homeassistant.components.homeassistant import (
+    DOMAIN as HA_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_CLOSE_COVER,
     SERVICE_OPEN_COVER,
-    SERVICE_RELOAD,
     SERVICE_STOP_COVER,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+import homeassistant.helpers.issue_registry as ir
 import homeassistant.util.dt as dt_util
 
-from tests.common import async_fire_time_changed, get_fixture_path
-
-
-async def setup_test_entity(hass: HomeAssistant, config_dict: dict[str, Any]) -> None:
-    """Set up a test command line notify service."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
-        {
-            DOMAIN: [
-                {"platform": "command_line", "covers": config_dict},
-            ]
-        },
-    )
-    await hass.async_block_till_done()
+from tests.common import async_fire_time_changed
 
 
-async def test_no_covers(caplog: pytest.LogCaptureFixture, hass: HomeAssistant) -> None:
+async def test_no_covers_platform_yaml(
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+) -> None:
     """Test that the cover does not polls when there's no state command."""
 
     with patch(
         "homeassistant.components.command_line.utils.subprocess.check_output",
         return_value=b"50\n",
     ):
-        await setup_test_entity(hass, {})
+        assert await setup.async_setup_component(
+            hass,
+            COVER_DOMAIN,
+            {
+                COVER_DOMAIN: [
+                    {"platform": "command_line", "covers": {}},
+                ]
+            },
+        )
+        await hass.async_block_till_done()
         assert "No covers added" in caplog.text
 
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, "deprecated_yaml_cover")
+    assert issue.translation_key == "deprecated_platform_yaml"
+
+
+async def test_state_value_platform_yaml(hass: HomeAssistant) -> None:
+    """Test with state value."""
+    with tempfile.TemporaryDirectory() as tempdirname:
+        path = os.path.join(tempdirname, "cover_status")
+        assert await setup.async_setup_component(
+            hass,
+            COVER_DOMAIN,
+            {
+                COVER_DOMAIN: [
+                    {
+                        "platform": "command_line",
+                        "covers": {
+                            "test": {
+                                "command_state": f"cat {path}",
+                                "command_open": f"echo 1 > {path}",
+                                "command_close": f"echo 1 > {path}",
+                                "command_stop": f"echo 0 > {path}",
+                                "value_template": "{{ value }}",
+                                "friendly_name": "Test",
+                            },
+                        },
+                    },
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+        entity_state = hass.states.get("cover.test")
+        assert entity_state
+        assert entity_state.state == "unknown"
+
+        await hass.services.async_call(
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.test"},
+            blocking=True,
+        )
+        entity_state = hass.states.get("cover.test")
+        assert entity_state
+        assert entity_state.state == "open"
+
 
 async def test_no_poll_when_cover_has_no_command_state(hass: HomeAssistant) -> None:
     """Test that the cover does not polls when there's no state command."""
@@ -56,25 +106,49 @@ async def test_no_poll_when_cover_has_no_command_state(hass: HomeAssistant) -> N
         "homeassistant.components.command_line.utils.subprocess.check_output",
         return_value=b"50\n",
     ) as check_output:
-        await setup_test_entity(hass, {"test": {}})
+        assert await setup.async_setup_component(
+            hass,
+            COVER_DOMAIN,
+            {
+                COVER_DOMAIN: [
+                    {"platform": "command_line", "covers": {"test": {}}},
+                ]
+            },
+        )
         async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
         await hass.async_block_till_done()
         assert not check_output.called
 
 
-async def test_poll_when_cover_has_command_state(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "cover": {
+                        "command_state": "echo state",
+                        "name": "Test",
+                    },
+                }
+            ]
+        }
+    ],
+)
+async def test_poll_when_cover_has_command_state(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
     """Test that the cover polls when there's a state  command."""
 
     with patch(
         "homeassistant.components.command_line.utils.subprocess.check_output",
         return_value=b"50\n",
     ) as check_output:
-        await setup_test_entity(hass, {"test": {"command_state": "echo state"}})
         async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
         await hass.async_block_till_done()
         check_output.assert_called_once_with(
             "echo state",
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S604 # shell by design
             timeout=15,
             close_fds=False,
         )
@@ -84,121 +158,128 @@ async def test_state_value(hass: HomeAssistant) -> None:
     """Test with state value."""
     with tempfile.TemporaryDirectory() as tempdirname:
         path = os.path.join(tempdirname, "cover_status")
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_state": f"cat {path}",
-                    "command_open": f"echo 1 > {path}",
-                    "command_close": f"echo 1 > {path}",
-                    "command_stop": f"echo 0 > {path}",
-                    "value_template": "{{ value }}",
-                }
+                "command_line": [
+                    {
+                        "cover": {
+                            "command_state": f"cat {path}",
+                            "command_open": f"echo 1 > {path}",
+                            "command_close": f"echo 1 > {path}",
+                            "command_stop": f"echo 0 > {path}",
+                            "value_template": "{{ value }}",
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("cover.test")
         assert entity_state
         assert entity_state.state == "unknown"
 
         await hass.services.async_call(
-            DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.test"},
+            blocking=True,
         )
         entity_state = hass.states.get("cover.test")
         assert entity_state
         assert entity_state.state == "open"
 
         await hass.services.async_call(
-            DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
+            COVER_DOMAIN,
+            SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: "cover.test"},
+            blocking=True,
         )
         entity_state = hass.states.get("cover.test")
         assert entity_state
         assert entity_state.state == "open"
 
         await hass.services.async_call(
-            DOMAIN, SERVICE_STOP_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
+            COVER_DOMAIN,
+            SERVICE_STOP_COVER,
+            {ATTR_ENTITY_ID: "cover.test"},
+            blocking=True,
         )
         entity_state = hass.states.get("cover.test")
         assert entity_state
         assert entity_state.state == "closed"
 
 
-async def test_reload(hass: HomeAssistant) -> None:
-    """Verify we can reload command_line covers."""
-
-    await setup_test_entity(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "test": {
-                "command_state": "echo open",
-                "value_template": "{{ value }}",
-            }
-        },
-    )
-    entity_state = hass.states.get("cover.test")
-    assert entity_state
-    assert entity_state.state == "unknown"
-
-    yaml_path = get_fixture_path("configuration.yaml", "command_line")
-    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
-        await hass.services.async_call(
-            "command_line",
-            SERVICE_RELOAD,
-            {},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
-
-    assert len(hass.states.async_all()) == 1
-
-    assert not hass.states.get("cover.test")
-    assert hass.states.get("cover.from_yaml")
-
-
+            "command_line": [
+                {
+                    "cover": {
+                        "command_open": "exit 1",
+                        "name": "Test",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_move_cover_failure(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test command failure."""
 
-    await setup_test_entity(
-        hass,
-        {"test": {"command_open": "exit 1"}},
-    )
     await hass.services.async_call(
-        DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
+        COVER_DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: "cover.test"}, blocking=True
     )
     assert "Command failed" in caplog.text
     assert "return code 1" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "cover": {
+                        "command_open": "echo open",
+                        "command_close": "echo close",
+                        "command_stop": "echo stop",
+                        "unique_id": "unique",
+                        "name": "Test",
+                    }
+                },
+                {
+                    "cover": {
+                        "command_open": "echo open",
+                        "command_close": "echo close",
+                        "command_stop": "echo stop",
+                        "unique_id": "not-so-unique-anymore",
+                        "name": "Test2",
+                    }
+                },
+                {
+                    "cover": {
+                        "command_open": "echo open",
+                        "command_close": "echo close",
+                        "command_stop": "echo stop",
+                        "unique_id": "not-so-unique-anymore",
+                        "name": "Test3",
+                    }
+                },
+            ]
+        }
+    ],
+)
 async def test_unique_id(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, load_yaml_integration: None
 ) -> None:
     """Test unique_id option and if it only creates one cover per id."""
-    await setup_test_entity(
-        hass,
-        {
-            "unique": {
-                "command_open": "echo open",
-                "command_close": "echo close",
-                "command_stop": "echo stop",
-                "unique_id": "unique",
-            },
-            "not_unique_1": {
-                "command_open": "echo open",
-                "command_close": "echo close",
-                "command_stop": "echo stop",
-                "unique_id": "not-so-unique-anymore",
-            },
-            "not_unique_2": {
-                "command_open": "echo open",
-                "command_close": "echo close",
-                "command_stop": "echo stop",
-                "unique_id": "not-so-unique-anymore",
-            },
-        },
-    )
-
     assert len(hass.states.async_all()) == 2
 
     assert len(entity_registry.entities) == 2
@@ -206,3 +287,112 @@ async def test_unique_id(
     assert entity_registry.async_get_entity_id(
         "cover", "command_line", "not-so-unique-anymore"
     )
+
+
+async def test_updating_to_often(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling updating when command already running."""
+    called = []
+
+    class MockCommandCover(CommandCover):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.cover.CommandCover",
+        side_effect=MockCommandCover,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "cover": {
+                            "command_state": "echo 1",
+                            "value_template": "{{ value }}",
+                            "name": "Test",
+                            "scan_interval": 0.1,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 0
+    assert (
+        "Updating Command Line Cover Test took longer than the scheduled update interval"
+        not in caplog.text
+    )
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+
+    assert len(called) == 1
+    assert (
+        "Updating Command Line Cover Test took longer than the scheduled update interval"
+        in caplog.text
+    )
+
+    await asyncio.sleep(0.2)
+
+
+async def test_updating_manually(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling manual updating using homeassistant udate_entity service."""
+    await setup.async_setup_component(hass, HA_DOMAIN, {})
+    called = []
+
+    class MockCommandCover(CommandCover):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.cover.CommandCover",
+        side_effect=MockCommandCover,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "cover": {
+                            "command_state": "echo 1",
+                            "value_template": "{{ value }}",
+                            "name": "Test",
+                            "scan_interval": 10,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=10))
+    await hass.async_block_till_done()
+    assert len(called) == 1
+
+    await hass.services.async_call(
+        HA_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ["cover.test"]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert len(called) == 2
+
+    await asyncio.sleep(0.2)
diff --git a/tests/components/command_line/test_init.py b/tests/components/command_line/test_init.py
new file mode 100644
index 00000000000000..53f985961f3f3a
--- /dev/null
+++ b/tests/components/command_line/test_init.py
@@ -0,0 +1,84 @@
+"""Test Command line component setup process."""
+from __future__ import annotations
+
+from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant import config as hass_config
+from homeassistant.components.command_line.const import DOMAIN
+from homeassistant.const import SERVICE_RELOAD, STATE_ON, STATE_OPEN
+from homeassistant.core import HomeAssistant
+import homeassistant.util.dt as dt_util
+
+from tests.common import async_fire_time_changed, get_fixture_path
+
+
+async def test_setup_config(hass: HomeAssistant, load_yaml_integration: None) -> None:
+    """Test setup from yaml."""
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
+    await hass.async_block_till_done()
+
+    state_binary_sensor = hass.states.get("binary_sensor.test")
+    state_sensor = hass.states.get("sensor.test")
+    state_cover = hass.states.get("cover.test")
+    state_switch = hass.states.get("switch.test")
+
+    assert state_binary_sensor.state == STATE_ON
+    assert state_sensor.state == "5"
+    assert state_cover.state == STATE_OPEN
+    assert state_switch.state == STATE_ON
+
+
+async def test_reload_service(
+    hass: HomeAssistant, load_yaml_integration: None, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test reload serviice."""
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
+    await hass.async_block_till_done()
+
+    state_binary_sensor = hass.states.get("binary_sensor.test")
+    state_sensor = hass.states.get("sensor.test")
+    assert state_binary_sensor.state == STATE_ON
+    assert state_sensor.state == "5"
+
+    caplog.clear()
+
+    yaml_path = get_fixture_path("configuration.yaml", "command_line")
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    assert "Loading config" in caplog.text
+
+    state_binary_sensor = hass.states.get("binary_sensor.test")
+    state_sensor = hass.states.get("sensor.test")
+    assert state_binary_sensor.state == STATE_ON
+    assert not state_sensor
+
+    caplog.clear()
+
+    yaml_path = get_fixture_path("configuration_empty.yaml", "command_line")
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    state_binary_sensor = hass.states.get("binary_sensor.test")
+    state_sensor = hass.states.get("sensor.test")
+    assert not state_binary_sensor
+    assert not state_sensor
+
+    assert "Loading config" not in caplog.text
diff --git a/tests/components/command_line/test_notify.py b/tests/components/command_line/test_notify.py
index 918880a98fd46a..a17b1ec33e1937 100644
--- a/tests/components/command_line/test_notify.py
+++ b/tests/components/command_line/test_notify.py
@@ -4,40 +4,71 @@
 import os
 import subprocess
 import tempfile
-from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant import setup
-from homeassistant.components.notify import DOMAIN
+from homeassistant.components.command_line import DOMAIN
+from homeassistant.components.notify import DOMAIN as NOTIFY_DOMAIN
 from homeassistant.core import HomeAssistant
+import homeassistant.helpers.issue_registry as ir
 
 
-async def setup_test_service(hass: HomeAssistant, config_dict: dict[str, Any]) -> None:
-    """Set up a test command line notify service."""
+async def test_setup_platform_yaml(hass: HomeAssistant) -> None:
+    """Test sensor setup."""
     assert await setup.async_setup_component(
         hass,
-        DOMAIN,
+        NOTIFY_DOMAIN,
         {
-            DOMAIN: [
-                {"platform": "command_line", "name": "Test", **config_dict},
+            NOTIFY_DOMAIN: [
+                {"platform": "command_line", "name": "Test1", "command": "exit 0"},
             ]
         },
     )
     await hass.async_block_till_done()
+    assert hass.services.has_service(NOTIFY_DOMAIN, "test1")
+
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, "deprecated_yaml_notify")
+    assert issue.translation_key == "deprecated_platform_yaml"
 
 
-async def test_setup(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "notify": {
+                        "command": "exit 0",
+                        "name": "Test2",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_setup_integration_yaml(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
     """Test sensor setup."""
-    await setup_test_service(hass, {"command": "exit 0"})
-    assert hass.services.has_service(DOMAIN, "test")
+    assert hass.services.has_service(NOTIFY_DOMAIN, "test2")
 
 
 async def test_bad_config(hass: HomeAssistant) -> None:
     """Test set up the platform with bad/missing configuration."""
-    await setup_test_service(hass, {})
-    assert not hass.services.has_service(DOMAIN, "test")
+    assert await setup.async_setup_component(
+        hass,
+        NOTIFY_DOMAIN,
+        {
+            NOTIFY_DOMAIN: [
+                {"platform": "command_line"},
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert not hass.services.has_service(NOTIFY_DOMAIN, "test")
 
 
 async def test_command_line_output(hass: HomeAssistant) -> None:
@@ -45,58 +76,102 @@ async def test_command_line_output(hass: HomeAssistant) -> None:
     with tempfile.TemporaryDirectory() as tempdirname:
         filename = os.path.join(tempdirname, "message.txt")
         message = "one, two, testing, testing"
-        await setup_test_service(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "command": f"cat > {filename}",
+                "command_line": [
+                    {
+                        "notify": {
+                            "command": f"cat > {filename}",
+                            "name": "Test3",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
 
-        assert hass.services.has_service(DOMAIN, "test")
+        assert hass.services.has_service(NOTIFY_DOMAIN, "test3")
 
-        assert await hass.services.async_call(
-            DOMAIN, "test", {"message": message}, blocking=True
+        await hass.services.async_call(
+            NOTIFY_DOMAIN, "test3", {"message": message}, blocking=True
         )
-        with open(filename) as handle:
+        with open(filename, encoding="UTF-8") as handle:
             # the echo command adds a line break
             assert message == handle.read()
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "notify": {
+                        "command": "exit 1",
+                        "name": "Test4",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_error_for_none_zero_exit_code(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test if an error is logged for non zero exit codes."""
-    await setup_test_service(
-        hass,
-        {
-            "command": "exit 1",
-        },
-    )
 
-    assert await hass.services.async_call(
-        DOMAIN, "test", {"message": "error"}, blocking=True
+    await hass.services.async_call(
+        NOTIFY_DOMAIN, "test4", {"message": "error"}, blocking=True
     )
     assert "Command failed" in caplog.text
     assert "return code 1" in caplog.text
 
 
-async def test_timeout(caplog: pytest.LogCaptureFixture, hass: HomeAssistant) -> None:
-    """Test blocking is not forever."""
-    await setup_test_service(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "sleep 10000",
-            "command_timeout": 0.0000001,
-        },
-    )
-    assert await hass.services.async_call(
-        DOMAIN, "test", {"message": "error"}, blocking=True
+            "command_line": [
+                {
+                    "notify": {
+                        "command": "sleep 10000",
+                        "command_timeout": 0.0000001,
+                        "name": "Test5",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_timeout(
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Test blocking is not forever."""
+    await hass.services.async_call(
+        NOTIFY_DOMAIN, "test5", {"message": "error"}, blocking=True
     )
     assert "Timeout" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "notify": {
+                        "command": "exit 0",
+                        "name": "Test6",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_subprocess_exceptions(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test that notify subprocess exceptions are handled correctly."""
 
@@ -110,15 +185,14 @@ async def test_subprocess_exceptions(
             subprocess.SubprocessError(),
         ]
 
-        await setup_test_service(hass, {"command": "exit 0"})
-        assert await hass.services.async_call(
-            DOMAIN, "test", {"message": "error"}, blocking=True
+        await hass.services.async_call(
+            NOTIFY_DOMAIN, "test6", {"message": "error"}, blocking=True
         )
         assert check_output.call_count == 2
         assert "Timeout for command" in caplog.text
 
-        assert await hass.services.async_call(
-            DOMAIN, "test", {"message": "error"}, blocking=True
+        await hass.services.async_call(
+            NOTIFY_DOMAIN, "test6", {"message": "error"}, blocking=True
         )
         assert check_output.call_count == 4
         assert "Error trying to exec command" in caplog.text
diff --git a/tests/components/command_line/test_sensor.py b/tests/components/command_line/test_sensor.py
index 188f4aac062dec..b837f5808622c6 100644
--- a/tests/components/command_line/test_sensor.py
+++ b/tests/components/command_line/test_sensor.py
@@ -1,6 +1,7 @@
 """The tests for the Command line sensor platform."""
 from __future__ import annotations
 
+import asyncio
 from datetime import timedelta
 from typing import Any
 from unittest.mock import patch
@@ -8,38 +9,71 @@
 import pytest
 
 from homeassistant import setup
+from homeassistant.components.command_line import DOMAIN
+from homeassistant.components.command_line.sensor import CommandSensor
+from homeassistant.components.homeassistant import (
+    DOMAIN as HA_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+import homeassistant.helpers.issue_registry as ir
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
 
-async def setup_test_entities(hass: HomeAssistant, config_dict: dict[str, Any]) -> None:
-    """Set up a test command line sensor entity."""
-    hass.states.async_set("sensor.input_sensor", "sensor_value")
+async def test_setup_platform_yaml(hass: HomeAssistant) -> None:
+    """Test sensor setup."""
     assert await setup.async_setup_component(
         hass,
         SENSOR_DOMAIN,
         {
             SENSOR_DOMAIN: [
-                {"platform": "command_line", "name": "Test", **config_dict},
+                {
+                    "platform": "command_line",
+                    "name": "Test",
+                    "command": "echo 5",
+                    "unit_of_measurement": "in",
+                },
             ]
         },
     )
     await hass.async_block_till_done()
+    entity_state = hass.states.get("sensor.test")
+    assert entity_state
+    assert entity_state.state == "5"
+    assert entity_state.name == "Test"
+    assert entity_state.attributes["unit_of_measurement"] == "in"
 
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, "deprecated_yaml_sensor")
+    assert issue.translation_key == "deprecated_platform_yaml"
 
-async def test_setup(hass: HomeAssistant) -> None:
-    """Test sensor setup."""
-    await setup_test_entities(
-        hass,
+
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "echo 5",
-            "unit_of_measurement": "in",
-        },
-    )
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo 5",
+                        "unit_of_measurement": "in",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_setup_integration_yaml(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Test sensor setup."""
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.state == "5"
@@ -47,35 +81,56 @@ async def test_setup(hass: HomeAssistant) -> None:
     assert entity_state.attributes["unit_of_measurement"] == "in"
 
 
-async def test_template(hass: HomeAssistant) -> None:
-    """Test command sensor with template."""
-    await setup_test_entities(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "echo 50",
-            "unit_of_measurement": "in",
-            "value_template": "{{ value | multiply(0.1) }}",
-        },
-    )
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo 50",
+                        "unit_of_measurement": "in",
+                        "value_template": "{{ value | multiply(0.1) }}",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_template(hass: HomeAssistant, load_yaml_integration: None) -> None:
+    """Test command sensor with template."""
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert float(entity_state.state) == 5
 
 
-async def test_template_render(hass: HomeAssistant) -> None:
-    """Ensure command with templates get rendered properly."""
-
-    await setup_test_entities(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": "echo {{ states.sensor.input_sensor.state }}",
-        },
-    )
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo {{ states.sensor.input_sensor.state }}",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_template_render(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Ensure command with templates get rendered properly."""
+    hass.states.async_set("sensor.input_sensor", "sensor_value")
 
     # Give time for template to load
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(minutes=1),
+        dt_util.utcnow() + timedelta(minutes=1),
     )
     await hass.async_block_till_done()
 
@@ -86,87 +141,153 @@ async def test_template_render(hass: HomeAssistant) -> None:
 
 async def test_template_render_with_quote(hass: HomeAssistant) -> None:
     """Ensure command with templates and quotes get rendered properly."""
+    hass.states.async_set("sensor.input_sensor", "sensor_value")
+    await setup.async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": 'echo "{{ states.sensor.input_sensor.state }}" "3 4"',
+                    }
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
 
     with patch(
         "homeassistant.components.command_line.utils.subprocess.check_output",
         return_value=b"Works\n",
     ) as check_output:
-        await setup_test_entities(
-            hass,
-            {
-                "command": 'echo "{{ states.sensor.input_sensor.state }}" "3 4"',
-            },
-        )
-
         # Give time for template to load
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=1),
+            dt_util.utcnow() + timedelta(minutes=1),
         )
         await hass.async_block_till_done()
 
-        assert len(check_output.mock_calls) == 2
+        assert len(check_output.mock_calls) == 1
         check_output.assert_called_with(
             'echo "sensor_value" "3 4"',
-            shell=True,  # nosec # shell by design
+            shell=True,  # noqa: S604 # shell by design
             timeout=15,
             close_fds=False,
         )
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo {{ this template doesn't parse",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_bad_template_render(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, get_config: dict[str, Any]
 ) -> None:
     """Test rendering a broken template."""
-
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "echo {{ this template doesn't parse",
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
 
     assert "Error rendering command template" in caplog.text
 
 
-async def test_bad_command(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "asdfasdf",
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_bad_command(hass: HomeAssistant, get_config: dict[str, Any]) -> None:
     """Test bad command."""
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "asdfasdf",
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.state == "unknown"
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "exit 33",
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_return_code(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, get_config: dict[str, Any]
 ) -> None:
     """Test that an error return code is logged."""
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "exit 33",
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
+
     assert "return code 33" in caplog.text
 
 
-async def test_update_with_json_attrs(hass: HomeAssistant) -> None:
-    """Test attributes get extracted from a JSON result."""
-    await setup_test_entities(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": (
-                'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
-                '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
-            ),
-            "json_attributes": ["key", "another_key", "key_three"],
-        },
-    )
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": (
+                            'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
+                            '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
+                        ),
+                        "json_attributes": ["key", "another_key", "key_three"],
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_update_with_json_attrs(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Test attributes get extracted from a JSON result."""
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.state == "unknown"
@@ -175,19 +296,30 @@ async def test_update_with_json_attrs(hass: HomeAssistant) -> None:
     assert entity_state.attributes["key_three"] == "value_three"
 
 
-async def test_update_with_json_attrs_and_value_template(hass: HomeAssistant) -> None:
-    """Test json_attributes can be used together with value_template."""
-    await setup_test_entities(
-        hass,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            "command": (
-                'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
-                '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
-            ),
-            "json_attributes": ["key", "another_key", "key_three"],
-            "value_template": '{{ value_json["key"] }}',
-        },
-    )
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": (
+                            'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
+                            '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
+                        ),
+                        "json_attributes": ["key", "another_key", "key_three"],
+                        "value_template": '{{ value_json["key"] }}',
+                    }
+                }
+            ]
+        }
+    ],
+)
+async def test_update_with_json_attrs_and_value_template(
+    hass: HomeAssistant, load_yaml_integration: None
+) -> None:
+    """Test json_attributes can be used together with value_template."""
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.state == "some_json_value"
@@ -196,75 +328,134 @@ async def test_update_with_json_attrs_and_value_template(hass: HomeAssistant) ->
     assert entity_state.attributes["key_three"] == "value_three"
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo",
+                        "json_attributes": ["key"],
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_update_with_json_attrs_no_data(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, get_config: dict[str, Any]
 ) -> None:
     """Test attributes when no JSON result fetched."""
-
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "echo",
-            "json_attributes": ["key"],
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert "key" not in entity_state.attributes
     assert "Empty reply found when expecting JSON data" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo [1, 2, 3]",
+                        "json_attributes": ["key"],
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_update_with_json_attrs_not_dict(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, get_config: dict[str, Any]
 ) -> None:
     """Test attributes when the return value not a dict."""
-
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "echo [1, 2, 3]",
-            "json_attributes": ["key"],
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert "key" not in entity_state.attributes
     assert "JSON result was not a dictionary" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": "echo This is text rather than JSON data.",
+                        "json_attributes": ["key"],
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_update_with_json_attrs_bad_json(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, get_config: dict[str, Any]
 ) -> None:
     """Test attributes when the return value is invalid JSON."""
-
-    await setup_test_entities(
+    await setup.async_setup_component(
         hass,
-        {
-            "command": "echo This is text rather than JSON data.",
-            "json_attributes": ["key"],
-        },
+        DOMAIN,
+        get_config,
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert "key" not in entity_state.attributes
     assert "Unable to parse output as JSON" in caplog.text
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": (
+                            'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
+                            '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
+                        ),
+                        "json_attributes": [
+                            "key",
+                            "another_key",
+                            "key_three",
+                            "missing_key",
+                        ],
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_update_with_missing_json_attrs(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test attributes when an expected key is missing."""
 
-    await setup_test_entities(
-        hass,
-        {
-            "command": (
-                'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
-                '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
-            ),
-            "json_attributes": ["key", "another_key", "key_three", "missing_key"],
-        },
-    )
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.attributes["key"] == "some_json_value"
@@ -273,21 +464,30 @@ async def test_update_with_missing_json_attrs(
     assert "missing_key" not in entity_state.attributes
 
 
+@pytest.mark.parametrize(
+    "get_config",
+    [
+        {
+            "command_line": [
+                {
+                    "sensor": {
+                        "name": "Test",
+                        "command": (
+                            'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
+                            '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
+                        ),
+                        "json_attributes": ["key", "another_key"],
+                    }
+                }
+            ]
+        }
+    ],
+)
 async def test_update_with_unnecessary_json_attrs(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
+    caplog: pytest.LogCaptureFixture, hass: HomeAssistant, load_yaml_integration: None
 ) -> None:
     """Test attributes when an expected key is missing."""
 
-    await setup_test_entities(
-        hass,
-        {
-            "command": (
-                'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
-                '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
-            ),
-            "json_attributes": ["key", "another_key"],
-        },
-    )
     entity_state = hass.states.get("sensor.test")
     assert entity_state
     assert entity_state.attributes["key"] == "some_json_value"
@@ -295,34 +495,40 @@ async def test_update_with_unnecessary_json_attrs(
     assert "key_three" not in entity_state.attributes
 
 
-async def test_unique_id(
-    hass: HomeAssistant, entity_registry: er.EntityRegistry
-) -> None:
-    """Test unique_id option and if it only creates one sensor per id."""
-    assert await setup.async_setup_component(
-        hass,
-        SENSOR_DOMAIN,
+@pytest.mark.parametrize(
+    "get_config",
+    [
         {
-            SENSOR_DOMAIN: [
+            "command_line": [
                 {
-                    "platform": "command_line",
-                    "unique_id": "unique",
-                    "command": "echo 0",
+                    "sensor": {
+                        "name": "Test",
+                        "unique_id": "unique",
+                        "command": "echo 0",
+                    }
                 },
                 {
-                    "platform": "command_line",
-                    "unique_id": "not-so-unique-anymore",
-                    "command": "echo 1",
+                    "sensor": {
+                        "name": "Test",
+                        "unique_id": "not-so-unique-anymore",
+                        "command": "echo 1",
+                    }
                 },
                 {
-                    "platform": "command_line",
-                    "unique_id": "not-so-unique-anymore",
-                    "command": "echo 2",
+                    "sensor": {
+                        "name": "Test",
+                        "unique_id": "not-so-unique-anymore",
+                        "command": "echo 2",
+                    },
                 },
             ]
-        },
-    )
-    await hass.async_block_till_done()
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, load_yaml_integration: None
+) -> None:
+    """Test unique_id option and if it only creates one sensor per id."""
 
     assert len(hass.states.async_all()) == 2
 
@@ -331,3 +537,108 @@ async def test_unique_id(
     assert entity_registry.async_get_entity_id(
         "sensor", "command_line", "not-so-unique-anymore"
     )
+
+
+async def test_updating_to_often(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling updating when command already running."""
+    called = []
+
+    class MockCommandSensor(CommandSensor):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.sensor.CommandSensor",
+        side_effect=MockCommandSensor,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "sensor": {
+                            "name": "Test",
+                            "command": "echo 1",
+                            "scan_interval": 0.1,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 1
+    assert (
+        "Updating Command Line Sensor Test took longer than the scheduled update interval"
+        not in caplog.text
+    )
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+
+    assert len(called) == 2
+    assert (
+        "Updating Command Line Sensor Test took longer than the scheduled update interval"
+        in caplog.text
+    )
+
+    await asyncio.sleep(0.2)
+
+
+async def test_updating_manually(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling manual updating using homeassistant udate_entity service."""
+    await setup.async_setup_component(hass, HA_DOMAIN, {})
+    called = []
+
+    class MockCommandSensor(CommandSensor):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.sensor.CommandSensor",
+        side_effect=MockCommandSensor,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "sensor": {
+                            "name": "Test",
+                            "command": "echo 1",
+                            "scan_interval": 10,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 1
+
+    await hass.services.async_call(
+        HA_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ["sensor.test"]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert len(called) == 2
+
+    await asyncio.sleep(0.2)
diff --git a/tests/components/command_line/test_switch.py b/tests/components/command_line/test_switch.py
index 69e78379afe668..e5331fbe7dda69 100644
--- a/tests/components/command_line/test_switch.py
+++ b/tests/components/command_line/test_switch.py
@@ -1,17 +1,24 @@
 """The tests for the Command line switch platform."""
 from __future__ import annotations
 
+import asyncio
+from datetime import timedelta
 import json
 import os
 import subprocess
 import tempfile
-from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant import setup
-from homeassistant.components.switch import DOMAIN, SCAN_INTERVAL
+from homeassistant.components.command_line import DOMAIN
+from homeassistant.components.command_line.switch import CommandSwitch
+from homeassistant.components.homeassistant import (
+    DOMAIN as HA_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SCAN_INTERVAL
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     SERVICE_TURN_OFF,
@@ -21,45 +28,45 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+import homeassistant.helpers.issue_registry as ir
 import homeassistant.util.dt as dt_util
 
 from tests.common import async_fire_time_changed
 
 
-async def setup_test_entity(hass: HomeAssistant, config_dict: dict[str, Any]) -> None:
-    """Set up a test command line switch entity."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
-        {
-            DOMAIN: [
-                {"platform": "command_line", "switches": config_dict},
-            ]
-        },
-    )
-    await hass.async_block_till_done()
-
-
-async def test_state_none(hass: HomeAssistant) -> None:
+async def test_state_platform_yaml(hass: HomeAssistant) -> None:
     """Test with none state."""
     with tempfile.TemporaryDirectory() as tempdirname:
         path = os.path.join(tempdirname, "switch_status")
-        await setup_test_entity(
+        assert await setup.async_setup_component(
             hass,
+            SWITCH_DOMAIN,
             {
-                "test": {
-                    "command_on": f"echo 1 > {path}",
-                    "command_off": f"echo 0 > {path}",
-                }
+                SWITCH_DOMAIN: [
+                    {
+                        "platform": "command_line",
+                        "switches": {
+                            "test": {
+                                "command_on": f"echo 1 > {path}",
+                                "command_off": f"echo 0 > {path}",
+                                "friendly_name": "Test",
+                                "icon_template": (
+                                    '{% if value=="1" %} mdi:on {% else %} mdi:off {% endif %}'
+                                ),
+                            }
+                        },
+                    },
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -70,7 +77,7 @@ async def test_state_none(hass: HomeAssistant) -> None:
         assert entity_state.state == STATE_ON
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -80,32 +87,69 @@ async def test_state_none(hass: HomeAssistant) -> None:
         assert entity_state
         assert entity_state.state == STATE_OFF
 
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue(DOMAIN, "deprecated_yaml_switch")
+    assert issue.translation_key == "deprecated_platform_yaml"
+
+
+async def test_state_integration_yaml(hass: HomeAssistant) -> None:
+    """Test with none state."""
+    with tempfile.TemporaryDirectory() as tempdirname:
+        path = os.path.join(tempdirname, "switch_status")
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_on": f"echo 1 > {path}",
+                            "command_off": f"echo 0 > {path}",
+                            "name": "Test",
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+        entity_state = hass.states.get("switch.test")
+        assert entity_state
+        assert entity_state.state == STATE_OFF
+
 
 async def test_state_value(hass: HomeAssistant) -> None:
     """Test with state value."""
     with tempfile.TemporaryDirectory() as tempdirname:
         path = os.path.join(tempdirname, "switch_status")
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_state": f"cat {path}",
-                    "command_on": f"echo 1 > {path}",
-                    "command_off": f"echo 0 > {path}",
-                    "value_template": '{{ value=="1" }}',
-                    "icon_template": (
-                        '{% if value=="1" %} mdi:on {% else %} mdi:off {% endif %}'
-                    ),
-                }
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": f"cat {path}",
+                            "command_on": f"echo 1 > {path}",
+                            "command_off": f"echo 0 > {path}",
+                            "value_template": '{{ value=="1" }}',
+                            "icon": (
+                                '{% if value=="1" %} mdi:on {% else %} mdi:off {% endif %}'
+                            ),
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -117,7 +161,7 @@ async def test_state_value(hass: HomeAssistant) -> None:
         assert entity_state.attributes.get("icon") == "mdi:on"
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -136,28 +180,35 @@ async def test_state_json_value(hass: HomeAssistant) -> None:
         oncmd = json.dumps({"status": "ok"})
         offcmd = json.dumps({"status": "nope"})
 
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_state": f"cat {path}",
-                    "command_on": f"echo '{oncmd}' > {path}",
-                    "command_off": f"echo '{offcmd}' > {path}",
-                    "value_template": '{{ value_json.status=="ok" }}',
-                    "icon_template": (
-                        '{% if value_json.status=="ok" %} mdi:on'
-                        "{% else %} mdi:off {% endif %}"
-                    ),
-                }
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": f"cat {path}",
+                            "command_on": f"echo '{oncmd}' > {path}",
+                            "command_off": f"echo '{offcmd}' > {path}",
+                            "value_template": '{{ value_json.status=="ok" }}',
+                            "icon": (
+                                '{% if value_json.status=="ok" %} mdi:on'
+                                "{% else %} mdi:off {% endif %}"
+                            ),
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -169,7 +220,7 @@ async def test_state_json_value(hass: HomeAssistant) -> None:
         assert entity_state.attributes.get("icon") == "mdi:on"
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -185,23 +236,30 @@ async def test_state_code(hass: HomeAssistant) -> None:
     """Test with state code."""
     with tempfile.TemporaryDirectory() as tempdirname:
         path = os.path.join(tempdirname, "switch_status")
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_state": f"cat {path}",
-                    "command_on": f"echo 1 > {path}",
-                    "command_off": f"echo 0 > {path}",
-                }
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": f"cat {path}",
+                            "command_on": f"echo 1 > {path}",
+                            "command_off": f"echo 0 > {path}",
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -212,7 +270,7 @@ async def test_state_code(hass: HomeAssistant) -> None:
         assert entity_state.state == STATE_ON
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
@@ -228,15 +286,23 @@ async def test_assumed_state_should_be_true_if_command_state_is_none(
 ) -> None:
     """Test with state value."""
 
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
+        DOMAIN,
         {
-            "test": {
-                "command_on": "echo 'on command'",
-                "command_off": "echo 'off command'",
-            }
+            "command_line": [
+                {
+                    "switch": {
+                        "command_on": "echo 'on command'",
+                        "command_off": "echo 'off command'",
+                        "name": "Test",
+                    }
+                }
+            ]
         },
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("switch.test")
     assert entity_state
     assert entity_state.attributes["assumed_state"]
@@ -247,16 +313,24 @@ async def test_assumed_state_should_absent_if_command_state_present(
 ) -> None:
     """Test with state value."""
 
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
+        DOMAIN,
         {
-            "test": {
-                "command_on": "echo 'on command'",
-                "command_off": "echo 'off command'",
-                "command_state": "cat {}",
-            }
+            "command_line": [
+                {
+                    "switch": {
+                        "command_on": "echo 'on command'",
+                        "command_off": "echo 'off command'",
+                        "command_state": "cat {}",
+                        "name": "Test",
+                    }
+                }
+            ]
         },
     )
+    await hass.async_block_till_done()
+
     entity_state = hass.states.get("switch.test")
     assert entity_state
     assert "assumed_state" not in entity_state.attributes
@@ -264,18 +338,24 @@ async def test_assumed_state_should_absent_if_command_state_present(
 
 async def test_name_is_set_correctly(hass: HomeAssistant) -> None:
     """Test that name is set correctly."""
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
+        DOMAIN,
         {
-            "test": {
-                "command_on": "echo 'on command'",
-                "command_off": "echo 'off command'",
-                "friendly_name": "Test friendly name!",
-            }
+            "command_line": [
+                {
+                    "switch": {
+                        "command_on": "echo 'on command'",
+                        "command_off": "echo 'off command'",
+                        "name": "Test friendly name!",
+                    }
+                }
+            ]
         },
     )
+    await hass.async_block_till_done()
 
-    entity_state = hass.states.get("switch.test")
+    entity_state = hass.states.get("switch.test_friendly_name")
     assert entity_state
     assert entity_state.name == "Test friendly name!"
 
@@ -284,16 +364,23 @@ async def test_switch_command_state_fail(
     caplog: pytest.LogCaptureFixture, hass: HomeAssistant
 ) -> None:
     """Test that switch failures are handled correctly."""
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
+        DOMAIN,
         {
-            "test": {
-                "command_on": "exit 0",
-                "command_off": "exit 0'",
-                "command_state": "echo 1",
-            }
+            "command_line": [
+                {
+                    "switch": {
+                        "command_on": "exit 0",
+                        "command_off": "exit 0'",
+                        "command_state": "echo 1",
+                        "name": "Test",
+                    }
+                }
+            ]
         },
     )
+    await hass.async_block_till_done()
 
     async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
     await hass.async_block_till_done()
@@ -303,7 +390,7 @@ async def test_switch_command_state_fail(
     assert entity_state.state == "on"
 
     await hass.services.async_call(
-        DOMAIN,
+        SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.test"},
         blocking=True,
@@ -329,16 +416,24 @@ async def test_switch_command_state_code_exceptions(
             subprocess.SubprocessError(),
         ],
     ) as check_output:
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_on": "exit 0",
-                    "command_off": "exit 0'",
-                    "command_state": "echo 1",
-                }
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_on": "exit 0",
+                            "command_off": "exit 0'",
+                            "command_state": "echo 1",
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
+
         async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
         await hass.async_block_till_done()
         assert check_output.called
@@ -362,17 +457,25 @@ async def test_switch_command_state_value_exceptions(
             subprocess.SubprocessError(),
         ],
     ) as check_output:
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_on": "exit 0",
-                    "command_off": "exit 0'",
-                    "command_state": "echo 1",
-                    "value_template": '{{ value=="1" }}',
-                }
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_on": "exit 0",
+                            "command_off": "exit 0'",
+                            "command_state": "echo 1",
+                            "value_template": '{{ value=="1" }}',
+                            "name": "Test",
+                        }
+                    }
+                ]
             },
         )
+        await hass.async_block_till_done()
+
         async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
         await hass.async_block_till_done()
         assert check_output.call_count == 1
@@ -384,12 +487,24 @@ async def test_switch_command_state_value_exceptions(
         assert "Error trying to exec command" in caplog.text
 
 
-async def test_no_switches(
+async def test_no_switches_platform_yaml(
     caplog: pytest.LogCaptureFixture, hass: HomeAssistant
 ) -> None:
     """Test with no switches."""
 
-    await setup_test_entity(hass, {})
+    assert await setup.async_setup_component(
+        hass,
+        SWITCH_DOMAIN,
+        {
+            SWITCH_DOMAIN: [
+                {
+                    "platform": "command_line",
+                    "switches": {},
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
     assert "No switches" in caplog.text
 
 
@@ -397,26 +512,39 @@ async def test_unique_id(
     hass: HomeAssistant, entity_registry: er.EntityRegistry
 ) -> None:
     """Test unique_id option and if it only creates one switch per id."""
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
+        DOMAIN,
         {
-            "unique": {
-                "command_on": "echo on",
-                "command_off": "echo off",
-                "unique_id": "unique",
-            },
-            "not_unique_1": {
-                "command_on": "echo on",
-                "command_off": "echo off",
-                "unique_id": "not-so-unique-anymore",
-            },
-            "not_unique_2": {
-                "command_on": "echo on",
-                "command_off": "echo off",
-                "unique_id": "not-so-unique-anymore",
-            },
+            "command_line": [
+                {
+                    "switch": {
+                        "command_on": "echo on",
+                        "command_off": "echo off",
+                        "unique_id": "unique",
+                        "name": "Test",
+                    }
+                },
+                {
+                    "switch": {
+                        "command_on": "echo on",
+                        "command_off": "echo off",
+                        "unique_id": "not-so-unique-anymore",
+                        "name": "Test2",
+                    }
+                },
+                {
+                    "switch": {
+                        "command_on": "echo on",
+                        "command_off": "echo off",
+                        "unique_id": "not-so-unique-anymore",
+                        "name": "Test3",
+                    },
+                },
+            ]
         },
     )
+    await hass.async_block_till_done()
 
     assert len(hass.states.async_all()) == 2
 
@@ -432,12 +560,24 @@ async def test_command_failure(
 ) -> None:
     """Test command failure."""
 
-    await setup_test_entity(
+    await setup.async_setup_component(
         hass,
-        {"test": {"command_off": "exit 33"}},
+        DOMAIN,
+        {
+            "command_line": [
+                {
+                    "switch": {
+                        "command_off": "exit 33",
+                        "name": "Test",
+                    }
+                }
+            ]
+        },
     )
+    await hass.async_block_till_done()
+
     await hass.services.async_call(
-        DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: "switch.test"}, blocking=True
+        SWITCH_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: "switch.test"}, blocking=True
     )
     assert "return code 33" in caplog.text
 
@@ -446,29 +586,39 @@ async def test_templating(hass: HomeAssistant) -> None:
     """Test with templating."""
     with tempfile.TemporaryDirectory() as tempdirname:
         path = os.path.join(tempdirname, "switch_status")
-        await setup_test_entity(
+        await setup.async_setup_component(
             hass,
+            DOMAIN,
             {
-                "test": {
-                    "command_state": f"cat {path}",
-                    "command_on": f"echo 1 > {path}",
-                    "command_off": f"echo 0 > {path}",
-                    "value_template": '{{ value=="1" }}',
-                    "icon_template": (
-                        '{% if this.state=="on" %} mdi:on {% else %} mdi:off {% endif %}'
-                    ),
-                },
-                "test2": {
-                    "command_state": f"cat {path}",
-                    "command_on": f"echo 1 > {path}",
-                    "command_off": f"echo 0 > {path}",
-                    "value_template": '{{ value=="1" }}',
-                    "icon_template": (
-                        '{% if states("switch.test2")=="on" %} mdi:on {% else %} mdi:off {% endif %}'
-                    ),
-                },
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": f"cat {path}",
+                            "command_on": f"echo 1 > {path}",
+                            "command_off": f"echo 0 > {path}",
+                            "value_template": '{{ value=="1" }}',
+                            "icon": (
+                                '{% if this.state=="on" %} mdi:on {% else %} mdi:off {% endif %}'
+                            ),
+                            "name": "Test",
+                        }
+                    },
+                    {
+                        "switch": {
+                            "command_state": f"cat {path}",
+                            "command_on": f"echo 1 > {path}",
+                            "command_off": f"echo 0 > {path}",
+                            "value_template": '{{ value=="1" }}',
+                            "icon": (
+                                '{% if states("switch.test2")=="on" %} mdi:on {% else %} mdi:off {% endif %}'
+                            ),
+                            "name": "Test2",
+                        },
+                    },
+                ]
             },
         )
+        await hass.async_block_till_done()
 
         entity_state = hass.states.get("switch.test")
         entity_state2 = hass.states.get("switch.test2")
@@ -476,13 +626,13 @@ async def test_templating(hass: HomeAssistant) -> None:
         assert entity_state2.state == STATE_OFF
 
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test"},
             blocking=True,
         )
         await hass.services.async_call(
-            DOMAIN,
+            SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.test2"},
             blocking=True,
@@ -494,3 +644,114 @@ async def test_templating(hass: HomeAssistant) -> None:
         assert entity_state.attributes.get("icon") == "mdi:on"
         assert entity_state2.state == STATE_ON
         assert entity_state2.attributes.get("icon") == "mdi:on"
+
+
+async def test_updating_to_often(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling updating when command already running."""
+    called = []
+
+    class MockCommandSwitch(CommandSwitch):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.switch.CommandSwitch",
+        side_effect=MockCommandSwitch,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": "echo 1",
+                            "command_on": "echo 2",
+                            "command_off": "echo 3",
+                            "name": "Test",
+                            "scan_interval": 0.1,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert len(called) == 0
+    assert (
+        "Updating Command Line Switch Test took longer than the scheduled update interval"
+        not in caplog.text
+    )
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+
+    assert len(called) == 1
+    assert (
+        "Updating Command Line Switch Test took longer than the scheduled update interval"
+        in caplog.text
+    )
+
+    await asyncio.sleep(0.2)
+
+
+async def test_updating_manually(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test handling manual updating using homeassistant udate_entity service."""
+    await setup.async_setup_component(hass, HA_DOMAIN, {})
+    called = []
+
+    class MockCommandSwitch(CommandSwitch):
+        """Mock entity that updates slow."""
+
+        async def _async_update(self) -> None:
+            """Update slow."""
+            called.append(1)
+            # Add waiting time
+            await asyncio.sleep(1)
+
+    with patch(
+        "homeassistant.components.command_line.switch.CommandSwitch",
+        side_effect=MockCommandSwitch,
+    ):
+        await setup.async_setup_component(
+            hass,
+            DOMAIN,
+            {
+                "command_line": [
+                    {
+                        "switch": {
+                            "command_state": "echo 1",
+                            "command_on": "echo 2",
+                            "command_off": "echo 3",
+                            "name": "Test",
+                            "scan_interval": 10,
+                        }
+                    }
+                ]
+            },
+        )
+        await hass.async_block_till_done()
+
+    async_fire_time_changed(hass, dt_util.now() + timedelta(seconds=10))
+    await hass.async_block_till_done()
+    assert len(called) == 1
+
+    await hass.services.async_call(
+        HA_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: ["switch.test"]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert len(called) == 2
+
+    await asyncio.sleep(0.2)
diff --git a/tests/components/compensation/test_sensor.py b/tests/components/compensation/test_sensor.py
index 59804c6b85415a..5bc5a5e1c3981f 100644
--- a/tests/components/compensation/test_sensor.py
+++ b/tests/components/compensation/test_sensor.py
@@ -223,3 +223,50 @@ async def test_new_state_is_none(hass: HomeAssistant) -> None:
     )
 
     assert last_changed == hass.states.get(expected_entity_id).last_changed
+
+
+@pytest.mark.parametrize(
+    ("lower", "upper"),
+    [
+        (True, False),
+        (False, True),
+        (True, True),
+    ],
+)
+async def test_limits(hass: HomeAssistant, lower: bool, upper: bool) -> None:
+    """Test compensation sensor state."""
+    source = "sensor.test"
+    config = {
+        "compensation": {
+            "test": {
+                "source": source,
+                "data_points": [
+                    [1.0, 0.0],
+                    [3.0, 2.0],
+                    [2.0, 1.0],
+                ],
+                "precision": 2,
+                "lower_limit": lower,
+                "upper_limit": upper,
+                "unit_of_measurement": "a",
+            }
+        }
+    }
+    await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    entity_id = "sensor.compensation_sensor_test"
+
+    hass.states.async_set(source, 0, {})
+    await hass.async_block_till_done()
+    state = hass.states.get(entity_id)
+    value = 0.0 if lower else -1.0
+    assert float(state.state) == value
+
+    hass.states.async_set(source, 5, {})
+    await hass.async_block_till_done()
+    state = hass.states.get(entity_id)
+    value = 2.0 if upper else 4.0
+    assert float(state.state) == value
diff --git a/tests/components/config/test_automation.py b/tests/components/config/test_automation.py
index dcc76d9df0c2c5..11f17199e5a0be 100644
--- a/tests/components/config/test_automation.py
+++ b/tests/components/config/test_automation.py
@@ -1,19 +1,26 @@
 """Test Automation config panel."""
 from http import HTTPStatus
 import json
+from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components import config
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util import yaml
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 async def setup_automation(
     hass, automation_config, stub_blueprint_populate  # noqa: F811
@@ -71,8 +78,11 @@ async def test_update_automation_config(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -84,12 +94,61 @@ async def test_update_automation_config(
 
 
 @pytest.mark.parametrize("automation_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {"action": []},
+            "required key not provided @ data['trigger']",
+        ),
+        (
+            {
+                "trigger": {"platform": "automation"},
+                "action": [],
+            },
+            "Integration 'automation' does not provide trigger support",
+        ),
+        (
+            {
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "condition": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                },
+                "action": [],
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "action": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                },
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "use_blueprint": {"path": "test_event_service.yaml", "input": {}},
+            },
+            "Missing input a_number, service_to_call, trigger_event",
+        ),
+    ],
+)
 async def test_update_automation_config_with_error(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_config_store,
     setup_automation,
     caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
 ) -> None:
     """Test updating automation config with errors."""
     with patch.object(config, "SECTIONS", ["automation"]):
@@ -104,14 +163,70 @@ async def test_update_automation_config_with_error(
 
     resp = await client.post(
         "/api/config/automation/config/moon",
-        data=json.dumps({"action": []}),
+        data=json.dumps(updated_config),
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == []
 
     assert resp.status != HTTPStatus.OK
     result = await resp.json()
-    validation_error = "required key not provided @ data['trigger']"
+    assert result == {"message": f"Message malformed: {validation_error}"}
+    # Assert the validation error is not logged
+    assert validation_error not in caplog.text
+
+
+@pytest.mark.parametrize("automation_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_event_service.yaml",
+                    "input": {
+                        "trigger_event": "test_event",
+                        "service_to_call": "test.automation",
+                        "a_number": 5,
+                    },
+                },
+            },
+            "No substitution found for input blah",
+        ),
+    ],
+)
+async def test_update_automation_config_with_blueprint_substitution_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_config_store,
+    setup_automation,
+    caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
+) -> None:
+    """Test updating automation config with errors."""
+    with patch.object(config, "SECTIONS", ["automation"]):
+        await async_setup_component(hass, "config", {})
+
+    assert sorted(hass.states.async_entity_ids("automation")) == []
+
+    client = await hass_client()
+
+    orig_data = [{"id": "sun"}, {"id": "moon"}]
+    hass_config_store["automations.yaml"] = orig_data
+
+    with patch(
+        "homeassistant.components.blueprint.models.BlueprintInputs.async_substitute",
+        side_effect=yaml.UndefinedSubstitution("blah"),
+    ):
+        resp = await client.post(
+            "/api/config/automation/config/moon",
+            data=json.dumps(updated_config),
+        )
+        await hass.async_block_till_done()
+    assert sorted(hass.states.async_entity_ids("automation")) == []
+
+    assert resp.status != HTTPStatus.OK
+    result = await resp.json()
     assert result == {"message": f"Message malformed: {validation_error}"}
     # Assert the validation error is not logged
     assert validation_error not in caplog.text
@@ -141,8 +256,11 @@ async def test_update_remove_key_automation_config(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -183,8 +301,11 @@ async def test_bad_formatted_automations(
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("automation")) == [
-        "automation.automation_0"
+        "automation.automation_0",
+        "automation.automation_1",
     ]
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
+    assert hass.states.get("automation.automation_1").state == STATE_ON
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index d54abe772769cc..bf94e36a9b4d84 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -216,7 +216,9 @@ def async_supports_options_flow(cls, config_entry):
 
 async def test_remove_entry(hass: HomeAssistant, client) -> None:
     """Test removing an entry via the API."""
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(
+        domain="kitchen_sink", state=core_ce.ConfigEntryState.LOADED
+    )
     entry.add_to_hass(hass)
     resp = await client.delete(f"/api/config/config_entries/entry/{entry.entry_id}")
     assert resp.status == HTTPStatus.OK
@@ -227,7 +229,9 @@ async def test_remove_entry(hass: HomeAssistant, client) -> None:
 
 async def test_reload_entry(hass: HomeAssistant, client) -> None:
     """Test reloading an entry via the API."""
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(
+        domain="kitchen_sink", state=core_ce.ConfigEntryState.LOADED
+    )
     entry.add_to_hass(hass)
     resp = await client.post(
         f"/api/config/config_entries/entry/{entry.entry_id}/reload"
@@ -965,12 +969,14 @@ async def async_step_finish(self, user_input=None):
         }
 
 
-async def test_get(hass: HomeAssistant, hass_ws_client: WebSocketGenerator) -> None:
+async def test_get_single(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
     """Test that we can get a config entry."""
     assert await async_setup_component(hass, "config", {})
     ws_client = await hass_ws_client(hass)
 
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(domain="test", state=core_ce.ConfigEntryState.LOADED)
     entry.add_to_hass(hass)
 
     assert entry.pref_disable_new_entities is False
@@ -978,7 +984,7 @@ async def test_get(hass: HomeAssistant, hass_ws_client: WebSocketGenerator) -> N
 
     await ws_client.send_json_auto_id(
         {
-            "type": "config_entries/get",
+            "type": "config_entries/get_single",
             "entry_id": entry.entry_id,
         }
     )
@@ -987,7 +993,7 @@ async def test_get(hass: HomeAssistant, hass_ws_client: WebSocketGenerator) -> N
     assert response["success"]
     assert response["result"]["config_entry"] == {
         "disabled_by": None,
-        "domain": "demo",
+        "domain": "test",
         "entry_id": entry.entry_id,
         "pref_disable_new_entities": False,
         "pref_disable_polling": False,
@@ -1002,7 +1008,7 @@ async def test_get(hass: HomeAssistant, hass_ws_client: WebSocketGenerator) -> N
 
     await ws_client.send_json_auto_id(
         {
-            "type": "config_entries/get",
+            "type": "config_entries/get_single",
             "entry_id": "blah",
         }
     )
@@ -1021,7 +1027,9 @@ async def test_update_prefrences(
     assert await async_setup_component(hass, "config", {})
     ws_client = await hass_ws_client(hass)
 
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(
+        domain="kitchen_sink", state=core_ce.ConfigEntryState.LOADED
+    )
     entry.add_to_hass(hass)
 
     assert entry.pref_disable_new_entities is False
@@ -1118,7 +1126,9 @@ async def test_disable_entry(
     assert await async_setup_component(hass, "config", {})
     ws_client = await hass_ws_client(hass)
 
-    entry = MockConfigEntry(domain="demo", state=core_ce.ConfigEntryState.LOADED)
+    entry = MockConfigEntry(
+        domain="kitchen_sink", state=core_ce.ConfigEntryState.LOADED
+    )
     entry.add_to_hass(hass)
     assert entry.disabled_by is None
 
@@ -1309,7 +1319,7 @@ async def test_get_matching_entries_ws(
 
     ws_client = await hass_ws_client(hass)
 
-    await ws_client.send_json_auto_id({"type": "config_entries/get_matching"})
+    await ws_client.send_json_auto_id({"type": "config_entries/get"})
     response = await ws_client.receive_json()
     assert response["result"] == [
         {
@@ -1386,7 +1396,7 @@ async def test_get_matching_entries_ws(
 
     await ws_client.send_json_auto_id(
         {
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "comp1",
             "type_filter": "hub",
         }
@@ -1411,7 +1421,7 @@ async def test_get_matching_entries_ws(
 
     await ws_client.send_json_auto_id(
         {
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "type_filter": ["service", "device"],
         }
     )
@@ -1449,7 +1459,7 @@ async def test_get_matching_entries_ws(
 
     await ws_client.send_json_auto_id(
         {
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "type_filter": "hub",
         }
     )
@@ -1492,7 +1502,7 @@ async def test_get_matching_entries_ws(
     ):
         await ws_client.send_json_auto_id(
             {
-                "type": "config_entries/get_matching",
+                "type": "config_entries/get",
                 "type_filter": "hub",
             }
         )
@@ -1578,7 +1588,7 @@ async def test_get_matching_entries_ws(
     ):
         await ws_client.send_json_auto_id(
             {
-                "type": "config_entries/get_matching",
+                "type": "config_entries/get",
                 "type_filter": ["helper"],
             }
         )
@@ -1594,7 +1604,7 @@ async def test_get_matching_entries_ws(
     ):
         await ws_client.send_json_auto_id(
             {
-                "type": "config_entries/get_matching",
+                "type": "config_entries/get",
                 "type_filter": ["device", "hub", "service"],
             }
         )
diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py
index fef7bad9898057..25b465192cf495 100644
--- a/tests/components/config/test_device_registry.py
+++ b/tests/components/config/test_device_registry.py
@@ -7,10 +7,14 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry, MockModule, mock_integration
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import WebSocketGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def client(hass, hass_ws_client):
     """Fixture that can interact with the config manager API."""
diff --git a/tests/components/config/test_script.py b/tests/components/config/test_script.py
index c151157b937e79..34f807e3cc5960 100644
--- a/tests/components/config/test_script.py
+++ b/tests/components/config/test_script.py
@@ -1,19 +1,26 @@
 """Tests for config/script."""
 from http import HTTPStatus
 import json
+from typing import Any
 from unittest.mock import patch
 
 import pytest
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components import config
+from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util import yaml
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture(autouse=True)
 async def setup_script(hass, script_config, stub_blueprint_populate):  # noqa: F811
     """Set up script integration."""
@@ -63,7 +70,12 @@ async def test_update_script_config(
         data=json.dumps({"alias": "Moon updated", "sequence": []}),
     )
     await hass.async_block_till_done()
-    assert sorted(hass.states.async_entity_ids("script")) == ["script.moon"]
+    assert sorted(hass.states.async_entity_ids("script")) == [
+        "script.moon",
+        "script.sun",
+    ]
+    assert hass.states.get("script.moon").state == STATE_OFF
+    assert hass.states.get("script.sun").state == STATE_UNAVAILABLE
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
@@ -75,11 +87,39 @@ async def test_update_script_config(
 
 
 @pytest.mark.parametrize("script_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        ({}, "required key not provided @ data['sequence']"),
+        (
+            {
+                "sequence": {
+                    "condition": "state",
+                    # The UUID will fail being resolved to en entity_id
+                    "entity_id": "abcdabcdabcdabcdabcdabcdabcdabcd",
+                    "state": "blah",
+                }
+            },
+            "Unknown entity registry entry abcdabcdabcdabcdabcdabcdabcdabcd",
+        ),
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_service.yaml",
+                    "input": {},
+                },
+            },
+            "Missing input service_to_call",
+        ),
+    ],
+)
 async def test_update_script_config_with_error(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_config_store,
     caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
 ) -> None:
     """Test updating script config with errors."""
     with patch.object(config, "SECTIONS", ["script"]):
@@ -94,14 +134,68 @@ async def test_update_script_config_with_error(
 
     resp = await client.post(
         "/api/config/script/config/moon",
-        data=json.dumps({}),
+        data=json.dumps(updated_config),
     )
     await hass.async_block_till_done()
     assert sorted(hass.states.async_entity_ids("script")) == []
 
     assert resp.status != HTTPStatus.OK
     result = await resp.json()
-    validation_error = "required key not provided @ data['sequence']"
+    assert result == {"message": f"Message malformed: {validation_error}"}
+    # Assert the validation error is not logged
+    assert validation_error not in caplog.text
+
+
+@pytest.mark.parametrize("script_config", ({},))
+@pytest.mark.parametrize(
+    ("updated_config", "validation_error"),
+    [
+        (
+            {
+                "use_blueprint": {
+                    "path": "test_service.yaml",
+                    "input": {
+                        "service_to_call": "test.automation",
+                    },
+                },
+            },
+            "No substitution found for input blah",
+        ),
+    ],
+)
+async def test_update_script_config_with_blueprint_substitution_error(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_config_store,
+    # setup_automation,
+    caplog: pytest.LogCaptureFixture,
+    updated_config: Any,
+    validation_error: str,
+) -> None:
+    """Test updating script config with errors."""
+    with patch.object(config, "SECTIONS", ["script"]):
+        await async_setup_component(hass, "config", {})
+
+    assert sorted(hass.states.async_entity_ids("script")) == []
+
+    client = await hass_client()
+
+    orig_data = {"sun": {}, "moon": {}}
+    hass_config_store["scripts.yaml"] = orig_data
+
+    with patch(
+        "homeassistant.components.blueprint.models.BlueprintInputs.async_substitute",
+        side_effect=yaml.UndefinedSubstitution("blah"),
+    ):
+        resp = await client.post(
+            "/api/config/script/config/moon",
+            data=json.dumps(updated_config),
+        )
+        await hass.async_block_till_done()
+    assert sorted(hass.states.async_entity_ids("script")) == []
+
+    assert resp.status != HTTPStatus.OK
+    result = await resp.json()
     assert result == {"message": f"Message malformed: {validation_error}"}
     # Assert the validation error is not logged
     assert validation_error not in caplog.text
@@ -127,7 +221,12 @@ async def test_update_remove_key_script_config(
         data=json.dumps({"sequence": []}),
     )
     await hass.async_block_till_done()
-    assert sorted(hass.states.async_entity_ids("script")) == ["script.moon"]
+    assert sorted(hass.states.async_entity_ids("script")) == [
+        "script.moon",
+        "script.sun",
+    ]
+    assert hass.states.get("script.moon").state == STATE_OFF
+    assert hass.states.get("script.sun").state == STATE_UNAVAILABLE
 
     assert resp.status == HTTPStatus.OK
     result = await resp.json()
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index d57ef9768a005d..c985565b1bea48 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -1,6 +1,7 @@
 """Fixtures for component testing."""
 from collections.abc import Generator
-from unittest.mock import patch
+from typing import Any
+from unittest.mock import MagicMock, patch
 
 import pytest
 
@@ -32,3 +33,61 @@ def entity_registry_enabled_by_default() -> Generator[None, None, None]:
         return_value=True,
     ):
         yield
+
+
+# Blueprint test fixtures
+@pytest.fixture(name="stub_blueprint_populate")
+def stub_blueprint_populate_fixture() -> Generator[None, Any, None]:
+    """Stub copying the blueprints to the config folder."""
+    from tests.components.blueprint.common import stub_blueprint_populate_fixture_helper
+
+    yield from stub_blueprint_populate_fixture_helper()
+
+
+# TTS test fixtures
+@pytest.fixture(name="mock_tts_get_cache_files")
+def mock_tts_get_cache_files_fixture():
+    """Mock the list TTS cache function."""
+    from tests.components.tts.common import mock_tts_get_cache_files_fixture_helper
+
+    yield from mock_tts_get_cache_files_fixture_helper()
+
+
+@pytest.fixture(name="mock_tts_init_cache_dir")
+def mock_tts_init_cache_dir_fixture(
+    init_tts_cache_dir_side_effect: Any,
+) -> Generator[MagicMock, None, None]:
+    """Mock the TTS cache dir in memory."""
+    from tests.components.tts.common import mock_tts_init_cache_dir_fixture_helper
+
+    yield from mock_tts_init_cache_dir_fixture_helper(init_tts_cache_dir_side_effect)
+
+
+@pytest.fixture(name="init_tts_cache_dir_side_effect")
+def init_tts_cache_dir_side_effect_fixture() -> Any:
+    """Return the cache dir."""
+    from tests.components.tts.common import (
+        init_tts_cache_dir_side_effect_fixture_helper,
+    )
+
+    return init_tts_cache_dir_side_effect_fixture_helper()
+
+
+@pytest.fixture(name="mock_tts_cache_dir")
+def mock_tts_cache_dir_fixture(
+    tmp_path, mock_tts_init_cache_dir, mock_tts_get_cache_files, request
+):
+    """Mock the TTS cache dir with empty dir."""
+    from tests.components.tts.common import mock_tts_cache_dir_fixture_helper
+
+    yield from mock_tts_cache_dir_fixture_helper(
+        tmp_path, mock_tts_init_cache_dir, mock_tts_get_cache_files, request
+    )
+
+
+@pytest.fixture(name="tts_mutagen_mock")
+def tts_mutagen_mock_fixture():
+    """Mock writing tags."""
+    from tests.components.tts.common import tts_mutagen_mock_fixture_helper
+
+    yield from tts_mutagen_mock_fixture_helper()
diff --git a/tests/components/conversation/snapshots/test_init.ambr b/tests/components/conversation/snapshots/test_init.ambr
index 7284b83cb77166..8ef0cef52f9117 100644
--- a/tests/components/conversation/snapshots/test_init.ambr
+++ b/tests/components/conversation/snapshots/test_init.ambr
@@ -1,20 +1,20 @@
 # serializer version: 1
 # name: test_get_agent_info
   dict({
-    'id': 'mock-entry',
-    'name': 'Mock Title',
+    'id': 'homeassistant',
+    'name': 'Home Assistant',
   })
 # ---
 # name: test_get_agent_info.1
   dict({
-    'id': 'homeassistant',
-    'name': 'Home Assistant',
+    'id': 'mock-entry',
+    'name': 'Mock Title',
   })
 # ---
 # name: test_get_agent_info.2
   dict({
-    'id': 'mock-entry',
-    'name': 'Mock Title',
+    'id': 'homeassistant',
+    'name': 'Home Assistant',
   })
 # ---
 # name: test_get_agent_info.3
@@ -41,6 +41,8 @@
           'el',
           'en',
           'es',
+          'et',
+          'eu',
           'fa',
           'fi',
           'fr',
@@ -56,6 +58,7 @@
           'it',
           'ka',
           'kn',
+          'ko',
           'lb',
           'lt',
           'lv',
@@ -221,14 +224,131 @@
     ]),
   })
 # ---
-# name: test_ws_get_agent_info
+# name: test_turn_on_intent[turn kitchen on-None]
   dict({
-    'attribution': dict({
-      'name': 'Mock assistant',
-      'url': 'https://assist.me',
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_turn_on_intent[turn kitchen on-homeassistant]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
     }),
   })
 # ---
+# name: test_turn_on_intent[turn on kitchen-None]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_turn_on_intent[turn on kitchen-homeassistant]
+  dict({
+    'conversation_id': None,
+    'response': dict({
+      'card': dict({
+      }),
+      'data': dict({
+        'failed': list([
+        ]),
+        'success': list([
+          dict({
+            'id': 'light.kitchen',
+            'name': 'kitchen',
+            'type': <IntentResponseTargetType.ENTITY: 'entity'>,
+          }),
+        ]),
+        'targets': list([
+        ]),
+      }),
+      'language': 'en',
+      'response_type': 'action_done',
+      'speech': dict({
+        'plain': dict({
+          'extra_data': None,
+          'speech': 'Turned on light',
+        }),
+      }),
+    }),
+  })
+# ---
+# name: test_ws_get_agent_info
+  dict({
+    'attribution': None,
+  })
+# ---
 # name: test_ws_get_agent_info.1
   dict({
     'attribution': None,
@@ -248,3 +368,102 @@
     'message': "invalid agent ID for dictionary value @ data['agent_id']. Got 'not_exist'",
   })
 # ---
+# name: test_ws_hass_agent_debug
+  dict({
+    'results': list([
+      dict({
+        'entities': dict({
+          'name': dict({
+            'name': 'name',
+            'text': 'my cool light',
+            'value': 'my cool light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOn',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'name': dict({
+            'name': 'name',
+            'text': 'my cool light',
+            'value': 'my cool light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOff',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'area': dict({
+            'name': 'area',
+            'text': 'kitchen',
+            'value': 'kitchen',
+          }),
+          'domain': dict({
+            'name': 'domain',
+            'text': '',
+            'value': 'light',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassTurnOn',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': True,
+          }),
+        }),
+      }),
+      dict({
+        'entities': dict({
+          'area': dict({
+            'name': 'area',
+            'text': 'kitchen',
+            'value': 'kitchen',
+          }),
+          'domain': dict({
+            'name': 'domain',
+            'text': 'lights',
+            'value': 'light',
+          }),
+          'state': dict({
+            'name': 'state',
+            'text': 'on',
+            'value': 'on',
+          }),
+        }),
+        'intent': dict({
+          'name': 'HassGetState',
+        }),
+        'targets': dict({
+          'light.kitchen': dict({
+            'matched': False,
+          }),
+        }),
+      }),
+      None,
+    ]),
+  })
+# ---
+# name: test_ws_hass_agent_debug.1
+  dict({
+    'name': dict({
+      'name': 'name',
+      'text': 'my cool light',
+      'value': 'my cool light',
+    }),
+  })
+# ---
diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
index 58fe9371e1109b..899fd761d5ebf8 100644
--- a/tests/components/conversation/test_default_agent.py
+++ b/tests/components/conversation/test_default_agent.py
@@ -1,5 +1,5 @@
 """Test for the default agent."""
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -223,3 +223,45 @@ async def test_unexposed_entities_skipped(
     assert result.response.response_type == intent.IntentResponseType.QUERY_ANSWER
     assert len(result.response.matched_states) == 1
     assert result.response.matched_states[0].entity_id == exposed_light.entity_id
+
+
+async def test_trigger_sentences(hass: HomeAssistant, init_components) -> None:
+    """Test registering/unregistering/matching a few trigger sentences."""
+    trigger_sentences = ["It's party time", "It is time to party"]
+    trigger_response = "Cowabunga!"
+
+    agent = await conversation._get_agent_manager(hass).async_get_agent(
+        conversation.HOME_ASSISTANT_AGENT
+    )
+    assert isinstance(agent, conversation.DefaultAgent)
+
+    callback = AsyncMock(return_value=trigger_response)
+    unregister = agent.register_trigger(trigger_sentences, callback)
+
+    result = await conversation.async_converse(hass, "Not the trigger", None, Context())
+    assert result.response.response_type == intent.IntentResponseType.ERROR
+
+    # Using different case and including punctuation
+    test_sentences = ["it's party time!", "IT IS TIME TO PARTY."]
+    for sentence in test_sentences:
+        callback.reset_mock()
+        result = await conversation.async_converse(hass, sentence, None, Context())
+        callback.assert_called_once_with(sentence)
+        assert (
+            result.response.response_type == intent.IntentResponseType.ACTION_DONE
+        ), sentence
+        assert result.response.speech == {
+            "plain": {"speech": trigger_response, "extra_data": None}
+        }
+
+    unregister()
+
+    # Should produce errors now
+    callback.reset_mock()
+    for sentence in test_sentences:
+        result = await conversation.async_converse(hass, sentence, None, Context())
+        assert (
+            result.response.response_type == intent.IntentResponseType.ERROR
+        ), sentence
+
+    assert len(callback.mock_calls) == 0
diff --git a/tests/components/conversation/test_init.py b/tests/components/conversation/test_init.py
index 54e7020fdda5c3..6ad9beb3362160 100644
--- a/tests/components/conversation/test_init.py
+++ b/tests/components/conversation/test_init.py
@@ -12,6 +12,7 @@
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.const import ATTR_FRIENDLY_NAME
 from homeassistant.core import Context, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     area_registry as ar,
     device_registry as dr,
@@ -873,7 +874,7 @@ async def test_http_processing_intent_conversion_not_expose_new(
 @pytest.mark.parametrize("agent_id", AGENT_ID_OPTIONS)
 @pytest.mark.parametrize("sentence", ("turn on kitchen", "turn kitchen on"))
 async def test_turn_on_intent(
-    hass: HomeAssistant, init_components, sentence, agent_id
+    hass: HomeAssistant, init_components, sentence, agent_id, snapshot
 ) -> None:
     """Test calling the turn on intent."""
     hass.states.async_set("light.kitchen", "off")
@@ -882,8 +883,13 @@ async def test_turn_on_intent(
     data = {conversation.ATTR_TEXT: sentence}
     if agent_id is not None:
         data[conversation.ATTR_AGENT_ID] = agent_id
-    await hass.services.async_call("conversation", "process", data)
-    await hass.async_block_till_done()
+    result = await hass.services.async_call(
+        "conversation",
+        "process",
+        data,
+        blocking=True,
+        return_response=True,
+    )
 
     assert len(calls) == 1
     call = calls[0]
@@ -891,6 +897,22 @@ async def test_turn_on_intent(
     assert call.service == "turn_on"
     assert call.data == {"entity_id": ["light.kitchen"]}
 
+    assert result == snapshot
+
+
+async def test_service_fails(hass: HomeAssistant, init_components) -> None:
+    """Test calling the turn on intent."""
+    with pytest.raises(HomeAssistantError), patch(
+        "homeassistant.components.conversation.async_converse",
+        side_effect=intent.IntentHandleError,
+    ):
+        await hass.services.async_call(
+            "conversation",
+            "process",
+            {"text": "bla"},
+            blocking=True,
+        )
+
 
 @pytest.mark.parametrize("sentence", ("turn off kitchen", "turn kitchen off"))
 async def test_turn_off_intent(hass: HomeAssistant, init_components, sentence) -> None:
@@ -1032,16 +1054,16 @@ async def test_http_api_wrong_data(
     assert resp.status == HTTPStatus.BAD_REQUEST
 
 
-@pytest.mark.parametrize("agent_id", (None, "mock-entry"))
 async def test_custom_agent(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
     hass_admin_user: MockUser,
     mock_agent,
-    agent_id,
 ) -> None:
     """Test a custom conversation agent."""
+    assert await async_setup_component(hass, "homeassistant", {})
     assert await async_setup_component(hass, "conversation", {})
+    assert await async_setup_component(hass, "intent", {})
 
     client = await hass_client()
 
@@ -1049,9 +1071,8 @@ async def test_custom_agent(
         "text": "Test Text",
         "conversation_id": "test-conv-id",
         "language": "test-language",
+        "agent_id": mock_agent.agent_id,
     }
-    if agent_id is not None:
-        data["agent_id"] = agent_id
 
     resp = await client.post("/api/conversation/process", json=data)
     assert resp.status == HTTPStatus.OK
@@ -1371,6 +1392,7 @@ async def test_non_default_response(hass: HomeAssistant, init_components) -> Non
             text="open the front door",
             context=Context(),
             conversation_id=None,
+            device_id=None,
             language=hass.config.language,
         )
     )
@@ -1576,8 +1598,7 @@ async def test_get_agent_info(
     """Test get agent info."""
     agent_info = conversation.async_get_agent_info(hass)
     # Test it's the default
-    assert agent_info.id == mock_agent.agent_id
-    assert agent_info == snapshot
+    assert conversation.async_get_agent_info(hass, "homeassistant") == agent_info
     assert conversation.async_get_agent_info(hass, "homeassistant") == snapshot
     assert conversation.async_get_agent_info(hass, mock_agent.agent_id) == snapshot
     assert conversation.async_get_agent_info(hass, "not exist") is None
@@ -1625,3 +1646,51 @@ async def test_ws_get_agent_info(
     msg = await client.receive_json()
     assert not msg["success"]
     assert msg["error"] == snapshot
+
+
+async def test_ws_hass_agent_debug(
+    hass: HomeAssistant,
+    init_components,
+    hass_ws_client: WebSocketGenerator,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test homeassistant agent debug websocket command."""
+    client = await hass_ws_client(hass)
+
+    kitchen_area = area_registry.async_create("kitchen")
+    entity_registry.async_get_or_create(
+        "light", "demo", "1234", suggested_object_id="kitchen"
+    )
+    entity_registry.async_update_entity(
+        "light.kitchen",
+        aliases={"my cool light"},
+        area_id=kitchen_area.id,
+    )
+    hass.states.async_set("light.kitchen", "off")
+
+    on_calls = async_mock_service(hass, LIGHT_DOMAIN, "turn_on")
+    off_calls = async_mock_service(hass, LIGHT_DOMAIN, "turn_off")
+
+    await client.send_json_auto_id(
+        {
+            "type": "conversation/agent/homeassistant/debug",
+            "sentences": [
+                "turn on my cool light",
+                "turn my cool light off",
+                "turn on all lights in the kitchen",
+                "how many lights are on in the kitchen?",
+                "this will not match anything",  # null in results
+            ],
+        }
+    )
+
+    msg = await client.receive_json()
+
+    assert msg["success"]
+    assert msg["result"] == snapshot
+
+    # Light state should not have been changed
+    assert len(on_calls) == 0
+    assert len(off_calls) == 0
diff --git a/tests/components/conversation/test_trigger.py b/tests/components/conversation/test_trigger.py
new file mode 100644
index 00000000000000..522162fa457df9
--- /dev/null
+++ b/tests/components/conversation/test_trigger.py
@@ -0,0 +1,190 @@
+"""Test conversation triggers."""
+import pytest
+import voluptuous as vol
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import trigger
+from homeassistant.setup import async_setup_component
+
+from tests.common import async_mock_service
+
+
+@pytest.fixture
+def calls(hass):
+    """Track calls to a mock service."""
+    return async_mock_service(hass, "test", "automation")
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass):
+    """Initialize components."""
+    assert await async_setup_component(hass, "homeassistant", {})
+    assert await async_setup_component(hass, "conversation", {})
+
+
+async def test_if_fires_on_event(hass: HomeAssistant, calls, setup_comp) -> None:
+    """Test the firing of events."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {
+                    "platform": "conversation",
+                    "command": [
+                        "Hey yo",
+                        "Ha ha ha",
+                    ],
+                },
+                "action": {
+                    "service": "test.automation",
+                    "data_template": {"data": "{{ trigger }}"},
+                },
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "Ha ha ha",
+        },
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["data"] == {
+        "alias": None,
+        "id": "0",
+        "idx": "0",
+        "platform": "conversation",
+        "sentence": "Ha ha ha",
+    }
+
+
+async def test_same_trigger_multiple_sentences(
+    hass: HomeAssistant, calls, setup_comp
+) -> None:
+    """Test matching of multiple sentences from the same trigger."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {
+                    "platform": "conversation",
+                    "command": ["hello", "hello[ world]"],
+                },
+                "action": {
+                    "service": "test.automation",
+                    "data_template": {"data": "{{ trigger }}"},
+                },
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "hello",
+        },
+        blocking=True,
+    )
+
+    # Only triggers once
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["data"] == {
+        "alias": None,
+        "id": "0",
+        "idx": "0",
+        "platform": "conversation",
+        "sentence": "hello",
+    }
+
+
+async def test_same_sentence_multiple_triggers(
+    hass: HomeAssistant, calls, setup_comp
+) -> None:
+    """Test use of the same sentence in multiple triggers."""
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": [
+                {
+                    "trigger": {
+                        "id": "trigger1",
+                        "platform": "conversation",
+                        "command": [
+                            "hello",
+                        ],
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"data": "{{ trigger }}"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "id": "trigger2",
+                        "platform": "conversation",
+                        "command": [
+                            "hello[ world]",
+                        ],
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"data": "{{ trigger }}"},
+                    },
+                },
+            ],
+        },
+    )
+
+    await hass.services.async_call(
+        "conversation",
+        "process",
+        {
+            "text": "hello",
+        },
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+
+    # The calls may come in any order
+    call_datas: set[tuple[str, str, str]] = set()
+    for call in calls:
+        call_data = call.data["data"]
+        call_datas.add((call_data["id"], call_data["platform"], call_data["sentence"]))
+
+    assert call_datas == {
+        ("trigger1", "conversation", "hello"),
+        ("trigger2", "conversation", "hello"),
+    }
+
+
+@pytest.mark.parametrize(
+    "command",
+    ["hello?", "hello!", "4 a.m."],
+)
+async def test_fails_on_punctuation(hass: HomeAssistant, command: str) -> None:
+    """Test that validation fails when sentences contain punctuation."""
+    with pytest.raises(vol.Invalid):
+        await trigger.async_validate_trigger_config(
+            hass,
+            [
+                {
+                    "id": "trigger1",
+                    "platform": "conversation",
+                    "command": [
+                        command,
+                    ],
+                },
+            ],
+        )
diff --git a/tests/components/cover/test_device_action.py b/tests/components/cover/test_device_action.py
index 354e840e54869a..0cc6716bd3c0df 100644
--- a/tests/components/cover/test_device_action.py
+++ b/tests/components/cover/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Cover device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -12,12 +13,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.mark.parametrize(
@@ -57,7 +61,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -66,7 +70,7 @@ async def test_get_actions(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
+            entity_entry.entity_id, "attributes", {"supported_features": features_state}
         )
     await hass.async_block_till_done()
 
@@ -76,7 +80,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -84,7 +88,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -110,7 +114,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -125,7 +129,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["close"]
@@ -133,7 +137,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -186,6 +190,57 @@ async def test_get_action_capabilities(
         assert capabilities == {"extra_fields": []}
 
 
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover action."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init(empty=True)
+    platform.ENTITIES.append(
+        platform.MockCover(
+            name="Set position cover",
+            is_on=True,
+            unique_id="unique_set_pos_cover",
+            current_cover_position=50,
+            supported_features=CoverEntityFeature.OPEN
+            | CoverEntityFeature.CLOSE
+            | CoverEntityFeature.STOP
+            | CoverEntityFeature.OPEN_TILT
+            | CoverEntityFeature.CLOSE_TILT
+            | CoverEntityFeature.STOP_TILT,
+        ),
+    )
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == 5  # open, close, open_tilt, close_tilt
+    action_types = {action["type"] for action in actions}
+    assert action_types == {"open", "close", "stop", "open_tilt", "close_tilt"}
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        assert capabilities == {"extra_fields": []}
+
+
 async def test_get_action_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -294,11 +349,13 @@ async def test_get_action_capabilities_set_tilt_pos(
             assert capabilities == {"extra_fields": []}
 
 
-async def test_action(hass: HomeAssistant, enable_custom_integrations: None) -> None:
+async def test_action(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
     """Test for cover actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -310,7 +367,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "open",
                     },
                 },
@@ -319,7 +376,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "close",
                     },
                 },
@@ -328,7 +385,7 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "stop",
                     },
                 },
@@ -359,14 +416,62 @@ async def test_action(hass: HomeAssistant, enable_custom_integrations: None) ->
     assert len(close_calls) == 1
     assert len(stop_calls) == 1
 
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+    assert close_calls[0].domain == DOMAIN
+    assert close_calls[0].service == "close_cover"
+    assert close_calls[0].data == {"entity_id": entry.entity_id}
+    assert stop_calls[0].domain == DOMAIN
+    assert stop_calls[0].service == "stop_cover"
+    assert stop_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for cover actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_open"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
+                        "type": "open",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    open_calls = async_mock_service(hass, "cover", "open_cover")
+
+    hass.bus.async_fire("test_event_open")
+    await hass.async_block_till_done()
+    assert len(open_calls) == 1
+
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+
 
 async def test_action_tilt(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for cover tilt actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -378,7 +483,7 @@ async def test_action_tilt(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "open_tilt",
                     },
                 },
@@ -387,7 +492,7 @@ async def test_action_tilt(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "close_tilt",
                     },
                 },
@@ -414,14 +519,21 @@ async def test_action_tilt(
     assert len(open_calls) == 1
     assert len(close_calls) == 1
 
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open_cover_tilt"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+    assert close_calls[0].domain == DOMAIN
+    assert close_calls[0].service == "close_cover_tilt"
+    assert close_calls[0].data == {"entity_id": entry.entity_id}
+
 
 async def test_action_set_position(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for cover set position actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -436,7 +548,7 @@ async def test_action_set_position(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "set_position",
                         "position": 25,
                     },
@@ -449,7 +561,7 @@ async def test_action_set_position(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "set_tilt_position",
                         "position": 75,
                     },
@@ -465,11 +577,16 @@ async def test_action_set_position(
     hass.bus.async_fire("test_event_set_pos")
     await hass.async_block_till_done()
     assert len(cover_pos_calls) == 1
-    assert cover_pos_calls[0].data["position"] == 25
     assert len(tilt_pos_calls) == 0
 
     hass.bus.async_fire("test_event_set_tilt_pos")
     await hass.async_block_till_done()
     assert len(cover_pos_calls) == 1
     assert len(tilt_pos_calls) == 1
-    assert tilt_pos_calls[0].data["tilt_position"] == 75
+
+    assert cover_pos_calls[0].domain == DOMAIN
+    assert cover_pos_calls[0].service == "set_cover_position"
+    assert cover_pos_calls[0].data == {"entity_id": entry.entity_id, "position": 25}
+    assert tilt_pos_calls[0].domain == DOMAIN
+    assert tilt_pos_calls[0].service == "set_cover_tilt_position"
+    assert tilt_pos_calls[0].data == {"entity_id": entry.entity_id, "tilt_position": 75}
diff --git a/tests/components/cover/test_device_condition.py b/tests/components/cover/test_device_condition.py
index d8f9b9547fd459..bfde3a0b514855 100644
--- a/tests/components/cover/test_device_condition.py
+++ b/tests/components/cover/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Cover device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -20,12 +21,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -85,7 +89,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -105,7 +109,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -113,7 +117,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -139,7 +143,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -154,7 +158,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_open", "is_closed", "is_opening", "is_closing"]
@@ -162,7 +166,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -199,6 +203,43 @@ async def test_get_condition_capabilities(
         assert capabilities == {"extra_fields": []}
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover condition."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    assert len(conditions) == 4
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == {"extra_fields": []}
+
+
 async def test_get_condition_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -313,9 +354,13 @@ async def test_get_condition_capabilities_set_tilt_pos(
             assert capabilities == {"extra_fields": []}
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("cover.entity", STATE_OPEN)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
 
     assert await async_setup_component(
         hass,
@@ -329,7 +374,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_open",
                         }
                     ],
@@ -351,7 +396,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_closed",
                         }
                     ],
@@ -373,7 +418,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_opening",
                         }
                     ],
@@ -395,7 +440,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "cover.entity",
+                            "entity_id": entry.id,
                             "type": "is_closing",
                         }
                     ],
@@ -419,21 +464,21 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_open - event - test_event1"
 
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_closed - event - test_event2"
 
-    hass.states.async_set("cover.entity", STATE_OPENING)
+    hass.states.async_set(entry.entity_id, STATE_OPENING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_opening - event - test_event3"
 
-    hass.states.async_set("cover.entity", STATE_CLOSING)
+    hass.states.async_set(entry.entity_id, STATE_CLOSING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event4")
     await hass.async_block_till_done()
@@ -441,8 +486,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[3].data["some"] == "is_closing - event - test_event4"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_open",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_open "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_open - event - test_event1"
+
+
 async def test_if_position(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
@@ -454,6 +545,8 @@ async def test_if_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -467,7 +560,7 @@ async def test_if_position(
                                 "condition": "device",
                                 "domain": DOMAIN,
                                 "device_id": "",
-                                "entity_id": ent.entity_id,
+                                "entity_id": entry.id,
                                 "type": "is_position",
                                 "above": 45,
                             },
@@ -501,7 +594,7 @@ async def test_if_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_position",
                             "below": 90,
                         }
@@ -524,7 +617,7 @@ async def test_if_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_position",
                             "above": 45,
                             "below": 90,
@@ -593,6 +686,7 @@ async def test_if_position(
 
 async def test_if_tilt_position(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
@@ -604,6 +698,8 @@ async def test_if_tilt_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -617,7 +713,7 @@ async def test_if_tilt_position(
                                 "condition": "device",
                                 "domain": DOMAIN,
                                 "device_id": "",
-                                "entity_id": ent.entity_id,
+                                "entity_id": entry.id,
                                 "type": "is_tilt_position",
                                 "above": 45,
                             },
@@ -651,7 +747,7 @@ async def test_if_tilt_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_tilt_position",
                             "below": 90,
                         }
@@ -674,7 +770,7 @@ async def test_if_tilt_position(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_tilt_position",
                             "above": 45,
                             "below": 90,
diff --git a/tests/components/cover/test_device_trigger.py b/tests/components/cover/test_device_trigger.py
index a9d5d2b6ee1c2f..fc82bbd14993b2 100644
--- a/tests/components/cover/test_device_trigger.py
+++ b/tests/components/cover/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.cover import DOMAIN, CoverEntityFeature
@@ -22,13 +23,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -84,7 +88,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -93,7 +97,7 @@ async def test_get_triggers(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             "attributes",
             {"supported_features": features_state},
         )
@@ -106,7 +110,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in expected_trigger_types
@@ -114,7 +118,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -140,7 +144,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -155,7 +159,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["opened", "closed", "opening", "closing"]
@@ -163,7 +167,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -204,6 +208,45 @@ async def test_get_trigger_capabilities(
         }
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
+) -> None:
+    """Test we get the expected capabilities from a cover trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+    ent = platform.ENTITIES[0]
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", ent.unique_id, device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 4
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
 async def test_get_trigger_capabilities_set_pos(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
@@ -334,9 +377,13 @@ async def test_get_trigger_capabilities_set_tilt_pos(
             }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for state triggers firing."""
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
 
     assert await async_setup_component(
         hass,
@@ -348,7 +395,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "opened",
                     },
                     "action": {
@@ -370,7 +417,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "closed",
                     },
                     "action": {
@@ -392,7 +439,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "opening",
                     },
                     "action": {
@@ -414,7 +461,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "cover.entity",
+                        "entity_id": entry.id,
                         "type": "closing",
                     },
                     "action": {
@@ -436,42 +483,98 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is opened.
-    hass.states.async_set("cover.entity", STATE_OPEN)
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "opened - device - {} - closed - open - None".format("cover.entity")
+    assert (
+        calls[0].data["some"]
+        == f"opened - device - {entry.entity_id} - closed - open - None"
+    )
 
     # Fake that the entity is closed.
-    hass.states.async_set("cover.entity", STATE_CLOSED)
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "closed - device - {} - open - closed - None".format("cover.entity")
+    assert (
+        calls[1].data["some"]
+        == f"closed - device - {entry.entity_id} - open - closed - None"
+    )
 
     # Fake that the entity is opening.
-    hass.states.async_set("cover.entity", STATE_OPENING)
+    hass.states.async_set(entry.entity_id, STATE_OPENING)
     await hass.async_block_till_done()
     assert len(calls) == 3
-    assert calls[2].data[
-        "some"
-    ] == "opening - device - {} - closed - opening - None".format("cover.entity")
+    assert (
+        calls[2].data["some"]
+        == f"opening - device - {entry.entity_id} - closed - opening - None"
+    )
 
     # Fake that the entity is closing.
-    hass.states.async_set("cover.entity", STATE_CLOSING)
+    hass.states.async_set(entry.entity_id, STATE_CLOSING)
     await hass.async_block_till_done()
     assert len(calls) == 4
-    assert calls[3].data[
-        "some"
-    ] == "closing - device - {} - opening - closing - None".format("cover.entity")
+    assert (
+        calls[3].data["some"]
+        == f"closing - device - {entry.entity_id} - opening - closing - None"
+    )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for state triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "opened",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "opened "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is opened.
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"opened - device - {entry.entity_id} - closed - open - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for triggers firing with delay."""
-    entity_id = "cover.entity"
-    hass.states.async_set(entity_id, STATE_CLOSED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLOSED)
 
     assert await async_setup_component(
         hass,
@@ -483,7 +586,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "opened",
                         "for": {"seconds": 5},
                     },
@@ -507,10 +610,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_CLOSED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_OPEN)
+    hass.states.async_set(entry.entity_id, STATE_OPEN)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -519,12 +621,15 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - closed - open - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - closed - open - 0:00:05"
     )
 
 
 async def test_if_fires_on_position(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for position triggers."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -533,6 +638,8 @@ async def test_if_fires_on_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -544,7 +651,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "above": 45,
                         }
@@ -569,7 +676,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "below": 90,
                         }
@@ -594,7 +701,7 @@ async def test_if_fires_on_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "position",
                             "above": 45,
                             "below": 90,
@@ -665,7 +772,10 @@ async def test_if_fires_on_position(
 
 
 async def test_if_fires_on_tilt_position(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for tilt position triggers."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -674,6 +784,8 @@ async def test_if_fires_on_tilt_position(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get(ent.entity_id)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -685,7 +797,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "above": 45,
                         }
@@ -710,7 +822,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "below": 90,
                         }
@@ -735,7 +847,7 @@ async def test_if_fires_on_tilt_position(
                             "platform": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent.entity_id,
+                            "entity_id": entry.id,
                             "type": "tilt_position",
                             "above": 45,
                             "below": 90,
diff --git a/tests/components/daikin/test_init.py b/tests/components/daikin/test_init.py
new file mode 100644
index 00000000000000..8145a7a1e99b7a
--- /dev/null
+++ b/tests/components/daikin/test_init.py
@@ -0,0 +1,128 @@
+"""Define tests for the Daikin init."""
+import asyncio
+from unittest.mock import AsyncMock, PropertyMock, patch
+
+from aiohttp import ClientConnectionError
+import pytest
+
+from homeassistant.components.daikin import update_unique_id
+from homeassistant.components.daikin.const import DOMAIN, KEY_MAC
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
+
+from .test_config_flow import HOST, MAC
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_daikin():
+    """Mock pydaikin."""
+
+    async def mock_daikin_factory(*args, **kwargs):
+        """Mock the init function in pydaikin."""
+        return Appliance
+
+    with patch("homeassistant.components.daikin.Appliance") as Appliance:
+        Appliance.factory.side_effect = mock_daikin_factory
+        type(Appliance).update_status = AsyncMock()
+        type(Appliance).inside_temperature = PropertyMock(return_value=22)
+        type(Appliance).target_temperature = PropertyMock(return_value=22)
+        type(Appliance).zones = PropertyMock(return_value=[("Zone 1", "0", 0)])
+        type(Appliance).fan_rate = PropertyMock(return_value=[])
+        type(Appliance).swing_modes = PropertyMock(return_value=[])
+        yield Appliance
+
+
+DATA = {
+    "ver": "1_1_8",
+    "name": "DaikinAP00000",
+    "mac": MAC,
+    "model": "NOTSUPPORT",
+}
+
+
+INVALID_DATA = {**DATA, "name": None, "mac": HOST}
+
+
+async def test_unique_id_migrate(hass: HomeAssistant, mock_daikin) -> None:
+    """Test unique id migration."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=HOST,
+        title=None,
+        data={CONF_HOST: HOST, KEY_MAC: HOST},
+    )
+    config_entry.add_to_hass(hass)
+    entity_registry = er.async_get(hass)
+    device_registry = dr.async_get(hass)
+
+    type(mock_daikin).mac = PropertyMock(return_value=HOST)
+    type(mock_daikin).values = PropertyMock(return_value=INVALID_DATA)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.unique_id == HOST
+
+    assert device_registry.async_get_device({}, {(KEY_MAC, HOST)}).name is None
+
+    entity = entity_registry.async_get("climate.daikin_127_0_0_1")
+    assert entity.unique_id == HOST
+    assert update_unique_id(entity, MAC) is not None
+
+    assert entity_registry.async_get("switch.none_zone_1").unique_id.startswith(HOST)
+
+    type(mock_daikin).mac = PropertyMock(return_value=MAC)
+    type(mock_daikin).values = PropertyMock(return_value=DATA)
+
+    assert config_entry.unique_id != MAC
+
+    assert await hass.config_entries.async_reload(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.unique_id == MAC
+
+    assert (
+        device_registry.async_get_device({}, {(KEY_MAC, MAC)}).name == "DaikinAP00000"
+    )
+
+    entity = entity_registry.async_get("climate.daikin_127_0_0_1")
+    assert entity.unique_id == MAC
+    assert update_unique_id(entity, MAC) is None
+
+    assert entity_registry.async_get("switch.none_zone_1").unique_id.startswith(MAC)
+
+
+async def test_client_connection_error(hass: HomeAssistant, mock_daikin) -> None:
+    """Test unique id migration."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MAC,
+        data={CONF_HOST: HOST, KEY_MAC: MAC},
+    )
+    config_entry.add_to_hass(hass)
+
+    mock_daikin.factory.side_effect = ClientConnectionError
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+
+
+async def test_timeout_error(hass: HomeAssistant, mock_daikin) -> None:
+    """Test unique id migration."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MAC,
+        data={CONF_HOST: HOST, KEY_MAC: MAC},
+    )
+    config_entry.add_to_hass(hass)
+
+    mock_daikin.factory.side_effect = asyncio.TimeoutError
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/datadog/test_init.py b/tests/components/datadog/test_init.py
index c42d532b8009a0..76956874e737f4 100644
--- a/tests/components/datadog/test_init.py
+++ b/tests/components/datadog/test_init.py
@@ -1,15 +1,13 @@
 """The tests for the Datadog component."""
 from unittest import mock
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import homeassistant.components.datadog as datadog
 from homeassistant.const import (
     EVENT_LOGBOOK_ENTRY,
-    EVENT_STATE_CHANGED,
     STATE_OFF,
     STATE_ON,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -27,7 +25,6 @@ async def test_invalid_config(hass: HomeAssistant) -> None:
 async def test_datadog_setup_full(hass: HomeAssistant) -> None:
     """Test setup with all data."""
     config = {datadog.DOMAIN: {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}}
-    hass.bus.listen = MagicMock()
 
     with patch("homeassistant.components.datadog.initialize") as mock_init, patch(
         "homeassistant.components.datadog.statsd"
@@ -37,15 +34,9 @@ async def test_datadog_setup_full(hass: HomeAssistant) -> None:
         assert mock_init.call_count == 1
         assert mock_init.call_args == mock.call(statsd_host="host", statsd_port=123)
 
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_LOGBOOK_ENTRY
-    assert hass.bus.listen.call_args_list[1][0][0] == EVENT_STATE_CHANGED
-
 
 async def test_datadog_setup_defaults(hass: HomeAssistant) -> None:
     """Test setup with defaults."""
-    hass.bus.listen = mock.MagicMock()
-
     with patch("homeassistant.components.datadog.initialize") as mock_init, patch(
         "homeassistant.components.datadog.statsd"
     ):
@@ -63,13 +54,10 @@ async def test_datadog_setup_defaults(hass: HomeAssistant) -> None:
 
         assert mock_init.call_count == 1
         assert mock_init.call_args == mock.call(statsd_host="host", statsd_port=8125)
-    assert hass.bus.listen.called
 
 
 async def test_logbook_entry(hass: HomeAssistant) -> None:
     """Test event listener."""
-    hass.bus.listen = mock.MagicMock()
-
     with patch("homeassistant.components.datadog.initialize"), patch(
         "homeassistant.components.datadog.statsd"
     ) as mock_statsd:
@@ -79,16 +67,14 @@ async def test_logbook_entry(hass: HomeAssistant) -> None:
             {datadog.DOMAIN: {"host": "host", "rate": datadog.DEFAULT_RATE}},
         )
 
-        assert hass.bus.listen.called
-        handler_method = hass.bus.listen.call_args_list[0][0][1]
-
         event = {
             "domain": "automation",
             "entity_id": "sensor.foo.bar",
             "message": "foo bar biz",
             "name": "triggered something",
         }
-        handler_method(mock.MagicMock(data=event))
+        hass.bus.async_fire(EVENT_LOGBOOK_ENTRY, event)
+        await hass.async_block_till_done()
 
         assert mock_statsd.event.call_count == 1
         assert mock_statsd.event.call_args == mock.call(
@@ -102,8 +88,6 @@ async def test_logbook_entry(hass: HomeAssistant) -> None:
 
 async def test_state_changed(hass: HomeAssistant) -> None:
     """Test event listener."""
-    hass.bus.listen = mock.MagicMock()
-
     with patch("homeassistant.components.datadog.initialize"), patch(
         "homeassistant.components.datadog.statsd"
     ) as mock_statsd:
@@ -119,9 +103,6 @@ async def test_state_changed(hass: HomeAssistant) -> None:
             },
         )
 
-        assert hass.bus.listen.called
-        handler_method = hass.bus.listen.call_args_list[1][0][1]
-
         valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0}
 
         attributes = {"elevation": 3.2, "temperature": 5.0, "up": True, "down": False}
@@ -129,12 +110,12 @@ async def test_state_changed(hass: HomeAssistant) -> None:
         for in_, out in valid.items():
             state = mock.MagicMock(
                 domain="sensor",
-                entity_id="sensor.foo.bar",
+                entity_id="sensor.foobar",
                 state=in_,
                 attributes=attributes,
             )
-            handler_method(mock.MagicMock(data={"new_state": state}))
-
+            hass.states.async_set(state.entity_id, state.state, state.attributes)
+            await hass.async_block_till_done()
             assert mock_statsd.gauge.call_count == 5
 
             for attribute, value in attributes.items():
@@ -160,7 +141,6 @@ async def test_state_changed(hass: HomeAssistant) -> None:
             mock_statsd.gauge.reset_mock()
 
         for invalid in ("foo", "", object):
-            handler_method(
-                mock.MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
-            )
+            hass.states.async_set("domain.test", invalid, {})
+            await hass.async_block_till_done()
             assert not mock_statsd.gauge.called
diff --git a/tests/components/datetime/__init__.py b/tests/components/datetime/__init__.py
new file mode 100644
index 00000000000000..728e6e4a99ddf6
--- /dev/null
+++ b/tests/components/datetime/__init__.py
@@ -0,0 +1 @@
+"""Tests for the datetime component."""
diff --git a/tests/components/datetime/test_init.py b/tests/components/datetime/test_init.py
new file mode 100644
index 00000000000000..66390c8d90f4db
--- /dev/null
+++ b/tests/components/datetime/test_init.py
@@ -0,0 +1,98 @@
+"""The tests for the datetime component."""
+from datetime import datetime, timezone
+from zoneinfo import ZoneInfo
+
+import pytest
+
+from homeassistant.components.datetime import (
+    ATTR_DATETIME,
+    DOMAIN,
+    SERVICE_SET_VALUE,
+    DateTimeEntity,
+)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, CONF_PLATFORM
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+DEFAULT_VALUE = datetime(2020, 1, 1, 12, 0, 0, tzinfo=timezone.utc)
+
+
+class MockDateTimeEntity(DateTimeEntity):
+    """Mock datetime device to use in tests."""
+
+    def __init__(self, native_value: datetime | None = DEFAULT_VALUE) -> None:
+        """Initialize mock datetime entity."""
+        self._attr_native_value = native_value
+
+    async def async_set_value(self, value: datetime) -> None:
+        """Change the date/time."""
+        self._attr_native_value = value
+
+
+async def test_datetime(hass: HomeAssistant, enable_custom_integrations: None) -> None:
+    """Test date/time entity."""
+    hass.config.set_time_zone("UTC")
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    state = hass.states.get("datetime.test")
+    assert state.state == "2020-01-01T01:02:03+00:00"
+    assert state.attributes == {ATTR_FRIENDLY_NAME: "test"}
+
+    # Test updating datetime
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_DATETIME: datetime(2022, 3, 3, 3, 4, 5), ATTR_ENTITY_ID: "datetime.test"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("datetime.test")
+    assert state.state == "2022-03-03T03:04:05+00:00"
+
+    # Test updating datetime with UTC timezone
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_DATETIME: "2022-03-03T03:04:05+00:00", ATTR_ENTITY_ID: "datetime.test"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("datetime.test")
+    assert state.state == "2022-03-03T03:04:05+00:00"
+
+    # Test updating datetime with non UTC timezone
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_DATETIME: "2022-03-03T03:04:05-05:00", ATTR_ENTITY_ID: "datetime.test"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("datetime.test")
+    assert state.state == "2022-03-03T08:04:05+00:00"
+
+    # Test that non UTC timezone gets converted to UTC
+    assert (
+        MockDateTimeEntity(
+            native_value=datetime(2020, 1, 2, 3, 4, 5, tzinfo=ZoneInfo("US/Eastern"))
+        ).state
+        == "2020-01-02T08:04:05+00:00"
+    )
+
+    # Test None state
+    date_entity = MockDateTimeEntity(native_value=None)
+    assert date_entity.state is None
+    assert date_entity.state_attributes is None
+
+    # Test that timezone is required to process state
+    with pytest.raises(ValueError):
+        assert MockDateTimeEntity(
+            native_value=datetime(2020, 1, 2, 3, 4, 5, tzinfo=None)
+        ).state
diff --git a/tests/components/deconz/test_device_trigger.py b/tests/components/deconz/test_device_trigger.py
index d574d6d96470f8..fe2ba8d4177d43 100644
--- a/tests/components/deconz/test_device_trigger.py
+++ b/tests/components/deconz/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
@@ -23,23 +24,27 @@
     CONF_DOMAIN,
     CONF_PLATFORM,
     CONF_TYPE,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.trigger import async_initialize_triggers
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def automation_calls(hass):
     """Track automation calls to a mock service."""
@@ -80,6 +85,10 @@ async def test_get_triggers(
     device = device_registry.async_get_device(
         identifiers={(DECONZ_DOMAIN, "d0:cf:5e:ff:fe:71:a4:3a")}
     )
+    entity_registry = er.async_get(hass)
+    battery_sensor_entry = entity_registry.async_get(
+        "sensor.tradfri_on_off_switch_battery"
+    )
 
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
@@ -137,14 +146,14 @@ async def test_get_triggers(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "sensor.tradfri_on_off_switch_battery",
+            ATTR_ENTITY_ID: battery_sensor_entry.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: ATTR_BATTERY_LEVEL,
             "metadata": {"secondary": True},
         },
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_alarm_event(
@@ -188,6 +197,10 @@ async def test_get_triggers_for_alarm_event(
     device = device_registry.async_get_device(
         identifiers={(DECONZ_DOMAIN, "00:00:00:00:00:00:00:00")}
     )
+    entity_registry = er.async_get(hass)
+    bat_entity = entity_registry.async_get("sensor.keypad_battery")
+    low_bat_entity = entity_registry.async_get("binary_sensor.keypad_low_battery")
+    tamper_entity = entity_registry.async_get("binary_sensor.keypad_tampered")
 
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
@@ -197,7 +210,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_low_battery",
+            ATTR_ENTITY_ID: low_bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_BAT_LOW,
             "metadata": {"secondary": True},
@@ -205,7 +218,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_low_battery",
+            ATTR_ENTITY_ID: low_bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_NOT_BAT_LOW,
             "metadata": {"secondary": True},
@@ -213,7 +226,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_tampered",
+            ATTR_ENTITY_ID: tamper_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_TAMPERED,
             "metadata": {"secondary": True},
@@ -221,7 +234,7 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: BINARY_SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "binary_sensor.keypad_tampered",
+            ATTR_ENTITY_ID: tamper_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: CONF_NOT_TAMPERED,
             "metadata": {"secondary": True},
@@ -229,14 +242,14 @@ async def test_get_triggers_for_alarm_event(
         {
             CONF_DEVICE_ID: device.id,
             CONF_DOMAIN: SENSOR_DOMAIN,
-            ATTR_ENTITY_ID: "sensor.keypad_battery",
+            ATTR_ENTITY_ID: bat_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: ATTR_BATTERY_LEVEL,
             "metadata": {"secondary": True},
         },
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_manage_unsupported_remotes(
@@ -279,7 +292,7 @@ async def test_get_triggers_manage_unsupported_remotes(
 
     expected_triggers = []
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_functional_device_trigger(
@@ -428,7 +441,9 @@ async def test_validate_trigger_unsupported_device(
     )
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_entity_ids(AUTOMATION_DOMAIN)) == 0
+    automations = hass.states.async_entity_ids(AUTOMATION_DOMAIN)
+    assert len(automations) == 1
+    assert hass.states.get(automations[0]).state == STATE_UNAVAILABLE
 
 
 async def test_validate_trigger_unsupported_trigger(
@@ -469,7 +484,9 @@ async def test_validate_trigger_unsupported_trigger(
     )
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_entity_ids(AUTOMATION_DOMAIN)) == 0
+    automations = hass.states.async_entity_ids(AUTOMATION_DOMAIN)
+    assert len(automations) == 1
+    assert hass.states.get(automations[0]).state == STATE_UNAVAILABLE
 
 
 async def test_attach_trigger_no_matching_event(
diff --git a/tests/components/deconz/test_sensor.py b/tests/components/deconz/test_sensor.py
index eb27d9f68d4b2b..4d93df17ba3fba 100644
--- a/tests/components/deconz/test_sensor.py
+++ b/tests/components/deconz/test_sensor.py
@@ -24,7 +24,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
@@ -423,7 +423,7 @@ async def test_no_sensors(
             "entity_id": "sensor.mi_temperature_1",
             "unique_id": "00:15:8d:00:02:45:dc:53-01-0405-humidity",
             "old_unique_id": "00:15:8d:00:02:45:dc:53-01-0405",
-            "state": "35.5",
+            "state": "35.55",
             "entity_category": None,
             "device_class": SensorDeviceClass.HUMIDITY,
             "state_class": SensorStateClass.MEASUREMENT,
@@ -434,10 +434,50 @@ async def test_no_sensors(
                 "device_class": "humidity",
                 "friendly_name": "Mi temperature 1",
             },
+            "options": {
+                "suggested_display_precision": 1,
+            },
             "websocket_event": {"state": {"humidity": 1000}},
             "next_state": "10.0",
         },
     ),
+    (  # Moisture Sensor
+        {
+            "config": {"battery": 100, "offset": 0, "on": True, "reachable": True},
+            "etag": "1ba99c68975111c04367b67cf95ead44",
+            "lastannounced": None,
+            "lastseen": "2023-05-19T09:55Z",
+            "manufacturername": "_TZE200_myd45weu",
+            "modelid": "TS0601",
+            "name": "Soil Sensor",
+            "state": {
+                "lastupdated": "2023-05-19T09:42:00.472",
+                "lowbattery": False,
+                "moisture": 7213,
+            },
+            "swversion": "1.0.8",
+            "type": "ZHAMoisture",
+            "uniqueid": "a4:c1:38:fe:86:8f:07:a3-01-0408",
+        },
+        {
+            "entity_count": 3,
+            "device_count": 3,
+            "entity_id": "sensor.soil_sensor",
+            "unique_id": "a4:c1:38:fe:86:8f:07:a3-01-0408-moisture",
+            "state": "72.13",
+            "entity_category": None,
+            "device_class": SensorDeviceClass.MOISTURE,
+            "state_class": SensorStateClass.MEASUREMENT,
+            "attributes": {
+                "state_class": "measurement",
+                "unit_of_measurement": "%",
+                "device_class": "moisture",
+                "friendly_name": "Soil Sensor",
+            },
+            "websocket_event": {"state": {"moisture": 6923}},
+            "next_state": "69.23",
+        },
+    ),
     (  # Light level sensor
         {
             "config": {
@@ -601,7 +641,7 @@ async def test_no_sensors(
             "entity_id": "sensor.mi_temperature_1",
             "unique_id": "00:15:8d:00:02:45:dc:53-01-0402-temperature",
             "old_unique_id": "00:15:8d:00:02:45:dc:53-01-0402",
-            "state": "21.8",
+            "state": "21.82",
             "entity_category": None,
             "device_class": SensorDeviceClass.TEMPERATURE,
             "state_class": SensorStateClass.MEASUREMENT,
@@ -612,6 +652,9 @@ async def test_no_sensors(
                 "device_class": "temperature",
                 "friendly_name": "Mi temperature 1",
             },
+            "options": {
+                "suggested_display_precision": 1,
+            },
             "websocket_event": {"state": {"temperature": 1800}},
             "next_state": "18.0",
         },
@@ -779,7 +822,7 @@ async def test_sensors(
 
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+            dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/default_config/test_init.py b/tests/components/default_config/test_init.py
index 1f7c08202020c1..f3907aac548055 100644
--- a/tests/components/default_config/test_init.py
+++ b/tests/components/default_config/test_init.py
@@ -7,7 +7,10 @@
 from homeassistant.helpers import recorder as recorder_helper
 from homeassistant.setup import async_setup_component
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/components/demo/conftest.py b/tests/components/demo/conftest.py
index a6182289a86650..0e54587ba4e326 100644
--- a/tests/components/demo/conftest.py
+++ b/tests/components/demo/conftest.py
@@ -1,14 +1,30 @@
 """demo conftest."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.components.light.conftest import mock_light_profiles  # noqa: F401
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture(autouse=True)
 async def setup_homeassistant(hass: HomeAssistant):
     """Set up the homeassistant integration."""
     await async_setup_component(hass, "homeassistant", {})
+
+
+@pytest.fixture
+async def disable_platforms(hass: HomeAssistant) -> None:
+    """Disable platforms to speed up tests."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [],
+    ):
+        yield
diff --git a/tests/components/demo/test_button.py b/tests/components/demo/test_button.py
index 98728c0ffab050..bcaddab433b8d5 100644
--- a/tests/components/demo/test_button.py
+++ b/tests/components/demo/test_button.py
@@ -5,7 +5,7 @@
 import pytest
 
 from homeassistant.components.button import DOMAIN, SERVICE_PRESS
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -13,8 +13,18 @@
 ENTITY_PUSH = "button.push"
 
 
+@pytest.fixture
+async def button_only() -> None:
+    """Enable only the button platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.BUTTON],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_button(hass: HomeAssistant) -> None:
+async def setup_demo_button(hass: HomeAssistant, button_only) -> None:
     """Initialize setup demo button entity."""
     assert await async_setup_component(hass, DOMAIN, {"button": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_camera.py b/tests/components/demo/test_camera.py
index 25c7814961bc5d..132e7bdb09622a 100644
--- a/tests/components/demo/test_camera.py
+++ b/tests/components/demo/test_camera.py
@@ -14,7 +14,7 @@
     async_get_image,
 )
 from homeassistant.components.demo import DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
@@ -22,8 +22,18 @@
 ENTITY_CAMERA = "camera.demo_camera"
 
 
+@pytest.fixture
+async def camera_only() -> None:
+    """Enable only the button platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CAMERA],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def demo_camera(hass):
+async def demo_camera(hass, camera_only):
     """Initialize a demo camera platform."""
     assert await async_setup_component(
         hass, CAMERA_DOMAIN, {CAMERA_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_climate.py b/tests/components/demo/test_climate.py
index 7ce19e2143e05d..fa87c439a4d4f0 100644
--- a/tests/components/demo/test_climate.py
+++ b/tests/components/demo/test_climate.py
@@ -1,4 +1,5 @@
 """The tests for the demo climate component."""
+from unittest.mock import patch
 
 import pytest
 import voluptuous as vol
@@ -40,6 +41,7 @@
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
@@ -50,8 +52,18 @@
 ENTITY_HEATPUMP = "climate.heatpump"
 
 
+@pytest.fixture
+async def climate_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.CLIMATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_climate(hass):
+async def setup_demo_climate(hass, climate_only):
     """Initialize setup demo climate."""
     hass.config.units = METRIC_SYSTEM
     assert await async_setup_component(hass, DOMAIN, {"climate": {"platform": "demo"}})
diff --git a/tests/components/demo/test_cover.py b/tests/components/demo/test_cover.py
index d6b44b06b9aea5..3a8fbb02f80cc9 100644
--- a/tests/components/demo/test_cover.py
+++ b/tests/components/demo/test_cover.py
@@ -1,5 +1,6 @@
 """The tests for the Demo cover platform."""
 from datetime import timedelta
+from unittest.mock import patch
 
 import pytest
 
@@ -27,6 +28,7 @@
     STATE_CLOSING,
     STATE_OPEN,
     STATE_OPENING,
+    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
@@ -39,7 +41,17 @@
 
 
 @pytest.fixture
-async def setup_comp(hass):
+async def cover_only() -> None:
+    """Enable only the climate platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.COVER],
+    ):
+        yield
+
+
+@pytest.fixture
+async def setup_comp(hass, cover_only):
     """Set up demo cover component."""
     with assert_setup_component(1, DOMAIN):
         await async_setup_component(hass, DOMAIN, CONFIG)
diff --git a/tests/components/demo/test_date.py b/tests/components/demo/test_date.py
index c42ba06667e747..d0208c8e6dd6c1 100644
--- a/tests/components/demo/test_date.py
+++ b/tests/components/demo/test_date.py
@@ -1,16 +1,28 @@
 """The tests for the demo date component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.date import ATTR_DATE, DOMAIN, SERVICE_SET_VALUE
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_DATE = "date.date"
 
 
+@pytest.fixture
+async def date_only() -> None:
+    """Enable only the date platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.DATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_date(hass: HomeAssistant) -> None:
+async def setup_demo_date(hass: HomeAssistant, date_only) -> None:
     """Initialize setup demo date."""
     assert await async_setup_component(hass, DOMAIN, {"date": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_datetime.py b/tests/components/demo/test_datetime.py
new file mode 100644
index 00000000000000..41ed6969df39a2
--- /dev/null
+++ b/tests/components/demo/test_datetime.py
@@ -0,0 +1,47 @@
+"""The tests for the demo datetime component."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.datetime import ATTR_DATETIME, DOMAIN, SERVICE_SET_VALUE
+from homeassistant.const import ATTR_ENTITY_ID, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+ENTITY_DATETIME = "datetime.date_and_time"
+
+
+@pytest.fixture
+async def datetime_only() -> None:
+    """Enable only the datetime platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.DATETIME],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_demo_datetime(hass: HomeAssistant, datetime_only) -> None:
+    """Initialize setup demo datetime."""
+    assert await async_setup_component(hass, DOMAIN, {"datetime": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+
+def test_setup_params(hass: HomeAssistant) -> None:
+    """Test the initial parameters."""
+    state = hass.states.get(ENTITY_DATETIME)
+    assert state.state == "2020-01-01T12:00:00+00:00"
+
+
+async def test_set_datetime(hass: HomeAssistant) -> None:
+    """Test set datetime service."""
+    hass.config.set_time_zone("UTC")
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: ENTITY_DATETIME, ATTR_DATETIME: "2021-02-03 01:02:03"},
+        blocking=True,
+    )
+    state = hass.states.get(ENTITY_DATETIME)
+    assert state.state == "2021-02-03T01:02:03+00:00"
diff --git a/tests/components/demo/test_fan.py b/tests/components/demo/test_fan.py
index 773b94b3482378..9c1b84313f6bb9 100644
--- a/tests/components/demo/test_fan.py
+++ b/tests/components/demo/test_fan.py
@@ -32,7 +32,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Initialize components."""
     assert await async_setup_component(hass, fan.DOMAIN, {"fan": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py
index 431db116f36156..8cd176934bcec1 100644
--- a/tests/components/demo/test_geo_location.py
+++ b/tests/components/demo/test_geo_location.py
@@ -21,7 +21,7 @@
 CONFIG = {geo_location.DOMAIN: [{"platform": "demo"}]}
 
 
-async def test_setup_platform(hass: HomeAssistant) -> None:
+async def test_setup_platform(hass: HomeAssistant, disable_platforms) -> None:
     """Test setup of demo platform via configuration."""
     utcnow = dt_util.utcnow()
     # Patching 'utcnow' to gain more control over the timed update.
diff --git a/tests/components/demo/test_humidifier.py b/tests/components/demo/test_humidifier.py
index 565c0ebcad1f86..13aeb5724b9fb0 100644
--- a/tests/components/demo/test_humidifier.py
+++ b/tests/components/demo/test_humidifier.py
@@ -4,6 +4,8 @@
 import voluptuous as vol
 
 from homeassistant.components.humidifier import (
+    ATTR_ACTION,
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MAX_HUMIDITY,
     ATTR_MIN_HUMIDITY,
@@ -30,7 +32,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_humidifier(hass):
+async def setup_demo_humidifier(hass, disable_platforms):
     """Initialize setup demo humidifier."""
     assert await async_setup_component(
         hass, DOMAIN, {"humidifier": {"platform": "demo"}}
@@ -43,6 +45,8 @@ def test_setup_params(hass: HomeAssistant) -> None:
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
     assert state.attributes.get(ATTR_HUMIDITY) == 54
+    assert state.attributes.get(ATTR_CURRENT_HUMIDITY) == 59
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
 
 def test_default_setup_params(hass: HomeAssistant) -> None:
@@ -122,12 +126,14 @@ async def test_turn_on(hass: HomeAssistant) -> None:
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_OFF
+    assert state.attributes.get(ATTR_ACTION) == "off"
 
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_DEHUMIDIFIER}, blocking=True
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
 
 async def test_turn_off(hass: HomeAssistant) -> None:
@@ -137,12 +143,14 @@ async def test_turn_off(hass: HomeAssistant) -> None:
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ACTION) == "drying"
 
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_DEHUMIDIFIER}, blocking=True
     )
     state = hass.states.get(ENTITY_DEHUMIDIFIER)
     assert state.state == STATE_OFF
+    assert state.attributes.get(ATTR_ACTION) == "off"
 
 
 async def test_toggle(hass: HomeAssistant) -> None:
diff --git a/tests/components/demo/test_light.py b/tests/components/demo/test_light.py
index d5a3b7434b2b10..90fa26885dc29f 100644
--- a/tests/components/demo/test_light.py
+++ b/tests/components/demo/test_light.py
@@ -1,4 +1,6 @@
 """The tests for the demo light component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.demo import DOMAIN
@@ -16,15 +18,25 @@
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
 )
-from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_LIGHT = "light.bed_light"
 
 
+@pytest.fixture
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, light_only):
     """Set up demo component."""
     assert await async_setup_component(
         hass, LIGHT_DOMAIN, {LIGHT_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_lock.py b/tests/components/demo/test_lock.py
index d859eaeef94b86..377f9f2d76505f 100644
--- a/tests/components/demo/test_lock.py
+++ b/tests/components/demo/test_lock.py
@@ -28,7 +28,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Set up demo component."""
     assert await async_setup_component(
         hass, LOCK_DOMAIN, {LOCK_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_media_player.py b/tests/components/demo/test_media_player.py
index c9ea785678a05c..1681cdb910162f 100644
--- a/tests/components/demo/test_media_player.py
+++ b/tests/components/demo/test_media_player.py
@@ -23,6 +23,11 @@
 TEST_ENTITY_ID = "media_player.walkman"
 
 
+@pytest.fixture(autouse=True)
+def autouse_disable_platforms(disable_platforms):
+    """Auto use the disable_platforms fixture."""
+
+
 @pytest.fixture(name="mock_media_seek")
 def media_player_media_seek_fixture():
     """Mock demo YouTube player media seek."""
diff --git a/tests/components/demo/test_notify.py b/tests/components/demo/test_notify.py
index 40bc7db2cc323b..96ffcdec96b789 100644
--- a/tests/components/demo/test_notify.py
+++ b/tests/components/demo/test_notify.py
@@ -16,6 +16,11 @@
 CONFIG = {notify.DOMAIN: {"platform": "demo"}}
 
 
+@pytest.fixture(autouse=True)
+def autouse_disable_platforms(disable_platforms):
+    """Auto use the disable_platforms fixture."""
+
+
 @pytest.fixture
 def events(hass):
     """Fixture that catches notify events."""
diff --git a/tests/components/demo/test_number.py b/tests/components/demo/test_number.py
index b87c6690cf57a0..f444b2f483128f 100644
--- a/tests/components/demo/test_number.py
+++ b/tests/components/demo/test_number.py
@@ -1,4 +1,5 @@
 """The tests for the demo number component."""
+from unittest.mock import patch
 
 import pytest
 import voluptuous as vol
@@ -12,7 +13,7 @@
     SERVICE_SET_VALUE,
     NumberMode,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -22,8 +23,18 @@
 ENTITY_SMALL_RANGE = "number.small_range"
 
 
+@pytest.fixture
+async def number_only() -> None:
+    """Enable only the number platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.NUMBER],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_number(hass):
+async def setup_demo_number(hass, number_only):
     """Initialize setup demo Number entity."""
     assert await async_setup_component(hass, DOMAIN, {"number": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_remote.py b/tests/components/demo/test_remote.py
index 943d1fb3886691..d1e5b4007ca583 100644
--- a/tests/components/demo/test_remote.py
+++ b/tests/components/demo/test_remote.py
@@ -18,7 +18,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_component(hass):
+async def setup_component(hass, disable_platforms):
     """Initialize components."""
     assert await async_setup_component(
         hass, remote.DOMAIN, {"remote": {"platform": "demo"}}
diff --git a/tests/components/demo/test_select.py b/tests/components/demo/test_select.py
index 06b8beac5fef18..a4fff2a231e6d5 100644
--- a/tests/components/demo/test_select.py
+++ b/tests/components/demo/test_select.py
@@ -1,4 +1,5 @@
 """The tests for the demo select component."""
+from unittest.mock import patch
 
 import pytest
 
@@ -8,15 +9,25 @@
     DOMAIN,
     SERVICE_SELECT_OPTION,
 )
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_SPEED = "select.speed"
 
 
+@pytest.fixture
+async def select_only() -> None:
+    """Enable only the select platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SELECT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_select(hass: HomeAssistant) -> None:
+async def setup_demo_select(hass: HomeAssistant, select_only) -> None:
     """Initialize setup demo select entity."""
     assert await async_setup_component(hass, DOMAIN, {"select": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_sensor.py b/tests/components/demo/test_sensor.py
index 71c212694c441b..0fbe8f3fa7f908 100644
--- a/tests/components/demo/test_sensor.py
+++ b/tests/components/demo/test_sensor.py
@@ -1,5 +1,6 @@
 """The tests for the demo sensor component."""
 from datetime import timedelta
+from unittest.mock import patch
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -7,12 +8,23 @@
 from homeassistant import core as ha
 from homeassistant.components.demo import DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 from tests.common import mock_restore_cache_with_extra_data
 
 
+@pytest.fixture(autouse=True)
+async def sensor_only() -> None:
+    """Enable only the sensor platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SENSOR],
+    ):
+        yield
+
+
 @pytest.mark.parametrize(("entity_id", "delta"), (("sensor.total_energy_kwh", 0.5),))
 async def test_energy_sensor(
     hass: HomeAssistant, entity_id, delta, freezer: FrozenDateTimeFactory
diff --git a/tests/components/demo/test_siren.py b/tests/components/demo/test_siren.py
index 21c464c7325310..8051aaf5b205c7 100644
--- a/tests/components/demo/test_siren.py
+++ b/tests/components/demo/test_siren.py
@@ -25,7 +25,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_siren(hass):
+async def setup_demo_siren(hass, disable_platforms):
     """Initialize setup demo siren."""
     assert await async_setup_component(hass, DOMAIN, {"siren": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_stt.py b/tests/components/demo/test_stt.py
index 5d4242844eeefe..6ce25135ae02d2 100644
--- a/tests/components/demo/test_stt.py
+++ b/tests/components/demo/test_stt.py
@@ -4,42 +4,38 @@
 
 import pytest
 
-from homeassistant.components import stt
 from homeassistant.components.demo import DOMAIN as DEMO_DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 from tests.typing import ClientSessionGenerator
 
 
 @pytest.fixture
-async def setup_legacy_platform(hass: HomeAssistant) -> None:
-    """Set up legacy demo platform."""
-    assert await async_setup_component(hass, stt.DOMAIN, {"stt": {"platform": "demo"}})
-    await hass.async_block_till_done()
+async def stt_only(hass: HomeAssistant) -> None:
+    """Enable only the stt platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.STT],
+    ):
+        yield
 
 
-@pytest.fixture
-async def setup_config_entry(hass: HomeAssistant) -> None:
+@pytest.fixture(autouse=True)
+async def setup_config_entry(hass: HomeAssistant, stt_only) -> None:
     """Set up demo component from config entry."""
     config_entry = MockConfigEntry(domain=DEMO_DOMAIN)
     config_entry.add_to_hass(hass)
-    with patch(
-        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
-        [Platform.STT],
-    ):
-        assert await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_settings(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
-    response = await client.get("/api/stt/demo")
+    response = await client.get("/api/stt/stt.demo_stt")
     response_data = await response.json()
 
     assert response.status == HTTPStatus.OK
@@ -53,22 +49,20 @@ async def test_demo_settings(hass_client: ClientSessionGenerator) -> None:
     }
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech_no_metadata(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
-    response = await client.post("/api/stt/demo", data=b"Test")
+    response = await client.post("/api/stt/stt.demo_stt", data=b"Test")
     assert response.status == HTTPStatus.BAD_REQUEST
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech_wrong_metadata(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
     response = await client.post(
-        "/api/stt/demo",
+        "/api/stt/stt.demo_stt",
         headers={
             "X-Speech-Content": (
                 "format=wav; codec=pcm; sample_rate=8000; bit_rate=16; channel=1;"
@@ -80,13 +74,12 @@ async def test_demo_speech_wrong_metadata(hass_client: ClientSessionGenerator) -
     assert response.status == HTTPStatus.UNSUPPORTED_MEDIA_TYPE
 
 
-@pytest.mark.usefixtures("setup_legacy_platform")
 async def test_demo_speech(hass_client: ClientSessionGenerator) -> None:
     """Test retrieve settings from demo provider."""
     client = await hass_client()
 
     response = await client.post(
-        "/api/stt/demo",
+        "/api/stt/stt.demo_stt",
         headers={
             "X-Speech-Content": (
                 "format=wav; codec=pcm; sample_rate=16000; bit_rate=16; channel=2;"
diff --git a/tests/components/demo/test_switch.py b/tests/components/demo/test_switch.py
index 30c07b495734ec..95963ba0cbd395 100644
--- a/tests/components/demo/test_switch.py
+++ b/tests/components/demo/test_switch.py
@@ -1,4 +1,6 @@
 """The tests for the demo switch component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.demo import DOMAIN
@@ -7,15 +9,25 @@
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
 )
-from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 SWITCH_ENTITY_IDS = ["switch.decorative_lights", "switch.ac"]
 
 
+@pytest.fixture
+async def switch_only() -> None:
+    """Enable only the switch platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SWITCH],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, switch_only):
     """Set up demo component."""
     assert await async_setup_component(
         hass, SWITCH_DOMAIN, {SWITCH_DOMAIN: {"platform": DOMAIN}}
diff --git a/tests/components/demo/test_text.py b/tests/components/demo/test_text.py
index bfeca29f1dd9da..2b8d8d122a331a 100644
--- a/tests/components/demo/test_text.py
+++ b/tests/components/demo/test_text.py
@@ -1,4 +1,6 @@
 """The tests for the demo text component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.text import (
@@ -9,15 +11,30 @@
     DOMAIN,
     SERVICE_SET_VALUE,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, MAX_LENGTH_STATE_STATE
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_MODE,
+    MAX_LENGTH_STATE_STATE,
+    Platform,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_TEXT = "text.text"
 
 
+@pytest.fixture
+async def text_only() -> None:
+    """Enable only the text platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TEXT],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_text(hass):
+async def setup_demo_text(hass, text_only):
     """Initialize setup demo text."""
     assert await async_setup_component(hass, DOMAIN, {"text": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_time.py b/tests/components/demo/test_time.py
index 555cfe3ffc96a9..efa62c1436b34d 100644
--- a/tests/components/demo/test_time.py
+++ b/tests/components/demo/test_time.py
@@ -1,16 +1,28 @@
 """The tests for the demo time component."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.components.time import ATTR_TIME, DOMAIN, SERVICE_SET_VALUE
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 ENTITY_TIME = "time.time"
 
 
+@pytest.fixture
+async def time_only() -> None:
+    """Enable only the time platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TIME],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_datetime(hass: HomeAssistant) -> None:
+async def setup_demo_datetime(hass: HomeAssistant, time_only) -> None:
     """Initialize setup demo time."""
     assert await async_setup_component(hass, DOMAIN, {"time": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_update.py b/tests/components/demo/test_update.py
index c06483b7bdcc7c..a645c45019c768 100644
--- a/tests/components/demo/test_update.py
+++ b/tests/components/demo/test_update.py
@@ -20,14 +20,25 @@
     ATTR_ENTITY_PICTURE,
     STATE_OFF,
     STATE_ON,
+    Platform,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.setup import async_setup_component
 
 
+@pytest.fixture
+async def update_only() -> None:
+    """Enable only the update platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.UPDATE],
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
-async def setup_demo_update(hass: HomeAssistant) -> None:
+async def setup_demo_update(hass: HomeAssistant, update_only) -> None:
     """Initialize setup demo update entity."""
     assert await async_setup_component(hass, DOMAIN, {"update": {"platform": "demo"}})
     await hass.async_block_till_done()
diff --git a/tests/components/demo/test_vacuum.py b/tests/components/demo/test_vacuum.py
index 8b17e1726a9744..bc003c6e27ba38 100644
--- a/tests/components/demo/test_vacuum.py
+++ b/tests/components/demo/test_vacuum.py
@@ -38,7 +38,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, async_mock_service
 from tests.components.vacuum import common
@@ -52,7 +52,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_demo_vacuum(hass):
+async def setup_demo_vacuum(hass, disable_platforms):
     """Initialize setup demo vacuum."""
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "demo"}})
     await hass.async_block_till_done()
@@ -179,7 +179,7 @@ async def test_methods(hass: HomeAssistant) -> None:
     state = hass.states.get(ENTITY_VACUUM_STATE)
     assert state.state == STATE_RETURNING
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=31))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=31))
     await hass.async_block_till_done()
     state = hass.states.get(ENTITY_VACUUM_STATE)
     assert state.state == STATE_DOCKED
diff --git a/tests/components/demo/test_water_heater.py b/tests/components/demo/test_water_heater.py
index bbe28b8a5e5336..9e45b4e39bf994 100644
--- a/tests/components/demo/test_water_heater.py
+++ b/tests/components/demo/test_water_heater.py
@@ -14,7 +14,7 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_comp(hass):
+async def setup_comp(hass, disable_platforms):
     """Set up demo component."""
     hass.config.units = US_CUSTOMARY_SYSTEM
     assert await async_setup_component(
diff --git a/tests/components/demo/test_weather.py b/tests/components/demo/test_weather.py
index 92005491cef5ad..b2b789a084f448 100644
--- a/tests/components/demo/test_weather.py
+++ b/tests/components/demo/test_weather.py
@@ -20,7 +20,7 @@
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 
-async def test_attributes(hass: HomeAssistant) -> None:
+async def test_attributes(hass: HomeAssistant, disable_platforms) -> None:
     """Test weather attributes."""
     assert await async_setup_component(
         hass, weather.DOMAIN, {"weather": {"platform": "demo"}}
diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py
index c1541812d1b56c..2d1d7a93afc169 100644
--- a/tests/components/derivative/test_sensor.py
+++ b/tests/components/derivative/test_sensor.py
@@ -2,13 +2,18 @@
 from datetime import timedelta
 from math import sin
 import random
-from unittest.mock import patch
 
+from freezegun import freeze_time
+
+from homeassistant.components.derivative.const import DOMAIN
 from homeassistant.const import UnitOfPower, UnitOfTime
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
+from tests.common import MockConfigEntry
+
 
 async def test_state(hass: HomeAssistant) -> None:
     """Test derivative sensor state."""
@@ -26,12 +31,11 @@ async def test_state(hass: HomeAssistant) -> None:
 
     entity_id = config["sensor"]["source"]
     base = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow") as now:
-        now.return_value = base
+    with freeze_time(base) as freezer:
         hass.states.async_set(entity_id, 1, {})
         await hass.async_block_till_done()
 
-        now.return_value += timedelta(seconds=3600)
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
         hass.states.async_set(entity_id, 1, {}, force_update=True)
         await hass.async_block_till_done()
 
@@ -68,9 +72,9 @@ async def setup_tests(hass, config, times, values, expected_state):
 
     # Testing a energy sensor with non-monotonic intervals and values
     base = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow") as now:
+    with freeze_time(base) as freezer:
         for time, value in zip(times, values):
-            now.return_value = base + timedelta(seconds=time)
+            freezer.move_to(base + timedelta(seconds=time))
             hass.states.async_set(entity_id, value, {}, force_update=True)
             await hass.async_block_till_done()
 
@@ -169,18 +173,19 @@ async def test_data_moving_average_for_discrete_sensor(hass: HomeAssistant) -> N
     )  # two minute window
 
     base = dt_util.utcnow()
-    for time, value in zip(times, temperature_values):
-        now = base + timedelta(seconds=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(base) as freezer:
+        for time, value in zip(times, temperature_values):
+            now = base + timedelta(seconds=time)
+            freezer.move_to(now)
             hass.states.async_set(entity_id, value, {}, force_update=True)
             await hass.async_block_till_done()
 
-        if time_window < time < times[-1] - time_window:
-            state = hass.states.get("sensor.power")
-            derivative = round(float(state.state), config["sensor"]["round"])
-            # Test that the error is never more than
-            # (time_window_in_minutes / true_derivative * 100) = 10% + ε
-            assert abs(1 - derivative) <= 0.1 + 1e-6
+            if time_window < time < times[-1] - time_window:
+                state = hass.states.get("sensor.power")
+                derivative = round(float(state.state), config["sensor"]["round"])
+                # Test that the error is never more than
+                # (time_window_in_minutes / true_derivative * 100) = 10% + ε
+                assert abs(1 - derivative) <= 0.1 + 1e-6
 
 
 async def test_data_moving_average_for_irregular_times(hass: HomeAssistant) -> None:
@@ -212,18 +217,19 @@ def temp_function(time):
     )
 
     base = dt_util.utcnow()
-    for time, value in zip(times, temperature_values):
-        now = base + timedelta(seconds=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(base) as freezer:
+        for time, value in zip(times, temperature_values):
+            now = base + timedelta(seconds=time)
+            freezer.move_to(now)
             hass.states.async_set(entity_id, value, {}, force_update=True)
             await hass.async_block_till_done()
 
-        if time_window < time and time > times[3]:
-            state = hass.states.get("sensor.power")
-            derivative = round(float(state.state), config["sensor"]["round"])
-            # Test that the error is never more than
-            # (time_window_in_minutes / true_derivative * 100) = 10% + ε
-            assert abs(0.1 - derivative) <= 0.01 + 1e-6
+            if time_window < time and time > times[3]:
+                state = hass.states.get("sensor.power")
+                derivative = round(float(state.state), config["sensor"]["round"])
+                # Test that the error is never more than
+                # (time_window_in_minutes / true_derivative * 100) = 10% + ε
+                assert abs(0.1 - derivative) <= 0.01 + 1e-6
 
 
 async def test_double_signal_after_delay(hass: HomeAssistant) -> None:
@@ -253,18 +259,19 @@ async def test_double_signal_after_delay(hass: HomeAssistant) -> None:
 
     base = dt_util.utcnow()
     previous = 0
-    for time, value in zip(times, temperature_values):
-        now = base + timedelta(seconds=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(base) as freezer:
+        for time, value in zip(times, temperature_values):
+            now = base + timedelta(seconds=time)
+            freezer.move_to(now)
             hass.states.async_set(entity_id, value, {}, force_update=True)
             await hass.async_block_till_done()
-        state = hass.states.get("sensor.power")
-        derivative = round(float(state.state), config["sensor"]["round"])
-        if time == times[-1]:
-            # Test that the error is never more than
-            # (time_window_in_minutes / true_derivative * 100) = 10% + ε
-            assert abs(previous - derivative) <= 0.01 + 1e-6
-        previous = derivative
+            state = hass.states.get("sensor.power")
+            derivative = round(float(state.state), config["sensor"]["round"])
+            if time == times[-1]:
+                # Test that the error is never more than
+                # (time_window_in_minutes / true_derivative * 100) = 10% + ε
+                assert abs(previous - derivative) <= 0.01 + 1e-6
+            previous = derivative
 
 
 async def test_prefix(hass: HomeAssistant) -> None:
@@ -283,8 +290,7 @@ async def test_prefix(hass: HomeAssistant) -> None:
 
     entity_id = config["sensor"]["source"]
     base = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow") as now:
-        now.return_value = base
+    with freeze_time(base) as freezer:
         hass.states.async_set(
             entity_id,
             1000,
@@ -293,7 +299,7 @@ async def test_prefix(hass: HomeAssistant) -> None:
         )
         await hass.async_block_till_done()
 
-        now.return_value += timedelta(seconds=3600)
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
         hass.states.async_set(
             entity_id,
             1000,
@@ -327,12 +333,11 @@ async def test_suffix(hass: HomeAssistant) -> None:
 
     entity_id = config["sensor"]["source"]
     base = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow") as now:
-        now.return_value = base
+    with freeze_time(base) as freezer:
         hass.states.async_set(entity_id, 1000, {})
         await hass.async_block_till_done()
 
-        now.return_value += timedelta(seconds=10)
+        freezer.move_to(dt_util.utcnow() + timedelta(seconds=3600))
         hass.states.async_set(entity_id, 1000, {}, force_update=True)
         await hass.async_block_till_done()
 
@@ -341,3 +346,48 @@ async def test_suffix(hass: HomeAssistant) -> None:
 
     # Testing a network speed sensor at 1000 bytes/s over 10s  = 10kbytes/s2
     assert round(float(state.state), config["sensor"]["round"]) == 0.0
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Derivative."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    derivative_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "name": "Derivative",
+            "round": 1.0,
+            "source": "sensor.test_source",
+            "time_window": {"seconds": 0.0},
+            "unit_prefix": "k",
+            "unit_time": "min",
+        },
+        title="Derivative",
+    )
+
+    derivative_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(derivative_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    derivative_entity = entity_registry.async_get("sensor.derivative")
+    assert derivative_entity is not None
+    assert derivative_entity.device_id == source_entity.device_id
diff --git a/tests/components/device_automation/test_init.py b/tests/components/device_automation/test_init.py
index 2fdea0a0bb1d29..d0f013299b15ad 100644
--- a/tests/components/device_automation/test_init.py
+++ b/tests/components/device_automation/test_init.py
@@ -28,10 +28,14 @@
     mock_integration,
     mock_platform,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import WebSocketGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def fake_integration(hass):
     """Set up a mock integration with device automation support."""
@@ -110,7 +114,7 @@ async def test_websocket_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -118,21 +122,21 @@ async def test_websocket_get_actions(
             "domain": "fake_integration",
             "type": "turn_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": "fake_integration",
             "type": "turn_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
             "domain": "fake_integration",
             "type": "toggle",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -165,7 +169,7 @@ async def test_websocket_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -174,7 +178,7 @@ async def test_websocket_get_conditions(
             "domain": "fake_integration",
             "type": "is_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -182,7 +186,7 @@ async def test_websocket_get_conditions(
             "domain": "fake_integration",
             "type": "is_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
@@ -219,7 +223,7 @@ async def test_websocket_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         "fake_integration", "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -228,7 +232,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "changed_states",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -236,7 +240,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "turned_off",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
         {
@@ -244,7 +248,7 @@ async def test_websocket_get_triggers(
             "domain": "fake_integration",
             "type": "turned_on",
             "device_id": device_entry.id,
-            "entity_id": "fake_integration.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
diff --git a/tests/components/device_automation/test_toggle_entity.py b/tests/components/device_automation/test_toggle_entity.py
index 6d89a59ee94622..f02704cdc1351f 100644
--- a/tests/components/device_automation/test_toggle_entity.py
+++ b/tests/components/device_automation/test_toggle_entity.py
@@ -10,7 +10,11 @@
 import homeassistant.util.dt as dt_util
 
 from tests.common import async_fire_time_changed, async_mock_service
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/device_tracker/test_device_condition.py b/tests/components/device_tracker/test_device_condition.py
index 1ac6dfdeed9064..008a7eb75c47cd 100644
--- a/tests/components/device_tracker/test_device_condition.py
+++ b/tests/components/device_tracker/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Device tracker device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -37,7 +41,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -46,7 +50,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_not_home", "is_home"]
@@ -54,7 +58,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -80,7 +84,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -94,7 +98,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_not_home", "is_home"]
@@ -102,12 +106,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("device_tracker.entity", STATE_HOME)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_HOME)
 
     assert await async_setup_component(
         hass,
@@ -121,7 +129,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "device_tracker.entity",
+                            "entity_id": entry.id,
                             "type": "is_home",
                         }
                     ],
@@ -143,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "device_tracker.entity",
+                            "entity_id": entry.id,
                             "type": "is_not_home",
                         }
                     ],
@@ -167,9 +175,54 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_home - event - test_event1"
 
-    hass.states.async_set("device_tracker.entity", "school")
+    hass.states.async_set(entry.entity_id, "school")
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_not_home - event - test_event2"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_HOME)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_home",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_home "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_home - event - test_event1"
diff --git a/tests/components/device_tracker/test_device_trigger.py b/tests/components/device_tracker/test_device_trigger.py
index c99e2d4928e491..75209ec607bb64 100644
--- a/tests/components/device_tracker/test_device_trigger.py
+++ b/tests/components/device_tracker/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Device Tracker device triggers."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -18,11 +19,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
 
 AWAY_LATITUDE = 32.881011
 AWAY_LONGITUDE = -117.234758
@@ -68,7 +73,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -77,7 +82,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["leaves", "enters"]
@@ -85,7 +90,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -111,7 +116,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -125,7 +130,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["leaves", "enters"]
@@ -133,13 +138,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_zone_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for enter and leave triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
     )
@@ -154,7 +163,7 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "device_tracker.entity",
+                        "entity_id": entry.id,
                         "type": "enters",
                         "zone": "zone.test",
                     },
@@ -178,7 +187,7 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "device_tracker.entity",
+                        "entity_id": entry.id,
                         "type": "leaves",
                         "zone": "zone.test",
                     },
@@ -203,26 +212,87 @@ async def test_if_fires_on_zone_change(hass: HomeAssistant, calls) -> None:
 
     # Fake that the entity is entering.
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": HOME_LATITUDE, "longitude": HOME_LONGITUDE},
     )
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "enter - device - {} - -117.235 - -117.238".format(
-        "device_tracker.entity"
+    assert (
+        calls[0].data["some"]
+        == f"enter - device - {entry.entity_id} - -117.235 - -117.238"
     )
 
     # Fake that the entity is leaving.
     hass.states.async_set(
-        "device_tracker.entity",
+        entry.entity_id,
         "state",
         {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
     )
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "leave - device - {} - -117.238 - -117.235".format(
-        "device_tracker.entity"
+    assert (
+        calls[1].data["some"]
+        == f"leave - device - {entry.entity_id} - -117.238 - -117.235"
+    )
+
+
+async def test_if_fires_on_zone_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for enter and leave triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        "state",
+        {"latitude": AWAY_LATITUDE, "longitude": AWAY_LONGITUDE},
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "enters",
+                        "zone": "zone.test",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "enter "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ "
+                                "    trigger.from_state.attributes.longitude|round(3) "
+                                "  }} "
+                                "- {{ trigger.to_state.attributes.longitude|round(3) }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is entering.
+    hass.states.async_set(
+        entry.entity_id,
+        "state",
+        {"latitude": HOME_LATITUDE, "longitude": HOME_LONGITUDE},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"enter - device - {entry.entity_id} - -117.235 - -117.238"
     )
 
 
@@ -238,7 +308,46 @@ async def test_get_trigger_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    capabilities = await device_trigger.async_get_trigger_capabilities(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": "enters",
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.id,
+        },
+    )
+    assert capabilities and "extra_fields" in capabilities
+
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "zone",
+            "required": True,
+            "type": "select",
+            "options": [("zone.test", "test"), ("zone.home", "test home")],
+        }
+    ]
+
+
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a device_tracker trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     capabilities = await device_trigger.async_get_trigger_capabilities(
@@ -248,7 +357,7 @@ async def test_get_trigger_capabilities(
             "domain": DOMAIN,
             "type": "enters",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.entity_id,
         },
     )
     assert capabilities and "extra_fields" in capabilities
diff --git a/tests/components/devolo_home_network/__init__.py b/tests/components/devolo_home_network/__init__.py
index 9340f7d2283d0b..ac6a960fd8fb88 100644
--- a/tests/components/devolo_home_network/__init__.py
+++ b/tests/components/devolo_home_network/__init__.py
@@ -14,7 +14,7 @@ def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
         CONF_IP_ADDRESS: IP,
         CONF_PASSWORD: "test",
     }
-    entry = MockConfigEntry(domain=DOMAIN, data=config)
+    entry = MockConfigEntry(domain=DOMAIN, data=config, entry_id="123456")
     entry.add_to_hass(hass)
 
     return entry
diff --git a/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
new file mode 100644
index 00000000000000..f247f2dc1f04f2
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_binary_sensor.ambr
@@ -0,0 +1,45 @@
+# serializer version: 1
+# name: test_update_attached_to_router
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'plug',
+      'friendly_name': 'Mock Title Connected to router',
+      'icon': 'mdi:router-network',
+    }),
+    'context': <ANY>,
+    'entity_id': 'binary_sensor.mock_title_connected_to_router',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_attached_to_router.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'binary_sensor',
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+    'entity_id': 'binary_sensor.mock_title_connected_to_router',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+    'original_icon': 'mdi:router-network',
+    'original_name': 'Connected to router',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'connected_to_router',
+    'unique_id': '1234567890_connected_to_router',
+    'unit_of_measurement': None,
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr b/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr
new file mode 100644
index 00000000000000..d438aca6a4a775
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_device_tracker.ambr
@@ -0,0 +1,17 @@
+# serializer version: 1
+# name: test_device_tracker
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'band': '5 GHz',
+      'icon': 'mdi:lan-connect',
+      'mac': 'AA:BB:CC:DD:EE:FF',
+      'source_type': <SourceType.ROUTER: 'router'>,
+      'wifi': 'Main',
+    }),
+    'context': <ANY>,
+    'entity_id': 'device_tracker.devolo_home_network_1234567890_aa_bb_cc_dd_ee_ff',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'home',
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000000..236588b87ada6f
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_diagnostics.ambr
@@ -0,0 +1,37 @@
+# serializer version: 1
+# name: test_entry_diagnostics
+  dict({
+    'device_info': dict({
+      'device_api': True,
+      'features': list([
+        'intmtg1',
+        'led',
+        'reset',
+        'restart',
+        'update',
+        'wifi1',
+      ]),
+      'firmware': '5.6.1',
+      'mt_number': '2730',
+      'plcnet_api': True,
+      'product': 'dLAN pro 1200+ WiFi ac',
+    }),
+    'entry': dict({
+      'data': dict({
+        'ip_address': '192.0.2.1',
+        'password': '**REDACTED**',
+      }),
+      'disabled_by': None,
+      'domain': 'devolo_home_network',
+      'entry_id': '123456',
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'title': 'Mock Title',
+      'unique_id': None,
+      'version': 1,
+    }),
+  })
+# ---
diff --git a/tests/components/devolo_home_network/snapshots/test_switch.ambr b/tests/components/devolo_home_network/snapshots/test_switch.ambr
new file mode 100644
index 00000000000000..600c9478035605
--- /dev/null
+++ b/tests/components/devolo_home_network/snapshots/test_switch.ambr
@@ -0,0 +1,173 @@
+# serializer version: 1
+# name: test_switches[enable_guest_wifi-async_get_wifi_guest_access-async_set_wifi_guest_access-interval0]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable guest Wifi',
+      'icon': 'mdi:wifi',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switches[enable_guest_wifi-async_get_wifi_guest_access-async_set_wifi_guest_access-interval0].1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:wifi',
+    'original_name': 'Enable guest Wifi',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234567890_switch_guest_wifi',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_switches[enable_leds-async_get_led_setting-async_set_led_setting-interval1]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable LEDs',
+      'icon': 'mdi:led-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_switches[enable_leds-async_get_led_setting-async_set_led_setting-interval1].1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:led-off',
+    'original_name': 'Enable LEDs',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': None,
+    'unique_id': '1234567890_switch_leds',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_update_enable_guest_wifi
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable guest Wifi',
+      'icon': 'mdi:wifi',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_enable_guest_wifi.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': None,
+    'entity_id': 'switch.mock_title_enable_guest_wifi',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:wifi',
+    'original_name': 'Enable guest Wifi',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'switch_guest_wifi',
+    'unique_id': '1234567890_switch_guest_wifi',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_update_enable_leds
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'Mock Title Enable LEDs',
+      'icon': 'mdi:led-off',
+    }),
+    'context': <ANY>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'last_changed': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'off',
+  })
+# ---
+# name: test_update_enable_leds.1
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'switch',
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
+    'entity_id': 'switch.mock_title_enable_leds',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': 'mdi:led-off',
+    'original_name': 'Enable LEDs',
+    'platform': 'devolo_home_network',
+    'supported_features': 0,
+    'translation_key': 'switch_leds',
+    'unique_id': '1234567890_switch_leds',
+    'unit_of_measurement': None,
+  })
+# ---
diff --git a/tests/components/devolo_home_network/test_binary_sensor.py b/tests/components/devolo_home_network/test_binary_sensor.py
index 5906112ffd1439..7a6395c20f1e8e 100644
--- a/tests/components/devolo_home_network/test_binary_sensor.py
+++ b/tests/components/devolo_home_network/test_binary_sensor.py
@@ -3,22 +3,17 @@
 
 from devolo_plc_api.exceptions.device import DeviceUnavailable
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.binary_sensor import DOMAIN
 from homeassistant.components.devolo_home_network.const import (
     CONNECTED_TO_ROUTER,
     LONG_UPDATE_INTERVAL,
 )
-from homeassistant.const import (
-    ATTR_FRIENDLY_NAME,
-    STATE_OFF,
-    STATE_ON,
-    STATE_UNAVAILABLE,
-    EntityCategory,
-)
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import configure_integration
 from .const import PLCNET_ATTACHED
@@ -42,7 +37,10 @@ async def test_binary_sensor_setup(hass: HomeAssistant) -> None:
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_update_attached_to_router(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a attached_to_router binary sensor device."""
     entry = configure_integration(hass)
@@ -52,21 +50,14 @@ async def test_update_attached_to_router(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
-    assert state.attributes[ATTR_FRIENDLY_NAME] == f"{entry.title} Connected to router"
-
-    assert (
-        entity_registry.async_get(state_key).entity_category
-        == EntityCategory.DIAGNOSTIC
-    )
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate device failure
     mock_device.plcnet.async_get_network_overview = AsyncMock(
         side_effect=DeviceUnavailable
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -77,7 +68,7 @@ async def test_update_attached_to_router(
     mock_device.plcnet.async_get_network_overview = AsyncMock(
         return_value=PLCNET_ATTACHED
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
diff --git a/tests/components/devolo_home_network/test_config_flow.py b/tests/components/devolo_home_network/test_config_flow.py
index 82aa983522e030..91d7d6f39cff12 100644
--- a/tests/components/devolo_home_network/test_config_flow.py
+++ b/tests/components/devolo_home_network/test_config_flow.py
@@ -31,7 +31,7 @@
 from tests.common import MockConfigEntry
 
 
-async def test_form(hass: HomeAssistant, info: dict[str, Any]):
+async def test_form(hass: HomeAssistant, info: dict[str, Any]) -> None:
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
diff --git a/tests/components/devolo_home_network/test_device_tracker.py b/tests/components/devolo_home_network/test_device_tracker.py
index 963956abd905de..324f8b44041b0d 100644
--- a/tests/components/devolo_home_network/test_device_tracker.py
+++ b/tests/components/devolo_home_network/test_device_tracker.py
@@ -2,23 +2,17 @@
 from unittest.mock import AsyncMock
 
 from devolo_plc_api.exceptions.device import DeviceUnavailable
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.device_tracker import DOMAIN as PLATFORM
 from homeassistant.components.devolo_home_network.const import (
     DOMAIN,
     LONG_UPDATE_INTERVAL,
-    WIFI_APTYPE,
-    WIFI_BANDS,
-)
-from homeassistant.const import (
-    STATE_HOME,
-    STATE_NOT_HOME,
-    STATE_UNAVAILABLE,
-    UnitOfFrequency,
 )
+from homeassistant.const import STATE_NOT_HOME, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import configure_integration
 from .const import CONNECTED_STATIONS, DISCOVERY_INFO, NO_CONNECTED_STATIONS
@@ -31,7 +25,10 @@
 
 
 async def test_device_tracker(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test device tracker states."""
     state_key = (
@@ -40,29 +37,22 @@ async def test_device_tracker(
     entry = configure_integration(hass)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     # Enable entity
     entity_registry.async_update_entity(state_key, disabled_by=None)
     await hass.async_block_till_done()
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_HOME
-    assert state.attributes["wifi"] == WIFI_APTYPE[STATION.vap_type]
-    assert (
-        state.attributes["band"]
-        == f"{WIFI_BANDS[STATION.band]} {UnitOfFrequency.GIGAHERTZ}"
-    )
+    assert hass.states.get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_wifi_connected_station = AsyncMock(
         return_value=NO_CONNECTED_STATIONS
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -73,7 +63,7 @@ async def test_device_tracker(
     mock_device.device.async_get_wifi_connected_station = AsyncMock(
         side_effect=DeviceUnavailable
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -84,7 +74,9 @@ async def test_device_tracker(
 
 
 async def test_restoring_clients(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test restoring existing device_tracker entities."""
     state_key = (
diff --git a/tests/components/devolo_home_network/test_diagnostics.py b/tests/components/devolo_home_network/test_diagnostics.py
index f56f73aac0aa44..0248d755e22feb 100644
--- a/tests/components/devolo_home_network/test_diagnostics.py
+++ b/tests/components/devolo_home_network/test_diagnostics.py
@@ -2,14 +2,12 @@
 from __future__ import annotations
 
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.devolo_home_network.diagnostics import TO_REDACT
-from homeassistant.components.diagnostics import REDACTED
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
 from . import configure_integration
-from .const import DISCOVERY_INFO
 
 from tests.components.diagnostics import get_diagnostics_for_config_entry
 from tests.typing import ClientSessionGenerator
@@ -19,6 +17,7 @@
 async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test config entry diagnostics."""
     entry = configure_integration(hass)
@@ -27,19 +26,5 @@ async def test_entry_diagnostics(
 
     assert entry.state == ConfigEntryState.LOADED
 
-    entry_dict = entry.as_dict()
-    for key in TO_REDACT:
-        entry_dict["data"][key] = REDACTED
-
     result = await get_diagnostics_for_config_entry(hass, hass_client, entry)
-    assert result == {
-        "entry": entry_dict,
-        "device_info": {
-            "mt_number": DISCOVERY_INFO.properties["MT"],
-            "product": DISCOVERY_INFO.properties["Product"],
-            "firmware": DISCOVERY_INFO.properties["FirmwareVersion"],
-            "device_api": True,
-            "plcnet_api": True,
-            "features": DISCOVERY_INFO.properties["Features"].split(","),
-        },
-    }
+    assert result == snapshot
diff --git a/tests/components/devolo_home_network/test_sensor.py b/tests/components/devolo_home_network/test_sensor.py
index fc8afbe1ae8f2b..0511544224ad1b 100644
--- a/tests/components/devolo_home_network/test_sensor.py
+++ b/tests/components/devolo_home_network/test_sensor.py
@@ -12,7 +12,7 @@
 from homeassistant.const import ATTR_FRIENDLY_NAME, STATE_UNAVAILABLE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import configure_integration
 from .mock import MockDevice
@@ -57,7 +57,7 @@ async def test_update_connected_wifi_clients(
     mock_device.device.async_get_wifi_connected_station = AsyncMock(
         side_effect=DeviceUnavailable
     )
-    async_fire_time_changed(hass, dt.utcnow() + SHORT_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + SHORT_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -66,7 +66,7 @@ async def test_update_connected_wifi_clients(
 
     # Emulate state change
     mock_device.reset()
-    async_fire_time_changed(hass, dt.utcnow() + SHORT_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + SHORT_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -103,7 +103,7 @@ async def test_update_neighboring_wifi_networks(
     mock_device.device.async_get_wifi_neighbor_access_points = AsyncMock(
         side_effect=DeviceUnavailable
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -112,7 +112,7 @@ async def test_update_neighboring_wifi_networks(
 
     # Emulate state change
     mock_device.reset()
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -148,7 +148,7 @@ async def test_update_connected_plc_devices(
     mock_device.plcnet.async_get_network_overview = AsyncMock(
         side_effect=DeviceUnavailable
     )
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -157,7 +157,7 @@ async def test_update_connected_plc_devices(
 
     # Emulate state change
     mock_device.reset()
-    async_fire_time_changed(hass, dt.utcnow() + LONG_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + LONG_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
diff --git a/tests/components/devolo_home_network/test_switch.py b/tests/components/devolo_home_network/test_switch.py
index 47e09a034ca7bd..8b84a0a9344517 100644
--- a/tests/components/devolo_home_network/test_switch.py
+++ b/tests/components/devolo_home_network/test_switch.py
@@ -5,6 +5,7 @@
 from devolo_plc_api.device_api import WifiGuestAccessGet
 from devolo_plc_api.exceptions.device import DevicePasswordProtected, DeviceUnavailable
 import pytest
+from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.devolo_home_network.const import (
     DOMAIN,
@@ -18,13 +19,12 @@
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
-    EntityCategory,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.update_coordinator import REQUEST_REFRESH_DEFAULT_COOLDOWN
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import configure_integration
 from .mock import MockDevice
@@ -72,7 +72,10 @@ async def test_update_guest_wifi_status_auth_failed(
 
 
 async def test_update_enable_guest_wifi(
-    hass: HomeAssistant, mock_device: MockDevice
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a enable_guest_wifi switch device."""
     entry = configure_integration(hass)
@@ -82,15 +85,14 @@ async def test_update_enable_guest_wifi(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_wifi_guest_access.return_value = WifiGuestAccessGet(
         enabled=True
     )
-    async_fire_time_changed(hass, dt.utcnow() + SHORT_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + SHORT_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -115,7 +117,7 @@ async def test_update_enable_guest_wifi(
         turn_off.assert_called_once_with(False)
 
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -137,7 +139,7 @@ async def test_update_enable_guest_wifi(
         turn_on.assert_called_once_with(True)
 
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -159,7 +161,10 @@ async def test_update_enable_guest_wifi(
 
 
 async def test_update_enable_leds(
-    hass: HomeAssistant, mock_device: MockDevice, entity_registry: er.EntityRegistry
+    hass: HomeAssistant,
+    mock_device: MockDevice,
+    entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test state change of a enable_leds switch device."""
     entry = configure_integration(hass)
@@ -169,15 +174,12 @@ async def test_update_enable_leds(
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(state_key)
-    assert state is not None
-    assert state.state == STATE_OFF
-
-    assert entity_registry.async_get(state_key).entity_category == EntityCategory.CONFIG
+    assert hass.states.get(state_key) == snapshot
+    assert entity_registry.async_get(state_key) == snapshot
 
     # Emulate state change
     mock_device.device.async_get_led_setting.return_value = True
-    async_fire_time_changed(hass, dt.utcnow() + SHORT_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + SHORT_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
@@ -200,7 +202,7 @@ async def test_update_enable_leds(
         turn_off.assert_called_once_with(False)
 
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -220,7 +222,7 @@ async def test_update_enable_leds(
         turn_on.assert_called_once_with(True)
 
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=REQUEST_REFRESH_DEFAULT_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -268,7 +270,7 @@ async def test_device_failure(
 
     api = getattr(mock_device.device, get_method)
     api.side_effect = DeviceUnavailable
-    async_fire_time_changed(hass, dt.utcnow() + update_interval)
+    async_fire_time_changed(hass, dt_util.utcnow() + update_interval)
     await hass.async_block_till_done()
 
     state = hass.states.get(state_key)
diff --git a/tests/components/discovergy/__init__.py b/tests/components/discovergy/__init__.py
new file mode 100644
index 00000000000000..321e66ef74e195
--- /dev/null
+++ b/tests/components/discovergy/__init__.py
@@ -0,0 +1 @@
+"""Test the Discovergy integration."""
diff --git a/tests/components/discovergy/conftest.py b/tests/components/discovergy/conftest.py
new file mode 100644
index 00000000000000..313985bd7d2a3d
--- /dev/null
+++ b/tests/components/discovergy/conftest.py
@@ -0,0 +1,33 @@
+"""Fixtures for Discovergy integration tests."""
+from unittest.mock import AsyncMock, Mock, patch
+
+import pytest
+
+from homeassistant.components.discovergy import DOMAIN
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.components.discovergy.const import GET_METERS
+
+
+@pytest.fixture
+def mock_meters() -> Mock:
+    """Patch libraries."""
+    with patch("pydiscovergy.Discovergy.get_meters") as discovergy:
+        discovergy.side_effect = AsyncMock(return_value=GET_METERS)
+        yield discovergy
+
+
+@pytest.fixture
+async def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Return a MockConfigEntry for testing."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="user@example.org",
+        unique_id="user@example.org",
+        data={CONF_EMAIL: "user@example.org", CONF_PASSWORD: "supersecretpassword"},
+    )
+    entry.add_to_hass(hass)
+
+    return entry
diff --git a/tests/components/discovergy/const.py b/tests/components/discovergy/const.py
new file mode 100644
index 00000000000000..2205a70830ee6f
--- /dev/null
+++ b/tests/components/discovergy/const.py
@@ -0,0 +1,49 @@
+"""Constants for Discovergy integration tests."""
+import datetime
+
+from pydiscovergy.models import Meter, Reading
+
+GET_METERS = [
+    Meter(
+        meterId="f8d610b7a8cc4e73939fa33b990ded54",
+        serialNumber="abc123",
+        fullSerialNumber="abc123",
+        type="TST",
+        measurementType="ELECTRICITY",
+        loadProfileType="SLP",
+        location={
+            "city": "Testhause",
+            "street": "Teststraße",
+            "streetNumber": "1",
+            "country": "Germany",
+        },
+        manufacturerId="TST",
+        printedFullSerialNumber="abc123",
+        administrationNumber="12345",
+        scalingFactor=1,
+        currentScalingFactor=1,
+        voltageScalingFactor=1,
+        internalMeters=1,
+        firstMeasurementTime=1517569090926,
+        lastMeasurementTime=1678430543742,
+    ),
+]
+
+LAST_READING = Reading(
+    time=datetime.datetime(2023, 3, 10, 7, 32, 6, 702000),
+    values={
+        "energy": 119348699715000.0,
+        "energy1": 2254180000.0,
+        "energy2": 119346445534000.0,
+        "energyOut": 55048723044000.0,
+        "energyOut1": 0.0,
+        "energyOut2": 0.0,
+        "power": 531750.0,
+        "power1": 142680.0,
+        "power2": 138010.0,
+        "power3": 251060.0,
+        "voltage1": 239800.0,
+        "voltage2": 239700.0,
+        "voltage3": 239000.0,
+    },
+)
diff --git a/tests/components/discovergy/test_config_flow.py b/tests/components/discovergy/test_config_flow.py
new file mode 100644
index 00000000000000..f42a4a983fb757
--- /dev/null
+++ b/tests/components/discovergy/test_config_flow.py
@@ -0,0 +1,133 @@
+"""Test the Discovergy config flow."""
+from unittest.mock import Mock, patch
+
+from pydiscovergy.error import HTTPError, InvalidLogin
+
+from homeassistant import data_entry_flow
+from homeassistant.components.discovergy.const import DOMAIN
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_form(hass: HomeAssistant, mock_meters: Mock) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.discovergy.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "test@example.com"
+    assert result2["data"] == {
+        CONF_EMAIL: "test@example.com",
+        CONF_PASSWORD: "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_reauth(
+    hass: HomeAssistant, mock_meters: Mock, mock_config_entry: MockConfigEntry
+) -> None:
+    """Test reauth flow."""
+    init_result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_REAUTH, "unique_id": mock_config_entry.unique_id},
+        data=None,
+    )
+
+    assert init_result["type"] == data_entry_flow.FlowResultType.FORM
+    assert init_result["step_id"] == "reauth"
+
+    with patch(
+        "homeassistant.components.discovergy.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        configure_result = await hass.config_entries.flow.async_configure(
+            init_result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+        assert configure_result["type"] == data_entry_flow.FlowResultType.ABORT
+        assert configure_result["reason"] == "reauth_successful"
+        assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_form_invalid_auth(hass: HomeAssistant) -> None:
+    """Test we handle invalid auth."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch(
+        "pydiscovergy.Discovergy.get_meters",
+        side_effect=InvalidLogin,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.FlowResultType.FORM
+    assert result2["errors"] == {"base": "invalid_auth"}
+
+
+async def test_form_cannot_connect(hass: HomeAssistant) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch("pydiscovergy.Discovergy.get_meters", side_effect=HTTPError):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_unknown_exception(hass: HomeAssistant) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch("pydiscovergy.Discovergy.get_meters", side_effect=Exception):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_EMAIL: "test@example.com",
+                CONF_PASSWORD: "test-password",
+            },
+        )
+
+    assert result2["type"] == data_entry_flow.FlowResultType.FORM
+    assert result2["errors"] == {"base": "unknown"}
diff --git a/tests/components/discovergy/test_diagnostics.py b/tests/components/discovergy/test_diagnostics.py
new file mode 100644
index 00000000000000..1d465dda0e066c
--- /dev/null
+++ b/tests/components/discovergy/test_diagnostics.py
@@ -0,0 +1,88 @@
+"""Test Discovergy diagnostics."""
+from unittest.mock import patch
+
+from homeassistant.components.diagnostics import REDACTED
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.components.discovergy.const import GET_METERS, LAST_READING
+from tests.typing import ClientSessionGenerator
+
+
+async def test_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test config entry diagnostics."""
+    with patch("pydiscovergy.Discovergy.get_meters", return_value=GET_METERS), patch(
+        "pydiscovergy.Discovergy.get_last_reading", return_value=LAST_READING
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    result = await get_diagnostics_for_config_entry(
+        hass, hass_client, mock_config_entry
+    )
+
+    assert result["entry"] == {
+        "entry_id": mock_config_entry.entry_id,
+        "version": 1,
+        "domain": "discovergy",
+        "title": REDACTED,
+        "data": {"email": REDACTED, "password": REDACTED},
+        "options": {},
+        "pref_disable_new_entities": False,
+        "pref_disable_polling": False,
+        "source": "user",
+        "unique_id": REDACTED,
+        "disabled_by": None,
+    }
+
+    assert result["meters"] == [
+        {
+            "additional": {
+                "administrationNumber": REDACTED,
+                "currentScalingFactor": 1,
+                "firstMeasurementTime": 1517569090926,
+                "fullSerialNumber": REDACTED,
+                "internalMeters": 1,
+                "lastMeasurementTime": 1678430543742,
+                "loadProfileType": "SLP",
+                "manufacturerId": "TST",
+                "printedFullSerialNumber": REDACTED,
+                "scalingFactor": 1,
+                "type": "TST",
+                "voltageScalingFactor": 1,
+            },
+            "full_serial_number": REDACTED,
+            "load_profile_type": "SLP",
+            "location": REDACTED,
+            "measurement_type": "ELECTRICITY",
+            "meter_id": "f8d610b7a8cc4e73939fa33b990ded54",
+            "serial_number": REDACTED,
+            "type": "TST",
+        }
+    ]
+
+    assert result["readings"] == {
+        "f8d610b7a8cc4e73939fa33b990ded54": {
+            "time": "2023-03-10T07:32:06.702000",
+            "values": {
+                "energy": 119348699715000.0,
+                "energy1": 2254180000.0,
+                "energy2": 119346445534000.0,
+                "energyOut": 55048723044000.0,
+                "energyOut1": 0.0,
+                "energyOut2": 0.0,
+                "power": 531750.0,
+                "power1": 142680.0,
+                "power2": 138010.0,
+                "power3": 251060.0,
+                "voltage1": 239800.0,
+                "voltage2": 239700.0,
+                "voltage3": 239000.0,
+            },
+        }
+    }
diff --git a/tests/components/discovergy/test_system_health.py b/tests/components/discovergy/test_system_health.py
new file mode 100644
index 00000000000000..91025b06dd7b37
--- /dev/null
+++ b/tests/components/discovergy/test_system_health.py
@@ -0,0 +1,48 @@
+"""Test Discovergy system health."""
+import asyncio
+
+from aiohttp import ClientError
+from pydiscovergy.const import API_BASE
+
+from homeassistant.components.discovergy.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import get_system_health_info
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+
+async def test_discovergy_system_health(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test Discovergy system health."""
+    aioclient_mock.get(API_BASE, text="")
+    hass.config.components.add(DOMAIN)
+    assert await async_setup_component(hass, "system_health", {})
+
+    info = await get_system_health_info(hass, DOMAIN)
+
+    for key, val in info.items():
+        if asyncio.iscoroutine(val):
+            info[key] = await val
+
+    assert info == {"api_endpoint_reachable": "ok"}
+
+
+async def test_discovergy_system_health_fail(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test Discovergy system health."""
+    aioclient_mock.get(API_BASE, exc=ClientError)
+    hass.config.components.add(DOMAIN)
+    assert await async_setup_component(hass, "system_health", {})
+
+    info = await get_system_health_info(hass, DOMAIN)
+
+    for key, val in info.items():
+        if asyncio.iscoroutine(val):
+            info[key] = await val
+
+    assert info == {
+        "api_endpoint_reachable": {"type": "failed", "error": "unreachable"}
+    }
diff --git a/tests/components/dnsip/test_sensor.py b/tests/components/dnsip/test_sensor.py
index 75e5f5ebf88e89..1282cddc5e6b8f 100644
--- a/tests/components/dnsip/test_sensor.py
+++ b/tests/components/dnsip/test_sensor.py
@@ -17,7 +17,7 @@
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_NAME, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import RetrieveDNS
 
@@ -97,7 +97,7 @@ async def test_sensor_no_response(hass: HomeAssistant) -> None:
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=10),
+            dt_util.utcnow() + timedelta(minutes=10),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/dremel_3d_printer/__init__.py b/tests/components/dremel_3d_printer/__init__.py
new file mode 100644
index 00000000000000..90da6ee929b219
--- /dev/null
+++ b/tests/components/dremel_3d_printer/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Dremel 3D Printer integration."""
diff --git a/tests/components/dremel_3d_printer/conftest.py b/tests/components/dremel_3d_printer/conftest.py
new file mode 100644
index 00000000000000..8df59a2e64abd8
--- /dev/null
+++ b/tests/components/dremel_3d_printer/conftest.py
@@ -0,0 +1,58 @@
+"""Configure tests for the Dremel 3D Printer integration."""
+from http import HTTPStatus
+from unittest.mock import patch
+
+import pytest
+import requests_mock
+
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry, load_fixture
+
+HOST = "1.2.3.4"
+CONF_DATA = {CONF_HOST: HOST}
+
+
+def create_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create fixture for adding config entry in Home Assistant."""
+    entry = MockConfigEntry(domain=DOMAIN, data=CONF_DATA, unique_id="123456789")
+    entry.add_to_hass(hass)
+    return entry
+
+
+@pytest.fixture
+def config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Add config entry in Home Assistant."""
+    return create_entry(hass)
+
+
+@pytest.fixture
+def connection() -> None:
+    """Mock Dremel 3D Printer connection."""
+    mock = requests_mock.Mocker()
+    mock.post(
+        f"http://{HOST}:80/command",
+        response_list=[
+            {"text": load_fixture("dremel_3d_printer/command_1.json")},
+            {"text": load_fixture("dremel_3d_printer/command_2.json")},
+            {"text": load_fixture("dremel_3d_printer/command_1.json")},
+            {"text": load_fixture("dremel_3d_printer/command_2.json")},
+        ],
+    )
+
+    mock.post(
+        f"https://{HOST}:11134/getHomeMessage",
+        text=load_fixture("dremel_3d_printer/get_home_message.json"),
+        status_code=HTTPStatus.OK,
+    )
+    mock.start()
+
+
+def patch_async_setup_entry():
+    """Patch the async entry setup of Dremel 3D Printer."""
+    return patch(
+        "homeassistant.components.dremel_3d_printer.async_setup_entry",
+        return_value=True,
+    )
diff --git a/tests/components/dremel_3d_printer/fixtures/command_1.json b/tests/components/dremel_3d_printer/fixtures/command_1.json
new file mode 100644
index 00000000000000..4e61b40ea46584
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/command_1.json
@@ -0,0 +1,12 @@
+{
+  "SN": "123456789",
+  "api_version": "1.0.2-alpha",
+  "error_code": 200,
+  "ethernet_connected": 1,
+  "ethernet_ip": "1.2.3.4",
+  "firmware_version": "v3.0_R02.12.10",
+  "machine_type": "DREMEL 3D45 IDEA BUILDER",
+  "message": "success",
+  "wifi_connected": 1,
+  "wifi_ip": "1.2.3.5"
+}
diff --git a/tests/components/dremel_3d_printer/fixtures/command_2.json b/tests/components/dremel_3d_printer/fixtures/command_2.json
new file mode 100644
index 00000000000000..fc73b10cb57c90
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/command_2.json
@@ -0,0 +1,22 @@
+{
+  "buildPlate_target_temperature": 60,
+  "chamber_temperature": 27,
+  "door_open": 0,
+  "elaspedtime": 0,
+  "error_code": 200,
+  "extruder_target_temperature": 230,
+  "fanSpeed": 0,
+  "filament_type ": "ECO-ABS",
+  "firmware_version": "v3.0_R02.12.10",
+  "jobname": "D32_Imperial_Credit.gcode",
+  "jobstatus": "building",
+  "layer": 0,
+  "message": "success",
+  "networkBuild": 1,
+  "platform_temperature": 60,
+  "progress": 13.9,
+  "remaining": 3736,
+  "status": "busy",
+  "temperature": 230,
+  "totalTime": 4340
+}
diff --git a/tests/components/dremel_3d_printer/fixtures/get_home_message.json b/tests/components/dremel_3d_printer/fixtures/get_home_message.json
new file mode 100644
index 00000000000000..1a79210c35d37f
--- /dev/null
+++ b/tests/components/dremel_3d_printer/fixtures/get_home_message.json
@@ -0,0 +1,26 @@
+{
+  "BedTemp": 60,
+  "BedTempTarget": 60,
+  "ErrorCode": 200,
+  "FilamentType": 2,
+  "FirwareVersion": "v3.0_R02.12.10",
+  "Message": "success",
+  "NozzleTemp": 230,
+  "NozzleTempTarget": 230,
+  "PreheatBed": 0,
+  "PreheatNozzle": 0,
+  "PrinterBedMessage": "Bed 0-100 ℃",
+  "PrinterCamera": "http://1.2.3.4:10123/?action=stream",
+  "PrinterFiles": 10,
+  "PrinterMicrons": "50-300 microns",
+  "PrinterName": "DREMEL DIGILAB 3D45",
+  "PrinterNozzleMessage": "Nozzle 0-280 ℃",
+  "PrinterStatus": "printing",
+  "PrintererAvailabelStorage": 87,
+  "PrintingFileName": "D32_Imperial_Credit.gcode",
+  "PrintingFilePic": "/tmp/mnt/dev/mmcblk0p3/modelFromDevice/pic/D32_Imperial_Credit_gcode.bmp",
+  "PrintingProgress": 13.9,
+  "RemainTime": 3736,
+  "SerialNumber": "123456789",
+  "UsageCounter": "7"
+}
diff --git a/tests/components/dremel_3d_printer/test_binary_sensor.py b/tests/components/dremel_3d_printer/test_binary_sensor.py
new file mode 100644
index 00000000000000..081cc7a02fb42b
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_binary_sensor.py
@@ -0,0 +1,27 @@
+"""Binary sensor tests for the Dremel 3D Printer integration."""
+from unittest.mock import AsyncMock
+
+from homeassistant.components.binary_sensor import BinarySensorDeviceClass
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import ATTR_DEVICE_CLASS, STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+async def test_binary_sensors(
+    hass: HomeAssistant,
+    connection,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+) -> None:
+    """Test we get binary sensor data."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    state = hass.states.get("binary_sensor.dremel_3d45_door")
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.DOOR
+    assert state.state == STATE_OFF
+    state = hass.states.get("binary_sensor.dremel_3d45_running")
+    assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == BinarySensorDeviceClass.RUNNING
diff --git a/tests/components/dremel_3d_printer/test_button.py b/tests/components/dremel_3d_printer/test_button.py
new file mode 100644
index 00000000000000..00102b3306b7b8
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_button.py
@@ -0,0 +1,56 @@
+"""Button tests for the Dremel 3D Printer integration."""
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("button", "function"),
+    (
+        ("cancel", "stop"),
+        ("pause", "pause"),
+        ("resume", "resume"),
+    ),
+)
+async def test_buttons(
+    hass: HomeAssistant,
+    connection: None,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+    button: str,
+    function: str,
+) -> None:
+    """Test button entities function."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    with patch(
+        f"homeassistant.components.dremel_3d_printer.Dremel3DPrinter.{function}_print"
+    ) as mock:
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: [f"button.dremel_3d45_{button}_job"]},
+            blocking=True,
+        )
+    assert mock.call_count == 1
+
+    with patch(
+        f"homeassistant.components.dremel_3d_printer.Dremel3DPrinter.{function}_print",
+        side_effect=RuntimeError,
+    ) as mock, pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            BUTTON_DOMAIN,
+            SERVICE_PRESS,
+            {ATTR_ENTITY_ID: [f"button.dremel_3d45_{button}_job"]},
+            blocking=True,
+        )
+    assert mock.call_count == 1
diff --git a/tests/components/dremel_3d_printer/test_config_flow.py b/tests/components/dremel_3d_printer/test_config_flow.py
new file mode 100644
index 00000000000000..8161662a14a8f9
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_config_flow.py
@@ -0,0 +1,87 @@
+"""Test Dremel 3D Printer config flow."""
+from unittest.mock import patch
+
+from requests.exceptions import ConnectTimeout
+
+from homeassistant import data_entry_flow
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_SOURCE
+from homeassistant.core import HomeAssistant
+
+from .conftest import CONF_DATA, patch_async_setup_entry
+
+from tests.common import MockConfigEntry
+
+MOCK = "homeassistant.components.dremel_3d_printer.config_flow.Dremel3DPrinter"
+
+
+async def test_full_user_flow_implementation(hass: HomeAssistant, connection) -> None:
+    """Test the full manual user flow from start to finish."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == "DREMEL 3D45"
+    assert result["data"] == CONF_DATA
+
+
+async def test_already_configured(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test we abort if the device is already configured."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+    )
+    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_cannot_connect(hass: HomeAssistant, connection) -> None:
+    """Test we show user form on connection error."""
+    with patch(MOCK, side_effect=ConnectTimeout):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["data"] == CONF_DATA
+
+
+async def test_unknown_error(hass: HomeAssistant, connection) -> None:
+    """Test we show user form on unknown error."""
+    with patch(MOCK, side_effect=Exception):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={CONF_SOURCE: SOURCE_USER}, data=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "unknown"}
+
+    with patch_async_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_DATA
+        )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == "DREMEL 3D45"
+    assert result["data"] == CONF_DATA
diff --git a/tests/components/dremel_3d_printer/test_init.py b/tests/components/dremel_3d_printer/test_init.py
new file mode 100644
index 00000000000000..a77c6159927b20
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_init.py
@@ -0,0 +1,88 @@
+"""Test Dremel 3D Printer integration."""
+from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
+from requests.exceptions import ConnectTimeout
+
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+MOCKED_MODEL = "homeassistant.components.dremel_3d_printer.Dremel3DPrinter.get_model"
+
+
+@pytest.mark.parametrize("model", ["3D45", "3D20"])
+async def test_setup(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry, model: str
+) -> None:
+    """Test load and unload."""
+    with patch(MOCKED_MODEL, return_value=model) as mock:
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        assert await async_setup_component(hass, DOMAIN, {})
+    assert config_entry.state == ConfigEntryState.LOADED
+    assert mock.called
+
+    with patch(MOCKED_MODEL, return_value=model) as mock:
+        assert await hass.config_entries.async_unload(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+    assert mock.called
+
+
+async def test_async_setup_entry_not_ready(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test that it throws ConfigEntryNotReady when exception occurs during setup."""
+    with patch(
+        "homeassistant.components.dremel_3d_printer.Dremel3DPrinter",
+        side_effect=ConnectTimeout,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_update_failed(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test coordinator throws UpdateFailed after failed update."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    with patch(
+        "homeassistant.components.dremel_3d_printer.Dremel3DPrinter.refresh",
+        side_effect=RuntimeError,
+    ) as updater:
+        next_update = dt_util.utcnow() + timedelta(seconds=10)
+        async_fire_time_changed(hass, next_update)
+        await hass.async_block_till_done()
+        updater.assert_called_once()
+    state = hass.states.get("sensor.dremel_3d45_job_phase")
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_device_info(
+    hass: HomeAssistant, connection, config_entry: MockConfigEntry
+) -> None:
+    """Test device info."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    device_registry = dr.async_get(hass)
+    device = device_registry.async_get_device({(DOMAIN, config_entry.unique_id)})
+
+    assert device.manufacturer == "Dremel"
+    assert device.model == "3D45"
+    assert device.name == "DREMEL 3D45"
+    assert device.sw_version == "v3.0_R02.12.10"
diff --git a/tests/components/dremel_3d_printer/test_sensor.py b/tests/components/dremel_3d_printer/test_sensor.py
new file mode 100644
index 00000000000000..49d66fe1e61c12
--- /dev/null
+++ b/tests/components/dremel_3d_printer/test_sensor.py
@@ -0,0 +1,111 @@
+"""Sensor tests for the Dremel 3D Printer integration."""
+from datetime import datetime
+from unittest.mock import AsyncMock
+
+from freezegun.api import FrozenDateTimeFactory
+
+from homeassistant.components.dremel_3d_printer.const import DOMAIN
+from homeassistant.components.sensor import (
+    ATTR_STATE_CLASS,
+    SensorDeviceClass,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_UNIT_OF_MEASUREMENT,
+    PERCENTAGE,
+    UnitOfInformation,
+    UnitOfTemperature,
+    UnitOfTime,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import UTC
+
+from tests.common import MockConfigEntry
+
+
+async def test_sensors(
+    hass: HomeAssistant,
+    connection,
+    config_entry: MockConfigEntry,
+    entity_registry_enabled_by_default: AsyncMock,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test we get sensor data."""
+    freezer.move_to(datetime(2023, 5, 31, 13, 30, tzinfo=UTC))
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert await async_setup_component(hass, DOMAIN, {})
+    state = hass.states.get("sensor.dremel_3d45_job_phase")
+    assert state.state == "building"
+    state = hass.states.get("sensor.dremel_3d45_completion_time")
+    assert state.state == "2023-05-31T14:32:16+00:00"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TIMESTAMP
+    state = hass.states.get("sensor.dremel_3d45_progress")
+    assert state.state == "13.9"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is PERCENTAGE
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_chamber")
+    assert state.state == "27"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_platform_temperature")
+    assert state.state == "60"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_target_platform_temperature")
+    assert state.state == "60"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_max_platform_temperature")
+    assert state.state == "100"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_extruder")
+    assert state.state == "230"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_target_extruder_temperature")
+    assert state.state == "230"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_max_extruder_temperature")
+    assert state.state == "280"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTemperature.CELSIUS
+    assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
+    state = hass.states.get("sensor.dremel_3d45_network_build")
+    assert state.state == "1"
+    state = hass.states.get("sensor.dremel_3d45_filament")
+    assert state.state == "ECO-ABS"
+    state = hass.states.get("sensor.dremel_3d45_elapsed_time")
+    assert state.state == "0"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DURATION
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.SECONDS
+    state = hass.states.get("sensor.dremel_3d45_estimated_total_time")
+    assert state.state == "4340"
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DURATION
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.SECONDS
+    state = hass.states.get("sensor.dremel_3d45_job_status")
+    assert state.state == "building"
+    state = hass.states.get("sensor.dremel_3d45_job_name")
+    assert state.state == "D32_Imperial_Credit"
+    state = hass.states.get("sensor.dremel_3d45_api_version")
+    assert state.state == "1.0.2-alpha"
+    state = hass.states.get("sensor.dremel_3d45_host")
+    assert state.state == "1.2.3.4"
+    state = hass.states.get("sensor.dremel_3d45_connection_type")
+    assert state.state == "eth0"
+    state = hass.states.get("sensor.dremel_3d45_available_storage")
+    assert state.state == "8700"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfInformation.MEGABYTES
+    assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DATA_SIZE
+    state = hass.states.get("sensor.dremel_3d45_hours_used")
+    assert state.state == "7"
+    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is UnitOfTime.HOURS
diff --git a/tests/components/dwd_weather_warnings/test_config_flow.py b/tests/components/dwd_weather_warnings/test_config_flow.py
index 9c730eacffdfa3..819d98e25ef42a 100644
--- a/tests/components/dwd_weather_warnings/test_config_flow.py
+++ b/tests/components/dwd_weather_warnings/test_config_flow.py
@@ -64,7 +64,7 @@ async def test_create_entry(hass: HomeAssistant) -> None:
     # Test for successfully created entry.
     await hass.async_block_till_done()
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "DWD Weather Warnings 807111000"
+    assert result["title"] == "807111000"
     assert result["data"] == {
         CONF_REGION_IDENTIFIER: "807111000",
     }
@@ -102,9 +102,7 @@ async def test_import_flow_full_data(hass: HomeAssistant) -> None:
     assert result["type"] == FlowResultType.CREATE_ENTRY
     assert result["title"] == "Unit Test"
     assert result["data"] == {
-        CONF_NAME: "Unit Test",
         CONF_REGION_IDENTIFIER: "807111000",
-        CONF_MONITORED_CONDITIONS: [CURRENT_WARNING_SENSOR, ADVANCE_WARNING_SENSOR],
     }
 
 
@@ -123,30 +121,7 @@ async def test_import_flow_no_name(hass: HomeAssistant) -> None:
 
     await hass.async_block_till_done()
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "DWD Weather Warnings 807111000"
-    assert result["data"] == {
-        CONF_REGION_IDENTIFIER: "807111000",
-        CONF_MONITORED_CONDITIONS: [CURRENT_WARNING_SENSOR, ADVANCE_WARNING_SENSOR],
-    }
-
-
-async def test_import_flow_only_required(hass: HomeAssistant) -> None:
-    """Test a successful import of a YAML configuration with only required properties."""
-    data = DEMO_YAML_CONFIGURATION.copy()
-    data.pop(CONF_NAME)
-    data.pop(CONF_MONITORED_CONDITIONS)
-
-    with patch(
-        "homeassistant.components.dwd_weather_warnings.config_flow.DwdWeatherWarningsAPI",
-        return_value=True,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=data
-        )
-
-    await hass.async_block_till_done()
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "DWD Weather Warnings 807111000"
+    assert result["title"] == "807111000"
     assert result["data"] == {
         CONF_REGION_IDENTIFIER: "807111000",
     }
diff --git a/tests/components/ecobee/test_climate.py b/tests/components/ecobee/test_climate.py
index 09b127432db414..8572764ce4dd17 100644
--- a/tests/components/ecobee/test_climate.py
+++ b/tests/components/ecobee/test_climate.py
@@ -25,6 +25,7 @@ def ecobee_fixture():
     vals = {
         "name": "Ecobee",
         "modelNumber": "athenaSmart",
+        "identifier": "abc",
         "program": {
             "climates": [
                 {"name": "Climate1", "climateRef": "c1"},
@@ -83,7 +84,7 @@ def thermostat_fixture(data):
 
 async def test_name(thermostat) -> None:
     """Test name property."""
-    assert thermostat.name == "Ecobee"
+    assert thermostat.device_info["name"] == "Ecobee"
 
 
 async def test_aux_heat_not_supported_by_default(hass: HomeAssistant) -> None:
diff --git a/tests/components/econet/test_config_flow.py b/tests/components/econet/test_config_flow.py
index d01d6163285360..3444cc83834515 100644
--- a/tests/components/econet/test_config_flow.py
+++ b/tests/components/econet/test_config_flow.py
@@ -25,9 +25,7 @@ async def test_bad_credentials(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         side_effect=InvalidCredentialsError(),
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -55,9 +53,7 @@ async def test_generic_error_from_library(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         side_effect=PyeconetError(),
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -85,9 +81,7 @@ async def test_auth_worked(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         return_value=EcoNetApiInterface,
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -122,9 +116,7 @@ async def test_already_configured(hass: HomeAssistant) -> None:
     with patch(
         "pyeconet.EcoNetApiInterface.login",
         return_value=EcoNetApiInterface,
-    ), patch("homeassistant.components.econet.async_setup", return_value=True), patch(
-        "homeassistant.components.econet.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.econet.async_setup_entry", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
diff --git a/tests/components/edl21/test_config_flow.py b/tests/components/edl21/test_config_flow.py
index 4dbd69b2371840..030ff7ae63e420 100644
--- a/tests/components/edl21/test_config_flow.py
+++ b/tests/components/edl21/test_config_flow.py
@@ -3,7 +3,7 @@
 import pytest
 
 from homeassistant.components.edl21.const import CONF_SERIAL_PORT, DEFAULT_TITLE, DOMAIN
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -51,31 +51,3 @@ async def test_integration_already_exists(hass: HomeAssistant) -> None:
 
     assert result["type"] == FlowResultType.ABORT
     assert result["reason"] == "already_configured"
-
-
-async def test_create_entry_by_import(hass: HomeAssistant) -> None:
-    """Test that the import step works."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data=VALID_LEGACY_CONFIG,
-    )
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == VALID_LEGACY_CONFIG[CONF_NAME]
-    assert result["data"][CONF_NAME] == VALID_LEGACY_CONFIG[CONF_NAME]
-    assert result["data"][CONF_SERIAL_PORT] == VALID_LEGACY_CONFIG[CONF_SERIAL_PORT]
-
-    # Test the import step with an empty string as name
-    # (the name is optional in the old schema and defaults to "")
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data={CONF_SERIAL_PORT: "/dev/ttyUSB2", CONF_NAME: ""},
-    )
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == DEFAULT_TITLE
-    assert result["data"][CONF_NAME] == ""
-    assert result["data"][CONF_SERIAL_PORT] == "/dev/ttyUSB2"
diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py
index f38832e1876f30..f8eb889d3c3ab2 100644
--- a/tests/components/efergy/test_sensor.py
+++ b/tests/components/efergy/test_sensor.py
@@ -35,62 +35,62 @@ async def test_sensor_readings(
     entry = await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN)
     ent_reg: EntityRegistry = er.async_get(hass)
 
-    state = hass.states.get("sensor.power_usage")
+    state = hass.states.get("sensor.efergy_power_usage")
     assert state.state == "1580"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.energy_budget")
+    state = hass.states.get("sensor.efergy_energy_budget")
     assert state.state == "ok"
     assert state.attributes.get(ATTR_DEVICE_CLASS) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None
     assert state.attributes.get(ATTR_STATE_CLASS) is None
-    state = hass.states.get("sensor.daily_consumption")
+    state = hass.states.get("sensor.efergy_daily_consumption")
     assert state.state == "38.21"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.weekly_consumption")
+    state = hass.states.get("sensor.efergy_weekly_consumption")
     assert state.state == "267.47"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.monthly_consumption")
+    state = hass.states.get("sensor.efergy_monthly_consumption")
     assert state.state == "1069.88"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.yearly_consumption")
+    state = hass.states.get("sensor.efergy_yearly_consumption")
     assert state.state == "13373.50"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.daily_energy_cost")
+    state = hass.states.get("sensor.efergy_daily_energy_cost")
     assert state.state == "5.27"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.weekly_energy_cost")
+    state = hass.states.get("sensor.efergy_weekly_energy_cost")
     assert state.state == "36.89"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.monthly_energy_cost")
+    state = hass.states.get("sensor.efergy_monthly_energy_cost")
     assert state.state == "147.56"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    state = hass.states.get("sensor.yearly_energy_cost")
+    state = hass.states.get("sensor.efergy_yearly_energy_cost")
     assert state.state == "1844.50"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
-    entity = ent_reg.async_get("sensor.power_usage_728386")
+    entity = ent_reg.async_get("sensor.efergy_power_usage_728386")
     assert entity.disabled_by is er.RegistryEntryDisabler.INTEGRATION
     ent_reg.async_update_entity(entity.entity_id, **{"disabled_by": None})
     await hass.config_entries.async_reload(entry.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get("sensor.power_usage_728386")
+    state = hass.states.get("sensor.efergy_power_usage_728386")
     assert state.state == "1628"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -104,17 +104,17 @@ async def test_multi_sensor_readings(
     for description in SENSOR_TYPES:
         description.entity_registry_enabled_default = True
     await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN, MULTI_SENSOR_TOKEN)
-    state = hass.states.get("sensor.power_usage_728386")
+    state = hass.states.get("sensor.efergy_power_usage_728386")
     assert state.state == "218"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.power_usage_0")
+    state = hass.states.get("sensor.efergy_power_usage_0")
     assert state.state == "1808"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
-    state = hass.states.get("sensor.power_usage_728387")
+    state = hass.states.get("sensor.efergy_power_usage_728387")
     assert state.state == "312"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -126,16 +126,16 @@ async def test_failed_update_and_reconnection(
 ) -> None:
     """Test failed update and reconnection."""
     await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN)
-    assert hass.states.get("sensor.power_usage").state == "1580"
+    assert hass.states.get("sensor.efergy_power_usage").state == "1580"
     aioclient_mock.clear_requests()
     await mock_responses(hass, aioclient_mock, error=True)
     next_update = dt_util.utcnow() + timedelta(seconds=30)
     async_fire_time_changed(hass, next_update)
     await hass.async_block_till_done()
-    assert hass.states.get("sensor.power_usage").state == STATE_UNAVAILABLE
+    assert hass.states.get("sensor.efergy_power_usage").state == STATE_UNAVAILABLE
     aioclient_mock.clear_requests()
     await mock_responses(hass, aioclient_mock)
     next_update = dt_util.utcnow() + timedelta(seconds=30)
     async_fire_time_changed(hass, next_update)
     await hass.async_block_till_done()
-    assert hass.states.get("sensor.power_usage").state == "1580"
+    assert hass.states.get("sensor.efergy_power_usage").state == "1580"
diff --git a/tests/components/elgato/snapshots/test_button.ambr b/tests/components/elgato/snapshots/test_button.ambr
index cb420c486b4718..920aa40bfe787e 100644
--- a/tests/components/elgato/snapshots/test_button.ambr
+++ b/tests/components/elgato/snapshots/test_button.ambr
@@ -2,8 +2,8 @@
 # name: test_buttons[button.frenck_identify-identify-key-light-mini]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      'device_class': 'identify',
       'friendly_name': 'Frenck Identify',
-      'icon': 'mdi:help',
     }),
     'context': <ANY>,
     'entity_id': 'button.frenck_identify',
@@ -32,12 +32,12 @@
     'name': None,
     'options': dict({
     }),
-    'original_device_class': None,
-    'original_icon': 'mdi:help',
+    'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+    'original_icon': None,
     'original_name': 'Identify',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'identify',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_identify',
     'unit_of_measurement': None,
   })
@@ -111,7 +111,7 @@
     'original_name': 'Restart',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'restart',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_restart',
     'unit_of_measurement': None,
   })
diff --git a/tests/components/elgato/snapshots/test_sensor.ambr b/tests/components/elgato/snapshots/test_sensor.ambr
index 35429b8a320cda..5fa7a6e827ab26 100644
--- a/tests/components/elgato/snapshots/test_sensor.ambr
+++ b/tests/components/elgato/snapshots/test_sensor.ambr
@@ -44,7 +44,7 @@
     'original_name': 'Battery',
     'platform': 'elgato',
     'supported_features': 0,
-    'translation_key': 'battery',
+    'translation_key': None,
     'unique_id': 'GW24L1A02987_battery',
     'unit_of_measurement': '%',
   })
diff --git a/tests/components/emulated_hue/conftest.py b/tests/components/emulated_hue/conftest.py
index 8b47cca6d5d600..e25a2099227f75 100644
--- a/tests/components/emulated_hue/conftest.py
+++ b/tests/components/emulated_hue/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for emulated_hue tests."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py
index 247a507bb69ea9..acfb11ced0a4f5 100644
--- a/tests/components/emulated_hue/test_hue_api.py
+++ b/tests/components/emulated_hue/test_hue_api.py
@@ -120,7 +120,7 @@ async def _async_setup_emulated_hue(hass: HomeAssistant, conf: ConfigType) -> No
             hass,
             emulated_hue.DOMAIN,
             {emulated_hue.DOMAIN: conf},
-        ),
+        )
         await hass.async_block_till_done()
 
 
@@ -135,8 +135,25 @@ async def base_setup(hass):
     )
 
 
+@pytest.fixture(autouse=True)
+async def wanted_platforms_only() -> None:
+    """Enable only the wanted demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [
+            const.Platform.CLIMATE,
+            const.Platform.COVER,
+            const.Platform.FAN,
+            const.Platform.HUMIDIFIER,
+            const.Platform.LIGHT,
+            const.Platform.MEDIA_PLAYER,
+        ],
+    ):
+        yield
+
+
 @pytest.fixture
-async def demo_setup(hass):
+async def demo_setup(hass, wanted_platforms_only):
     """Fixture to setup demo platforms."""
     # We need to do this to get access to homeassistant/turn_(on,off)
     setups = [
@@ -144,12 +161,7 @@ async def demo_setup(hass):
         setup.async_setup_component(
             hass, http.DOMAIN, {http.DOMAIN: {http.CONF_SERVER_PORT: HTTP_SERVER_PORT}}
         ),
-        *[
-            setup.async_setup_component(
-                hass, comp.DOMAIN, {comp.DOMAIN: [{"platform": "demo"}]}
-            )
-            for comp in (light, climate, humidifier, media_player, fan, cover)
-        ],
+        setup.async_setup_component(hass, "demo", {}),
         setup.async_setup_component(
             hass,
             script.DOMAIN,
diff --git a/tests/components/energyzero/snapshots/test_sensor.ambr b/tests/components/energyzero/snapshots/test_sensor.ambr
index f758e8f53ca560..619813c52c1ef1 100644
--- a/tests/components/energyzero/snapshots/test_sensor.ambr
+++ b/tests/components/energyzero/snapshots/test_sensor.ambr
@@ -41,7 +41,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -105,7 +105,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -169,7 +169,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -236,7 +236,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -303,7 +303,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -367,7 +367,7 @@
     'original_name': 'Time of highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'highest_price_time',
     'unit_of_measurement': None,
   })
 # ---
@@ -431,7 +431,7 @@
     'original_name': 'Highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'max_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -495,7 +495,7 @@
     'original_name': 'Average - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'average_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -562,7 +562,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -626,7 +626,7 @@
     'original_name': 'Time of highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'highest_price_time',
     'unit_of_measurement': None,
   })
 # ---
@@ -690,7 +690,7 @@
     'original_name': 'Highest price - today',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'max_price',
     'unit_of_measurement': '€/kWh',
   })
 # ---
@@ -757,7 +757,7 @@
     'original_name': 'Current hour',
     'platform': 'energyzero',
     'supported_features': 0,
-    'translation_key': None,
+    'translation_key': 'current_hour_price',
     'unit_of_measurement': '€/m³',
   })
 # ---
diff --git a/tests/components/esphome/conftest.py b/tests/components/esphome/conftest.py
index 381b9e99f03b09..1dcdc559de7b61 100644
--- a/tests/components/esphome/conftest.py
+++ b/tests/components/esphome/conftest.py
@@ -2,17 +2,31 @@
 from __future__ import annotations
 
 from asyncio import Event
+from collections.abc import Awaitable, Callable
+from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 
-from aioesphomeapi import APIClient, APIVersion, DeviceInfo, ReconnectLogic
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    DeviceInfo,
+    EntityInfo,
+    EntityState,
+    ReconnectLogic,
+    UserService,
+)
 import pytest
 from zeroconf import Zeroconf
 
 from homeassistant.components.esphome import (
+    dashboard,
+)
+from homeassistant.components.esphome.const import (
+    CONF_ALLOW_SERVICE_CALLS,
     CONF_DEVICE_NAME,
     CONF_NOISE_PSK,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
     DOMAIN,
-    dashboard,
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
@@ -64,7 +78,7 @@ def mock_device_info() -> DeviceInfo:
     return DeviceInfo(
         uses_password=False,
         name="test",
-        bluetooth_proxy_version=0,
+        legacy_bluetooth_proxy_version=0,
         mac_address="11:22:33:44:55:aa",
         esphome_version="1.0.0",
     )
@@ -82,7 +96,7 @@ async def init_integration(
 
 
 @pytest.fixture
-def mock_client(mock_device_info):
+def mock_client(mock_device_info) -> APIClient:
     """Mock APIClient."""
     mock_client = Mock(spec=APIClient)
 
@@ -132,79 +146,176 @@ async def mock_dashboard(hass):
         yield data
 
 
-@pytest.fixture
-async def mock_voice_assistant_v1_entry(
+class MockESPHomeDevice:
+    """Mock an esphome device."""
+
+    def __init__(self, entry: MockConfigEntry) -> None:
+        """Init the mock."""
+        self.entry = entry
+        self.state_callback: Callable[[EntityState], None]
+        self.on_disconnect: Callable[[bool], None]
+
+    def set_state_callback(self, state_callback: Callable[[EntityState], None]) -> None:
+        """Set the state callback."""
+        self.state_callback = state_callback
+
+    def set_state(self, state: EntityState) -> None:
+        """Mock setting state."""
+        self.state_callback(state)
+
+    def set_on_disconnect(self, on_disconnect: Callable[[bool], None]) -> None:
+        """Set the disconnect callback."""
+        self.on_disconnect = on_disconnect
+
+    async def mock_disconnect(self, expected_disconnect: bool) -> None:
+        """Mock disconnecting."""
+        await self.on_disconnect(expected_disconnect)
+
+
+async def _mock_generic_device_entry(
     hass: HomeAssistant,
-    mock_client,
-) -> MockConfigEntry:
-    """Set up an ESPHome entry with voice assistant."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_HOST: "test.local",
-            CONF_PORT: 6053,
-            CONF_PASSWORD: "",
-        },
-    )
-    entry.add_to_hass(hass)
+    mock_client: APIClient,
+    mock_device_info: dict[str, Any],
+    mock_list_entities_services: tuple[list[EntityInfo], list[UserService]],
+    states: list[EntityState],
+    entry: MockConfigEntry | None = None,
+) -> MockESPHomeDevice:
+    if not entry:
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data={
+                CONF_HOST: "test.local",
+                CONF_PORT: 6053,
+                CONF_PASSWORD: "",
+            },
+            options={
+                CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+            },
+        )
+        entry.add_to_hass(hass)
+
+    mock_device = MockESPHomeDevice(entry)
 
     device_info = DeviceInfo(
         name="test",
         friendly_name="Test",
-        voice_assistant_version=1,
         mac_address="11:22:33:44:55:aa",
         esphome_version="1.0.0",
+        **mock_device_info,
     )
 
+    async def _subscribe_states(callback: Callable[[EntityState], None]) -> None:
+        """Subscribe to state."""
+        mock_device.set_state_callback(callback)
+        for state in states:
+            callback(state)
+
     mock_client.device_info = AsyncMock(return_value=device_info)
     mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())
+    mock_client.list_entities_services = AsyncMock(
+        return_value=mock_list_entities_services
+    )
+    mock_client.subscribe_states = _subscribe_states
 
     try_connect_done = Event()
-    real_try_connect = ReconnectLogic._try_connect
 
-    async def mock_try_connect(self):
-        """Set an event when ReconnectLogic._try_connect has been awaited."""
-        result = await real_try_connect(self)
-        try_connect_done.set()
-        return result
+    class MockReconnectLogic(ReconnectLogic):
+        """Mock ReconnectLogic."""
+
+        def __init__(self, *args, **kwargs):
+            """Init the mock."""
+            super().__init__(*args, **kwargs)
+            mock_device.set_on_disconnect(kwargs["on_disconnect"])
+            self._try_connect = self.mock_try_connect
 
-    with patch.object(ReconnectLogic, "_try_connect", mock_try_connect):
-        await hass.config_entries.async_setup(entry.entry_id)
+        async def mock_try_connect(self):
+            """Set an event when ReconnectLogic._try_connect has been awaited."""
+            result = await super()._try_connect()
+            try_connect_done.set()
+            return result
+
+    with patch(
+        "homeassistant.components.esphome.manager.ReconnectLogic", MockReconnectLogic
+    ):
+        assert await hass.config_entries.async_setup(entry.entry_id)
         await try_connect_done.wait()
 
-    return entry
+    await hass.async_block_till_done()
+
+    return mock_device
 
 
 @pytest.fixture
-async def mock_voice_assistant_v2_entry(
+async def mock_voice_assistant_entry(
     hass: HomeAssistant,
-    mock_client,
-) -> MockConfigEntry:
+    mock_client: APIClient,
+):
     """Set up an ESPHome entry with voice assistant."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            CONF_HOST: "test.local",
-            CONF_PORT: 6053,
-            CONF_PASSWORD: "",
-        },
-    )
-    entry.add_to_hass(hass)
 
-    device_info = DeviceInfo(
-        name="test",
-        friendly_name="Test",
-        voice_assistant_version=2,
-        mac_address="11:22:33:44:55:aa",
-        esphome_version="1.0.0",
-    )
+    async def _mock_voice_assistant_entry(version: int) -> MockConfigEntry:
+        return (
+            await _mock_generic_device_entry(
+                hass, mock_client, {"voice_assistant_version": version}, ([], []), []
+            )
+        ).entry
 
-    mock_client.device_info = AsyncMock(return_value=device_info)
-    mock_client.subscribe_voice_assistant = AsyncMock(return_value=Mock())
+    return _mock_voice_assistant_entry
 
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
 
-    return entry
+@pytest.fixture
+async def mock_voice_assistant_v1_entry(mock_voice_assistant_entry) -> MockConfigEntry:
+    """Set up an ESPHome entry with voice assistant."""
+    return await mock_voice_assistant_entry(version=1)
+
+
+@pytest.fixture
+async def mock_voice_assistant_v2_entry(mock_voice_assistant_entry) -> MockConfigEntry:
+    """Set up an ESPHome entry with voice assistant."""
+    return await mock_voice_assistant_entry(version=2)
+
+
+@pytest.fixture
+async def mock_generic_device_entry(
+    hass: HomeAssistant,
+) -> Callable[
+    [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+    Awaitable[MockConfigEntry],
+]:
+    """Set up an ESPHome entry and return the MockConfigEntry."""
+
+    async def _mock_device_entry(
+        mock_client: APIClient,
+        entity_info: list[EntityInfo],
+        user_service: list[UserService],
+        states: list[EntityState],
+    ) -> MockConfigEntry:
+        return (
+            await _mock_generic_device_entry(
+                hass, mock_client, {}, (entity_info, user_service), states
+            )
+        ).entry
+
+    return _mock_device_entry
+
+
+@pytest.fixture
+async def mock_esphome_device(
+    hass: HomeAssistant,
+) -> Callable[
+    [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+    Awaitable[MockESPHomeDevice],
+]:
+    """Set up an ESPHome entry and return the MockESPHomeDevice."""
+
+    async def _mock_device(
+        mock_client: APIClient,
+        entity_info: list[EntityInfo],
+        user_service: list[UserService],
+        states: list[EntityState],
+        entry: MockConfigEntry | None = None,
+    ) -> MockESPHomeDevice:
+        return await _mock_generic_device_entry(
+            hass, mock_client, {}, (entity_info, user_service), states, entry
+        )
+
+    return _mock_device
diff --git a/tests/components/esphome/test_alarm_control_panel.py b/tests/components/esphome/test_alarm_control_panel.py
new file mode 100644
index 00000000000000..90d7bde521582e
--- /dev/null
+++ b/tests/components/esphome/test_alarm_control_panel.py
@@ -0,0 +1,247 @@
+"""Test ESPHome alarm_control_panels."""
+from unittest.mock import call
+
+from aioesphomeapi import (
+    AlarmControlPanelCommand,
+    AlarmControlPanelEntityState,
+    AlarmControlPanelInfo,
+    AlarmControlPanelState,
+    APIClient,
+)
+
+from homeassistant.components.alarm_control_panel import (
+    ATTR_CODE,
+    DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
+    SERVICE_ALARM_ARM_AWAY,
+    SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+    SERVICE_ALARM_ARM_HOME,
+    SERVICE_ALARM_ARM_NIGHT,
+    SERVICE_ALARM_ARM_VACATION,
+    SERVICE_ALARM_DISARM,
+    SERVICE_ALARM_TRIGGER,
+)
+from homeassistant.components.esphome.alarm_control_panel import EspHomeACPFeatures
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    STATE_ALARM_ARMED_AWAY,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+
+
+async def test_generic_alarm_control_panel_requires_code(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that requires a code."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=True,
+            requires_code_to_arm=True,
+        )
+    ]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_ALARM_ARMED_AWAY
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_AWAY,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_AWAY, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_CUSTOM_BYPASS, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_HOME,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_HOME, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_NIGHT,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_NIGHT, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_ARM_VACATION,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.ARM_VACATION, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_TRIGGER,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.TRIGGER, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {
+            ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel",
+            ATTR_CODE: 1234,
+        },
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.DISARM, "1234")]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+
+async def test_generic_alarm_control_panel_no_code(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that does not require a code."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=False,
+            requires_code_to_arm=False,
+        )
+    ]
+    states = [
+        AlarmControlPanelEntityState(key=1, state=AlarmControlPanelState.ARMED_AWAY)
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_ALARM_ARMED_AWAY
+
+    await hass.services.async_call(
+        ALARM_CONTROL_PANEL_DOMAIN,
+        SERVICE_ALARM_DISARM,
+        {ATTR_ENTITY_ID: "alarm_control_panel.test_my_alarm_control_panel"},
+        blocking=True,
+    )
+    mock_client.alarm_control_panel_command.assert_has_calls(
+        [call(1, AlarmControlPanelCommand.DISARM, None)]
+    )
+    mock_client.alarm_control_panel_command.reset_mock()
+
+
+async def test_generic_alarm_control_panel_missing_state(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic alarm_control_panel entity that is missing state."""
+    entity_info = [
+        AlarmControlPanelInfo(
+            object_id="myalarm_control_panel",
+            key=1,
+            name="my alarm_control_panel",
+            unique_id="my_alarm_control_panel",
+            supported_features=EspHomeACPFeatures.ARM_AWAY
+            | EspHomeACPFeatures.ARM_CUSTOM_BYPASS
+            | EspHomeACPFeatures.ARM_HOME
+            | EspHomeACPFeatures.ARM_NIGHT
+            | EspHomeACPFeatures.ARM_VACATION
+            | EspHomeACPFeatures.TRIGGER,
+            requires_code=False,
+            requires_code_to_arm=False,
+        )
+    ]
+    states = []
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("alarm_control_panel.test_my_alarm_control_panel")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/esphome/test_binary_sensor.py b/tests/components/esphome/test_binary_sensor.py
index 3f780f3003dd28..231bd51c0a33f5 100644
--- a/tests/components/esphome/test_binary_sensor.py
+++ b/tests/components/esphome/test_binary_sensor.py
@@ -1,9 +1,24 @@
 """Test ESPHome binary sensors."""
+from collections.abc import Awaitable, Callable
 
+from aioesphomeapi import (
+    APIClient,
+    BinarySensorInfo,
+    BinarySensorState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+import pytest
 
 from homeassistant.components.esphome import DomainData
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
+from .conftest import MockESPHomeDevice
+
+from tests.common import MockConfigEntry
+
 
 async def test_assist_in_progress(
     hass: HomeAssistant,
@@ -26,3 +41,135 @@ async def test_assist_in_progress(
 
     state = hass.states.get("binary_sensor.test_assist_in_progress")
     assert state.state == "off"
+
+
+@pytest.mark.parametrize(
+    "binary_state", ((True, STATE_ON), (False, STATE_OFF), (None, STATE_UNKNOWN))
+)
+async def test_binary_sensor_generic_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    binary_state: tuple[bool, str],
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor entity."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    esphome_state, hass_state = binary_state
+    states = [BinarySensorState(key=1, state=esphome_state)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == hass_state
+
+
+async def test_status_binary_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor entity."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+            is_status_binary_sensor=True,
+        )
+    ]
+    states = [BinarySensorState(key=1, state=None)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+
+
+async def test_binary_sensor_missing_state(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockConfigEntry],
+    ],
+) -> None:
+    """Test a generic binary_sensor that is missing state."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    states = [BinarySensorState(key=1, state=True, missing_state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_binary_sensor_has_state_false(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic binary_sensor where has_state is false."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    mock_device.set_state(BinarySensorState(key=1, state=True, missing_state=False))
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
diff --git a/tests/components/esphome/test_button.py b/tests/components/esphome/test_button.py
new file mode 100644
index 00000000000000..c0e7db14998df6
--- /dev/null
+++ b/tests/components/esphome/test_button.py
@@ -0,0 +1,54 @@
+"""Test ESPHome buttones."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, ButtonInfo
+
+from homeassistant.components.button import (
+    DOMAIN as BUTTON_DOMAIN,
+    SERVICE_PRESS,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+
+
+async def test_button_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_esphome_device
+) -> None:
+    """Test a generic button entity."""
+    entity_info = [
+        ButtonInfo(
+            object_id="mybutton",
+            key=1,
+            name="my button",
+            unique_id="my_button",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: "button.test_my_button"},
+        blocking=True,
+    )
+    mock_client.button_command.assert_has_calls([call(1)])
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state != STATE_UNKNOWN
+
+    await mock_device.mock_disconnect(False)
+    state = hass.states.get("button.test_my_button")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/esphome/test_camera.py b/tests/components/esphome/test_camera.py
new file mode 100644
index 00000000000000..f856a9dd15caa5
--- /dev/null
+++ b/tests/components/esphome/test_camera.py
@@ -0,0 +1,316 @@
+"""Test ESPHome cameras."""
+from collections.abc import Awaitable, Callable
+
+from aioesphomeapi import (
+    APIClient,
+    CameraInfo,
+    CameraState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+
+from homeassistant.components.camera import (
+    STATE_IDLE,
+)
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockESPHomeDevice
+
+from tests.typing import ClientSessionGenerator
+
+SMALLEST_VALID_JPEG = (
+    "ffd8ffe000104a46494600010101004800480000ffdb00430003020202020203020202030303030406040404040408060"
+    "6050609080a0a090809090a0c0f0c0a0b0e0b09090d110d0e0f101011100a0c12131210130f101010ffc9000b08000100"
+    "0101011100ffcc000600101005ffda0008010100003f00d2cf20ffd9"
+)
+SMALLEST_VALID_JPEG_BYTES = bytes.fromhex(SMALLEST_VALID_JPEG)
+
+
+async def test_camera_single_image(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera single image request."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+
+    async def _mock_camera_image():
+        mock_device.set_state(CameraState(key=1, data=SMALLEST_VALID_JPEG_BYTES))
+
+    mock_client.request_single_image = _mock_camera_image
+
+    client = await hass_client()
+    resp = await client.get("/api/camera_proxy/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+
+    assert resp.status == 200
+    assert resp.content_type == "image/jpeg"
+    assert resp.content_length == len(SMALLEST_VALID_JPEG_BYTES)
+    assert await resp.read() == SMALLEST_VALID_JPEG_BYTES
+
+
+async def test_camera_single_image_unavailable_before_requested(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera that goes unavailable before the request."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+    await mock_device.mock_disconnect(False)
+
+    client = await hass_client()
+    resp = await client.get("/api/camera_proxy/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+    assert resp.status == 500
+
+
+async def test_camera_single_image_unavailable_during_request(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera that goes unavailable before the request."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+
+    async def _mock_camera_image():
+        await mock_device.mock_disconnect(False)
+        # Currently there is a bug where the camera will block
+        # forever if we don't send a response
+        mock_device.set_state(CameraState(key=1, data=SMALLEST_VALID_JPEG_BYTES))
+
+    mock_client.request_single_image = _mock_camera_image
+
+    client = await hass_client()
+    resp = await client.get("/api/camera_proxy/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+    assert resp.status == 500
+
+
+async def test_camera_stream(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera stream."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+    remaining_responses = 3
+
+    async def _mock_camera_image():
+        nonlocal remaining_responses
+        if remaining_responses == 0:
+            return
+        remaining_responses -= 1
+        mock_device.set_state(CameraState(key=1, data=SMALLEST_VALID_JPEG_BYTES))
+
+    mock_client.request_image_stream = _mock_camera_image
+    mock_client.request_single_image = _mock_camera_image
+
+    client = await hass_client()
+    resp = await client.get("/api/camera_proxy_stream/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+
+    assert resp.status == 200
+    assert resp.content_type == "multipart/x-mixed-replace"
+    assert resp.content_length is None
+    raw_stream = b""
+    async for data in resp.content.iter_any():
+        raw_stream += data
+        if len(raw_stream) > 300:
+            break
+
+    assert b"image/jpeg" in raw_stream
+
+
+async def test_camera_stream_unavailable(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera stream when the device is disconnected."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+
+    await mock_device.mock_disconnect(False)
+
+    client = await hass_client()
+    await client.get("/api/camera_proxy_stream/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_camera_stream_with_disconnection(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test a generic camera stream that goes unavailable during the request."""
+    entity_info = [
+        CameraInfo(
+            object_id="mycamera",
+            key=1,
+            name="my camera",
+            unique_id="my_camera",
+        )
+    ]
+    states = []
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_IDLE
+    remaining_responses = 3
+
+    async def _mock_camera_image():
+        nonlocal remaining_responses
+        if remaining_responses == 0:
+            return
+        if remaining_responses == 2:
+            await mock_device.mock_disconnect(False)
+        remaining_responses -= 1
+        mock_device.set_state(CameraState(key=1, data=SMALLEST_VALID_JPEG_BYTES))
+
+    mock_client.request_image_stream = _mock_camera_image
+    mock_client.request_single_image = _mock_camera_image
+
+    client = await hass_client()
+    await client.get("/api/camera_proxy_stream/camera.test_my_camera")
+    await hass.async_block_till_done()
+    state = hass.states.get("camera.test_my_camera")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/esphome/test_climate.py b/tests/components/esphome/test_climate.py
new file mode 100644
index 00000000000000..59072dc2e5999c
--- /dev/null
+++ b/tests/components/esphome/test_climate.py
@@ -0,0 +1,314 @@
+"""Test ESPHome climates."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    ClimateAction,
+    ClimateFanMode,
+    ClimateInfo,
+    ClimateMode,
+    ClimatePreset,
+    ClimateState,
+    ClimateSwingMode,
+)
+
+from homeassistant.components.climate import (
+    ATTR_FAN_MODE,
+    ATTR_HVAC_MODE,
+    ATTR_PRESET_MODE,
+    ATTR_SWING_MODE,
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    ATTR_TEMPERATURE,
+    DOMAIN as CLIMATE_DOMAIN,
+    FAN_HIGH,
+    SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_SWING_MODE,
+    SERVICE_SET_TEMPERATURE,
+    SWING_BOTH,
+    HVACMode,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_climate_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            supports_two_point_target_temperature=True,
+            supports_action=True,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            action=ClimateAction.COOLING,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+
+async def test_climate_entity_with_step_and_two_point(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            supports_two_point_target_temperature=True,
+            visual_target_temperature_step=2,
+            visual_current_temperature_step=2,
+            supports_action=False,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+            supported_modes=[ClimateMode.COOL, ClimateMode.HEAT, ClimateMode.AUTO],
+            supported_presets=[ClimatePreset.AWAY, ClimatePreset.ACTIVITY],
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.AUTO,
+            ATTR_TARGET_TEMP_LOW: 20,
+            ATTR_TARGET_TEMP_HIGH: 30,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.AUTO,
+                target_temperature_low=20.0,
+                target_temperature_high=30.0,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+
+async def test_climate_entity_with_step_and_target_temp(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic climate entity."""
+    entity_info = [
+        ClimateInfo(
+            object_id="myclimate",
+            key=1,
+            name="my climate",
+            unique_id="my_climate",
+            supports_current_temperature=True,
+            visual_target_temperature_step=2,
+            visual_current_temperature_step=2,
+            supports_action=True,
+            visual_min_temperature=10.0,
+            visual_max_temperature=30.0,
+            supported_fan_modes=[ClimateFanMode.LOW, ClimateFanMode.HIGH],
+            supported_modes=[ClimateMode.COOL, ClimateMode.HEAT, ClimateMode.AUTO],
+            supported_presets=[ClimatePreset.AWAY, ClimatePreset.ACTIVITY],
+            supported_custom_presets=["preset1", "preset2"],
+            supported_custom_fan_modes=["fan1", "fan2"],
+            supported_swing_modes=[ClimateSwingMode.BOTH, ClimateSwingMode.OFF],
+        )
+    ]
+    states = [
+        ClimateState(
+            key=1,
+            mode=ClimateMode.COOL,
+            action=ClimateAction.COOLING,
+            current_temperature=30,
+            target_temperature=20,
+            fan_mode=ClimateFanMode.AUTO,
+            swing_mode=ClimateSwingMode.BOTH,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("climate.test_my_climate")
+    assert state is not None
+    assert state.state == HVACMode.COOL
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, target_temperature=25.0)])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.AUTO,
+            ATTR_TARGET_TEMP_LOW: 20,
+            ATTR_TARGET_TEMP_HIGH: 30,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.AUTO,
+                target_temperature_low=20.0,
+                target_temperature_high=30.0,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {
+            ATTR_ENTITY_ID: "climate.test_my_climate",
+            ATTR_HVAC_MODE: HVACMode.HEAT,
+        },
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                mode=ClimateMode.HEAT,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_PRESET_MODE: "away"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                preset=ClimatePreset.AWAY,
+            )
+        ]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_PRESET_MODE: "preset1"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, custom_preset="preset1")])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_FAN_MODE: FAN_HIGH},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [call(key=1, fan_mode=ClimateFanMode.HIGH)]
+    )
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_FAN_MODE: "fan2"},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls([call(key=1, custom_fan_mode="fan2")])
+    mock_client.climate_command.reset_mock()
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_SWING_MODE,
+        {ATTR_ENTITY_ID: "climate.test_my_climate", ATTR_SWING_MODE: SWING_BOTH},
+        blocking=True,
+    )
+    mock_client.climate_command.assert_has_calls(
+        [call(key=1, swing_mode=ClimateSwingMode.BOTH)]
+    )
+    mock_client.climate_command.reset_mock()
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 7d901733d81b92..f5b7795a57bd9d 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -1,7 +1,10 @@
 """Test config flow."""
+import asyncio
+import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from aioesphomeapi import (
+    APIClient,
     APIConnectionError,
     DeviceInfo,
     InvalidAuthAPIError,
@@ -9,16 +12,21 @@
     RequiresEncryptionAPIError,
     ResolveAPIError,
 )
+import aiohttp
 import pytest
 
 from homeassistant import config_entries, data_entry_flow
 from homeassistant.components import dhcp, zeroconf
 from homeassistant.components.esphome import (
+    DomainData,
+    dashboard,
+)
+from homeassistant.components.esphome.const import (
+    CONF_ALLOW_SERVICE_CALLS,
     CONF_DEVICE_NAME,
     CONF_NOISE_PSK,
+    DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS,
     DOMAIN,
-    DomainData,
-    dashboard,
 )
 from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
@@ -30,9 +38,10 @@
 from tests.common import MockConfigEntry
 
 INVALID_NOISE_PSK = "lSYBYEjQI1bVL8s2Vask4YytGMj1f1epNtmoim2yuTM="
+WRONG_NOISE_PSK = "GP+ciK+nVfTQ/gcz6uOdS+oKEdJgesU+jeu8Ssj2how="
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture(autouse=False)
 def mock_setup_entry():
     """Mock setting up a config entry."""
     with patch("homeassistant.components.esphome.async_setup_entry", return_value=True):
@@ -40,7 +49,7 @@ def mock_setup_entry():
 
 
 async def test_user_connection_works(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test we can finish a config flow."""
     result = await hass.config_entries.flow.async_init(
@@ -66,6 +75,9 @@ async def test_user_connection_works(
         CONF_NOISE_PSK: "",
         CONF_DEVICE_NAME: "test",
     }
+    assert result["options"] == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+    }
     assert result["title"] == "test"
     assert result["result"].unique_id == "11:22:33:44:55:aa"
 
@@ -79,7 +91,7 @@ async def test_user_connection_works(
 
 
 async def test_user_connection_updates_host(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test setup up the same name updates the host."""
     entry = MockConfigEntry(
@@ -107,8 +119,60 @@ async def test_user_connection_updates_host(
     assert entry.data[CONF_HOST] == "127.0.0.1"
 
 
+async def test_user_sets_unique_id(
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
+) -> None:
+    """Test that the user flow sets the unique id."""
+    service_info = zeroconf.ZeroconfServiceInfo(
+        host="192.168.43.183",
+        addresses=["192.168.43.183"],
+        hostname="test8266.local.",
+        name="mock_name",
+        port=6053,
+        properties={
+            "mac": "1122334455aa",
+        },
+        type="mock_type",
+    )
+    discovery_result = await hass.config_entries.flow.async_init(
+        "esphome", context={"source": config_entries.SOURCE_ZEROCONF}, data=service_info
+    )
+
+    assert discovery_result["type"] == FlowResultType.FORM
+    assert discovery_result["step_id"] == "discovery_confirm"
+
+    discovery_result = await hass.config_entries.flow.async_configure(
+        discovery_result["flow_id"],
+        {},
+    )
+    assert discovery_result["type"] == FlowResultType.CREATE_ENTRY
+    assert discovery_result["data"] == {
+        CONF_HOST: "192.168.43.183",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: "",
+        CONF_DEVICE_NAME: "test",
+    }
+
+    result = await hass.config_entries.flow.async_init(
+        "esphome",
+        context={"source": config_entries.SOURCE_USER},
+        data=None,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+    )
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
 async def test_user_resolve_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with IP resolve error."""
 
@@ -132,8 +196,55 @@ async def test_user_resolve_error(
     assert len(mock_client.disconnect.mock_calls) == 1
 
 
+async def test_user_causes_zeroconf_to_abort(
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
+) -> None:
+    """Test that the user flow sets the unique id and aborts the zeroconf flow."""
+    service_info = zeroconf.ZeroconfServiceInfo(
+        host="192.168.43.183",
+        addresses=["192.168.43.183"],
+        hostname="test8266.local.",
+        name="mock_name",
+        port=6053,
+        properties={
+            "mac": "1122334455aa",
+        },
+        type="mock_type",
+    )
+    discovery_result = await hass.config_entries.flow.async_init(
+        "esphome", context={"source": config_entries.SOURCE_ZEROCONF}, data=service_info
+    )
+
+    assert discovery_result["type"] == FlowResultType.FORM
+    assert discovery_result["step_id"] == "discovery_confirm"
+
+    result = await hass.config_entries.flow.async_init(
+        "esphome",
+        context={"source": config_entries.SOURCE_USER},
+        data=None,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: "",
+        CONF_DEVICE_NAME: "test",
+    }
+
+    assert not hass.config_entries.flow.async_progress_by_handler(DOMAIN)
+
+
 async def test_user_connection_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with connection error."""
     mock_client.device_info.side_effect = APIConnectionError
@@ -154,7 +265,7 @@ async def test_user_connection_error(
 
 
 async def test_user_with_password(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with password."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=True, name="test")
@@ -209,8 +320,218 @@ async def test_user_invalid_password(
     assert result["errors"] == {"base": "invalid_auth"}
 
 
+async def test_user_dashboard_has_wrong_key(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step with key from dashboard that is incorrect."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError,
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        return_value=WRONG_NOISE_PSK,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+async def test_user_discovers_name_and_gets_key_from_dashboard(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name and get the key from the dashboard."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+    await dashboard.async_get_dashboard(hass).async_refresh()
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        return_value=VALID_NOISE_PSK,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+@pytest.mark.parametrize(
+    "dashboard_exception",
+    [aiohttp.ClientError(), json.JSONDecodeError("test", "test", 0)],
+)
+async def test_user_discovers_name_and_gets_key_from_dashboard_fails(
+    hass: HomeAssistant,
+    dashboard_exception: Exception,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name and get the key from the dashboard."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:aa",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+    await dashboard.async_get_dashboard(hass).async_refresh()
+
+    with patch(
+        "homeassistant.components.esphome.dashboard.ESPHomeDashboardAPI.get_encryption_key",
+        side_effect=dashboard_exception,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
+async def test_user_discovers_name_and_dashboard_is_unavailable(
+    hass: HomeAssistant,
+    mock_client,
+    mock_dashboard,
+    mock_zeroconf: None,
+    mock_setup_entry: None,
+) -> None:
+    """Test user step can discover the name but the dashboard is unavailable."""
+    mock_client.device_info.side_effect = [
+        RequiresEncryptionAPIError,
+        InvalidEncryptionKeyAPIError("Wrong key", "test"),
+        DeviceInfo(
+            uses_password=False,
+            name="test",
+            mac_address="11:22:33:44:55:AA",
+        ),
+    ]
+
+    mock_dashboard["configured"].append(
+        {
+            "name": "test",
+            "configuration": "test.yaml",
+        }
+    )
+
+    with patch(
+        "esphome_dashboard_api.ESPHomeDashboardAPI.get_devices",
+        side_effect=asyncio.TimeoutError,
+    ):
+        await dashboard.async_get_dashboard(hass).async_refresh()
+        result = await hass.config_entries.flow.async_init(
+            "esphome",
+            context={"source": config_entries.SOURCE_USER},
+            data={CONF_HOST: "127.0.0.1", CONF_PORT: 6053},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "encryption_key"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={CONF_NOISE_PSK: VALID_NOISE_PSK}
+    )
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_HOST: "127.0.0.1",
+        CONF_PORT: 6053,
+        CONF_PASSWORD: "",
+        CONF_NOISE_PSK: VALID_NOISE_PSK,
+        CONF_DEVICE_NAME: "test",
+    }
+    assert mock_client.noise_psk == VALID_NOISE_PSK
+
+
 async def test_login_connection_error(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with connection error on login attempt."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=True, name="test")
@@ -236,7 +557,7 @@ async def test_login_connection_error(
 
 
 async def test_discovery_initiation(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test discovery importing works."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -268,7 +589,7 @@ async def test_discovery_initiation(
 
 
 async def test_discovery_no_mac(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test discovery aborted if old ESPHome without mac in zeroconf."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -287,7 +608,9 @@ async def test_discovery_no_mac(
     assert flow["reason"] == "mdns_missing_mac"
 
 
-async def test_discovery_already_configured(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_already_configured(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test discovery aborts if already configured via hostname."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -314,7 +637,9 @@ async def test_discovery_already_configured(hass: HomeAssistant, mock_client) ->
     assert result["reason"] == "already_configured"
 
 
-async def test_discovery_duplicate_data(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_duplicate_data(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test discovery aborts if same mDNS packet arrives."""
     service_info = zeroconf.ZeroconfServiceInfo(
         host="192.168.43.183",
@@ -339,7 +664,9 @@ async def test_discovery_duplicate_data(hass: HomeAssistant, mock_client) -> Non
     assert result["reason"] == "already_in_progress"
 
 
-async def test_discovery_updates_unique_id(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_updates_unique_id(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test a duplicate discovery host aborts and updates existing entry."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -369,7 +696,7 @@ async def test_discovery_updates_unique_id(hass: HomeAssistant, mock_client) ->
 
 
 async def test_user_requires_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test user step with requiring encryption key."""
     mock_client.device_info.side_effect = RequiresEncryptionAPIError
@@ -384,13 +711,13 @@ async def test_user_requires_psk(
     assert result["step_id"] == "encryption_key"
     assert result["errors"] == {}
 
-    assert len(mock_client.connect.mock_calls) == 1
-    assert len(mock_client.device_info.mock_calls) == 1
-    assert len(mock_client.disconnect.mock_calls) == 1
+    assert len(mock_client.connect.mock_calls) == 2
+    assert len(mock_client.device_info.mock_calls) == 2
+    assert len(mock_client.disconnect.mock_calls) == 2
 
 
 async def test_encryption_key_valid_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test encryption key step with valid key."""
 
@@ -424,7 +751,7 @@ async def test_encryption_key_valid_psk(
 
 
 async def test_encryption_key_invalid_psk(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test encryption key step with invalid key."""
 
@@ -473,7 +800,7 @@ async def test_reauth_initiation(
 
 
 async def test_reauth_confirm_valid(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with valid PSK."""
     entry = MockConfigEntry(
@@ -502,7 +829,11 @@ async def test_reauth_confirm_valid(
 
 
 async def test_reauth_fixed_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard."""
 
@@ -554,6 +885,7 @@ async def test_reauth_fixed_via_dashboard_add_encryption_remove_password(
     mock_zeroconf: None,
     mock_dashboard,
     mock_config_entry,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard with password removed."""
     mock_client.device_info.side_effect = (
@@ -596,6 +928,7 @@ async def test_reauth_fixed_via_remove_password(
     mock_client,
     mock_config_entry,
     mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically by seeing password removed."""
     mock_client.device_info.return_value = DeviceInfo(uses_password=False, name="test")
@@ -615,7 +948,11 @@ async def test_reauth_fixed_via_remove_password(
 
 
 async def test_reauth_fixed_via_dashboard_at_confirm(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test reauth fixed automatically via dashboard at confirm step."""
 
@@ -668,7 +1005,7 @@ async def test_reauth_fixed_via_dashboard_at_confirm(
 
 
 async def test_reauth_confirm_invalid(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with invalid PSK."""
     entry = MockConfigEntry(
@@ -709,7 +1046,7 @@ async def test_reauth_confirm_invalid(
 
 
 async def test_reauth_confirm_invalid_with_unique_id(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None
+    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_setup_entry: None
 ) -> None:
     """Test reauth initiation with invalid PSK."""
     entry = MockConfigEntry(
@@ -750,7 +1087,9 @@ async def test_reauth_confirm_invalid_with_unique_id(
     assert entry.data[CONF_NOISE_PSK] == VALID_NOISE_PSK
 
 
-async def test_discovery_dhcp_updates_host(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_dhcp_updates_host(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test dhcp discovery updates host and aborts."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -774,7 +1113,9 @@ async def test_discovery_dhcp_updates_host(hass: HomeAssistant, mock_client) ->
     assert entry.data[CONF_HOST] == "192.168.43.184"
 
 
-async def test_discovery_dhcp_no_changes(hass: HomeAssistant, mock_client) -> None:
+async def test_discovery_dhcp_no_changes(
+    hass: HomeAssistant, mock_client: APIClient, mock_setup_entry: None
+) -> None:
     """Test dhcp discovery updates host and aborts."""
     entry = MockConfigEntry(
         domain=DOMAIN,
@@ -827,7 +1168,11 @@ async def test_discovery_hassio(hass: HomeAssistant, mock_dashboard) -> None:
 
 
 async def test_zeroconf_encryption_key_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test encryption key retrieved from dashboard."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -862,7 +1207,7 @@ async def test_zeroconf_encryption_key_via_dashboard(
         DeviceInfo(
             uses_password=False,
             name="test8266",
-            mac_address="11:22:33:44:55:aa",
+            mac_address="11:22:33:44:55:AA",
         ),
     ]
 
@@ -889,7 +1234,11 @@ async def test_zeroconf_encryption_key_via_dashboard(
 
 
 async def test_zeroconf_no_encryption_key_via_dashboard(
-    hass: HomeAssistant, mock_client, mock_zeroconf: None, mock_dashboard
+    hass: HomeAssistant,
+    mock_client,
+    mock_zeroconf: None,
+    mock_dashboard,
+    mock_setup_entry: None,
 ) -> None:
     """Test encryption key not retrieved from dashboard."""
     service_info = zeroconf.ZeroconfServiceInfo(
@@ -920,3 +1269,42 @@ async def test_zeroconf_no_encryption_key_via_dashboard(
 
     assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "encryption_key"
+
+
+@pytest.mark.parametrize("option_value", [True, False])
+async def test_option_flow(
+    hass: HomeAssistant,
+    option_value: bool,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test config flow options."""
+    entry = await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=[],
+        user_service=[],
+        states=[],
+    )
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "init"
+    assert result["data_schema"]({}) == {
+        CONF_ALLOW_SERVICE_CALLS: DEFAULT_NEW_CONFIG_ALLOW_ALLOW_SERVICE_CALLS
+    }
+
+    with patch(
+        "homeassistant.components.esphome.async_setup_entry", return_value=True
+    ) as mock_reload:
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={
+                CONF_ALLOW_SERVICE_CALLS: option_value,
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["data"] == {CONF_ALLOW_SERVICE_CALLS: option_value}
+    assert len(mock_reload.mock_calls) == int(option_value)
diff --git a/tests/components/esphome/test_cover.py b/tests/components/esphome/test_cover.py
new file mode 100644
index 00000000000000..59eadb3cfd9c41
--- /dev/null
+++ b/tests/components/esphome/test_cover.py
@@ -0,0 +1,208 @@
+"""Test ESPHome covers."""
+
+from collections.abc import Awaitable, Callable
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    CoverInfo,
+    CoverOperation,
+    CoverState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+
+from homeassistant.components.cover import (
+    ATTR_CURRENT_POSITION,
+    ATTR_CURRENT_TILT_POSITION,
+    ATTR_POSITION,
+    ATTR_TILT_POSITION,
+    DOMAIN as COVER_DOMAIN,
+    SERVICE_CLOSE_COVER,
+    SERVICE_CLOSE_COVER_TILT,
+    SERVICE_OPEN_COVER,
+    SERVICE_OPEN_COVER_TILT,
+    SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION,
+    SERVICE_STOP_COVER,
+    STATE_CLOSED,
+    STATE_CLOSING,
+    STATE_OPEN,
+    STATE_OPENING,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockESPHomeDevice
+
+
+async def test_cover_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic cover entity."""
+    entity_info = [
+        CoverInfo(
+            object_id="mycover",
+            key=1,
+            name="my cover",
+            unique_id="my_cover",
+            supports_position=True,
+            supports_tilt=True,
+            supports_stop=True,
+        )
+    ]
+    states = [
+        CoverState(
+            key=1,
+            position=0.5,
+            tilt=0.5,
+            current_operation=CoverOperation.IS_OPENING,
+        )
+    ]
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPENING
+    assert state.attributes[ATTR_CURRENT_POSITION] == 50
+    assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 50
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=0.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=1.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_my_cover", ATTR_POSITION: 50},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, position=0.5)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, stop=True)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=1.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: "cover.test_my_cover"},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=0.0)])
+    mock_client.cover_command.reset_mock()
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: "cover.test_my_cover", ATTR_TILT_POSITION: 50},
+        blocking=True,
+    )
+    mock_client.cover_command.assert_has_calls([call(key=1, tilt=0.5)])
+    mock_client.cover_command.reset_mock()
+
+    mock_device.set_state(
+        CoverState(key=1, position=0.0, current_operation=CoverOperation.IDLE)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_CLOSED
+
+    mock_device.set_state(
+        CoverState(key=1, position=0.5, current_operation=CoverOperation.IS_CLOSING)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_CLOSING
+
+    mock_device.set_state(
+        CoverState(key=1, position=1.0, current_operation=CoverOperation.IDLE)
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPEN
+
+
+async def test_cover_entity_without_position(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic cover entity without position, tilt, or stop."""
+    entity_info = [
+        CoverInfo(
+            object_id="mycover",
+            key=1,
+            name="my cover",
+            unique_id="my_cover",
+            supports_position=False,
+            supports_tilt=False,
+            supports_stop=False,
+        )
+    ]
+    states = [
+        CoverState(
+            key=1,
+            position=0.5,
+            tilt=0.5,
+            current_operation=CoverOperation.IS_OPENING,
+        )
+    ]
+    user_service = []
+    await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("cover.test_my_cover")
+    assert state is not None
+    assert state.state == STATE_OPENING
+    assert ATTR_CURRENT_TILT_POSITION not in state.attributes
+    assert ATTR_CURRENT_POSITION not in state.attributes
diff --git a/tests/components/esphome/test_dashboard.py b/tests/components/esphome/test_dashboard.py
index 580e741e03fee9..d16bf7c4d0073d 100644
--- a/tests/components/esphome/test_dashboard.py
+++ b/tests/components/esphome/test_dashboard.py
@@ -1,4 +1,5 @@
 """Test ESPHome dashboard features."""
+import asyncio
 from unittest.mock import patch
 
 from aioesphomeapi import DeviceInfo, InvalidAuthAPIError
@@ -10,6 +11,86 @@
 
 from . import VALID_NOISE_PSK
 
+from tests.common import MockConfigEntry
+
+
+async def test_dashboard_storage(
+    hass: HomeAssistant, init_integration, mock_dashboard, hass_storage
+) -> None:
+    """Test dashboard storage."""
+    assert hass_storage[dashboard.STORAGE_KEY]["data"] == {
+        "info": {"addon_slug": "mock-slug", "host": "mock-host", "port": 1234}
+    }
+    await dashboard.async_set_dashboard_info(hass, "test-slug", "new-host", 6052)
+    assert hass_storage[dashboard.STORAGE_KEY]["data"] == {
+        "info": {"addon_slug": "test-slug", "host": "new-host", "port": 6052}
+    }
+
+
+async def test_restore_dashboard_storage(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Restore dashboard url and slug from storage."""
+    hass_storage[dashboard.STORAGE_KEY] = {
+        "version": dashboard.STORAGE_VERSION,
+        "minor_version": dashboard.STORAGE_VERSION,
+        "key": dashboard.STORAGE_KEY,
+        "data": {"info": {"addon_slug": "test-slug", "host": "new-host", "port": 6052}},
+    }
+    with patch.object(
+        dashboard, "async_get_or_create_dashboard_manager"
+    ) as mock_get_or_create:
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+        assert mock_get_or_create.call_count == 1
+
+
+async def test_setup_dashboard_fails(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Test that nothing is stored on failed dashboard setup when there was no dashboard before."""
+    with patch.object(
+        dashboard.ESPHomeDashboardAPI, "get_devices", side_effect=asyncio.TimeoutError
+    ) as mock_get_devices:
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+        await dashboard.async_set_dashboard_info(hass, "test-slug", "test-host", 6052)
+        assert mock_config_entry.state == ConfigEntryState.LOADED
+        assert mock_get_devices.call_count == 1
+
+    assert dashboard.STORAGE_KEY not in hass_storage
+
+
+async def test_setup_dashboard_fails_when_already_setup(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, hass_storage
+) -> MockConfigEntry:
+    """Test failed dashboard setup still reloads entries if one existed before."""
+    with patch.object(dashboard.ESPHomeDashboardAPI, "get_devices") as mock_get_devices:
+        await dashboard.async_set_dashboard_info(
+            hass, "test-slug", "working-host", 6052
+        )
+        await hass.async_block_till_done()
+
+    assert mock_get_devices.call_count == 1
+    assert dashboard.STORAGE_KEY in hass_storage
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    with patch.object(
+        dashboard.ESPHomeDashboardAPI, "get_devices", side_effect=asyncio.TimeoutError
+    ) as mock_get_devices, patch(
+        "homeassistant.components.esphome.async_setup_entry", return_value=True
+    ) as mock_setup:
+        await dashboard.async_set_dashboard_info(hass, "test-slug", "test-host", 6052)
+        await hass.async_block_till_done()
+
+    assert mock_config_entry.state == ConfigEntryState.LOADED
+    assert mock_get_devices.call_count == 1
+    # We still setup, and reload, but we do not do the reauths
+    assert dashboard.STORAGE_KEY in hass_storage
+    assert len(mock_setup.mock_calls) == 1
+
 
 async def test_new_info_reload_config_entries(
     hass: HomeAssistant, init_integration, mock_dashboard
diff --git a/tests/components/esphome/test_diagnostics.py b/tests/components/esphome/test_diagnostics.py
index c1df7c024cd19c..a77fd9b0087597 100644
--- a/tests/components/esphome/test_diagnostics.py
+++ b/tests/components/esphome/test_diagnostics.py
@@ -1,7 +1,10 @@
 """Tests for the diagnostics data provided by the ESPHome integration."""
 
 
-from homeassistant.components.esphome import CONF_DEVICE_NAME, CONF_NOISE_PSK
+from homeassistant.components.esphome.const import (
+    CONF_DEVICE_NAME,
+    CONF_NOISE_PSK,
+)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
 from homeassistant.core import HomeAssistant
 
diff --git a/tests/components/esphome/test_entity.py b/tests/components/esphome/test_entity.py
new file mode 100644
index 00000000000000..39bfec852e7959
--- /dev/null
+++ b/tests/components/esphome/test_entity.py
@@ -0,0 +1,103 @@
+"""Test ESPHome binary sensors."""
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from aioesphomeapi import (
+    APIClient,
+    BinarySensorInfo,
+    BinarySensorState,
+    EntityInfo,
+    EntityState,
+    UserService,
+)
+
+from homeassistant.const import ATTR_RESTORED, STATE_ON
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockESPHomeDevice
+
+
+async def test_entities_removed(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    hass_storage: dict[str, Any],
+    mock_esphome_device: Callable[
+        [APIClient, list[EntityInfo], list[UserService], list[EntityState]],
+        Awaitable[MockESPHomeDevice],
+    ],
+) -> None:
+    """Test a generic binary_sensor where has_state is false."""
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        ),
+        BinarySensorInfo(
+            object_id="mybinary_sensor_to_be_removed",
+            key=2,
+            name="my binary_sensor to be removed",
+            unique_id="mybinary_sensor_to_be_removed",
+        ),
+    ]
+    states = [
+        BinarySensorState(key=1, state=True, missing_state=False),
+        BinarySensorState(key=2, state=True, missing_state=False),
+    ]
+    user_service = []
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    entry = mock_device.entry
+    entry_id = entry.entry_id
+    storage_key = f"esphome.{entry_id}"
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 2
+
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.attributes[ATTR_RESTORED] is True
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is not None
+    assert state.attributes[ATTR_RESTORED] is True
+
+    entity_info = [
+        BinarySensorInfo(
+            object_id="mybinary_sensor",
+            key=1,
+            name="my binary_sensor",
+            unique_id="my_binary_sensor",
+        ),
+    ]
+    states = [
+        BinarySensorState(key=1, state=True, missing_state=False),
+    ]
+    mock_device = await mock_esphome_device(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+        entry=entry,
+    )
+    assert mock_device.entry.entry_id == entry_id
+    state = hass.states.get("binary_sensor.test_my_binary_sensor")
+    assert state is not None
+    assert state.state == STATE_ON
+    state = hass.states.get("binary_sensor.test_my_binary_sensor_to_be_removed")
+    assert state is None
+    await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+    assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 1
diff --git a/tests/components/esphome/test_fan.py b/tests/components/esphome/test_fan.py
new file mode 100644
index 00000000000000..4f8f3918a1be47
--- /dev/null
+++ b/tests/components/esphome/test_fan.py
@@ -0,0 +1,318 @@
+"""Test ESPHome fans."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    FanDirection,
+    FanInfo,
+    FanSpeed,
+    FanState,
+)
+
+from homeassistant.components.fan import (
+    ATTR_DIRECTION,
+    ATTR_OSCILLATING,
+    ATTR_PERCENTAGE,
+    DOMAIN as FAN_DOMAIN,
+    SERVICE_DECREASE_SPEED,
+    SERVICE_INCREASE_SPEED,
+    SERVICE_OSCILLATE,
+    SERVICE_SET_DIRECTION,
+    SERVICE_SET_PERCENTAGE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_fan_entity_with_all_features_old_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the old api and has all features."""
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supports_direction=True,
+            supports_speed=True,
+            supports_oscillation=True,
+        )
+    ]
+    states = [
+        FanState(
+            key=1,
+            state=True,
+            oscillating=True,
+            speed=FanSpeed.MEDIUM,
+            direction=FanDirection.REVERSE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 20},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.LOW, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 50},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.MEDIUM, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_DECREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.LOW, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_INCREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.HIGH, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 100},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, speed=FanSpeed.HIGH, state=True)]
+    )
+    mock_client.fan_command.reset_mock()
+
+
+async def test_fan_entity_with_all_features_new_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the new api and has all features."""
+    mock_client.api_version = APIVersion(1, 4)
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supported_speed_levels=4,
+            supports_direction=True,
+            supports_speed=True,
+            supports_oscillation=True,
+        )
+    ]
+    states = [
+        FanState(
+            key=1,
+            state=True,
+            oscillating=True,
+            speed_level=3,
+            direction=FanDirection.REVERSE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 20},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=1, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 50},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=2, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_DECREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=2, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_INCREASE_SPEED,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=4, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 100},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, speed_level=4, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_PERCENTAGE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_PERCENTAGE: 0},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_OSCILLATING: True},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, oscillating=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_OSCILLATING: False},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, oscillating=False)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_DIRECTION,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_DIRECTION: "forward"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, direction=FanDirection.FORWARD)]
+    )
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_SET_DIRECTION,
+        {ATTR_ENTITY_ID: "fan.test_my_fan", ATTR_DIRECTION: "reverse"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls(
+        [call(key=1, direction=FanDirection.REVERSE)]
+    )
+    mock_client.fan_command.reset_mock()
+
+
+async def test_fan_entity_with_no_features_new_api(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic fan entity that uses the new api and has no features."""
+    mock_client.api_version = APIVersion(1, 4)
+    entity_info = [
+        FanInfo(
+            object_id="myfan",
+            key=1,
+            name="my fan",
+            unique_id="my_fan",
+            supports_direction=False,
+            supports_speed=False,
+            supports_oscillation=False,
+        )
+    ]
+    states = [FanState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("fan.test_my_fan")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=True)])
+    mock_client.fan_command.reset_mock()
+
+    await hass.services.async_call(
+        FAN_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "fan.test_my_fan"},
+        blocking=True,
+    )
+    mock_client.fan_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.fan_command.reset_mock()
diff --git a/tests/components/esphome/test_init.py b/tests/components/esphome/test_init.py
index 84bafc9fd84512..d3d47a40d66fab 100644
--- a/tests/components/esphome/test_init.py
+++ b/tests/components/esphome/test_init.py
@@ -31,3 +31,19 @@ async def test_unique_id_updated_to_mac(
     await hass.async_block_till_done()
 
     assert entry.unique_id == "11:22:33:44:55:aa"
+
+
+async def test_delete_entry(
+    hass: HomeAssistant, mock_client, mock_zeroconf: None
+) -> None:
+    """Test we can delete an entry with error."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "test.local", CONF_PORT: 6053, CONF_PASSWORD: ""},
+        unique_id="mock-config-name",
+    )
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    assert await hass.config_entries.async_remove(entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/esphome/test_light.py b/tests/components/esphome/test_light.py
new file mode 100644
index 00000000000000..a0998898e757bf
--- /dev/null
+++ b/tests/components/esphome/test_light.py
@@ -0,0 +1,1678 @@
+"""Test ESPHome lights."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    APIVersion,
+    LightColorCapability,
+    LightInfo,
+    LightState,
+)
+import pytest
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_MODE,
+    ATTR_COLOR_TEMP_KELVIN,
+    ATTR_EFFECT,
+    ATTR_EFFECT_LIST,
+    ATTR_FLASH,
+    ATTR_HS_COLOR,
+    ATTR_MAX_COLOR_TEMP_KELVIN,
+    ATTR_MAX_MIREDS,
+    ATTR_MIN_COLOR_TEMP_KELVIN,
+    ATTR_MIN_MIREDS,
+    ATTR_RGB_COLOR,
+    ATTR_RGBW_COLOR,
+    ATTR_RGBWW_COLOR,
+    ATTR_SUPPORTED_COLOR_MODES,
+    ATTR_TRANSITION,
+    DOMAIN as LIGHT_DOMAIN,
+    FLASH_LONG,
+    FLASH_SHORT,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_ON,
+    ColorMode,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_light_on_off(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports on/off."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[LightColorCapability.ON_OFF],
+        )
+    ]
+    states = [LightState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.ON_OFF)]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[LightColorCapability.BRIGHTNESS],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.BRIGHTNESS)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_TRANSITION: 2},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=False, transition_length=2.0)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_FLASH: FLASH_LONG},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=False, flash_length=10.0)]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_TRANSITION: 2},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                transition_length=2.0,
+                color_mode=LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_FLASH: FLASH_SHORT},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                flash_length=2.0,
+                color_mode=LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness_on_off(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_legacy_white_converted_to_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports legacy white."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.WHITE
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.WHITE,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_brightness_on_off_with_unknown_color_mode(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that only supports brightness along with an unknown color mode."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS | 1 << 8
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | 1 << 8,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | 1 << 8,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_on_and_brightness(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that supports on and on and brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+                LightColorCapability.ON_OFF,
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [call(key=1, state=True, color_mode=LightColorCapability.ON_OFF)]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_rgb_color_temp_light(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light that supports color temp and RGB."""
+    color_modes = [
+        LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+        LightColorCapability.ON_OFF
+        | LightColorCapability.BRIGHTNESS
+        | LightColorCapability.COLOR_TEMPERATURE,
+        LightColorCapability.ON_OFF
+        | LightColorCapability.BRIGHTNESS
+        | LightColorCapability.RGB,
+    ]
+
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=color_modes,
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.COLOR_TEMPERATURE,
+                color_temperature=400,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgb(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGB light entity."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100, red=1, green=1, blue=1)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbw(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBW light entity."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBW
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0.0,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbww_with_cold_warm_white_support(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBWW light entity with cold warm white support."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            color_brightness=1,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            warm_white=1,
+            cold_white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.COLD_WARM_WHITE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBWW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBWW
+    assert state.attributes[ATTR_RGBWW_COLOR] == (255, 255, 255, 255, 255)
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                cold_white=0,
+                warm_white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_RGBWW_COLOR: (255, 255, 255, 255, 255),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1,
+                cold_white=1,
+                warm_white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0,
+                cold_white=0,
+                warm_white=100,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.COLD_WARM_WHITE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgbww_without_cold_warm_white_support(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic RGBWW light entity without cold warm white support."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            supported_color_modes=[
+                LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            color_brightness=1,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            color_mode=LightColorCapability.RGB
+            | LightColorCapability.WHITE
+            | LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGBWW]
+    assert state.attributes[ATTR_COLOR_MODE] == ColorMode.RGBWW
+    assert state.attributes[ATTR_RGBWW_COLOR] == (255, 255, 255, 255, 0)
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_BRIGHTNESS: 127},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_BRIGHTNESS: 127,
+            ATTR_HS_COLOR: (100, 100),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                white=0,
+                rgb=(pytest.approx(0.32941176470588235), 1.0, 0.0),
+                brightness=pytest.approx(0.4980392156862745),
+            )
+        ]
+    )
+
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                color_temperature=276.5,
+                white=1,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGBW_COLOR: (255, 255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=pytest.approx(0.4235294117647059),
+                white=1,
+                color_temperature=276.5,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, pytest.approx(0.5462962962962963), 1.0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {
+            ATTR_ENTITY_ID: "light.test_my_light",
+            ATTR_RGBWW_COLOR: (255, 255, 255, 255, 255),
+        },
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=1,
+                white=1,
+                color_temperature=276.5,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(1, 1, 1),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 2500},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_brightness=0,
+                white=100,
+                color_temperature=400.0,
+                color_mode=LightColorCapability.RGB
+                | LightColorCapability.WHITE
+                | LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                rgb=(0, 0, 0),
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that does supports color temp."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            color_temperature=153.846161,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_MIN_MIREDS] == 153
+    assert attributes[ATTR_MAX_MIREDS] == 370
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 2700
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 6500
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp_no_mireds_set(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic color temp with no mireds set uses the defaults."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=0,
+            max_mireds=0,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            color_temperature=153.846161,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_MIN_MIREDS] is None
+    assert attributes[ATTR_MAX_MIREDS] is None
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 0
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 0
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_COLOR_TEMP_KELVIN: 6000},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_temperature=pytest.approx(166.66666666666666),
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_color_temp_legacy(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a legacy light entity that does supports color temp."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+            ],
+            legacy_supports_brightness=True,
+            legacy_supports_color_temperature=True,
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            white=1,
+            cold_white=1,
+            color_temperature=153.846161,
+            color_mode=19,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+
+    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
+    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.COLOR_TEMP]
+    assert attributes[ATTR_MIN_MIREDS] == 153
+    assert attributes[ATTR_MAX_MIREDS] == 370
+
+    assert attributes[ATTR_MIN_COLOR_TEMP_KELVIN] == 2700
+    assert attributes[ATTR_MAX_COLOR_TEMP_KELVIN] == 6500
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_rgb_legacy(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a legacy light entity that supports rgb."""
+    mock_client.api_version = APIVersion(1, 5)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153.846161,
+            max_mireds=370.370361,
+            supported_color_modes=[
+                LightColorCapability.COLOR_TEMPERATURE
+                | LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS
+                | LightColorCapability.RGB
+            ],
+            legacy_supports_brightness=True,
+            legacy_supports_color_temperature=True,
+            legacy_supports_rgb=True,
+        )
+    ]
+    states = [
+        LightState(
+            key=1,
+            state=True,
+            brightness=100,
+            red=1,
+            green=1,
+            blue=1,
+            color_mode=LightColorCapability.COLOR_TEMPERATURE
+            | LightColorCapability.ON_OFF
+            | LightColorCapability.BRIGHTNESS
+            | LightColorCapability.RGB,
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    attributes = state.attributes
+    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.RGB]
+    assert attributes[ATTR_COLOR_MODE] == ColorMode.RGB
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "light.test_my_light"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls([call(key=1, state=False)])
+    mock_client.light_command.reset_mock()
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_RGB_COLOR: (255, 255, 255)},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                rgb=(1.0, 1.0, 1.0),
+                color_brightness=1.0,
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
+
+
+async def test_light_effects(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic light entity that supports on and on and brightness."""
+    mock_client.api_version = APIVersion(1, 7)
+    entity_info = [
+        LightInfo(
+            object_id="mylight",
+            key=1,
+            name="my light",
+            unique_id="my_light",
+            min_mireds=153,
+            max_mireds=400,
+            effects=["effect1", "effect2"],
+            supported_color_modes=[
+                LightColorCapability.ON_OFF | LightColorCapability.BRIGHTNESS,
+            ],
+        )
+    ]
+    states = [LightState(key=1, state=True, brightness=100)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("light.test_my_light")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_EFFECT_LIST] == ["effect1", "effect2"]
+
+    await hass.services.async_call(
+        LIGHT_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "light.test_my_light", ATTR_EFFECT: "effect1"},
+        blocking=True,
+    )
+    mock_client.light_command.assert_has_calls(
+        [
+            call(
+                key=1,
+                state=True,
+                color_mode=LightColorCapability.ON_OFF
+                | LightColorCapability.BRIGHTNESS,
+                effect="effect1",
+            )
+        ]
+    )
+    mock_client.light_command.reset_mock()
diff --git a/tests/components/esphome/test_lock.py b/tests/components/esphome/test_lock.py
new file mode 100644
index 00000000000000..6e6461d34b1449
--- /dev/null
+++ b/tests/components/esphome/test_lock.py
@@ -0,0 +1,132 @@
+"""Test ESPHome locks."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, LockCommand, LockEntityState, LockInfo, LockState
+
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_LOCKING,
+    STATE_UNLOCKING,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+
+async def test_lock_entity_no_open(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that does not support open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+            supports_open=False,
+            requires_code=False,
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.UNLOCKING)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_UNLOCKING
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_LOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.LOCK)])
+    mock_client.lock_command.reset_mock()
+
+
+async def test_lock_entity_start_locked(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that does not support open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.LOCKED)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_LOCKED
+
+
+async def test_lock_entity_supports_open(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic lock entity that supports open."""
+    entity_info = [
+        LockInfo(
+            object_id="mylock",
+            key=1,
+            name="my lock",
+            unique_id="my_lock",
+            supports_open=True,
+            requires_code=True,
+        )
+    ]
+    states = [LockEntityState(key=1, state=LockState.LOCKING)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("lock.test_my_lock")
+    assert state is not None
+    assert state.state == STATE_LOCKING
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_LOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.LOCK)])
+    mock_client.lock_command.reset_mock()
+
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_UNLOCK,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.UNLOCK, None)])
+
+    mock_client.lock_command.reset_mock()
+    await hass.services.async_call(
+        LOCK_DOMAIN,
+        SERVICE_OPEN,
+        {ATTR_ENTITY_ID: "lock.test_my_lock"},
+        blocking=True,
+    )
+    mock_client.lock_command.assert_has_calls([call(1, LockCommand.OPEN)])
diff --git a/tests/components/esphome/test_media_player.py b/tests/components/esphome/test_media_player.py
new file mode 100644
index 00000000000000..bcef78e93454fc
--- /dev/null
+++ b/tests/components/esphome/test_media_player.py
@@ -0,0 +1,250 @@
+"""Test ESPHome media_players."""
+
+from unittest.mock import AsyncMock, Mock, call
+
+from aioesphomeapi import (
+    APIClient,
+    MediaPlayerCommand,
+    MediaPlayerEntityState,
+    MediaPlayerInfo,
+    MediaPlayerState,
+)
+import pytest
+
+from homeassistant.components import media_source
+from homeassistant.components.media_player import (
+    ATTR_MEDIA_CONTENT_ID,
+    ATTR_MEDIA_CONTENT_TYPE,
+    ATTR_MEDIA_VOLUME_LEVEL,
+    ATTR_MEDIA_VOLUME_MUTED,
+    DOMAIN as MEDIA_PLAYER_DOMAIN,
+    SERVICE_MEDIA_PAUSE,
+    SERVICE_MEDIA_PLAY,
+    SERVICE_MEDIA_STOP,
+    SERVICE_PLAY_MEDIA,
+    SERVICE_VOLUME_MUTE,
+    SERVICE_VOLUME_SET,
+    BrowseMedia,
+    MediaClass,
+    MediaType,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import (
+    mock_platform,
+)
+from tests.typing import WebSocketGenerator
+
+
+async def test_media_player_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic media_player entity."""
+    entity_info = [
+        MediaPlayerInfo(
+            object_id="mymedia_player",
+            key=1,
+            name="my media_player",
+            unique_id="my_media_player",
+            supports_pause=True,
+        )
+    ]
+    states = [
+        MediaPlayerEntityState(
+            key=1, volume=50, muted=True, state=MediaPlayerState.PAUSED
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("media_player.test_my_media_player")
+    assert state is not None
+    assert state.state == "paused"
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_MUTED: True,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.MUTE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_MUTED: True,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.MUTE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_VOLUME_SET,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_VOLUME_LEVEL: 0.5,
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls([call(1, volume=0.5)])
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PAUSE,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.PAUSE)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_PLAY,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.PLAY)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_MEDIA_STOP,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+        },
+        blocking=True,
+    )
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, command=MediaPlayerCommand.STOP)]
+    )
+    mock_client.media_player_command.reset_mock()
+
+
+async def test_media_player_entity_with_source(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    hass_ws_client: WebSocketGenerator,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic media_player entity media source."""
+    esphome_platform_mock = Mock(
+        async_get_media_browser_root_object=AsyncMock(
+            return_value=[
+                BrowseMedia(
+                    title="Spotify",
+                    media_class=MediaClass.APP,
+                    media_content_id="",
+                    media_content_type="spotify",
+                    thumbnail="https://brands.home-assistant.io/_/spotify/logo.png",
+                    can_play=False,
+                    can_expand=True,
+                )
+            ]
+        ),
+        async_browse_media=AsyncMock(
+            return_value=BrowseMedia(
+                title="Spotify Favourites",
+                media_class=MediaClass.PLAYLIST,
+                media_content_id="",
+                media_content_type="spotify",
+                can_play=True,
+                can_expand=False,
+            )
+        ),
+        async_play_media=AsyncMock(return_value=False),
+    )
+    mock_platform(hass, "test.esphome", esphome_platform_mock)
+    await async_setup_component(hass, "test", {"test": {}})
+    await async_setup_component(hass, "media_source", {"media_source": {}})
+    await hass.async_block_till_done()
+
+    entity_info = [
+        MediaPlayerInfo(
+            object_id="mymedia_player",
+            key=1,
+            name="my media_player",
+            unique_id="my_media_player",
+            supports_pause=True,
+        )
+    ]
+    states = [
+        MediaPlayerEntityState(
+            key=1, volume=50, muted=True, state=MediaPlayerState.PLAYING
+        )
+    ]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("media_player.test_my_media_player")
+    assert state is not None
+    assert state.state == "playing"
+
+    with pytest.raises(media_source.error.Unresolvable):
+        await hass.services.async_call(
+            MEDIA_PLAYER_DOMAIN,
+            SERVICE_PLAY_MEDIA,
+            {
+                ATTR_ENTITY_ID: "media_player.test_my_media_player",
+                ATTR_MEDIA_CONTENT_TYPE: MediaType.MUSIC,
+                ATTR_MEDIA_CONTENT_ID: "media-source://local/xz",
+            },
+            blocking=True,
+        )
+
+    mock_client.media_player_command.reset_mock()
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "media_player/browse_media",
+            "entity_id": "media_player.test_my_media_player",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+
+    await hass.services.async_call(
+        MEDIA_PLAYER_DOMAIN,
+        SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: "media_player.test_my_media_player",
+            ATTR_MEDIA_CONTENT_TYPE: MediaType.URL,
+            ATTR_MEDIA_CONTENT_ID: "media-source://tts?message=hello",
+        },
+        blocking=True,
+    )
+
+    mock_client.media_player_command.assert_has_calls(
+        [call(1, media_url="media-source://tts?message=hello")]
+    )
diff --git a/tests/components/esphome/test_number.py b/tests/components/esphome/test_number.py
new file mode 100644
index 00000000000000..8157c5f5c3d824
--- /dev/null
+++ b/tests/components/esphome/test_number.py
@@ -0,0 +1,91 @@
+"""Test ESPHome numbers."""
+
+import math
+from unittest.mock import call
+
+from aioesphomeapi import (
+    APIClient,
+    NumberInfo,
+    NumberMode as ESPHomeNumberMode,
+    NumberState,
+)
+
+from homeassistant.components.number import (
+    ATTR_VALUE,
+    DOMAIN as NUMBER_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+
+
+async def test_generic_number_entity(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic number entity."""
+    entity_info = [
+        NumberInfo(
+            object_id="mynumber",
+            key=1,
+            name="my number",
+            unique_id="my_number",
+            max_value=100,
+            min_value=0,
+            step=1,
+            unit_of_measurement="%",
+        )
+    ]
+    states = [NumberState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("number.test_my_number")
+    assert state is not None
+    assert state.state == "50"
+
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {ATTR_ENTITY_ID: "number.test_my_number", ATTR_VALUE: 50},
+        blocking=True,
+    )
+    mock_client.number_command.assert_has_calls([call(1, 50)])
+    mock_client.number_command.reset_mock()
+
+
+async def test_generic_number_nan(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic number entity with nan state."""
+    entity_info = [
+        NumberInfo(
+            object_id="mynumber",
+            key=1,
+            name="my number",
+            unique_id="my_number",
+            max_value=100,
+            min_value=0,
+            step=1,
+            unit_of_measurement="%",
+            mode=ESPHomeNumberMode.SLIDER,
+        )
+    ]
+    states = [NumberState(key=1, state=math.nan)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("number.test_my_number")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/esphome/test_select.py b/tests/components/esphome/test_select.py
index dec321ced868bd..8d17276c304211 100644
--- a/tests/components/esphome/test_select.py
+++ b/tests/components/esphome/test_select.py
@@ -1,6 +1,16 @@
 """Test ESPHome selects."""
 
 
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, SelectInfo, SelectState
+
+from homeassistant.components.select import (
+    ATTR_OPTION,
+    DOMAIN as SELECT_DOMAIN,
+    SERVICE_SELECT_OPTION,
+)
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 
 
@@ -13,3 +23,51 @@ async def test_pipeline_selector(
     state = hass.states.get("select.test_assist_pipeline")
     assert state is not None
     assert state.state == "preferred"
+
+
+async def test_vad_sensitivity_select(
+    hass: HomeAssistant,
+    mock_voice_assistant_v1_entry,
+) -> None:
+    """Test VAD sensitivity select.
+
+    Functionality is tested in assist_pipeline/test_select.py.
+    This test is only to ensure it is set up.
+    """
+    state = hass.states.get("select.test_finished_speaking_detection")
+    assert state is not None
+    assert state.state == "default"
+
+
+async def test_select_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic select entity."""
+    entity_info = [
+        SelectInfo(
+            object_id="myselect",
+            key=1,
+            name="my select",
+            unique_id="my_select",
+            options=["a", "b"],
+        )
+    ]
+    states = [SelectState(key=1, state="a")]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("select.test_my_select")
+    assert state is not None
+    assert state.state == "a"
+
+    await hass.services.async_call(
+        SELECT_DOMAIN,
+        SERVICE_SELECT_OPTION,
+        {ATTR_ENTITY_ID: "select.test_my_select", ATTR_OPTION: "b"},
+        blocking=True,
+    )
+    mock_client.select_command.assert_has_calls([call(1, "b")])
diff --git a/tests/components/esphome/test_sensor.py b/tests/components/esphome/test_sensor.py
new file mode 100644
index 00000000000000..8f4eb0f95139c8
--- /dev/null
+++ b/tests/components/esphome/test_sensor.py
@@ -0,0 +1,277 @@
+"""Test ESPHome sensors."""
+import math
+
+from aioesphomeapi import (
+    APIClient,
+    EntityCategory as ESPHomeEntityCategory,
+    LastResetType,
+    SensorInfo,
+    SensorState,
+    SensorStateClass as ESPHomeSensorStateClass,
+    TextSensorInfo,
+    TextSensorState,
+)
+
+from homeassistant.components.sensor import ATTR_STATE_CLASS, SensorStateClass
+from homeassistant.const import ATTR_ICON, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity import EntityCategory
+
+
+async def test_generic_numeric_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+
+
+async def test_generic_numeric_sensor_with_entity_category_and_icon(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            entity_category=ESPHomeEntityCategory.CONFIG,
+            icon="mdi:leaf",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_ICON] == "mdi:leaf"
+    entity_reg = er.async_get(hass)
+    entry = entity_reg.async_get("sensor.test_my_sensor")
+    assert entry is not None
+    assert entry.unique_id == "my_sensor"
+    assert entry.entity_category is EntityCategory.CONFIG
+
+
+async def test_generic_numeric_sensor_state_class_measurement(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic sensor entity."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            state_class=ESPHomeSensorStateClass.MEASUREMENT,
+            device_class="power",
+            unit_of_measurement="W",
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
+    entity_reg = er.async_get(hass)
+    entry = entity_reg.async_get("sensor.test_my_sensor")
+    assert entry is not None
+    assert entry.unique_id == "my_sensor"
+    assert entry.entity_category is None
+
+
+async def test_generic_numeric_sensor_device_class_timestamp(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a sensor entity that uses timestamp (epoch)."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            device_class="timestamp",
+        )
+    ]
+    states = [SensorState(key=1, state=1687459432.466624)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "2023-06-22T18:43:52+00:00"
+
+
+async def test_generic_numeric_sensor_legacy_last_reset_convert(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a state class of measurement with last reset type of auto is converted to total increasing."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+            last_reset_type=LastResetType.AUTO,
+            state_class=ESPHomeSensorStateClass.MEASUREMENT,
+        )
+    ]
+    states = [SensorState(key=1, state=50)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "50"
+    assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.TOTAL_INCREASING
+
+
+async def test_generic_numeric_sensor_no_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that has no state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = []
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_numeric_sensor_nan_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that has nan state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=math.nan, missing_state=False)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_numeric_sensor_missing_state(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic numeric sensor that is missing state."""
+    entity_info = [
+        SensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [SensorState(key=1, state=True, missing_state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_generic_text_sensor(
+    hass: HomeAssistant,
+    mock_client: APIClient,
+    mock_generic_device_entry,
+) -> None:
+    """Test a generic text sensor entity."""
+    entity_info = [
+        TextSensorInfo(
+            object_id="mysensor",
+            key=1,
+            name="my sensor",
+            unique_id="my_sensor",
+        )
+    ]
+    states = [TextSensorState(key=1, state="i am a teapot")]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("sensor.test_my_sensor")
+    assert state is not None
+    assert state.state == "i am a teapot"
diff --git a/tests/components/esphome/test_switch.py b/tests/components/esphome/test_switch.py
new file mode 100644
index 00000000000000..39e01a7d07c852
--- /dev/null
+++ b/tests/components/esphome/test_switch.py
@@ -0,0 +1,55 @@
+"""Test ESPHome switches."""
+
+
+from unittest.mock import call
+
+from aioesphomeapi import APIClient, SwitchInfo, SwitchState
+
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_ON
+from homeassistant.core import HomeAssistant
+
+
+async def test_switch_generic_entity(
+    hass: HomeAssistant, mock_client: APIClient, mock_generic_device_entry
+) -> None:
+    """Test a generic switch entity."""
+    entity_info = [
+        SwitchInfo(
+            object_id="myswitch",
+            key=1,
+            name="my switch",
+            unique_id="my_switch",
+        )
+    ]
+    states = [SwitchState(key=1, state=True)]
+    user_service = []
+    await mock_generic_device_entry(
+        mock_client=mock_client,
+        entity_info=entity_info,
+        user_service=user_service,
+        states=states,
+    )
+    state = hass.states.get("switch.test_my_switch")
+    assert state is not None
+    assert state.state == STATE_ON
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_my_switch"},
+        blocking=True,
+    )
+    mock_client.switch_command.assert_has_calls([call(1, True)])
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "switch.test_my_switch"},
+        blocking=True,
+    )
+    mock_client.switch_command.assert_has_calls([call(1, False)])
diff --git a/tests/components/esphome/test_update.py b/tests/components/esphome/test_update.py
index 5410af96bd7b84..53ae72e375e064 100644
--- a/tests/components/esphome/test_update.py
+++ b/tests/components/esphome/test_update.py
@@ -7,6 +7,7 @@
 
 from homeassistant.components.esphome.dashboard import async_get_dashboard
 from homeassistant.components.update import UpdateEntityFeature
+from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
@@ -14,7 +15,7 @@
 @pytest.fixture(autouse=True)
 def stub_reconnect():
     """Stub reconnect."""
-    with patch("homeassistant.components.esphome.ReconnectLogic.start"):
+    with patch("homeassistant.components.esphome.manager.ReconnectLogic.start"):
         yield
 
 
@@ -149,8 +150,12 @@ async def test_update_static_info(
     assert state.state == "off"
 
 
+@pytest.mark.parametrize(
+    "expected_disconnect_state", [(True, STATE_ON), (False, STATE_UNAVAILABLE)]
+)
 async def test_update_device_state_for_availability(
     hass: HomeAssistant,
+    expected_disconnect_state: tuple[bool, str],
     mock_config_entry,
     mock_device_info,
     mock_dashboard,
@@ -167,6 +172,7 @@ async def test_update_device_state_for_availability(
     signal_device_updated = f"esphome_{mock_config_entry.entry_id}_on_device_update"
     runtime_data = Mock(
         available=True,
+        expected_disconnect=False,
         device_info=mock_device_info,
         signal_device_updated=signal_device_updated,
     )
@@ -183,11 +189,14 @@ async def test_update_device_state_for_availability(
     assert state is not None
     assert state.state == "on"
 
+    expected_disconnect, expected_state = expected_disconnect_state
+
     runtime_data.available = False
+    runtime_data.expected_disconnect = expected_disconnect
     async_dispatcher_send(hass, signal_device_updated)
 
     state = hass.states.get("update.none_firmware")
-    assert state.state == "unavailable"
+    assert state.state == expected_state
 
     # Deep sleep devices should still be available
     runtime_data.device_info = dataclasses.replace(
diff --git a/tests/components/esphome/test_voice_assistant.py b/tests/components/esphome/test_voice_assistant.py
index fed83f8ab10149..322e057ec15ca0 100644
--- a/tests/components/esphome/test_voice_assistant.py
+++ b/tests/components/esphome/test_voice_assistant.py
@@ -8,7 +8,6 @@
 import async_timeout
 import pytest
 
-from homeassistant.components import esphome
 from homeassistant.components.assist_pipeline import PipelineEvent, PipelineEventType
 from homeassistant.components.esphome import DomainData
 from homeassistant.components.esphome.voice_assistant import VoiceAssistantUDPServer
@@ -19,43 +18,47 @@
 _TEST_OUTPUT_URL = "output.mp3"
 _TEST_MEDIA_ID = "12345"
 
+_ONE_SECOND = 16000 * 2  # 16Khz 16-bit
+
 
 @pytest.fixture
-def voice_assistant_udp_server_v1(
+def voice_assistant_udp_server(
     hass: HomeAssistant,
-    mock_voice_assistant_v1_entry,
 ) -> VoiceAssistantUDPServer:
-    """Return the UDP server."""
-    entry_data = DomainData.get(hass).get_entry_data(mock_voice_assistant_v1_entry)
+    """Return the UDP server factory."""
+
+    def _voice_assistant_udp_server(entry):
+        entry_data = DomainData.get(hass).get_entry_data(entry)
+
+        server: VoiceAssistantUDPServer = None
 
-    server: VoiceAssistantUDPServer = None
+        def handle_finished():
+            nonlocal server
+            assert server is not None
+            server.close()
 
-    def handle_finished():
-        nonlocal server
-        assert server is not None
-        server.close()
+        server = VoiceAssistantUDPServer(hass, entry_data, Mock(), handle_finished)
+        return server
 
-    server = VoiceAssistantUDPServer(hass, entry_data, Mock(), handle_finished)
-    return server
+    return _voice_assistant_udp_server
 
 
 @pytest.fixture
-def voice_assistant_udp_server_v2(
-    hass: HomeAssistant,
-    mock_voice_assistant_v2_entry,
+def voice_assistant_udp_server_v1(
+    voice_assistant_udp_server,
+    mock_voice_assistant_v1_entry,
 ) -> VoiceAssistantUDPServer:
     """Return the UDP server."""
-    entry_data = DomainData.get(hass).get_entry_data(mock_voice_assistant_v2_entry)
+    return voice_assistant_udp_server(entry=mock_voice_assistant_v1_entry)
 
-    server: VoiceAssistantUDPServer = None
 
-    def handle_finished():
-        nonlocal server
-        assert server is not None
-        server.close()
-
-    server = VoiceAssistantUDPServer(hass, entry_data, Mock(), handle_finished)
-    return server
+@pytest.fixture
+def voice_assistant_udp_server_v2(
+    voice_assistant_udp_server,
+    mock_voice_assistant_v2_entry,
+) -> VoiceAssistantUDPServer:
+    """Return the UDP server."""
+    return voice_assistant_udp_server(entry=mock_voice_assistant_v2_entry)
 
 
 async def test_pipeline_events(
@@ -64,7 +67,9 @@ async def test_pipeline_events(
 ) -> None:
     """Test that the pipeline function is called."""
 
-    async def async_pipeline_from_audio_stream(*args, **kwargs):
+    async def async_pipeline_from_audio_stream(*args, device_id, **kwargs):
+        assert device_id == "mock-device-id"
+
         event_callback = kwargs["event_callback"]
 
         # Fake events
@@ -97,15 +102,15 @@ async def async_pipeline_from_audio_stream(*args, **kwargs):
         )
 
     def handle_event(
-        event_type: esphome.VoiceAssistantEventType, data: dict[str, str] | None
+        event_type: VoiceAssistantEventType, data: dict[str, str] | None
     ) -> None:
-        if event_type == esphome.VoiceAssistantEventType.VOICE_ASSISTANT_STT_END:
+        if event_type == VoiceAssistantEventType.VOICE_ASSISTANT_STT_END:
             assert data is not None
             assert data["text"] == _TEST_INPUT_TEXT
-        elif event_type == esphome.VoiceAssistantEventType.VOICE_ASSISTANT_TTS_START:
+        elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_TTS_START:
             assert data is not None
             assert data["text"] == _TEST_OUTPUT_TEXT
-        elif event_type == esphome.VoiceAssistantEventType.VOICE_ASSISTANT_TTS_END:
+        elif event_type == VoiceAssistantEventType.VOICE_ASSISTANT_TTS_END:
             assert data is not None
             assert data["url"] == _TEST_OUTPUT_URL
 
@@ -117,7 +122,9 @@ def handle_event(
     ):
         voice_assistant_udp_server_v1.transport = Mock()
 
-        await voice_assistant_udp_server_v1.run_pipeline()
+        await voice_assistant_udp_server_v1.run_pipeline(
+            device_id="mock-device-id", conversation_id=None
+        )
 
 
 async def test_udp_server(
@@ -335,3 +342,136 @@ async def test_send_tts(
         await voice_assistant_udp_server_v2._tts_done.wait()
 
         voice_assistant_udp_server_v2.transport.sendto.assert_called()
+
+
+async def test_speech_detection(
+    hass: HomeAssistant,
+    voice_assistant_udp_server_v2: VoiceAssistantUDPServer,
+) -> None:
+    """Test the UDP server queues incoming data."""
+
+    def is_speech(self, chunk, sample_rate):
+        """Anything non-zero is speech."""
+        return sum(chunk) > 0
+
+    async def async_pipeline_from_audio_stream(*args, **kwargs):
+        stt_stream = kwargs["stt_stream"]
+        event_callback = kwargs["event_callback"]
+        async for _chunk in stt_stream:
+            pass
+
+        # Test empty data
+        event_callback(
+            PipelineEvent(
+                type=PipelineEventType.STT_END,
+                data={"stt_output": {"text": _TEST_INPUT_TEXT}},
+            )
+        )
+
+    with patch(
+        "webrtcvad.Vad.is_speech",
+        new=is_speech,
+    ), patch(
+        "homeassistant.components.esphome.voice_assistant.async_pipeline_from_audio_stream",
+        new=async_pipeline_from_audio_stream,
+    ):
+        voice_assistant_udp_server_v2.started = True
+
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes(_ONE_SECOND))
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes([255] * _ONE_SECOND * 2))
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes([255] * _ONE_SECOND * 2))
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes(_ONE_SECOND))
+
+        await voice_assistant_udp_server_v2.run_pipeline(
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
+        )
+
+
+async def test_no_speech(
+    hass: HomeAssistant,
+    voice_assistant_udp_server_v2: VoiceAssistantUDPServer,
+) -> None:
+    """Test there is no speech."""
+
+    def is_speech(self, chunk, sample_rate):
+        """Anything non-zero is speech."""
+        return sum(chunk) > 0
+
+    def handle_event(
+        event_type: VoiceAssistantEventType, data: dict[str, str] | None
+    ) -> None:
+        assert event_type == VoiceAssistantEventType.VOICE_ASSISTANT_ERROR
+        assert data is not None
+        assert data["code"] == "speech-timeout"
+
+    voice_assistant_udp_server_v2.handle_event = handle_event
+
+    with patch(
+        "webrtcvad.Vad.is_speech",
+        new=is_speech,
+    ):
+        voice_assistant_udp_server_v2.started = True
+
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes(_ONE_SECOND))
+
+        await voice_assistant_udp_server_v2.run_pipeline(
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
+        )
+
+
+async def test_speech_timeout(
+    hass: HomeAssistant,
+    voice_assistant_udp_server_v2: VoiceAssistantUDPServer,
+) -> None:
+    """Test when speech was detected, but the pipeline times out."""
+
+    def is_speech(self, chunk, sample_rate):
+        """Anything non-zero is speech."""
+        return sum(chunk) > 255
+
+    async def async_pipeline_from_audio_stream(*args, **kwargs):
+        stt_stream = kwargs["stt_stream"]
+        async for _chunk in stt_stream:
+            # Stream will end when VAD detects end of "speech"
+            pass
+
+    async def segment_audio(*args, **kwargs):
+        raise asyncio.TimeoutError()
+        async for chunk in []:
+            yield chunk
+
+    with patch(
+        "webrtcvad.Vad.is_speech",
+        new=is_speech,
+    ), patch(
+        "homeassistant.components.esphome.voice_assistant.async_pipeline_from_audio_stream",
+        new=async_pipeline_from_audio_stream,
+    ), patch(
+        "homeassistant.components.esphome.voice_assistant.VoiceAssistantUDPServer._segment_audio",
+        new=segment_audio,
+    ):
+        voice_assistant_udp_server_v2.started = True
+
+        voice_assistant_udp_server_v2.queue.put_nowait(bytes([255] * (_ONE_SECOND * 2)))
+
+        await voice_assistant_udp_server_v2.run_pipeline(
+            device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
+        )
+
+
+async def test_cancelled(
+    hass: HomeAssistant,
+    voice_assistant_udp_server_v2: VoiceAssistantUDPServer,
+) -> None:
+    """Test when the server is stopped while waiting for speech."""
+
+    voice_assistant_udp_server_v2.started = True
+
+    voice_assistant_udp_server_v2.queue.put_nowait(b"")
+
+    await voice_assistant_udp_server_v2.run_pipeline(
+        device_id="", conversation_id=None, use_vad=True, pipeline_timeout=1.0
+    )
+
+    # No events should be sent if cancelled while waiting for speech
+    voice_assistant_udp_server_v2.handle_event.assert_not_called()
diff --git a/tests/components/fan/test_device_action.py b/tests/components/fan/test_device_action.py
index fef3c4cc0e710a..5404c80340e8e3 100644
--- a/tests/components/fan/test_device_action.py
+++ b/tests/components/fan/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Fan device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 async def test_get_actions(
@@ -31,7 +35,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = []
@@ -40,7 +44,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -48,7 +52,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -74,7 +78,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -88,7 +92,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -96,11 +100,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -114,7 +120,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -126,7 +132,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -138,7 +144,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -167,3 +173,37 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(turn_off_calls) == 1
     assert len(turn_on_calls) == 1
     assert len(toggle_calls) == 1
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_off",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+
+    turn_off_calls = async_mock_service(hass, "fan", "turn_off")
+
+    hass.bus.async_fire("test_event_turn_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
diff --git a/tests/components/fan/test_device_condition.py b/tests/components/fan/test_device_condition.py
index 5f34850cd6abe9..20c84eb1436ab0 100644
--- a/tests/components/fan/test_device_condition.py
+++ b/tests/components/fan/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Fan device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -37,7 +41,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -46,7 +50,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -54,7 +58,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -80,7 +84,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -94,7 +98,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -102,12 +106,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("fan.entity", STATE_ON)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -121,7 +129,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "fan.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -143,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "fan.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -167,9 +175,53 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on - event - test_event1"
 
-    hass.states.async_set("fan.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off - event - test_event2"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "is_on "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.event.event_type }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on - event - test_event1"
diff --git a/tests/components/fan/test_device_trigger.py b/tests/components/fan/test_device_trigger.py
index 9f32a79bd31451..f1de07a9e977db 100644
--- a/tests/components/fan/test_device_trigger.py
+++ b/tests/components/fan/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -51,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["turned_off", "turned_on", "changed_states"]
@@ -59,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["turned_off", "turned_on", "changed_states"]
@@ -107,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -140,9 +144,44 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("fan.entity", STATE_OFF)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     assert await async_setup_component(
         hass,
@@ -154,7 +193,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -176,7 +215,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -198,7 +237,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "fan.entity",
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -220,28 +259,80 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("fan.entity", STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        "turn_on - device - fan.entity - off - on - None",
-        "turn_on_or_off - device - fan.entity - off - on - None",
+        f"turn_on - device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off - device - {entry.entity_id} - off - on - None",
     }
 
     # Fake that the entity is turning off.
-    hass.states.async_set("fan.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        "turn_off - device - fan.entity - on - off - None",
-        "turn_on_or_off - device - fan.entity - on - off - None",
+        f"turn_off - device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off - device - {entry.entity_id} - on - off - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "turned_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "turn_on "
+                                "- {{ trigger.platform }} "
+                                "- {{ trigger.entity_id }} "
+                                "- {{ trigger.from_state.state }} "
+                                "- {{ trigger.to_state.state }} "
+                                "- {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_on - device - {entry.entity_id} - off - on - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for triggers firing with delay."""
-    entity_id = "fan.entity"
-    hass.states.async_set(entity_id, STATE_ON)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -253,7 +344,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -277,10 +368,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -288,5 +378,6 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     assert len(calls) == 1
     await hass.async_block_till_done()
     assert (
-        calls[0].data["some"] == f"turn_off device - {entity_id} - on - off - 0:00:05"
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/fan/test_recorder.py b/tests/components/fan/test_recorder.py
index f60a06cb4c50ca..d75e1e18511f27 100644
--- a/tests/components/fan/test_recorder.py
+++ b/tests/components/fan/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import fan
 from homeassistant.components.fan import ATTR_PRESET_MODES
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def fan_only() -> None:
+    """Enable only the fan platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.FAN],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test fan registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
index 521ac732e5b782..0c6ce300d01b70 100644
--- a/tests/components/ffmpeg/test_init.py
+++ b/tests/components/ffmpeg/test_init.py
@@ -8,7 +8,11 @@
     SERVICE_START,
     SERVICE_STOP,
 )
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    EVENT_HOMEASSISTANT_START,
+    EVENT_HOMEASSISTANT_STOP,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.setup import async_setup_component, setup_component
 
@@ -54,7 +58,7 @@ def __init__(self, hass, initial_state=True, entity_id="test.ffmpeg_device"):
 
         self.hass = hass
         self.entity_id = entity_id
-        self.ffmpeg = MagicMock
+        self.ffmpeg = MagicMock()
         self.called_stop = False
         self.called_start = False
         self.called_restart = False
@@ -104,12 +108,18 @@ async def test_setup_component_test_register(hass: HomeAssistant) -> None:
     with assert_setup_component(1):
         await async_setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}})
 
-    hass.bus.async_listen_once = MagicMock()
     ffmpeg_dev = MockFFmpegDev(hass)
+    ffmpeg_dev._async_stop_ffmpeg = AsyncMock()
+    ffmpeg_dev._async_start_ffmpeg = AsyncMock()
     await ffmpeg_dev.async_added_to_hass()
 
-    assert hass.bus.async_listen_once.called
-    assert hass.bus.async_listen_once.call_count == 2
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+    await hass.async_block_till_done()
+    assert len(ffmpeg_dev._async_start_ffmpeg.mock_calls) == 2
+
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
+    await hass.async_block_till_done()
+    assert len(ffmpeg_dev._async_stop_ffmpeg.mock_calls) == 2
 
 
 async def test_setup_component_test_register_no_startup(hass: HomeAssistant) -> None:
@@ -117,12 +127,18 @@ async def test_setup_component_test_register_no_startup(hass: HomeAssistant) ->
     with assert_setup_component(1):
         await async_setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}})
 
-    hass.bus.async_listen_once = MagicMock()
     ffmpeg_dev = MockFFmpegDev(hass, False)
+    ffmpeg_dev._async_stop_ffmpeg = AsyncMock()
+    ffmpeg_dev._async_start_ffmpeg = AsyncMock()
     await ffmpeg_dev.async_added_to_hass()
 
-    assert hass.bus.async_listen_once.called
-    assert hass.bus.async_listen_once.call_count == 1
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+    await hass.async_block_till_done()
+    assert len(ffmpeg_dev._async_start_ffmpeg.mock_calls) == 1
+
+    hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
+    await hass.async_block_till_done()
+    assert len(ffmpeg_dev._async_stop_ffmpeg.mock_calls) == 2
 
 
 async def test_setup_component_test_service_start(hass: HomeAssistant) -> None:
diff --git a/tests/components/fibaro/conftest.py b/tests/components/fibaro/conftest.py
index 9f1c87c1d98abc..056b23e1cf4c8a 100644
--- a/tests/components/fibaro/conftest.py
+++ b/tests/components/fibaro/conftest.py
@@ -1,9 +1,15 @@
 """Test helpers."""
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock, Mock, patch
 
+from pyfibaro.fibaro_scene import SceneModel
 import pytest
 
+from homeassistant.components.fibaro import DOMAIN, FIBARO_CONTROLLER, FIBARO_DEVICES
+from homeassistant.config_entries import SOURCE_USER, ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
 
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
@@ -12,3 +18,48 @@ def mock_setup_entry() -> Generator[AsyncMock, None, None]:
         "homeassistant.components.fibaro.async_setup_entry", return_value=True
     ) as mock_setup_entry:
         yield mock_setup_entry
+
+
+@pytest.fixture(name="fibaro_scene")
+def mock_scene() -> SceneModel:
+    """Fixture for an individual scene."""
+    scene = Mock(SceneModel)
+    scene.fibaro_id = 1
+    scene.name = "Test scene"
+    scene.room_id = 1
+    scene.visible = True
+    return scene
+
+
+async def setup_platform(
+    hass: HomeAssistant,
+    platform: Platform,
+    room_name: str | None,
+    scenes: list[SceneModel],
+) -> ConfigEntry:
+    """Set up the fibaro platform and prerequisites."""
+    hass.config.components.add(DOMAIN)
+    config_entry = ConfigEntry(
+        1,
+        DOMAIN,
+        "Test",
+        {},
+        SOURCE_USER,
+    )
+
+    controller_mock = Mock()
+    controller_mock.hub_serial = "HC2-111111"
+    controller_mock.get_room_name.return_value = room_name
+
+    for scene in scenes:
+        scene.fibaro_controller = controller_mock
+
+    hass.data[DOMAIN] = {
+        config_entry.entry_id: {
+            FIBARO_CONTROLLER: controller_mock,
+            FIBARO_DEVICES: {Platform.SCENE: scenes},
+        }
+    }
+    await hass.config_entries.async_forward_entry_setup(config_entry, platform)
+    await hass.async_block_till_done()
+    return config_entry
diff --git a/tests/components/fibaro/test_scene.py b/tests/components/fibaro/test_scene.py
new file mode 100644
index 00000000000000..09e0543976fd34
--- /dev/null
+++ b/tests/components/fibaro/test_scene.py
@@ -0,0 +1,54 @@
+"""Test the Fibaro scene platform."""
+
+from pyfibaro.fibaro_scene import SceneModel
+
+from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from .conftest import setup_platform
+
+
+async def test_entity_attributes(hass: HomeAssistant, fibaro_scene: SceneModel) -> None:
+    """Test that the attributes of the entity are correct."""
+    # Arrange
+    entity_registry = er.async_get(hass)
+    # Act
+    await setup_platform(hass, Platform.SCENE, "Room 1", [fibaro_scene])
+    # Assert
+    entry = entity_registry.async_get("scene.room_1_test_scene")
+
+    assert entry
+    assert entry.unique_id == "hc2_111111.scene.1"
+    assert entry.original_name == "Room 1 Test scene"
+
+
+async def test_entity_attributes_without_room(
+    hass: HomeAssistant, fibaro_scene: SceneModel
+) -> None:
+    """Test that the attributes of the entity are correct."""
+    # Arrange
+    entity_registry = er.async_get(hass)
+    # Act
+    await setup_platform(hass, Platform.SCENE, None, [fibaro_scene])
+    # Assert
+    entry = entity_registry.async_get("scene.unknown_test_scene")
+
+    assert entry
+    assert entry.unique_id == "hc2_111111.scene.1"
+
+
+async def test_activate_scene(hass: HomeAssistant, fibaro_scene: SceneModel) -> None:
+    """Test activate scene is called."""
+    # Arrange
+    await setup_platform(hass, Platform.SCENE, "Room 1", [fibaro_scene])
+    # Act
+    await hass.services.async_call(
+        SCENE_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "scene.room_1_test_scene"},
+        blocking=True,
+    )
+    # Assert
+    assert fibaro_scene.start.call_count == 1
diff --git a/tests/components/flipr/test_sensor.py b/tests/components/flipr/test_sensor.py
index cd31ec33c124bf..54684722802f9f 100644
--- a/tests/components/flipr/test_sensor.py
+++ b/tests/components/flipr/test_sensor.py
@@ -66,7 +66,7 @@ async def test_sensors(hass: HomeAssistant, entity_registry: er.EntityRegistry)
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.state == "7.03"
 
-    state = hass.states.get("sensor.flipr_myfliprid_water_temp")
+    state = hass.states.get("sensor.flipr_myfliprid_water_temperature")
     assert state
     assert state.attributes.get(ATTR_ICON) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS
@@ -94,7 +94,7 @@ async def test_sensors(hass: HomeAssistant, entity_registry: er.EntityRegistry)
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.state == "0.23654886"
 
-    state = hass.states.get("sensor.flipr_myfliprid_battery_level")
+    state = hass.states.get("sensor.flipr_myfliprid_battery")
     assert state
     assert state.attributes.get(ATTR_ICON) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
diff --git a/tests/components/flo/test_device.py b/tests/components/flo/test_device.py
index 9ad0d39a47f655..5d619f9e91f7df 100644
--- a/tests/components/flo/test_device.py
+++ b/tests/components/flo/test_device.py
@@ -11,7 +11,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import UpdateFailed
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import TEST_PASSWORD, TEST_USER_ID
 
@@ -83,7 +83,7 @@ async def test_device(
 
     call_count = aioclient_mock.call_count
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=90))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=90))
     await hass.async_block_till_done()
 
     assert aioclient_mock.call_count == call_count + 6
diff --git a/tests/components/flux_led/test_number.py b/tests/components/flux_led/test_number.py
index d0d71cacbe19ed..ff288c777df74e 100644
--- a/tests/components/flux_led/test_number.py
+++ b/tests/components/flux_led/test_number.py
@@ -305,6 +305,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: pixels_per_segment_entity_id, ATTR_VALUE: 100},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(pixels_per_segment=100)
     bulb.async_set_device_config.reset_mock()
 
@@ -322,6 +323,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: music_pixels_per_segment_entity_id, ATTR_VALUE: 100},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(music_pixels_per_segment=100)
     bulb.async_set_device_config.reset_mock()
 
@@ -339,6 +341,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: segments_entity_id, ATTR_VALUE: 5},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(segments=5)
     bulb.async_set_device_config.reset_mock()
 
@@ -356,6 +359,7 @@ async def test_addressable_light_pixel_config(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: music_segments_entity_id, ATTR_VALUE: 5},
         blocking=True,
     )
+    await hass.async_block_till_done()
     bulb.async_set_device_config.assert_called_with(music_segments=5)
     bulb.async_set_device_config.reset_mock()
 
diff --git a/tests/components/freebox/conftest.py b/tests/components/freebox/conftest.py
index 7bf1cbfe7a4a5f..b950d44508dd4b 100644
--- a/tests/components/freebox/conftest.py
+++ b/tests/components/freebox/conftest.py
@@ -11,6 +11,7 @@
     DATA_HOME_GET_NODES,
     DATA_LAN_GET_HOSTS_LIST,
     DATA_STORAGE_GET_DISKS,
+    DATA_STORAGE_GET_RAIDS,
     DATA_SYSTEM_GET_CONFIG,
     WIFI_GET_GLOBAL_CONFIG,
 )
@@ -56,6 +57,7 @@ def mock_router(mock_device_registry_devices):
         # sensor
         instance.call.get_calls_log = AsyncMock(return_value=DATA_CALL_GET_CALLS_LOG)
         instance.storage.get_disks = AsyncMock(return_value=DATA_STORAGE_GET_DISKS)
+        instance.storage.get_raids = AsyncMock(return_value=DATA_STORAGE_GET_RAIDS)
         # home devices
         instance.home.get_home_nodes = AsyncMock(return_value=DATA_HOME_GET_NODES)
         instance.connection.get_status = AsyncMock(
diff --git a/tests/components/freebox/const.py b/tests/components/freebox/const.py
index 96fe96c19c5fa7..7028366d02b241 100644
--- a/tests/components/freebox/const.py
+++ b/tests/components/freebox/const.py
@@ -93,75 +93,177 @@
     {
         "idle_duration": 0,
         "read_error_requests": 0,
-        "read_requests": 110,
+        "read_requests": 1815106,
         "spinning": True,
-        # "table_type": "ms-dos", API returns without dash, but codespell isn't agree
-        "firmware": "SC1D",
-        "type": "internal",
-        "idle": False,
-        "connector": 0,
-        "id": 0,
+        "table_type": "raid",
+        "firmware": "0001",
+        "type": "sata",
+        "idle": True,
+        "connector": 2,
+        "id": 1000,
         "write_error_requests": 0,
-        "state": "enabled",
-        "write_requests": 2708929,
-        "total_bytes": 250050000000,
-        "model": "ST9250311CS",
+        "time_before_spindown": 600,
+        "state": "disabled",
+        "write_requests": 80386151,
+        "total_bytes": 2000000000000,
+        "model": "ST2000LM015-2E8174",
         "active_duration": 0,
-        "temp": 40,
-        "serial": "6VCQY907",
+        "temp": 30,
+        "serial": "ZDZLBFHC",
         "partitions": [
             {
-                "fstype": "ext4",
-                "total_bytes": 244950000000,
-                "label": "Disque dur",
-                "id": 2,
-                "internal": True,
+                "fstype": "raid",
+                "total_bytes": 0,
+                "label": "Volume 2000Go",
+                "id": 1000,
+                "internal": False,
                 "fsck_result": "no_run_yet",
-                "state": "mounted",
-                "disk_id": 0,
-                "free_bytes": 227390000000,
-                "used_bytes": 5090000000,
-                "path": "L0Rpc3F1ZSBkdXI=",
+                "state": "umounted",
+                "disk_id": 1000,
+                "free_bytes": 0,
+                "used_bytes": 0,
+                "path": "L1ZvbHVtZSAyMDAwR28=",
             }
         ],
     },
     {
-        "idle_duration": 8290,
+        "idle_duration": 0,
         "read_error_requests": 0,
-        "read_requests": 2326826,
-        "spinning": False,
-        "table_type": "gpt",
+        "read_requests": 3622038,
+        "spinning": True,
+        "table_type": "raid",
         "firmware": "0001",
         "type": "sata",
         "idle": True,
         "connector": 0,
         "id": 2000,
         "write_error_requests": 0,
-        "state": "enabled",
-        "write_requests": 122733632,
+        "time_before_spindown": 600,
+        "state": "disabled",
+        "write_requests": 80386151,
         "total_bytes": 2000000000000,
         "model": "ST2000LM015-2E8174",
         "active_duration": 0,
+        "temp": 31,
+        "serial": "ZDZLEJXE",
+        "partitions": [
+            {
+                "fstype": "raid",
+                "total_bytes": 0,
+                "label": "Volume 2000Go 1",
+                "id": 2000,
+                "internal": False,
+                "fsck_result": "no_run_yet",
+                "state": "umounted",
+                "disk_id": 2000,
+                "free_bytes": 0,
+                "used_bytes": 0,
+                "path": "L1ZvbHVtZSAyMDAwR28gMQ==",
+            }
+        ],
+    },
+    {
+        "idle_duration": 0,
+        "read_error_requests": 0,
+        "read_requests": 0,
+        "spinning": False,
+        "table_type": "superfloppy",
+        "firmware": "",
+        "type": "raid",
+        "idle": False,
+        "connector": 0,
+        "id": 3000,
+        "write_error_requests": 0,
+        "state": "enabled",
+        "write_requests": 0,
+        "total_bytes": 2000000000000,
+        "model": "",
+        "active_duration": 0,
         "temp": 0,
-        "serial": "WDZYJ27Q",
+        "serial": "",
         "partitions": [
             {
                 "fstype": "ext4",
                 "total_bytes": 1960000000000,
-                "label": "Disque 2",
-                "id": 2001,
+                "label": "Freebox",
+                "id": 3000,
                 "internal": False,
                 "fsck_result": "no_run_yet",
                 "state": "mounted",
-                "disk_id": 2000,
-                "free_bytes": 1880000000000,
-                "used_bytes": 85410000000,
-                "path": "L0Rpc3F1ZSAy",
+                "disk_id": 3000,
+                "free_bytes": 1730000000000,
+                "used_bytes": 236910000000,
+                "path": "L0ZyZWVib3g=",
             }
         ],
     },
 ]
 
+DATA_STORAGE_GET_RAIDS = [
+    {
+        "degraded": False,
+        "raid_disks": 2,  # Number of members that should be in this array
+        "next_check": 0,  # Unix timestamp of next check in seconds. Might be 0 if check_interval is 0
+        "sync_action": "idle",  # values: idle, resync, recover, check, repair, reshape, frozen
+        "level": "raid1",  # values: basic, raid0, raid1, raid5, raid10
+        "uuid": "dc8679f8-13f9-11ee-9106-38d547790df8",
+        "sysfs_state": "clear",  # values: clear, inactive, suspended, readonly, read_auto, clean, active, write_pending, active_idle
+        "id": 0,
+        "sync_completed_pos": 0,  # Current position of sync process
+        "members": [
+            {
+                "total_bytes": 2000000000000,
+                "active_device": 1,
+                "id": 1000,
+                "corrected_read_errors": 0,
+                "array_id": 0,
+                "disk": {
+                    "firmware": "0001",
+                    "temp": 29,
+                    "serial": "ZDZLBFHC",
+                    "model": "ST2000LM015-2E8174",
+                },
+                "role": "active",  # values: active, faulty, spare, missing
+                "sct_erc_supported": False,
+                "sct_erc_enabled": False,
+                "dev_uuid": "fca8720e-13f9-11ee-9106-38d547790df8",
+                "device_location": "sata-internal-p2",
+                "set_name": "Freebox",
+                "set_uuid": "dc8679f8-13f9-11ee-9106-38d547790df8",
+            },
+            {
+                "total_bytes": 2000000000000,
+                "active_device": 0,
+                "id": 2000,
+                "corrected_read_errors": 0,
+                "array_id": 0,
+                "disk": {
+                    "firmware": "0001",
+                    "temp": 30,
+                    "serial": "ZDZLEJXE",
+                    "model": "ST2000LM015-2E8174",
+                },
+                "role": "active",
+                "sct_erc_supported": False,
+                "sct_erc_enabled": False,
+                "dev_uuid": "16bf00d6-13fa-11ee-9106-38d547790df8",
+                "device_location": "sata-internal-p0",
+                "set_name": "Freebox",
+                "set_uuid": "dc8679f8-13f9-11ee-9106-38d547790df8",
+            },
+        ],
+        "array_size": 2000000000000,  # Size of array in bytes
+        "state": "running",  # stopped, running, error
+        "sync_speed": 0,  # Sync speed in bytes per second
+        "name": "Freebox",
+        "check_interval": 0,  # Check interval in seconds
+        "disk_id": 3000,
+        "last_check": 1682884357,  # Unix timestamp of last check in seconds
+        "sync_completed_end": 0,  # End position of sync process: total of bytes to sync
+        "sync_completed_percent": 0,  # Percentage of sync completion
+    }
+]
+
 # switch
 WIFI_GET_GLOBAL_CONFIG = {"enabled": True, "mac_filter_state": "disabled"}
 
diff --git a/tests/components/freebox/test_binary_sensor.py b/tests/components/freebox/test_binary_sensor.py
new file mode 100644
index 00000000000000..ec504a514adebc
--- /dev/null
+++ b/tests/components/freebox/test_binary_sensor.py
@@ -0,0 +1,44 @@
+"""Tests for the Freebox sensors."""
+from copy import deepcopy
+from datetime import timedelta
+from unittest.mock import Mock
+
+from homeassistant.components.freebox.const import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
+
+from .const import DATA_STORAGE_GET_RAIDS, MOCK_HOST, MOCK_PORT
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+async def test_raid_array_degraded(hass: HomeAssistant, router: Mock) -> None:
+    """Test raid array degraded binary sensor."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: MOCK_HOST, CONF_PORT: MOCK_PORT},
+        unique_id=MOCK_HOST,
+    )
+    entry.add_to_hass(hass)
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+
+    assert (
+        hass.states.get("binary_sensor.freebox_server_r2_raid_array_0_degraded").state
+        == "off"
+    )
+
+    # Now simulate we degraded
+    data_storage_get_raids_degraded = deepcopy(DATA_STORAGE_GET_RAIDS)
+    data_storage_get_raids_degraded[0]["degraded"] = True
+    router().storage.get_raids.return_value = data_storage_get_raids_degraded
+    # Simulate an update
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=60))
+    # To execute the save
+    await hass.async_block_till_done()
+    assert (
+        hass.states.get("binary_sensor.freebox_server_r2_raid_array_0_degraded").state
+        == "on"
+    )
diff --git a/tests/components/freedompro/conftest.py b/tests/components/freedompro/conftest.py
index 80e13edb8036b1..30e7968e2fee85 100644
--- a/tests/components/freedompro/conftest.py
+++ b/tests/components/freedompro/conftest.py
@@ -28,13 +28,13 @@ def mock_setup_entry() -> Generator[AsyncMock, None, None]:
 def mock_freedompro():
     """Mock freedompro get_list and get_states."""
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": True,
             "devices": DEVICES,
         },
     ), patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=DEVICES_STATE,
     ):
         yield
@@ -72,13 +72,13 @@ async def init_integration_no_state(hass) -> MockConfigEntry:
     )
 
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": True,
             "devices": DEVICES,
         },
     ), patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=[],
     ):
         entry.add_to_hass(hass)
diff --git a/tests/components/freedompro/test_binary_sensor.py b/tests/components/freedompro/test_binary_sensor.py
index 70acd5eb32026b..8a3605782a25a8 100644
--- a/tests/components/freedompro/test_binary_sensor.py
+++ b/tests/components/freedompro/test_binary_sensor.py
@@ -74,7 +74,7 @@ async def test_binary_sensor_get_state(
     assert state.state == STATE_OFF
 
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=[],
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -100,7 +100,7 @@ async def test_binary_sensor_get_state(
     elif states_response[0]["type"] == "contactSensor":
         states_response[0]["state"]["contactSensorState"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_climate.py b/tests/components/freedompro/test_climate.py
index a3dbc19d711928..ae7c39ed4baf0f 100644
--- a/tests/components/freedompro/test_climate.py
+++ b/tests/components/freedompro/test_climate.py
@@ -66,7 +66,7 @@ async def test_climate_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["currentTemperature"] = 20
     states_response[0]["state"]["targetTemperature"] = 21
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -101,7 +101,7 @@ async def test_climate_set_off(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.climate.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             CLIMATE_DOMAIN,
             SERVICE_SET_HVAC_MODE,
             {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVACMode.OFF},
@@ -156,7 +156,7 @@ async def test_climate_set_temperature(hass: HomeAssistant, init_integration) ->
     with patch(
         "homeassistant.components.freedompro.climate.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             CLIMATE_DOMAIN,
             SERVICE_SET_TEMPERATURE,
             {
@@ -174,7 +174,7 @@ async def test_climate_set_temperature(hass: HomeAssistant, init_integration) ->
     states_response[0]["state"]["currentTemperature"] = 20
     states_response[0]["state"]["targetTemperature"] = 21
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -200,7 +200,7 @@ async def test_climate_set_temperature_unsupported_hvac_mode(
     assert entry
     assert entry.unique_id == uid
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
diff --git a/tests/components/freedompro/test_cover.py b/tests/components/freedompro/test_cover.py
index e4c813e7207cfe..b29e6499fec3e6 100644
--- a/tests/components/freedompro/test_cover.py
+++ b/tests/components/freedompro/test_cover.py
@@ -66,7 +66,7 @@ async def test_cover_get_state(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -116,7 +116,7 @@ async def test_cover_set_position(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
             {ATTR_ENTITY_ID: [entity_id], ATTR_POSITION: 33},
@@ -127,7 +127,7 @@ async def test_cover_set_position(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 33
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -164,7 +164,7 @@ async def test_cover_close(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -181,7 +181,7 @@ async def test_cover_close(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_CLOSE_COVER,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -191,7 +191,7 @@ async def test_cover_close(
 
     states_response[0]["state"]["position"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -234,7 +234,7 @@ async def test_cover_open(
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.cover.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_OPEN_COVER,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -245,7 +245,7 @@ async def test_cover_open(
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["position"] = 100
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_fan.py b/tests/components/freedompro/test_fan.py
index 1cfda1359d8edb..159b495e0f8e3f 100644
--- a/tests/components/freedompro/test_fan.py
+++ b/tests/components/freedompro/test_fan.py
@@ -49,7 +49,7 @@ async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -78,7 +78,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -96,7 +96,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -107,7 +107,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = False
     states_response[0]["state"]["rotationSpeed"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -137,7 +137,7 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -149,7 +149,7 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 50
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -177,7 +177,7 @@ async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.fan.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             FAN_DOMAIN,
             SERVICE_SET_PERCENTAGE,
             {ATTR_ENTITY_ID: [entity_id], ATTR_PERCENTAGE: 40},
@@ -189,7 +189,7 @@ async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
     states_response[0]["state"]["on"] = True
     states_response[0]["state"]["rotationSpeed"] = 40
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_init.py b/tests/components/freedompro/test_init.py
index 955d793c41c0eb..5e1b050a4e7cb9 100644
--- a/tests/components/freedompro/test_init.py
+++ b/tests/components/freedompro/test_init.py
@@ -33,7 +33,7 @@ async def test_config_not_ready(hass: HomeAssistant) -> None:
     )
 
     with patch(
-        "homeassistant.components.freedompro.get_list",
+        "homeassistant.components.freedompro.coordinator.get_list",
         return_value={
             "state": False,
         },
diff --git a/tests/components/freedompro/test_lock.py b/tests/components/freedompro/test_lock.py
index b90d75581142bd..ae208194d2a256 100644
--- a/tests/components/freedompro/test_lock.py
+++ b/tests/components/freedompro/test_lock.py
@@ -46,7 +46,7 @@ async def test_lock_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -73,7 +73,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -90,7 +90,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.lock.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LOCK_DOMAIN,
             SERVICE_UNLOCK,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -101,7 +101,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 0
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -127,7 +127,7 @@ async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
     assert entry.unique_id == uid
 
     with patch("homeassistant.components.freedompro.lock.put_state") as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             LOCK_DOMAIN,
             SERVICE_LOCK,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -138,7 +138,7 @@ async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["lock"] = 1
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_sensor.py b/tests/components/freedompro/test_sensor.py
index 65db6025c3f34d..89acfb3cc320ea 100644
--- a/tests/components/freedompro/test_sensor.py
+++ b/tests/components/freedompro/test_sensor.py
@@ -58,7 +58,7 @@ async def test_sensor_get_state(
     elif states_response[0]["type"] == "humiditySensor":
         states_response[0]["state"]["currentRelativeHumidity"] = "1"
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/freedompro/test_switch.py b/tests/components/freedompro/test_switch.py
index f041bebfc306d4..03647e4389d66c 100644
--- a/tests/components/freedompro/test_switch.py
+++ b/tests/components/freedompro/test_switch.py
@@ -34,7 +34,7 @@ async def test_switch_get_state(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -61,7 +61,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         await async_update_entity(hass, entity_id)
@@ -80,7 +80,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.switch.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -91,7 +91,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = False
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
@@ -119,7 +119,7 @@ async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
     with patch(
         "homeassistant.components.freedompro.switch.put_state"
     ) as mock_put_state:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: [entity_id]},
@@ -130,7 +130,7 @@ async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
     states_response = get_states_response_for_uid(uid)
     states_response[0]["state"]["on"] = True
     with patch(
-        "homeassistant.components.freedompro.get_states",
+        "homeassistant.components.freedompro.coordinator.get_states",
         return_value=states_response,
     ):
         async_fire_time_changed(hass, utcnow() + timedelta(hours=2))
diff --git a/tests/components/fritz/conftest.py b/tests/components/fritz/conftest.py
index 5e86c3b83f6663..66f4cf2b879c81 100644
--- a/tests/components/fritz/conftest.py
+++ b/tests/components/fritz/conftest.py
@@ -43,6 +43,10 @@ def call_action_side_effect(self, side_effect=None) -> None:
         else:
             self.call_action = self._call_action
 
+    def override_services(self, services) -> None:
+        """Overrire services data."""
+        self._services = services
+
     def _call_action(self, service: str, action: str, **kwargs):
         LOGGER.debug(
             "_call_action service: %s, action: %s, **kwargs: %s",
diff --git a/tests/components/fritz/const.py b/tests/components/fritz/const.py
index fb62e14bc6fe72..7a89aab1af1df0 100644
--- a/tests/components/fritz/const.py
+++ b/tests/components/fritz/const.py
@@ -195,7 +195,6 @@
     },
 }
 
-
 MOCK_MESH_DATA = {
     "schema_version": "1.9",
     "nodes": [
diff --git a/tests/components/fritz/snapshots/test_image.ambr b/tests/components/fritz/snapshots/test_image.ambr
new file mode 100644
index 00000000000000..b64d8601a8aa42
--- /dev/null
+++ b/tests/components/fritz/snapshots/test_image.ambr
@@ -0,0 +1,13 @@
+# serializer version: 1
+# name: test_image[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_download[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_entity[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf5IDATx\xda\xedVQ\x0eC!\x0c"\xbb@\xef\x7fKn\xe0\x00\xfd\xdb\xcf6\xf9|\xc6\xc4\xc6\x0f\xd2\x02\xadb},\xe2\xb9\xfb\xe5\x0e\xc0(\x18\xf2\x84/|\xaeo\xef\x847\xda\x14\x1af\x1c\xde\xe3\x19(X\tKxN\xb2\x87\x17j9\x1d<m\x01)\xbbU\xe1\xcf\xa2\x9eU\xd1\xd7\xcbe.\xcc\xf6\xd05\x7f\x02\x82\x1d\xb8\x1c\xdd\xd7\x1b\xef\t\x90\x13an\xf1b\x13P\xb9\x01\xac\xd4k\xee\x04\xa5.\xd1.\xe8+\x90\x88\x1b\x0e\x0b\xfe\x03\xd3 \xd4Y\xe0\xef\x10\xa7z\xe3\xe9F\x7f(?;\xc6\x80\x95\xfc\xe2\x13\x1ddC\x0fZ\x07\xec6f\xc3/.\x94i\xddi\xf8\x8f\x9b9k<\x8d\xf9\xeci`\xfb\xed\xf1R\x99/g\x9e\xaei\xcc\x830\xb7\xf6\x83\xd4\xf1_\x9e\x0f\xf7.*\xf3\xc0\xf6\x1b\x86\xbf\x12\xde\xac\xed\x16\xb0\xf4\xbe\x9dO\x02\xd0\xe1\x8f\xee^\x0f|v\xf4\x15 \x13\xaf\x8e\xff\x9e\x7f\xe2\x9fwo\x06\xf4\x81v\xeb\xb3\xcc\xc3\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
+# name: test_image_update[fc_data0]
+  b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x94\x00\x00\x00\x94\x01\x00\x00\x00\x00]G=y\x00\x00\x00\xf9IDATx\xda\xedV\xc1\r\xc40\x0cB\xb7\x80\xf7\xdf\x92\r\\\xb0\xfb\xeb\xe7\xaa\xf0l\xd4\xaaQ\x1e\xc8\x06L\x8a~,\xe2;{s\x06\xa0\xd8z9\xdb\xe6\x0f\xcf\xf5\xef\x99\xf0J\x0f\x85\x86*o\xcf\xf1\x04\x04\x1ak\xb6\x11<\x97\xa6\xa6\x83x&\xb32x\x86\xa4\xab\xeb\x08\x7f\x16\xf5^\x11}\xbd$\xb0\x80k=t\xcc\x9f\xfdg\xfa\xda\xe5\x1d\xe3\t\x8br_\xdb3\x85D}\x063u\x00\x03\xfd\xb6<\xe2\xeaL\xa2y<\xae\xcf\xe3!\x895\xbfL\xf07\x0eT]n7\xc3_{0\xd4\xefx:\xc0\x1f\xc6}\x9e\xb7\x84\x1e\xfb\x91\x0e\x12\x84\t=z\xd2t\x07\x8e\x1d\xc9\x03\xc7\xa9G\xb7\x12\xf3&0\x176\x19\x98\xc8g\x8b;\x88@\xc6\x7f\x93\xa9\xfbVD\xdf\x193\xde9\x1d\xd1\xc3\x9ev`E\xf2oo\xa3\xe1/\x847\xad\x8a?0t\xffN\xb4p\xf35\xf3\x7f\x80\xad\xafS\xf7\x1bD`D\x8f\xef\x9f\xf0\xe0\xec\x02\xa4\xc0\x83\x92\xcf\xf3\xf9a\x00\x00\x00\x00IEND\xaeB`\x82'
+# ---
diff --git a/tests/components/fritz/test_image.py b/tests/components/fritz/test_image.py
new file mode 100644
index 00000000000000..e65fcb85457a9d
--- /dev/null
+++ b/tests/components/fritz/test_image.py
@@ -0,0 +1,172 @@
+"""Tests for Fritz!Tools image platform."""
+from datetime import timedelta
+from http import HTTPStatus
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.fritz.const import DOMAIN
+from homeassistant.components.image import DOMAIN as IMAGE_DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import async_get as async_get_entity_registry
+from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import utcnow
+
+from .const import MOCK_FB_SERVICES, MOCK_USER_DATA
+
+from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.typing import ClientSessionGenerator
+
+GUEST_WIFI_ENABLED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {
+        "GetInfo": {
+            "NewEnable": True,
+            "NewStatus": "Up",
+            "NewSSID": "GuestWifi",
+            "NewBeaconType": "11iandWPA3",
+            "NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
+            "NewStandard": "ax",
+            "NewBSSID": "1C:ED:6F:12:34:13",
+        },
+        "GetSSID": {
+            "NewSSID": "GuestWifi",
+        },
+        "GetSecurityKeys": {"NewKeyPassphrase": "1234567890"},
+    },
+}
+
+GUEST_WIFI_CHANGED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {
+        "GetInfo": {
+            "NewEnable": True,
+            "NewStatus": "Up",
+            "NewSSID": "GuestWifi",
+            "NewBeaconType": "11iandWPA3",
+            "NewX_AVM-DE_PossibleBeaconTypes": "None,11i,11iandWPA3",
+            "NewStandard": "ax",
+            "NewBSSID": "1C:ED:6F:12:34:13",
+        },
+        "GetSSID": {
+            "NewSSID": "GuestWifi",
+        },
+        "GetSecurityKeys": {"NewKeyPassphrase": "abcdefghij"},
+    },
+}
+
+GUEST_WIFI_DISABLED: dict[str, dict] = {
+    "WLANConfiguration0": {},
+    "WLANConfiguration1": {"GetInfo": {"NewEnable": False}},
+}
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_ENABLED})])
+async def test_image_entity(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image entity."""
+
+    # setup component with image platform only
+    with patch(
+        "homeassistant.components.fritz.PLATFORMS",
+        [Platform.IMAGE],
+    ):
+        entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+        entry.add_to_hass(hass)
+        assert await async_setup_component(hass, DOMAIN, {})
+
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    # test image entity is generated as expected
+    states = hass.states.async_all(IMAGE_DOMAIN)
+    assert len(states) == 1
+
+    state = states[0]
+    assert state.name == "Mock Title GuestWifi"
+    assert state.entity_id == "image.mock_title_guestwifi"
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.mock_title_guestwifi?token={access_token}",
+        "friendly_name": "Mock Title GuestWifi",
+    }
+
+    entity_registry = async_get_entity_registry(hass)
+    entity_entry = entity_registry.async_get("image.mock_title_guestwifi")
+    assert entity_entry.unique_id == "1c_ed_6f_12_34_11_guestwifi_qr_code"
+
+    # test image download
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    assert resp.status == HTTPStatus.OK
+
+    body = await resp.read()
+    assert body == snapshot
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_ENABLED})])
+async def test_image_update(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image update."""
+
+    # setup component with image platform only
+    with patch(
+        "homeassistant.components.fritz.PLATFORMS",
+        [Platform.IMAGE],
+    ):
+        entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+        entry.add_to_hass(hass)
+        assert await async_setup_component(hass, DOMAIN, {})
+
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    client = await hass_client()
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    resp_body = await resp.read()
+    assert resp.status == HTTPStatus.OK
+
+    fc_class_mock().override_services({**MOCK_FB_SERVICES, **GUEST_WIFI_CHANGED})
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=60))
+    await hass.async_block_till_done()
+
+    resp = await client.get("/api/image_proxy/image.mock_title_guestwifi")
+    resp_body_new = await resp.read()
+
+    assert resp_body != resp_body_new
+    assert resp_body_new == snapshot
+
+
+@pytest.mark.parametrize(("fc_data"), [({**MOCK_FB_SERVICES, **GUEST_WIFI_DISABLED})])
+async def test_image_guest_wifi_disabled(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    fc_class_mock,
+    fh_class_mock,
+) -> None:
+    """Test image entities."""
+
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA)
+    entry.add_to_hass(hass)
+
+    assert await async_setup_component(hass, DOMAIN, {})
+    await hass.async_block_till_done()
+    assert entry.state == ConfigEntryState.LOADED
+
+    images = hass.states.async_all(IMAGE_DOMAIN)
+    assert len(images) == 0
diff --git a/tests/components/fritz/test_update.py b/tests/components/fritz/test_update.py
index b139a86b82dd60..915a6bb6fd033e 100644
--- a/tests/components/fritz/test_update.py
+++ b/tests/components/fritz/test_update.py
@@ -113,7 +113,7 @@ async def test_available_update_can_be_installed(
         assert update is not None
         assert update.state == "on"
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "update",
             "install",
             {"entity_id": "update.mock_title_fritz_os"},
diff --git a/tests/components/fritzbox/test_button.py b/tests/components/fritzbox/test_button.py
index c6e73b32edc66f..9c53c895f5d9ea 100644
--- a/tests/components/fritzbox/test_button.py
+++ b/tests/components/fritzbox/test_button.py
@@ -37,7 +37,7 @@ async def test_apply_template(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], fritz=fritz, template=template
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_PRESS, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert fritz().apply_template.call_count == 1
diff --git a/tests/components/fritzbox/test_climate.py b/tests/components/fritzbox/test_climate.py
index edfaf73e3b810a..d49b5710a128cb 100644
--- a/tests/components/fritzbox/test_climate.py
+++ b/tests/components/fritzbox/test_climate.py
@@ -255,7 +255,7 @@ async def test_set_temperature_temperature(hass: HomeAssistant, fritz: Mock) ->
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 123},
@@ -271,7 +271,7 @@ async def test_set_temperature_mode_off(hass: HomeAssistant, fritz: Mock) -> Non
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
@@ -291,7 +291,7 @@ async def test_set_temperature_mode_heat(hass: HomeAssistant, fritz: Mock) -> No
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {
@@ -311,7 +311,7 @@ async def test_set_hvac_mode_off(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.OFF},
@@ -327,7 +327,7 @@ async def test_set_hvac_mode_heat(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVACMode.HEAT},
@@ -343,7 +343,7 @@ async def test_set_preset_mode_comfort(hass: HomeAssistant, fritz: Mock) -> None
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_COMFORT},
@@ -359,7 +359,7 @@ async def test_set_preset_mode_eco(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: PRESET_ECO},
diff --git a/tests/components/fritzbox/test_cover.py b/tests/components/fritzbox/test_cover.py
index d500efb9032e2e..af725ce93da151 100644
--- a/tests/components/fritzbox/test_cover.py
+++ b/tests/components/fritzbox/test_cover.py
@@ -38,7 +38,7 @@ async def test_open_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_open.call_count == 1
@@ -51,7 +51,7 @@ async def test_close_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_close.call_count == 1
@@ -64,7 +64,7 @@ async def test_set_position_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_COVER_POSITION,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_POSITION: 50},
@@ -80,7 +80,7 @@ async def test_stop_cover(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_STOP_COVER, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_blind_stop.call_count == 1
diff --git a/tests/components/fritzbox/test_light.py b/tests/components/fritzbox/test_light.py
index 074dd902fa1a1b..0192ea7bb00349 100644
--- a/tests/components/fritzbox/test_light.py
+++ b/tests/components/fritzbox/test_light.py
@@ -135,7 +135,7 @@ async def test_turn_on(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_COLOR_TEMP_KELVIN: 3000},
@@ -158,7 +158,7 @@ async def test_turn_on_color(hass: HomeAssistant, fritz: Mock) -> None:
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_HS_COLOR: (100, 70)},
@@ -192,7 +192,7 @@ async def test_turn_on_color_unsupported_api_method(
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_BRIGHTNESS: 100, ATTR_HS_COLOR: (100, 70)},
@@ -215,7 +215,7 @@ async def test_turn_off(hass: HomeAssistant, fritz: Mock) -> None:
     assert await setup_config_entry(
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_state_off.call_count == 1
diff --git a/tests/components/fritzbox/test_switch.py b/tests/components/fritzbox/test_switch.py
index 17c51af9d987fc..4ac36a13284e57 100644
--- a/tests/components/fritzbox/test_switch.py
+++ b/tests/components/fritzbox/test_switch.py
@@ -107,7 +107,7 @@ async def test_turn_on(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_switch_state_on.call_count == 1
@@ -120,7 +120,7 @@ async def test_turn_off(hass: HomeAssistant, fritz: Mock) -> None:
         hass, MOCK_CONFIG[FB_DOMAIN][CONF_DEVICES][0], ENTITY_ID, device, fritz
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert device.set_switch_state_off.call_count == 1
diff --git a/tests/components/fronius/__init__.py b/tests/components/fronius/__init__.py
index 4222a2037aa564..bd70604398dbd0 100644
--- a/tests/components/fronius/__init__.py
+++ b/tests/components/fronius/__init__.py
@@ -6,7 +6,7 @@
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
@@ -96,5 +96,5 @@ async def enable_all_entities(hass, config_entry_id, time_till_next_update):
     ]:
         registry.async_update_entity(entry.entity_id, **{"disabled_by": None})
     await hass.async_block_till_done()
-    async_fire_time_changed(hass, dt.utcnow() + time_till_next_update)
+    async_fire_time_changed(hass, dt_util.utcnow() + time_till_next_update)
     await hass.async_block_till_done()
diff --git a/tests/components/fronius/test_coordinator.py b/tests/components/fronius/test_coordinator.py
index 6a25cee6ea0d02..a0e420c5b52759 100644
--- a/tests/components/fronius/test_coordinator.py
+++ b/tests/components/fronius/test_coordinator.py
@@ -7,7 +7,7 @@
     FroniusInverterUpdateCoordinator,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import mock_responses, setup_fronius_integration
 
@@ -26,7 +26,7 @@ async def test_adaptive_update_interval(
         mock_inverter_data.reset_mock()
 
         async_fire_time_changed(
-            hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+            hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval
         )
         await hass.async_block_till_done()
         mock_inverter_data.assert_called_once()
@@ -36,14 +36,15 @@ async def test_adaptive_update_interval(
         # first 3 bad requests at default interval - 4th has different interval
         for _ in range(3):
             async_fire_time_changed(
-                hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+                hass,
+                dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval,
             )
             await hass.async_block_till_done()
         assert mock_inverter_data.call_count == 3
         mock_inverter_data.reset_mock()
 
         async_fire_time_changed(
-            hass, dt.utcnow() + FroniusInverterUpdateCoordinator.error_interval
+            hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.error_interval
         )
         await hass.async_block_till_done()
         assert mock_inverter_data.call_count == 1
@@ -52,14 +53,14 @@ async def test_adaptive_update_interval(
         mock_inverter_data.side_effect = None
         # next successful request resets to default interval
         async_fire_time_changed(
-            hass, dt.utcnow() + FroniusInverterUpdateCoordinator.error_interval
+            hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.error_interval
         )
         await hass.async_block_till_done()
         mock_inverter_data.assert_called_once()
         mock_inverter_data.reset_mock()
 
         async_fire_time_changed(
-            hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+            hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval
         )
         await hass.async_block_till_done()
         mock_inverter_data.assert_called_once()
@@ -70,7 +71,8 @@ async def test_adaptive_update_interval(
         # first 3 requests at default interval - 4th has different interval
         for _ in range(3):
             async_fire_time_changed(
-                hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+                hass,
+                dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval,
             )
             await hass.async_block_till_done()
         # BadStatusError does 3 silent retries for inverter endpoint * 3 request intervals = 9
diff --git a/tests/components/fronius/test_sensor.py b/tests/components/fronius/test_sensor.py
index 59dfeee9f5d012..47b6410a1466d8 100644
--- a/tests/components/fronius/test_sensor.py
+++ b/tests/components/fronius/test_sensor.py
@@ -8,7 +8,7 @@
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import enable_all_entities, mock_responses, setup_fronius_integration
 
@@ -43,7 +43,7 @@ def assert_state(entity_id, expected_state):
     # Second test at daytime when inverter is producing
     mock_responses(aioclient_mock, night=False)
     async_fire_time_changed(
-        hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+        hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval
     )
     await hass.async_block_till_done()
     assert len(hass.states.async_all(domain_filter=SENSOR_DOMAIN)) == 56
@@ -65,7 +65,7 @@ def assert_state(entity_id, expected_state):
     # Third test at nighttime - additional AC entities default to 0
     mock_responses(aioclient_mock, night=True)
     async_fire_time_changed(
-        hass, dt.utcnow() + FroniusInverterUpdateCoordinator.default_interval
+        hass, dt_util.utcnow() + FroniusInverterUpdateCoordinator.default_interval
     )
     await hass.async_block_till_done()
     assert_state("sensor.symo_20_ac_current", 0)
@@ -150,7 +150,7 @@ async def test_symo_power_flow(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test Fronius Symo power flow entities."""
-    async_fire_time_changed(hass, dt.utcnow())
+    async_fire_time_changed(hass, dt_util.utcnow())
 
     def assert_state(entity_id, expected_state):
         state = hass.states.get(entity_id)
@@ -176,7 +176,7 @@ def assert_state(entity_id, expected_state):
     # Second test at daytime when inverter is producing
     mock_responses(aioclient_mock, night=False)
     async_fire_time_changed(
-        hass, dt.utcnow() + FroniusPowerFlowUpdateCoordinator.default_interval
+        hass, dt_util.utcnow() + FroniusPowerFlowUpdateCoordinator.default_interval
     )
     await hass.async_block_till_done()
     # 54 because power_flow `rel_SelfConsumption` and `P_PV` is not `null` anymore
@@ -193,7 +193,7 @@ def assert_state(entity_id, expected_state):
     # Third test at nighttime - default values are used
     mock_responses(aioclient_mock, night=True)
     async_fire_time_changed(
-        hass, dt.utcnow() + FroniusPowerFlowUpdateCoordinator.default_interval
+        hass, dt_util.utcnow() + FroniusPowerFlowUpdateCoordinator.default_interval
     )
     await hass.async_block_till_done()
     assert len(hass.states.async_all(domain_filter=SENSOR_DOMAIN)) == 54
diff --git a/tests/components/frontend/test_init.py b/tests/components/frontend/test_init.py
index d713fc7e67970d..721f64161548ac 100644
--- a/tests/components/frontend/test_init.py
+++ b/tests/components/frontend/test_init.py
@@ -21,7 +21,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.loader import async_get_integration
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockUser, async_capture_events, async_fire_time_changed
 from tests.typing import WebSocketGenerator
@@ -228,7 +228,7 @@ async def test_themes_save_storage(
     )
 
     # To trigger the call_later
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=60))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=60))
     # To execute the save
     await hass.async_block_till_done()
 
diff --git a/tests/components/frontier_silicon/test_config_flow.py b/tests/components/frontier_silicon/test_config_flow.py
index c7ff99d877c0f9..bedac792f026cb 100644
--- a/tests/components/frontier_silicon/test_config_flow.py
+++ b/tests/components/frontier_silicon/test_config_flow.py
@@ -11,7 +11,7 @@
     DEFAULT_PIN,
     DOMAIN,
 )
-from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -37,122 +37,6 @@
 )
 
 
-@pytest.mark.parametrize(
-    ("radio_id_return_value", "radio_id_side_effect"),
-    [("mock_radio_id", None), (None, NotImplementedException)],
-)
-async def test_import_success(
-    hass: HomeAssistant,
-    radio_id_return_value: str | None,
-    radio_id_side_effect: Exception | None,
-) -> None:
-    """Test successful import."""
-    with patch(
-        "homeassistant.components.frontier_silicon.config_flow.AFSAPI.get_radio_id",
-        return_value=radio_id_return_value,
-        side_effect=radio_id_side_effect,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={
-                CONF_HOST: "1.1.1.1",
-                CONF_PORT: 80,
-                CONF_PIN: "1234",
-                CONF_NAME: "Test name",
-            },
-        )
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Test name"
-    assert result["data"] == {
-        CONF_WEBFSAPI_URL: "http://1.1.1.1:80/webfsapi",
-        CONF_PIN: "1234",
-    }
-
-
-@pytest.mark.parametrize(
-    ("webfsapi_endpoint_error", "result_reason"),
-    [
-        (ConnectionError, "cannot_connect"),
-        (ValueError, "unknown"),
-    ],
-)
-async def test_import_webfsapi_endpoint_failures(
-    hass: HomeAssistant, webfsapi_endpoint_error: Exception, result_reason: str
-) -> None:
-    """Test various failure of get_webfsapi_endpoint."""
-    with patch(
-        "homeassistant.components.frontier_silicon.config_flow.AFSAPI.get_webfsapi_endpoint",
-        side_effect=webfsapi_endpoint_error,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={
-                CONF_HOST: "1.1.1.1",
-                CONF_PORT: 80,
-                CONF_PIN: "1234",
-                CONF_NAME: "Test name",
-            },
-        )
-
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == result_reason
-
-
-@pytest.mark.parametrize(
-    ("radio_id_error", "result_reason"),
-    [
-        (ConnectionError, "cannot_connect"),
-        (InvalidPinException, "invalid_auth"),
-        (ValueError, "unknown"),
-    ],
-)
-async def test_import_radio_id_failures(
-    hass: HomeAssistant, radio_id_error: Exception, result_reason: str
-) -> None:
-    """Test various failure of get_radio_id."""
-    with patch(
-        "homeassistant.components.frontier_silicon.config_flow.AFSAPI.get_radio_id",
-        side_effect=radio_id_error,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={
-                CONF_HOST: "1.1.1.1",
-                CONF_PORT: 80,
-                CONF_PIN: "1234",
-                CONF_NAME: "Test name",
-            },
-        )
-
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == result_reason
-
-
-async def test_import_already_exists(
-    hass: HomeAssistant, config_entry: MockConfigEntry
-) -> None:
-    """Test import of device which already exists."""
-    config_entry.add_to_hass(hass)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data={
-            CONF_HOST: "1.1.1.1",
-            CONF_PORT: 80,
-            CONF_PIN: "1234",
-            CONF_NAME: "Test name",
-        },
-    )
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
 @pytest.mark.parametrize(
     ("radio_id_return_value", "radio_id_side_effect"),
     [("mock_radio_id", None), (None, NotImplementedException)],
diff --git a/tests/components/fully_kiosk/test_binary_sensor.py b/tests/components/fully_kiosk/test_binary_sensor.py
index f5cf6aca455a4e..5b88854b0209e0 100644
--- a/tests/components/fully_kiosk/test_binary_sensor.py
+++ b/tests/components/fully_kiosk/test_binary_sensor.py
@@ -15,7 +15,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -76,7 +76,7 @@ async def test_binary_sensors(
 
     # Test unknown/missing data
     mock_fully_kiosk.getDeviceInfo.return_value = {}
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("binary_sensor.amazon_fire_plugged_in")
@@ -85,7 +85,7 @@ async def test_binary_sensors(
 
     # Test failed update
     mock_fully_kiosk.getDeviceInfo.side_effect = FullyKioskError("error", "status")
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("binary_sensor.amazon_fire_plugged_in")
diff --git a/tests/components/fully_kiosk/test_button.py b/tests/components/fully_kiosk/test_button.py
index 1c839e57dfd13c..fee39be302ec59 100644
--- a/tests/components/fully_kiosk/test_button.py
+++ b/tests/components/fully_kiosk/test_button.py
@@ -22,7 +22,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_restart_browser")
     assert entry
     assert entry.unique_id == "abcdef-123456-restartApp"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_restart_browser"},
@@ -30,13 +30,13 @@ async def test_buttons(
     )
     assert len(mock_fully_kiosk.restartApp.mock_calls) == 1
 
-    entry = entity_registry.async_get("button.amazon_fire_reboot_device")
+    entry = entity_registry.async_get("button.amazon_fire_restart_device")
     assert entry
     assert entry.unique_id == "abcdef-123456-rebootDevice"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
-        {ATTR_ENTITY_ID: "button.amazon_fire_reboot_device"},
+        {ATTR_ENTITY_ID: "button.amazon_fire_restart_device"},
         blocking=True,
     )
     assert len(mock_fully_kiosk.rebootDevice.mock_calls) == 1
@@ -44,7 +44,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_bring_to_foreground")
     assert entry
     assert entry.unique_id == "abcdef-123456-toForeground"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_bring_to_foreground"},
@@ -55,7 +55,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_send_to_background")
     assert entry
     assert entry.unique_id == "abcdef-123456-toBackground"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_send_to_background"},
@@ -66,7 +66,7 @@ async def test_buttons(
     entry = entity_registry.async_get("button.amazon_fire_load_start_url")
     assert entry
     assert entry.unique_id == "abcdef-123456-loadStartUrl"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         button.DOMAIN,
         button.SERVICE_PRESS,
         {ATTR_ENTITY_ID: "button.amazon_fire_load_start_url"},
diff --git a/tests/components/fully_kiosk/test_init.py b/tests/components/fully_kiosk/test_init.py
index 956de050e56bed..c53e416873336f 100644
--- a/tests/components/fully_kiosk/test_init.py
+++ b/tests/components/fully_kiosk/test_init.py
@@ -7,6 +7,7 @@
 import pytest
 
 from homeassistant.components.fully_kiosk.const import DOMAIN
+from homeassistant.components.fully_kiosk.entity import valid_global_mac_address
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
@@ -134,3 +135,11 @@ async def test_multiple_kiosk_with_empty_mac(
     assert device2
 
     assert device1 != device2
+
+
+async def test_valid_global_mac_address() -> None:
+    """Test valid_global_mac_address function."""
+    assert valid_global_mac_address("a1:bb:cc:dd:ee:ff")
+    assert not valid_global_mac_address("02:00:00:00:00:00")
+    assert not valid_global_mac_address(None)
+    assert not valid_global_mac_address("foobar")
diff --git a/tests/components/fully_kiosk/test_number.py b/tests/components/fully_kiosk/test_number.py
index 968faa3f0b4a4e..4843e72465c590 100644
--- a/tests/components/fully_kiosk/test_number.py
+++ b/tests/components/fully_kiosk/test_number.py
@@ -6,7 +6,7 @@
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -52,7 +52,7 @@ async def test_numbers(
 
     # Test invalid numeric data
     mock_fully_kiosk.getSettings.return_value = {"screenBrightness": "invalid"}
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("number.amazon_fire_screen_brightness")
@@ -61,7 +61,7 @@ async def test_numbers(
 
     # Test unknown/missing data
     mock_fully_kiosk.getSettings.return_value = {}
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("number.amazon_fire_screensaver_timer")
diff --git a/tests/components/fully_kiosk/test_sensor.py b/tests/components/fully_kiosk/test_sensor.py
index c7ff09fe32ce0e..cc8b30640b5be4 100644
--- a/tests/components/fully_kiosk/test_sensor.py
+++ b/tests/components/fully_kiosk/test_sensor.py
@@ -18,7 +18,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -66,6 +66,8 @@ async def test_sensors_sensors(
     assert state.state == "https://homeassistant.local"
     assert state.attributes.get(ATTR_DEVICE_CLASS) is None
     assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Amazon Fire Current page"
+    assert state.attributes.get("full_url") == "https://homeassistant.local"
+    assert not state.attributes.get("truncated")
 
     entry = entity_registry.async_get("sensor.amazon_fire_current_page")
     assert entry
@@ -139,7 +141,7 @@ async def test_sensors_sensors(
 
     # Test unknown/missing data
     mock_fully_kiosk.getDeviceInfo.return_value = {}
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("sensor.amazon_fire_internal_storage_free_space")
@@ -148,9 +150,37 @@ async def test_sensors_sensors(
 
     # Test failed update
     mock_fully_kiosk.getDeviceInfo.side_effect = FullyKioskError("error", "status")
-    async_fire_time_changed(hass, dt.utcnow() + UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     state = hass.states.get("sensor.amazon_fire_internal_storage_free_space")
     assert state
     assert state.state == STATE_UNAVAILABLE
+
+
+async def test_url_sensor_truncating(
+    hass: HomeAssistant,
+    mock_fully_kiosk: MagicMock,
+    init_integration: MockConfigEntry,
+) -> None:
+    """Test that long URLs get truncated."""
+    state = hass.states.get("sensor.amazon_fire_current_page")
+    assert state
+    assert state.state == "https://homeassistant.local"
+    assert state.attributes.get("full_url") == "https://homeassistant.local"
+    assert not state.attributes.get("truncated")
+
+    long_url = "https://01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+    assert len(long_url) > 256
+
+    mock_fully_kiosk.getDeviceInfo.return_value = {
+        "currentPage": long_url,
+    }
+    async_fire_time_changed(hass, dt_util.utcnow() + UPDATE_INTERVAL)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.amazon_fire_current_page")
+    assert state
+    assert state.state == long_url[0:255]
+    assert state.attributes.get("full_url") == long_url
+    assert state.attributes.get("truncated")
diff --git a/tests/components/fully_kiosk/test_services.py b/tests/components/fully_kiosk/test_services.py
index 386bc542e3cc89..11d5a74f3d7d28 100644
--- a/tests/components/fully_kiosk/test_services.py
+++ b/tests/components/fully_kiosk/test_services.py
@@ -1,15 +1,21 @@
 """Test Fully Kiosk Browser services."""
 from unittest.mock import MagicMock
 
+import pytest
+
 from homeassistant.components.fully_kiosk.const import (
     ATTR_APPLICATION,
+    ATTR_KEY,
     ATTR_URL,
+    ATTR_VALUE,
     DOMAIN,
     SERVICE_LOAD_URL,
+    SERVICE_SET_CONFIG,
     SERVICE_START_APPLICATION,
 )
 from homeassistant.const import ATTR_DEVICE_ID
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 
 from tests.common import MockConfigEntry
@@ -28,20 +34,157 @@ async def test_services(
 
     assert device_entry
 
+    url = "https://example.com"
     await hass.services.async_call(
         DOMAIN,
         SERVICE_LOAD_URL,
-        {ATTR_DEVICE_ID: [device_entry.id], ATTR_URL: "https://example.com"},
+        {ATTR_DEVICE_ID: [device_entry.id], ATTR_URL: url},
         blocking=True,
     )
 
-    assert len(mock_fully_kiosk.loadUrl.mock_calls) == 1
+    mock_fully_kiosk.loadUrl.assert_called_once_with(url)
 
+    app = "de.ozerov.fully"
     await hass.services.async_call(
         DOMAIN,
         SERVICE_START_APPLICATION,
-        {ATTR_DEVICE_ID: [device_entry.id], ATTR_APPLICATION: "de.ozerov.fully"},
+        {ATTR_DEVICE_ID: [device_entry.id], ATTR_APPLICATION: app},
+        blocking=True,
+    )
+
+    mock_fully_kiosk.startApplication.assert_called_once_with(app)
+
+    key = "test_key"
+    value = "test_value"
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
+        blocking=True,
+    )
+
+    mock_fully_kiosk.setConfigurationString.assert_called_once_with(key, value)
+
+    key = "test_key"
+    value = "true"
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
         blocking=True,
     )
 
-    assert len(mock_fully_kiosk.startApplication.mock_calls) == 1
+    mock_fully_kiosk.setConfigurationBool.assert_called_once_with(key, value)
+
+    key = "test_key"
+    value = True
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_CONFIG,
+        {
+            ATTR_DEVICE_ID: [device_entry.id],
+            ATTR_KEY: key,
+            ATTR_VALUE: value,
+        },
+        blocking=True,
+    )
+
+    mock_fully_kiosk.setConfigurationBool.assert_called_with(key, value)
+
+
+async def test_service_unloaded_entry(
+    hass: HomeAssistant,
+    mock_fully_kiosk: MagicMock,
+    init_integration: MockConfigEntry,
+) -> None:
+    """Test service not called when config entry unloaded."""
+    await init_integration.async_unload(hass)
+
+    device_registry = dr.async_get(hass)
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, "abcdef-123456")}
+    )
+
+    assert device_entry
+
+    with pytest.raises(HomeAssistantError) as excinfo:
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LOAD_URL,
+            {ATTR_DEVICE_ID: [device_entry.id], ATTR_URL: "https://nabucasa.com"},
+            blocking=True,
+        )
+    assert "Test device is not loaded" in str(excinfo)
+    mock_fully_kiosk.loadUrl.assert_not_called()
+
+    with pytest.raises(HomeAssistantError) as excinfo:
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_START_APPLICATION,
+            {ATTR_DEVICE_ID: [device_entry.id], ATTR_APPLICATION: "de.ozerov.fully"},
+            blocking=True,
+        )
+    assert "Test device is not loaded" in str(excinfo)
+    mock_fully_kiosk.startApplication.assert_not_called()
+
+
+async def test_service_bad_device_id(
+    hass: HomeAssistant,
+    mock_fully_kiosk: MagicMock,
+    init_integration: MockConfigEntry,
+) -> None:
+    """Test Fully Kiosk Browser service invocation with bad device id."""
+    with pytest.raises(HomeAssistantError) as excinfo:
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LOAD_URL,
+            {ATTR_DEVICE_ID: ["bad-device_id"], ATTR_URL: "https://example.com"},
+            blocking=True,
+        )
+
+    assert "Device 'bad-device_id' not found in device registry" in str(excinfo)
+
+
+async def test_service_called_with_non_fkb_target_devices(
+    hass: HomeAssistant,
+    mock_fully_kiosk: MagicMock,
+    init_integration: MockConfigEntry,
+) -> None:
+    """Services raise exception when no valid devices provided."""
+    device_registry = dr.async_get(hass)
+
+    other_domain = "NotFullyKiosk"
+    other_config_id = "555"
+    await hass.config_entries.async_add(
+        MockConfigEntry(
+            title="Not Fully Kiosk", domain=other_domain, entry_id=other_config_id
+        )
+    )
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=other_config_id,
+        identifiers={
+            (other_domain, 1),
+        },
+    )
+
+    with pytest.raises(HomeAssistantError) as excinfo:
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_LOAD_URL,
+            {
+                ATTR_DEVICE_ID: [device_entry.id],
+                ATTR_URL: "https://example.com",
+            },
+            blocking=True,
+        )
+
+    assert f"Device '{device_entry.id}' is not a fully_kiosk device" in str(excinfo)
diff --git a/tests/components/generic_hygrostat/test_humidifier.py b/tests/components/generic_hygrostat/test_humidifier.py
index f6952f6e246dc0..dcb1608b7102ef 100644
--- a/tests/components/generic_hygrostat/test_humidifier.py
+++ b/tests/components/generic_hygrostat/test_humidifier.py
@@ -1,7 +1,7 @@
 """The tests for the generic_hygrostat."""
 import datetime
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
@@ -121,6 +121,7 @@ async def test_humidifier_input_boolean(hass: HomeAssistant, setup_comp_1) -> No
     await hass.async_block_till_done()
 
     assert hass.states.get(humidifier_switch).state == STATE_ON
+    assert hass.states.get(ENTITY).attributes.get("action") == "humidifying"
 
 
 async def test_humidifier_switch(
@@ -165,6 +166,7 @@ async def test_humidifier_switch(
     await hass.async_block_till_done()
 
     assert hass.states.get(humidifier_switch).state == STATE_ON
+    assert hass.states.get(ENTITY).attributes.get("action") == "humidifying"
 
 
 def _setup_sensor(hass, humidity):
@@ -277,6 +279,7 @@ async def test_default_setup_params(hass: HomeAssistant, setup_comp_2) -> None:
     assert state.attributes.get("min_humidity") == 0
     assert state.attributes.get("max_humidity") == 100
     assert state.attributes.get("humidity") == 0
+    assert state.attributes.get("action") == "idle"
 
 
 async def test_default_setup_params_dehumidifier(
@@ -287,6 +290,7 @@ async def test_default_setup_params_dehumidifier(
     assert state.attributes.get("min_humidity") == 0
     assert state.attributes.get("max_humidity") == 100
     assert state.attributes.get("humidity") == 100
+    assert state.attributes.get("action") == "idle"
 
 
 async def test_get_modes(hass: HomeAssistant, setup_comp_2) -> None:
@@ -414,16 +418,26 @@ async def test_set_away_mode_twice_and_restore_prev_humidity(
     assert state.attributes.get("humidity") == 44
 
 
+async def test_sensor_affects_attribute(hass: HomeAssistant, setup_comp_2) -> None:
+    """Test that the sensor changes are reflected in the current_humidity attribute."""
+    state = hass.states.get(ENTITY)
+    assert state.attributes.get("current_humidity") == 45
+
+    _setup_sensor(hass, 47)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY)
+    assert state.attributes.get("current_humidity") == 47
+
+
 async def test_sensor_bad_value(hass: HomeAssistant, setup_comp_2) -> None:
     """Test sensor that have None as state."""
-    state = hass.states.get(ENTITY)
-    humidity = state.attributes.get("current_humidity")
+    assert hass.states.get(ENTITY).state == STATE_ON
 
     _setup_sensor(hass, None)
     await hass.async_block_till_done()
 
-    state = hass.states.get(ENTITY)
-    assert humidity == state.attributes.get("current_humidity")
+    assert hass.states.get(ENTITY).state == STATE_UNAVAILABLE
 
 
 async def test_set_target_humidity_humidifier_on(
@@ -638,6 +652,7 @@ async def test_set_target_humidity_dry_off(hass: HomeAssistant, setup_comp_3) ->
     assert call.domain == HASS_DOMAIN
     assert call.service == SERVICE_TURN_OFF
     assert call.data["entity_id"] == ENT_SWITCH
+    assert hass.states.get(ENTITY).attributes.get("action") == "drying"
 
 
 async def test_turn_away_mode_on_drying(hass: HomeAssistant, setup_comp_3) -> None:
@@ -789,6 +804,7 @@ async def test_running_when_operating_mode_is_off_2(
     assert call.domain == HASS_DOMAIN
     assert call.service == SERVICE_TURN_OFF
     assert call.data["entity_id"] == ENT_SWITCH
+    assert hass.states.get(ENTITY).attributes.get("action") == "off"
 
 
 async def test_no_state_change_when_operation_mode_off_2(
@@ -808,6 +824,7 @@ async def test_no_state_change_when_operation_mode_off_2(
     _setup_sensor(hass, 45)
     await hass.async_block_till_done()
     assert len(calls) == 0
+    assert hass.states.get(ENTITY).attributes.get("action") == "off"
 
 
 @pytest.fixture
@@ -855,9 +872,7 @@ async def test_humidity_change_dry_trigger_on_long_enough(
     fake_changed = datetime.datetime(
         1970, 11, 11, 11, 11, 11, tzinfo=datetime.timezone.utc
     )
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = await _setup_switch(hass, False)
     _setup_sensor(hass, 35)
     await hass.async_block_till_done()
@@ -893,9 +908,7 @@ async def test_humidity_change_dry_trigger_off_long_enough(
     fake_changed = datetime.datetime(
         1970, 11, 11, 11, 11, 11, tzinfo=datetime.timezone.utc
     )
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = await _setup_switch(hass, True)
     _setup_sensor(hass, 45)
     await hass.async_block_till_done()
@@ -1021,9 +1034,7 @@ async def test_humidity_change_humidifier_trigger_on_long_enough(
     fake_changed = datetime.datetime(
         1970, 11, 11, 11, 11, 11, tzinfo=datetime.timezone.utc
     )
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = await _setup_switch(hass, False)
     _setup_sensor(hass, 45)
     await hass.async_block_till_done()
@@ -1045,9 +1056,7 @@ async def test_humidity_change_humidifier_trigger_off_long_enough(
     fake_changed = datetime.datetime(
         1970, 11, 11, 11, 11, 11, tzinfo=datetime.timezone.utc
     )
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = await _setup_switch(hass, True)
     _setup_sensor(hass, 35)
     await hass.async_block_till_done()
diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py
index 397096952d598a..4eb2e3ce7110d2 100644
--- a/tests/components/generic_thermostat/test_climate.py
+++ b/tests/components/generic_thermostat/test_climate.py
@@ -2,6 +2,7 @@
 import datetime
 from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
 import voluptuous as vol
 
@@ -130,6 +131,7 @@ async def test_heater_input_boolean(hass: HomeAssistant, setup_comp_1) -> None:
     _setup_sensor(hass, 18)
     await hass.async_block_till_done()
     await common.async_set_temperature(hass, 23)
+    await hass.async_block_till_done()
 
     assert hass.states.get(heater_switch).state == STATE_ON
 
@@ -786,9 +788,7 @@ async def test_temp_change_ac_trigger_on_long_enough(
 ) -> None:
     """Test if temperature change turn ac on."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, False)
     await common.async_set_temperature(hass, 25)
     _setup_sensor(hass, 30)
@@ -816,9 +816,7 @@ async def test_temp_change_ac_trigger_off_long_enough(
 ) -> None:
     """Test if temperature change turn ac on."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, True)
     await common.async_set_temperature(hass, 30)
     _setup_sensor(hass, 25)
@@ -904,9 +902,7 @@ async def test_temp_change_ac_trigger_on_long_enough_2(
 ) -> None:
     """Test if temperature change turn ac on."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, False)
     await common.async_set_temperature(hass, 25)
     _setup_sensor(hass, 30)
@@ -934,9 +930,7 @@ async def test_temp_change_ac_trigger_off_long_enough_2(
 ) -> None:
     """Test if temperature change turn ac on."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, True)
     await common.async_set_temperature(hass, 30)
     _setup_sensor(hass, 25)
@@ -1032,9 +1026,7 @@ async def test_temp_change_heater_trigger_on_long_enough(
 ) -> None:
     """Test if temperature change turn heater on after min cycle."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, False)
     await common.async_set_temperature(hass, 30)
     _setup_sensor(hass, 25)
@@ -1051,9 +1043,7 @@ async def test_temp_change_heater_trigger_off_long_enough(
 ) -> None:
     """Test if temperature change turn heater off after min cycle."""
     fake_changed = datetime.datetime(1970, 11, 11, 11, 11, 11, tzinfo=dt_util.UTC)
-    with patch(
-        "homeassistant.helpers.condition.dt_util.utcnow", return_value=fake_changed
-    ):
+    with freeze_time(fake_changed):
         calls = _setup_switch(hass, True)
     await common.async_set_temperature(hass, 25)
     _setup_sensor(hass, 30)
diff --git a/tests/components/geo_location/test_trigger.py b/tests/components/geo_location/test_trigger.py
index ea5c051d4d23a6..a5e0f99c5c2cf1 100644
--- a/tests/components/geo_location/test_trigger.py
+++ b/tests/components/geo_location/test_trigger.py
@@ -14,7 +14,11 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import async_mock_service, mock_component
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/github/test_sensor.py b/tests/components/github/test_sensor.py
index 60574c5b60c975..f81f59e88c9787 100644
--- a/tests/components/github/test_sensor.py
+++ b/tests/components/github/test_sensor.py
@@ -5,7 +5,7 @@
 
 from homeassistant.components.github.const import DOMAIN, FALLBACK_UPDATE_INTERVAL
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import TEST_REPOSITORY
 
@@ -42,7 +42,7 @@ async def test_sensor_updates_with_empty_release_array(
         headers=headers,
     )
 
-    async_fire_time_changed(hass, dt.utcnow() + FALLBACK_UPDATE_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + FALLBACK_UPDATE_INTERVAL)
     await hass.async_block_till_done()
 
     new_state = hass.states.get(TEST_SENSOR_ENTITY)
diff --git a/tests/components/glances/__init__.py b/tests/components/glances/__init__.py
index 8c9394ae84f765..41f2675c41ccee 100644
--- a/tests/components/glances/__init__.py
+++ b/tests/components/glances/__init__.py
@@ -109,7 +109,25 @@
             "unit": "C",
             "type": "temperature_core",
             "key": "label",
-        }
+        },
+        {
+            "label": "err_temp",
+            "value": "ERR",
+            "warning": None,
+            "critical": None,
+            "unit": "C",
+            "type": "temperature_hdd",
+            "key": "label",
+        },
+        {
+            "label": "na_temp",
+            "value": "NA",
+            "warning": None,
+            "critical": None,
+            "unit": "C",
+            "type": "temperature_hdd",
+            "key": "label",
+        },
     ],
     "system": {
         "os_name": "Linux",
@@ -119,6 +137,40 @@
         "os_version": "5.15.6-200.fc35.x86_64",
         "hr_name": "Fedora Linux 35 64bit",
     },
+    "raid": {
+        "md3": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdh1": "2", "sdi1": "0"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+        "md1": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdg": "0", "sde": "1"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+        "md4": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdf1": "1", "sdb1": "0"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+        "md0": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdc": "2", "sdd": "3"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+    },
     "uptime": "3 days, 10:25:20",
 }
 
@@ -127,11 +179,33 @@
         "/ssl": {"disk_use": 30.7, "disk_use_percent": 6.7, "disk_free": 426.5},
         "/media": {"disk_use": 30.7, "disk_use_percent": 6.7, "disk_free": 426.5},
     },
-    "sensors": {"cpu_thermal 1": {"temperature_core": 59}},
+    "sensors": {
+        "cpu_thermal 1": {"temperature_core": 59},
+        "err_temp": {"temperature_hdd": "Unavailable"},
+        "na_temp": {"temperature_hdd": "Unavailable"},
+    },
     "mem": {
         "memory_use_percent": 27.6,
         "memory_use": 1047.1,
         "memory_free": 2745.0,
     },
     "docker": {"docker_active": 2, "docker_cpu_use": 77.2, "docker_memory_use": 1149.6},
+    "raid": {
+        "md3": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdh1": "2", "sdi1": "0"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+        "md1": {
+            "status": "active",
+            "type": "raid1",
+            "components": {"sdg": "0", "sde": "1"},
+            "available": "2",
+            "used": "2",
+            "config": "UU",
+        },
+    },
 }
diff --git a/tests/components/glances/test_sensor.py b/tests/components/glances/test_sensor.py
index 9164dbadb146ee..d7705854720853 100644
--- a/tests/components/glances/test_sensor.py
+++ b/tests/components/glances/test_sensor.py
@@ -21,9 +21,28 @@ async def test_sensor_states(hass: HomeAssistant) -> None:
 
     if state := hass.states.get("sensor.0_0_0_0_ssl_disk_use"):
         assert state.state == HA_SENSOR_DATA["fs"]["/ssl"]["disk_use"]
-
     if state := hass.states.get("sensor.0_0_0_0_cpu_thermal_1"):
         assert state.state == HA_SENSOR_DATA["sensors"]["cpu_thermal 1"]
+    if state := hass.states.get("sensor.0_0_0_0_err_temp"):
+        assert state.state == HA_SENSOR_DATA["sensors"]["err_temp"]
+    if state := hass.states.get("sensor.0_0_0_0_na_temp"):
+        assert state.state == HA_SENSOR_DATA["sensors"]["na_temp"]
+    if state := hass.states.get("sensor.0_0_0_0_memory_use_percent"):
+        assert state.state == HA_SENSOR_DATA["mem"]["memory_use_percent"]
+    if state := hass.states.get("sensor.0_0_0_0_docker_active"):
+        assert state.state == HA_SENSOR_DATA["docker"]["docker_active"]
+    if state := hass.states.get("sensor.0_0_0_0_docker_cpu_use"):
+        assert state.state == HA_SENSOR_DATA["docker"]["docker_cpu_use"]
+    if state := hass.states.get("sensor.0_0_0_0_docker_memory_use"):
+        assert state.state == HA_SENSOR_DATA["docker"]["docker_memory_use"]
+    if state := hass.states.get("sensor.0_0_0_0_md3_available"):
+        assert state.state == HA_SENSOR_DATA["raid"]["md3"]["available"]
+    if state := hass.states.get("sensor.0_0_0_0_md3_used"):
+        assert state.state == HA_SENSOR_DATA["raid"]["md3"]["used"]
+    if state := hass.states.get("sensor.0_0_0_0_md1_available"):
+        assert state.state == HA_SENSOR_DATA["raid"]["md1"]["available"]
+    if state := hass.states.get("sensor.0_0_0_0_md1_used"):
+        assert state.state == HA_SENSOR_DATA["raid"]["md1"]["used"]
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/goalzero/test_sensor.py b/tests/components/goalzero/test_sensor.py
index 47fbb29915b2c6..90b1489803a812 100644
--- a/tests/components/goalzero/test_sensor.py
+++ b/tests/components/goalzero/test_sensor.py
@@ -66,7 +66,7 @@ async def test_sensors(
     assert state.state == "1330"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.WATT_HOUR
-    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
+    assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL
     state = hass.states.get(f"sensor.{DEFAULT_NAME}_volts")
     assert state.state == "12.0"
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.VOLTAGE
diff --git a/tests/components/google_assistant/test_diagnostics.py b/tests/components/google_assistant/test_diagnostics.py
index 5f033319c44076..fde7e99025f6e3 100644
--- a/tests/components/google_assistant/test_diagnostics.py
+++ b/tests/components/google_assistant/test_diagnostics.py
@@ -1,8 +1,11 @@
 """Test diagnostics."""
-from unittest.mock import ANY
+from unittest.mock import ANY, patch
+
+import pytest
 
 from homeassistant import setup
 from homeassistant.components import google_assistant as ga, switch
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -12,6 +15,16 @@
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.fixture(autouse=True)
+async def switch_only() -> None:
+    """Enable only the switch platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SWITCH],
+    ):
+        yield
+
+
 async def test_diagnostics(
     hass: HomeAssistant, hass_client: ClientSessionGenerator
 ) -> None:
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index a6c572c24f0d43..177220cc02f59e 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -1,26 +1,22 @@
 """The tests for the Google Assistant component."""
 from http import HTTPStatus
 import json
+from unittest.mock import patch
 
 from aiohttp.hdrs import AUTHORIZATION
 import pytest
 
 from homeassistant import const, core, setup
 from homeassistant.components import (
-    alarm_control_panel,
-    climate,
-    cover,
-    fan,
     google_assistant as ga,
     humidifier,
     light,
-    lock,
     media_player,
-    switch,
 )
 from homeassistant.const import (
     CLOUD_NEVER_EXPOSED_ENTITIES,
     EntityCategory,
+    Platform,
     UnitOfTemperature,
 )
 from homeassistant.helpers import entity_registry as er
@@ -65,6 +61,26 @@ def assistant_client(event_loop, hass, hass_client_no_auth):
     return loop.run_until_complete(hass_client_no_auth())
 
 
+@pytest.fixture(autouse=True)
+async def wanted_platforms_only() -> None:
+    """Enable only the wanted demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [
+            Platform.ALARM_CONTROL_PANEL,
+            Platform.CLIMATE,
+            Platform.COVER,
+            Platform.FAN,
+            Platform.HUMIDIFIER,
+            Platform.LIGHT,
+            Platform.LOCK,
+            Platform.MEDIA_PLAYER,
+            Platform.SWITCH,
+        ],
+    ):
+        yield
+
+
 @pytest.fixture
 def hass_fixture(event_loop, hass):
     """Set up a Home Assistant instance for these tests."""
@@ -73,55 +89,7 @@ def hass_fixture(event_loop, hass):
     # We need to do this to get access to homeassistant/turn_(on,off)
     loop.run_until_complete(setup.async_setup_component(hass, core.DOMAIN, {}))
 
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, light.DOMAIN, {"light": [{"platform": "demo"}]}
-        )
-    )
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, switch.DOMAIN, {"switch": [{"platform": "demo"}]}
-        )
-    )
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, cover.DOMAIN, {"cover": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, media_player.DOMAIN, {"media_player": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(hass, fan.DOMAIN, {"fan": [{"platform": "demo"}]})
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, climate.DOMAIN, {"climate": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass, humidifier.DOMAIN, {"humidifier": [{"platform": "demo"}]}
-        )
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(hass, lock.DOMAIN, {"lock": [{"platform": "demo"}]})
-    )
-
-    loop.run_until_complete(
-        setup.async_setup_component(
-            hass,
-            alarm_control_panel.DOMAIN,
-            {"alarm_control_panel": [{"platform": "demo"}]},
-        )
-    )
+    loop.run_until_complete(setup.async_setup_component(hass, "demo", {}))
 
     return hass
 
@@ -383,11 +351,13 @@ async def test_query_humidifier_request(
         "on": True,
         "online": True,
         "humiditySetpointPercent": 68,
+        "humidityAmbientPercent": 45,
     }
     assert devices["humidifier.dehumidifier"] == {
         "on": True,
         "online": True,
         "humiditySetpointPercent": 54,
+        "humidityAmbientPercent": 59,
     }
     assert devices["humidifier.hygrostat"] == {
         "on": True,
diff --git a/tests/components/google_assistant/test_helpers.py b/tests/components/google_assistant/test_helpers.py
index 793db076c79c2f..17df677110b223 100644
--- a/tests/components/google_assistant/test_helpers.py
+++ b/tests/components/google_assistant/test_helpers.py
@@ -17,7 +17,7 @@
 from homeassistant.config import async_process_ha_core_config
 from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import MockConfig
 
@@ -128,7 +128,7 @@ async def test_config_local_sdk(
     assert config.is_local_connected is True
     with patch(
         "homeassistant.components.google_assistant.helpers.utcnow",
-        return_value=dt.utcnow() + timedelta(seconds=90),
+        return_value=dt_util.utcnow() + timedelta(seconds=90),
     ):
         assert config.is_local_connected is False
 
@@ -255,7 +255,7 @@ async def test_agent_user_id_storage(
     }
 
     async def _check_after_delay(data):
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=2))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
         await hass.async_block_till_done()
 
         assert (
diff --git a/tests/components/google_assistant/test_smart_home.py b/tests/components/google_assistant/test_smart_home.py
index f9ea356216fcec..f471e6f862c574 100644
--- a/tests/components/google_assistant/test_smart_home.py
+++ b/tests/components/google_assistant/test_smart_home.py
@@ -1,7 +1,7 @@
 """Test Google Smart Home."""
 import asyncio
 from types import SimpleNamespace
-from unittest.mock import ANY, call, patch
+from unittest.mock import ANY, patch
 
 import pytest
 from pytest_unordered import unordered
@@ -22,7 +22,12 @@
     trait,
 )
 from homeassistant.config import async_process_ha_core_config
-from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, UnitOfTemperature, __version__
+from homeassistant.const import (
+    ATTR_UNIT_OF_MEASUREMENT,
+    Platform,
+    UnitOfTemperature,
+    __version__,
+)
 from homeassistant.core import EVENT_CALL_SERVICE, HomeAssistant, State
 from homeassistant.helpers import (
     area_registry as ar,
@@ -39,6 +44,16 @@
 REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf"
 
 
+@pytest.fixture
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 @pytest.fixture
 def registries(
     entity_registry: er.EntityRegistry,
@@ -128,6 +143,8 @@ async def test_sync_message(hass: HomeAssistant, registries) -> None:
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     # This should not show up in the sync request
@@ -268,6 +285,8 @@ async def test_sync_in_area(area_on_device, hass: HomeAssistant, registries) ->
     )
     light.hass = hass
     light.entity_id = entity.entity_id
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     config = MockConfig(should_expose=lambda _: True, entity_config={})
@@ -360,6 +379,8 @@ async def test_query_message(hass: HomeAssistant) -> None:
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     light2 = DemoLight(
@@ -367,11 +388,15 @@ async def test_query_message(hass: HomeAssistant) -> None:
     )
     light2.hass = hass
     light2.entity_id = "light.another_light"
+    light2._attr_device_info = None
+    light2._attr_name = "Another Light"
     light2.async_write_ha_state()
 
     light3 = DemoLight(None, "Color temp Light", state=True, ct=400, brightness=200)
     light3.hass = hass
     light3.entity_id = "light.color_temp_light"
+    light3._attr_device_info = None
+    light3._attr_name = "Color temp Light"
     light3.async_write_ha_state()
 
     events = async_capture_events(hass, EVENT_QUERY_RECEIVED)
@@ -448,7 +473,7 @@ async def test_query_message(hass: HomeAssistant) -> None:
     [(False, True, 20, 0.2), (True, ANY, ANY, ANY)],
 )
 async def test_execute(
-    hass: HomeAssistant, report_state, on, brightness, value
+    hass: HomeAssistant, light_only, report_state, on, brightness, value
 ) -> None:
     """Test an execute command."""
     await async_setup_component(hass, "homeassistant", {})
@@ -463,76 +488,41 @@ async def test_execute(
     events = async_capture_events(hass, EVENT_COMMAND_RECEIVED)
     service_events = async_capture_events(hass, EVENT_CALL_SERVICE)
 
-    with patch.object(
-        hass.services, "async_call", wraps=hass.services.async_call
-    ) as call_service_mock:
-        result = await sh.async_handle_message(
-            hass,
-            MockConfig(should_report_state=report_state),
-            None,
-            {
-                "requestId": REQ_ID,
-                "inputs": [
-                    {
-                        "intent": "action.devices.EXECUTE",
-                        "payload": {
-                            "commands": [
-                                {
-                                    "devices": [
-                                        {"id": "light.non_existing"},
-                                        {"id": "light.ceiling_lights"},
-                                        {"id": "light.kitchen_lights"},
-                                    ],
-                                    "execution": [
-                                        {
-                                            "command": "action.devices.commands.OnOff",
-                                            "params": {"on": True},
-                                        },
-                                        {
-                                            "command": "action.devices.commands.BrightnessAbsolute",
-                                            "params": {"brightness": 20},
-                                        },
-                                    ],
-                                }
-                            ]
-                        },
-                    }
-                ],
-            },
-            const.SOURCE_CLOUD,
-        )
-        assert call_service_mock.call_count == 4
-        expected_calls = [
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.ceiling_lights"},
-                blocking=not report_state,
-                context=ANY,
-            ),
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.kitchen_lights"},
-                blocking=not report_state,
-                context=ANY,
-            ),
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.ceiling_lights", "brightness_pct": 20},
-                blocking=not report_state,
-                context=ANY,
-            ),
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.kitchen_lights", "brightness_pct": 20},
-                blocking=not report_state,
-                context=ANY,
-            ),
-        ]
-        call_service_mock.assert_has_awaits(expected_calls, any_order=True)
+    result = await sh.async_handle_message(
+        hass,
+        MockConfig(should_report_state=report_state),
+        None,
+        {
+            "requestId": REQ_ID,
+            "inputs": [
+                {
+                    "intent": "action.devices.EXECUTE",
+                    "payload": {
+                        "commands": [
+                            {
+                                "devices": [
+                                    {"id": "light.non_existing"},
+                                    {"id": "light.ceiling_lights"},
+                                    {"id": "light.kitchen_lights"},
+                                ],
+                                "execution": [
+                                    {
+                                        "command": "action.devices.commands.OnOff",
+                                        "params": {"on": True},
+                                    },
+                                    {
+                                        "command": "action.devices.commands.BrightnessAbsolute",
+                                        "params": {"brightness": 20},
+                                    },
+                                ],
+                            }
+                        ]
+                    },
+                }
+            ],
+        },
+        const.SOURCE_CLOUD,
+    )
     await hass.async_block_till_done()
 
     assert result == {
@@ -630,7 +620,7 @@ async def test_execute(
     ("report_state", "on", "brightness", "value"), [(False, False, ANY, ANY)]
 )
 async def test_execute_times_out(
-    hass: HomeAssistant, report_state, on, brightness, value
+    hass: HomeAssistant, light_only, report_state, on, brightness, value
 ) -> None:
     """Test an execute command which times out."""
     orig_execute_limit = sh.EXECUTE_LIMIT
@@ -655,13 +645,9 @@ async def test_execute_times_out(
 
     async def slow_turn_on(*args, **kwargs):
         # Make DemoLigt.async_turn_on hang waiting for the turn_on_wait event
-        await turn_on_wait.wait(),
+        await turn_on_wait.wait()
 
-    with patch.object(
-        hass.services, "async_call", wraps=hass.services.async_call
-    ) as call_service_mock, patch.object(
-        DemoLight, "async_turn_on", wraps=slow_turn_on
-    ):
+    with patch.object(DemoLight, "async_turn_on", wraps=slow_turn_on):
         result = await sh.async_handle_message(
             hass,
             MockConfig(should_report_state=report_state),
@@ -697,50 +683,10 @@ async def slow_turn_on(*args, **kwargs):
             },
             const.SOURCE_CLOUD,
         )
-        # Only the two first calls are executed
-        assert call_service_mock.call_count == 2
-        expected_calls = [
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.ceiling_lights"},
-                blocking=not report_state,
-                context=ANY,
-            ),
-            call(
-                "light",
-                "turn_on",
-                {"entity_id": "light.kitchen_lights"},
-                blocking=not report_state,
-                context=ANY,
-            ),
-        ]
-        call_service_mock.assert_has_awaits(expected_calls, any_order=True)
 
         turn_on_wait.set()
         await hass.async_block_till_done()
-        # The remaining two calls should now have executed
-        assert call_service_mock.call_count == 4
-        expected_calls.extend(
-            [
-                call(
-                    "light",
-                    "turn_on",
-                    {"entity_id": "light.ceiling_lights", "brightness_pct": 20},
-                    blocking=not report_state,
-                    context=ANY,
-                ),
-                call(
-                    "light",
-                    "turn_on",
-                    {"entity_id": "light.kitchen_lights", "brightness_pct": 20},
-                    blocking=not report_state,
-                    context=ANY,
-                ),
-            ]
-        )
-        call_service_mock.assert_has_awaits(expected_calls, any_order=True)
-    await hass.async_block_till_done()
+        await hass.async_block_till_done()
 
     assert result == {
         "requestId": REQ_ID,
@@ -933,6 +879,8 @@ async def test_unavailable_state_does_sync(hass: HomeAssistant) -> None:
     light.hass = hass
     light.entity_id = "light.demo_light"
     light._available = False
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     events = async_capture_events(hass, EVENT_SYNC_RECEIVED)
@@ -1027,6 +975,8 @@ async def test_device_class_switch(
     )
     sensor.hass = hass
     sensor.entity_id = "switch.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1074,6 +1024,8 @@ async def test_device_class_binary_sensor(
     )
     sensor.hass = hass
     sensor.entity_id = "binary_sensor.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1125,6 +1077,8 @@ async def test_device_class_cover(
     sensor = DemoCover(None, hass, "Demo Sensor", device_class=device_class)
     sensor.hass = hass
     sensor.entity_id = "cover.demo_sensor"
+    sensor._attr_device_info = None
+    sensor._attr_name = "Demo Sensor"
     sensor.async_write_ha_state()
 
     result = await sh.async_handle_message(
@@ -1456,6 +1410,8 @@ async def test_sync_message_recovery(
     )
     light.hass = hass
     light.entity_id = "light.demo_light"
+    light._attr_device_info = None
+    light._attr_name = "Demo Light"
     light.async_write_ha_state()
 
     hass.states.async_set(
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index 33eac82a6ba8c3..fd6b3a6790b194 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -854,14 +854,18 @@ async def test_temperature_setting_climate_onoff(hass: HomeAssistant) -> None:
                     climate.HVACMode.HEAT,
                     climate.HVACMode.HEAT_COOL,
                 ],
-                climate.ATTR_MIN_TEMP: None,
-                climate.ATTR_MAX_TEMP: None,
+                climate.ATTR_MIN_TEMP: 45,
+                climate.ATTR_MAX_TEMP: 95,
             },
         ),
         BASIC_CONFIG,
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "heat", "heatcool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 7,
+            "maxThresholdCelsius": 35,
+        },
         "thermostatTemperatureUnit": "F",
     }
     assert trt.can_execute(trait.COMMAND_THERMOSTAT_SET_MODE, {})
@@ -893,14 +897,18 @@ async def test_temperature_setting_climate_no_modes(hass: HomeAssistant) -> None
             climate.HVACMode.AUTO,
             {
                 climate.ATTR_HVAC_MODES: [],
-                climate.ATTR_MIN_TEMP: None,
-                climate.ATTR_MAX_TEMP: None,
+                climate.ATTR_MIN_TEMP: climate.DEFAULT_MIN_TEMP,
+                climate.ATTR_MAX_TEMP: climate.DEFAULT_MAX_TEMP,
             },
         ),
         BASIC_CONFIG,
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["heat"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": climate.DEFAULT_MIN_TEMP,
+            "maxThresholdCelsius": climate.DEFAULT_MAX_TEMP,
+        },
         "thermostatTemperatureUnit": "C",
     }
 
@@ -937,6 +945,10 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "heat", "auto", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 27,
+        },
         "thermostatTemperatureUnit": "F",
     }
     assert trt.query_attributes() == {
@@ -978,12 +990,40 @@ async def test_temperature_setting_climate_range(hass: HomeAssistant) -> None:
 
     with pytest.raises(helpers.SmartHomeError) as err:
         await trt.execute(
-            trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
+            trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
             BASIC_DATA,
-            {"thermostatTemperatureSetpoint": -100},
+            {
+                "thermostatTemperatureSetpointHigh": 26,
+                "thermostatTemperatureSetpointLow": -100,
+            },
+            {},
+        )
+    assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
+
+    with pytest.raises(helpers.SmartHomeError) as err:
+        await trt.execute(
+            trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
+            BASIC_DATA,
+            {
+                "thermostatTemperatureSetpointHigh": 100,
+                "thermostatTemperatureSetpointLow": 18,
+            },
             {},
         )
     assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
+
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
+        BASIC_DATA,
+        {"thermostatTemperatureSetpoint": 23.9},
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {
+        ATTR_ENTITY_ID: "climate.bla",
+        climate.ATTR_TEMPERATURE: 75,
+    }
     hass.config.units.temperature_unit = UnitOfTemperature.CELSIUS
 
 
@@ -1000,9 +1040,11 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
             "climate.bla",
             climate.HVACMode.COOL,
             {
+                ATTR_SUPPORTED_FEATURES: climate.SUPPORT_TARGET_TEMPERATURE,
                 climate.ATTR_HVAC_MODES: [STATE_OFF, climate.HVACMode.COOL],
                 climate.ATTR_MIN_TEMP: 10,
                 climate.ATTR_MAX_TEMP: 30,
+                climate.ATTR_PRESET_MODE: climate.PRESET_ECO,
                 ATTR_TEMPERATURE: 18,
                 climate.ATTR_CURRENT_TEMPERATURE: 20,
             },
@@ -1011,10 +1053,14 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "cool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 30,
+        },
         "thermostatTemperatureUnit": "C",
     }
     assert trt.query_attributes() == {
-        "thermostatMode": "cool",
+        "thermostatMode": "eco",
         "thermostatTemperatureAmbient": 20,
         "thermostatTemperatureSetpoint": 18,
     }
@@ -1022,7 +1068,6 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     assert trt.can_execute(trait.COMMAND_THERMOSTAT_SET_MODE, {})
 
     calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
-
     with pytest.raises(helpers.SmartHomeError):
         await trt.execute(
             trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT,
@@ -1040,6 +1085,32 @@ async def test_temperature_setting_climate_setpoint(hass: HomeAssistant) -> None
     assert len(calls) == 1
     assert calls[0].data == {ATTR_ENTITY_ID: "climate.bla", ATTR_TEMPERATURE: 19}
 
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_PRESET_MODE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_SET_MODE,
+        BASIC_DATA,
+        {"thermostatMode": "eco"},
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {
+        ATTR_ENTITY_ID: "climate.bla",
+        climate.ATTR_PRESET_MODE: "eco",
+    }
+
+    calls = async_mock_service(hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
+    await trt.execute(
+        trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE,
+        BASIC_DATA,
+        {
+            "thermostatTemperatureSetpointHigh": 15,
+            "thermostatTemperatureSetpointLow": 22,
+        },
+        {},
+    )
+    assert len(calls) == 1
+    assert calls[0].data == {ATTR_ENTITY_ID: "climate.bla", ATTR_TEMPERATURE: 18.5}
+
 
 async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) -> None:
     """Test TemperatureSetting trait support for climate domain.
@@ -1068,6 +1139,10 @@ async def test_temperature_setting_climate_setpoint_auto(hass: HomeAssistant) ->
     )
     assert trt.sync_attributes() == {
         "availableThermostatModes": ["off", "heatcool", "on"],
+        "thermostatTemperatureRange": {
+            "minThresholdCelsius": 10,
+            "maxThresholdCelsius": 30,
+        },
         "thermostatTemperatureUnit": "C",
     }
     assert trt.query_attributes() == {
@@ -1128,6 +1203,7 @@ async def test_humidity_setting_humidifier_setpoint(hass: HomeAssistant) -> None
                 humidifier.ATTR_MIN_HUMIDITY: 20,
                 humidifier.ATTR_MAX_HUMIDITY: 90,
                 humidifier.ATTR_HUMIDITY: 38,
+                humidifier.ATTR_CURRENT_HUMIDITY: 30,
             },
         ),
         BASIC_CONFIG,
@@ -1137,6 +1213,7 @@ async def test_humidity_setting_humidifier_setpoint(hass: HomeAssistant) -> None
     }
     assert trt.query_attributes() == {
         "humiditySetpointPercent": 38,
+        "humidityAmbientPercent": 30,
     }
     assert trt.can_execute(trait.COMMAND_SET_HUMIDITY, {})
 
@@ -3214,6 +3291,50 @@ async def test_channel(hass: HomeAssistant) -> None:
     assert len(media_player_calls) == 1
 
 
+async def test_air_quality_description_for_aqi(hass: HomeAssistant) -> None:
+    """Test air quality description for a given AQI value."""
+    trt = trait.SensorStateTrait(
+        hass,
+        State(
+            "sensor.test",
+            100.0,
+            {
+                "device_class": sensor.SensorDeviceClass.AQI,
+            },
+        ),
+        BASIC_CONFIG,
+    )
+
+    assert trt._air_quality_description_for_aqi("0") == "healthy"
+    assert trt._air_quality_description_for_aqi("75") == "moderate"
+    assert (
+        trt._air_quality_description_for_aqi("125") == "unhealthy for sensitive groups"
+    )
+    assert trt._air_quality_description_for_aqi("175") == "unhealthy"
+    assert trt._air_quality_description_for_aqi("250") == "very unhealthy"
+    assert trt._air_quality_description_for_aqi("350") == "hazardous"
+    assert trt._air_quality_description_for_aqi("-1") == "unknown"
+    assert trt._air_quality_description_for_aqi("non-numeric") == "unknown"
+
+
+async def test_null_device_class(hass: HomeAssistant) -> None:
+    """Test handling a null device_class in sync_attributes and query_attributes."""
+    trt = trait.SensorStateTrait(
+        hass,
+        State(
+            "sensor.test",
+            100.0,
+            {
+                "device_class": None,
+            },
+        ),
+        BASIC_CONFIG,
+    )
+
+    assert trt.sync_attributes() == {}
+    assert trt.query_attributes() == {}
+
+
 async def test_sensorstate(hass: HomeAssistant) -> None:
     """Test SensorState trait support for sensor domain."""
     sensor_types = {
@@ -3247,16 +3368,52 @@ async def test_sensorstate(hass: HomeAssistant) -> None:
         name = sensor_types[sensor_type][0]
         unit = sensor_types[sensor_type][1]
 
-        assert trt.sync_attributes() == {
-            "sensorStatesSupported": {
-                "name": name,
-                "numericCapabilities": {"rawValueUnit": unit},
+        if sensor_type == sensor.SensorDeviceClass.AQI:
+            assert trt.sync_attributes() == {
+                "sensorStatesSupported": [
+                    {
+                        "name": name,
+                        "numericCapabilities": {"rawValueUnit": unit},
+                        "descriptiveCapabilities": {
+                            "availableStates": [
+                                "healthy",
+                                "moderate",
+                                "unhealthy for sensitive groups",
+                                "unhealthy",
+                                "very unhealthy",
+                                "hazardous",
+                                "unknown",
+                            ],
+                        },
+                    }
+                ]
+            }
+        else:
+            assert trt.sync_attributes() == {
+                "sensorStatesSupported": [
+                    {
+                        "name": name,
+                        "numericCapabilities": {"rawValueUnit": unit},
+                    }
+                ]
             }
-        }
 
-        assert trt.query_attributes() == {
-            "currentSensorStateData": [{"name": name, "rawValue": "100.0"}]
-        }
+        if sensor_type == sensor.SensorDeviceClass.AQI:
+            assert trt.query_attributes() == {
+                "currentSensorStateData": [
+                    {
+                        "name": name,
+                        "currentSensorState": trt._air_quality_description_for_aqi(
+                            trt.state.state
+                        ),
+                        "rawValue": trt.state.state,
+                    },
+                ]
+            }
+        else:
+            assert trt.query_attributes() == {
+                "currentSensorStateData": [{"name": name, "rawValue": trt.state.state}]
+            }
 
     assert helpers.get_google_type(sensor.DOMAIN, None) is not None
     assert (
diff --git a/tests/components/google_assistant_sdk/test_config_flow.py b/tests/components/google_assistant_sdk/test_config_flow.py
index 1d350a8fe4f098..c65477b18b1d31 100644
--- a/tests/components/google_assistant_sdk/test_config_flow.py
+++ b/tests/components/google_assistant_sdk/test_config_flow.py
@@ -223,65 +223,39 @@ async def test_options_flow(
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "es-ES"},
+        user_input={"language_code": "es-ES"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "es-ES",
-    }
+    assert config_entry.options == {"language_code": "es-ES"}
 
     # Retrigger options flow, not change language
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "es-ES"},
+        user_input={"language_code": "es-ES"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "es-ES",
-    }
+    assert config_entry.options == {"language_code": "es-ES"}
 
     # Retrigger options flow, change language
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] == "form"
     assert result["step_id"] == "init"
     data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
+    assert set(data_schema) == {"language_code"}
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"enable_conversation_agent": False, "language_code": "en-US"},
+        user_input={"language_code": "en-US"},
     )
     assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": False,
-        "language_code": "en-US",
-    }
-
-    # Retrigger options flow, enable conversation agent
-    result = await hass.config_entries.options.async_init(config_entry.entry_id)
-    assert result["type"] == "form"
-    assert result["step_id"] == "init"
-    data_schema = result["data_schema"].schema
-    assert set(data_schema) == {"enable_conversation_agent", "language_code"}
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={"enable_conversation_agent": True, "language_code": "en-US"},
-    )
-    assert result["type"] == "create_entry"
-    assert config_entry.options == {
-        "enable_conversation_agent": True,
-        "language_code": "en-US",
-    }
+    assert config_entry.options == {"language_code": "en-US"}
diff --git a/tests/components/google_assistant_sdk/test_init.py b/tests/components/google_assistant_sdk/test_init.py
index 884107b7eb9698..99f264e4a3a0f2 100644
--- a/tests/components/google_assistant_sdk/test_init.py
+++ b/tests/components/google_assistant_sdk/test_init.py
@@ -9,14 +9,15 @@
 
 from homeassistant.components import conversation
 from homeassistant.components.google_assistant_sdk import DOMAIN
+from homeassistant.components.google_assistant_sdk.const import SUPPORTED_LANGUAGE_CODES
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
+from homeassistant.core import Context, HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
 from .conftest import ComponentSetup, ExpectedCredentials
 
-from tests.common import async_fire_time_changed, async_mock_service
+from tests.common import MockConfigEntry, async_fire_time_changed, async_mock_service
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
@@ -29,13 +30,9 @@ async def fetch_api_url(hass_client, url):
     return response.status, contents
 
 
-@pytest.mark.parametrize(
-    "enable_conversation_agent", [False, True], ids=["", "enable_conversation_agent"]
-)
 async def test_setup_success(
     hass: HomeAssistant,
     setup_integration: ComponentSetup,
-    enable_conversation_agent: bool,
 ) -> None:
     """Test successful setup and unload."""
     await setup_integration()
@@ -44,12 +41,6 @@ async def test_setup_success(
     assert len(entries) == 1
     assert entries[0].state is ConfigEntryState.LOADED
 
-    if enable_conversation_agent:
-        hass.config_entries.async_update_entry(
-            entries[0], options={"enable_conversation_agent": True}
-        )
-        await hass.async_block_till_done()
-
     await hass.config_entries.async_unload(entries[0].entry_id)
     await hass.async_block_till_done()
 
@@ -230,6 +221,7 @@ async def test_send_text_command_expired_token_refresh_failure(
             {"command": "turn on tv"},
             blocking=True,
         )
+    await hass.async_block_till_done()
 
     assert any(entry.async_get_active_flows(hass, {"reauth"})) == requires_reauth
 
@@ -321,6 +313,7 @@ async def test_send_text_command_media_player(
 async def test_conversation_agent(
     hass: HomeAssistant,
     setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
 ) -> None:
     """Test GoogleAssistantConversationAgent."""
     await setup_integration()
@@ -331,30 +324,21 @@ async def test_conversation_agent(
     assert len(entries) == 1
     entry = entries[0]
     assert entry.state is ConfigEntryState.LOADED
-    hass.config_entries.async_update_entry(
-        entry, options={"enable_conversation_agent": True}
-    )
-    await hass.async_block_till_done()
 
     agent = await conversation._get_agent_manager(hass).async_get_agent(entry.entry_id)
-    assert agent.supported_languages == ["en-US"]
+    assert agent.attribution.keys() == {"name", "url"}
+    assert agent.supported_languages == SUPPORTED_LANGUAGE_CODES
 
     text1 = "tell me a joke"
     text2 = "tell me another one"
     with patch(
         "homeassistant.components.google_assistant_sdk.TextAssistant"
     ) as mock_text_assistant:
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text1},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
         )
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text2},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text2, None, Context(), "en-US", config_entry.entry_id
         )
 
     # Assert constructor is called only once since it's reused across requests
@@ -366,6 +350,7 @@ async def test_conversation_agent(
 
 async def test_conversation_agent_refresh_token(
     hass: HomeAssistant,
+    config_entry: MockConfigEntry,
     setup_integration: ComponentSetup,
     aioclient_mock: AiohttpClientMocker,
 ) -> None:
@@ -378,21 +363,14 @@ async def test_conversation_agent_refresh_token(
     assert len(entries) == 1
     entry = entries[0]
     assert entry.state is ConfigEntryState.LOADED
-    hass.config_entries.async_update_entry(
-        entry, options={"enable_conversation_agent": True}
-    )
-    await hass.async_block_till_done()
 
     text1 = "tell me a joke"
     text2 = "tell me another one"
     with patch(
         "homeassistant.components.google_assistant_sdk.TextAssistant"
     ) as mock_text_assistant:
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text1},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
         )
 
         # Expire the token between requests
@@ -408,11 +386,8 @@ async def test_conversation_agent_refresh_token(
             },
         )
 
-        await hass.services.async_call(
-            "conversation",
-            "process",
-            {"text": text2},
-            blocking=True,
+        await conversation.async_converse(
+            hass, text2, None, Context(), "en-US", config_entry.entry_id
         )
 
     # Assert constructor is called twice since the token was expired
@@ -423,3 +398,38 @@ async def test_conversation_agent_refresh_token(
     )
     mock_text_assistant.assert_has_calls([call().assist(text1)])
     mock_text_assistant.assert_has_calls([call().assist(text2)])
+
+
+async def test_conversation_agent_language_changed(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    setup_integration: ComponentSetup,
+) -> None:
+    """Test GoogleAssistantConversationAgent when language is changed."""
+    await setup_integration()
+
+    assert await async_setup_component(hass, "conversation", {})
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    entry = entries[0]
+    assert entry.state is ConfigEntryState.LOADED
+
+    text1 = "tell me a joke"
+    text2 = "cuéntame un chiste"
+    with patch(
+        "homeassistant.components.google_assistant_sdk.TextAssistant"
+    ) as mock_text_assistant:
+        await conversation.async_converse(
+            hass, text1, None, Context(), "en-US", config_entry.entry_id
+        )
+        await conversation.async_converse(
+            hass, text2, None, Context(), "es-ES", config_entry.entry_id
+        )
+
+    # Assert constructor is called twice since the language was changed
+    assert mock_text_assistant.call_count == 2
+    mock_text_assistant.assert_has_calls([call(ExpectedCredentials(), "en-US")])
+    mock_text_assistant.assert_has_calls([call(ExpectedCredentials(), "es-ES")])
+    mock_text_assistant.assert_has_calls([call().assist(text1)])
+    mock_text_assistant.assert_has_calls([call().assist(text2)])
diff --git a/tests/components/google_generative_ai_conversation/test_init.py b/tests/components/google_generative_ai_conversation/test_init.py
index 7335903b43b4c2..e8da4cf3920f0b 100644
--- a/tests/components/google_generative_ai_conversation/test_init.py
+++ b/tests/components/google_generative_ai_conversation/test_init.py
@@ -13,6 +13,7 @@
 
 async def test_default_prompt(
     hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
     mock_init_component,
     area_registry: ar.AreaRegistry,
     device_registry: dr.DeviceRegistry,
@@ -89,16 +90,22 @@ async def test_default_prompt(
         suggested_area="Test Area 2",
     )
     with patch("google.generativeai.chat_async") as mock_chat:
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
     assert mock_chat.mock_calls[0][2] == snapshot
 
 
-async def test_error_handling(hass: HomeAssistant, mock_init_component) -> None:
+async def test_error_handling(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+) -> None:
     """Test that the default prompt works."""
     with patch("google.generativeai.chat_async", side_effect=ClientError("")):
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
@@ -119,7 +126,9 @@ async def test_template_error(
     ), patch("google.generativeai.chat_async"):
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
diff --git a/tests/components/google_mail/test_services.py b/tests/components/google_mail/test_services.py
index 2523e7a9591aa7..b9fefa805e6a88 100644
--- a/tests/components/google_mail/test_services.py
+++ b/tests/components/google_mail/test_services.py
@@ -81,6 +81,9 @@ async def test_reauth_trigger(
             blocking=True,
         )
 
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
     flows = hass.config_entries.flow.async_progress()
 
     assert len(flows) == 1
diff --git a/tests/components/google_pubsub/test_init.py b/tests/components/google_pubsub/test_init.py
index 38c3da79524d80..0a1d474126811c 100644
--- a/tests/components/google_pubsub/test_init.py
+++ b/tests/components/google_pubsub/test_init.py
@@ -8,8 +8,7 @@
 
 import homeassistant.components.google_pubsub as google_pubsub
 from homeassistant.components.google_pubsub import DateTimeJSONEncoder as victim
-from homeassistant.const import EVENT_STATE_CHANGED
-from homeassistant.core import HomeAssistant, split_entity_id
+from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 GOOGLE_PUBSUB_PATH = "homeassistant.components.google_pubsub"
@@ -60,9 +59,8 @@ def mock_is_file_fixture():
 
 
 @pytest.fixture(autouse=True)
-def mock_bus_and_json(hass, monkeypatch):
+def mock_json(hass, monkeypatch):
     """Mock the event bus listener and os component."""
-    hass.bus.listen = mock.MagicMock()
     monkeypatch.setattr(
         f"{GOOGLE_PUBSUB_PATH}.json.dumps", mock.Mock(return_value=mock.MagicMock())
     )
@@ -80,8 +78,6 @@ async def test_minimal_config(hass: HomeAssistant, mock_client) -> None:
     }
     assert await async_setup_component(hass, google_pubsub.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
     assert mock_client.from_service_account_json.call_count == 1
     assert mock_client.from_service_account_json.call_args[0][0] == os.path.join(
         hass.config.config_dir, "creds"
@@ -107,27 +103,12 @@ async def test_full_config(hass: HomeAssistant, mock_client) -> None:
     }
     assert await async_setup_component(hass, google_pubsub.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
     assert mock_client.from_service_account_json.call_count == 1
     assert mock_client.from_service_account_json.call_args[0][0] == os.path.join(
         hass.config.config_dir, "creds"
     )
 
 
-def make_event(entity_id):
-    """Make a mock event for test."""
-    domain = split_entity_id(entity_id)[0]
-    state = mock.MagicMock(
-        state="not blank",
-        domain=domain,
-        entity_id=entity_id,
-        object_id="entity",
-        attributes={},
-    )
-    return mock.MagicMock(data={"new_state": state}, time_fired=12345)
-
-
 async def _setup(hass, filter_config):
     """Shared set up for filtering tests."""
     config = {
@@ -140,12 +121,11 @@ async def _setup(hass, filter_config):
     }
     assert await async_setup_component(hass, google_pubsub.DOMAIN, config)
     await hass.async_block_till_done()
-    return hass.bus.listen.call_args_list[0][0][1]
 
 
 async def test_allowlist(hass: HomeAssistant, mock_client) -> None:
     """Test an allowlist only config."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "include_domains": ["light"],
@@ -165,8 +145,8 @@ async def test_allowlist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = publish_client.publish.call_count == 1
         assert test.should_pass == was_called
@@ -175,7 +155,7 @@ async def test_allowlist(hass: HomeAssistant, mock_client) -> None:
 
 async def test_denylist(hass: HomeAssistant, mock_client) -> None:
     """Test a denylist only config."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "exclude_domains": ["climate"],
@@ -195,8 +175,8 @@ async def test_denylist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = publish_client.publish.call_count == 1
         assert test.should_pass == was_called
@@ -205,7 +185,7 @@ async def test_denylist(hass: HomeAssistant, mock_client) -> None:
 
 async def test_filtered_allowlist(hass: HomeAssistant, mock_client) -> None:
     """Test an allowlist config with a filtering denylist."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "include_domains": ["light"],
@@ -226,8 +206,8 @@ async def test_filtered_allowlist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = publish_client.publish.call_count == 1
         assert test.should_pass == was_called
@@ -236,7 +216,7 @@ async def test_filtered_allowlist(hass: HomeAssistant, mock_client) -> None:
 
 async def test_filtered_denylist(hass: HomeAssistant, mock_client) -> None:
     """Test a denylist config with a filtering allowlist."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "include_entities": ["climate.included", "sensor.excluded_test"],
@@ -257,8 +237,8 @@ async def test_filtered_denylist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = publish_client.publish.call_count == 1
         assert test.should_pass == was_called
diff --git a/tests/components/google_sheets/test_init.py b/tests/components/google_sheets/test_init.py
index 50c82ac5109f39..8f7ce7603e8e0b 100644
--- a/tests/components/google_sheets/test_init.py
+++ b/tests/components/google_sheets/test_init.py
@@ -6,7 +6,9 @@
 from typing import Any
 from unittest.mock import patch
 
+from gspread.exceptions import APIError
 import pytest
+from requests.models import Response
 
 from homeassistant.components.application_credentials import (
     ClientCredential,
@@ -15,7 +17,7 @@
 from homeassistant.components.google_sheets import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceNotFound
+from homeassistant.exceptions import HomeAssistantError, ServiceNotFound
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
@@ -212,6 +214,37 @@ async def test_append_sheet(
     assert len(mock_client.mock_calls) == 8
 
 
+async def test_append_sheet_api_error(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test append to sheet service call API error."""
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+
+    response = Response()
+    response.status_code = 503
+
+    with pytest.raises(HomeAssistantError), patch(
+        "homeassistant.components.google_sheets.Client.request",
+        side_effect=APIError(response),
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            "append_sheet",
+            {
+                "config_entry": config_entry.entry_id,
+                "worksheet": "Sheet1",
+                "data": {"foo": "bar"},
+            },
+            blocking=True,
+        )
+
+
 async def test_append_sheet_invalid_config_entry(
     hass: HomeAssistant,
     setup_integration: ComponentSetup,
diff --git a/tests/components/google_translate/conftest.py b/tests/components/google_translate/conftest.py
new file mode 100644
index 00000000000000..34132fc5c1d75d
--- /dev/null
+++ b/tests/components/google_translate/conftest.py
@@ -0,0 +1,14 @@
+"""Common fixtures for the Google Translate text-to-speech tests."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.google_translate.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/tests/components/google_translate/test_config_flow.py b/tests/components/google_translate/test_config_flow.py
new file mode 100644
index 00000000000000..e9a41e8eea6106
--- /dev/null
+++ b/tests/components/google_translate/test_config_flow.py
@@ -0,0 +1,86 @@
+"""Test the Google Translate text-to-speech config flow."""
+from unittest.mock import AsyncMock
+
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.google_translate.const import CONF_TLD, DOMAIN
+from homeassistant.components.tts import CONF_LANG
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+
+
+async def test_user_step(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+    """Test user step create entry result."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_LANG: "de",
+            CONF_TLD: "de",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Google Translate text-to-speech"
+    assert result["data"] == {
+        CONF_LANG: "de",
+        CONF_TLD: "de",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_already_configured(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test user step already configured entry."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN, data={CONF_LANG: "de", CONF_TLD: "de"}
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_LANG: "de",
+            CONF_TLD: "de",
+        },
+    )
+
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+    assert len(mock_setup_entry.mock_calls) == 0
+
+
+async def test_onboarding_flow(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test the onboarding configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": "onboarding"}
+    )
+
+    assert result.get("type") == FlowResultType.CREATE_ENTRY
+    assert result.get("title") == "Google Translate text-to-speech"
+    assert result.get("data") == {
+        CONF_LANG: "en",
+        CONF_TLD: "com",
+    }
+
+    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py
index 21386e5a8b3164..d6669ee3c5f688 100644
--- a/tests/components/google_translate/test_tts.py
+++ b/tests/components/google_translate/test_tts.py
@@ -1,27 +1,41 @@
 """The tests for the Google speech platform."""
-import os
-import shutil
-from unittest.mock import patch
+from __future__ import annotations
+
+from collections.abc import Generator
+from typing import Any
+from unittest.mock import MagicMock, patch
 
 from gtts import gTTSError
 import pytest
 
 from homeassistant.components import media_source, tts
+from homeassistant.components.google_translate.const import CONF_TLD, DOMAIN
 from homeassistant.components.media_player import (
     ATTR_MEDIA_CONTENT_ID,
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
 )
 from homeassistant.config import async_process_ha_core_config
-from homeassistant.core import HomeAssistant
+from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
+from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
 
-from tests.common import async_mock_service
-from tests.components.tts.conftest import mutagen_mock  # noqa: F401
+from tests.common import MockConfigEntry, async_mock_service
+
+
+@pytest.fixture(autouse=True)
+def tts_mutagen_mock_fixture_autouse(tts_mutagen_mock):
+    """Mock writing tags."""
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
 
 
-async def get_media_source_url(hass, media_content_id):
+async def get_media_source_url(hass: HomeAssistant, media_content_id: str) -> str:
     """Get the media source url."""
     if media_source.DOMAIN not in hass.config.components:
         assert await async_setup_component(hass, media_source.DOMAIN, {})
@@ -30,23 +44,14 @@ async def get_media_source_url(hass, media_content_id):
     return resolved.url
 
 
-@pytest.fixture(autouse=True)
-def cleanup_cache(hass):
-    """Clean up TTS cache."""
-    yield
-    default_tts = hass.config.path(tts.DEFAULT_CACHE_DIR)
-    if os.path.isdir(default_tts):
-        shutil.rmtree(default_tts)
-
-
 @pytest.fixture
-async def calls(hass):
+async def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Mock media player calls."""
     return async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
 
 
 @pytest.fixture(autouse=True)
-async def setup_internal_url(hass):
+async def setup_internal_url(hass: HomeAssistant) -> None:
     """Set up internal url."""
     await async_process_ha_core_config(
         hass, {"internal_url": "http://example.local:8123"}
@@ -54,26 +59,85 @@ async def setup_internal_url(hass):
 
 
 @pytest.fixture
-def mock_gtts():
+def mock_gtts() -> Generator[MagicMock, None, None]:
     """Mock gtts."""
     with patch("homeassistant.components.google_translate.tts.gTTS") as mock_gtts:
         yield mock_gtts
 
 
-async def test_service_say(hass: HomeAssistant, mock_gtts, calls) -> None:
-    """Test service call say."""
+@pytest.fixture(name="setup")
+async def setup_fixture(
+    hass: HomeAssistant,
+    config: dict[str, Any],
+    request: pytest.FixtureRequest,
+) -> None:
+    """Set up the test environment."""
+    if request.param == "mock_setup":
+        await mock_setup(hass, config)
+    elif request.param == "mock_config_entry_setup":
+        await mock_config_entry_setup(hass, config)
+    else:
+        raise RuntimeError("Invalid setup fixture")
+
+
+@pytest.fixture(name="config")
+def config_fixture() -> dict[str, Any]:
+    """Return config."""
+    return {}
+
 
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
+async def mock_setup(hass: HomeAssistant, config: dict[str, Any]) -> None:
+    """Mock setup."""
+    assert await async_setup_component(
+        hass, tts.DOMAIN, {tts.DOMAIN: {CONF_PLATFORM: DOMAIN} | config}
     )
 
+
+async def mock_config_entry_setup(hass: HomeAssistant, config: dict[str, Any]) -> None:
+    """Mock config entry setup."""
+    default_config = {tts.CONF_LANG: "en", CONF_TLD: "com"}
+    config_entry = MockConfigEntry(domain=DOMAIN, data=default_config | config)
+    config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+
+
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_tts_service(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
+    """Test tts service."""
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -89,22 +153,43 @@ async def test_service_say(hass: HomeAssistant, mock_gtts, calls) -> None:
     }
 
 
-async def test_service_say_german_config(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize("config", [{tts.CONF_LANG: "de"}])
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_de_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_german_config(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with german code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate", "language": "de"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -118,25 +203,44 @@ async def test_service_say_german_config(hass: HomeAssistant, mock_gtts, calls)
     }
 
 
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "de",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "de",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
 async def test_service_say_german_service(
-    hass: HomeAssistant, mock_gtts, calls
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
 ) -> None:
     """Test service call say with german code in the service."""
-
-    config = {
-        tts.DOMAIN: {"platform": "google_translate", "service_name": "google_say"}
-    }
-
-    await async_setup_component(hass, tts.DOMAIN, config)
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_LANGUAGE: "de",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -150,22 +254,43 @@ async def test_service_say_german_service(
     }
 
 
-async def test_service_say_en_uk_config(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize("config", [{tts.CONF_LANG: "en-uk"}])
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_co_uk",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_uk_config(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with en-uk code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate", "language": "en-uk"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -179,23 +304,44 @@ async def test_service_say_en_uk_config(hass: HomeAssistant, mock_gtts, calls) -
     }
 
 
-async def test_service_say_en_uk_service(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "en-uk",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_LANGUAGE: "en-uk",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_uk_service(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with en-uk code in the config."""
-
-    await async_setup_component(
-        hass,
-        tts.DOMAIN,
-        {tts.DOMAIN: {"platform": "google_translate"}},
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_LANGUAGE: "en-uk",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -209,21 +355,44 @@ async def test_service_say_en_uk_service(hass: HomeAssistant, mock_gtts, calls)
     }
 
 
-async def test_service_say_en_couk(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_OPTIONS: {"tld": "co.uk"},
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+                tts.ATTR_OPTIONS: {"tld": "co.uk"},
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_en_couk(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say in co.uk tld accent."""
-
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
-    )
-
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-            tts.ATTR_OPTIONS: {"tld": "co.uk"},
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
@@ -239,20 +408,44 @@ async def test_service_say_en_couk(hass: HomeAssistant, mock_gtts, calls) -> Non
     }
 
 
-async def test_service_say_error(hass: HomeAssistant, mock_gtts, calls) -> None:
+@pytest.mark.parametrize(
+    ("setup", "tts_service", "service_data"),
+    [
+        (
+            "mock_setup",
+            "google_translate_say",
+            {
+                ATTR_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+        (
+            "mock_config_entry_setup",
+            "speak",
+            {
+                ATTR_ENTITY_ID: "tts.google_en_com",
+                tts.ATTR_MEDIA_PLAYER_ENTITY_ID: "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+        ),
+    ],
+    indirect=["setup"],
+)
+async def test_service_say_error(
+    hass: HomeAssistant,
+    mock_gtts: MagicMock,
+    calls: list[ServiceCall],
+    setup: str,
+    tts_service: str,
+    service_data: dict[str, Any],
+) -> None:
     """Test service call say with http response 400."""
     mock_gtts.return_value.write_to_fp.side_effect = gTTSError
-    await async_setup_component(
-        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "google_translate"}}
-    )
 
     await hass.services.async_call(
         tts.DOMAIN,
-        "google_translate_say",
-        {
-            "entity_id": "media_player.something",
-            tts.ATTR_MESSAGE: "There is a person at the front door.",
-        },
+        tts_service,
+        service_data,
         blocking=True,
     )
 
diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py
index 868631e9c27c5f..3eceac64904ac4 100644
--- a/tests/components/google_wifi/test_sensor.py
+++ b/tests/components/google_wifi/test_sensor.py
@@ -30,7 +30,7 @@
     '"ipAddress":false}}'
 )
 
-MOCK_DATA_MISSING = '{"software": {},' '"system": {},' '"wan": {}}'
+MOCK_DATA_MISSING = '{"software": {},"system": {},"wan": {}}'
 
 
 async def test_setup_minimum(
diff --git a/tests/components/govee_ble/test_sensor.py b/tests/components/govee_ble/test_sensor.py
index e9e66ba73e8d7c..1408a35142a5bd 100644
--- a/tests/components/govee_ble/test_sensor.py
+++ b/tests/components/govee_ble/test_sensor.py
@@ -55,7 +55,7 @@ async def test_gvh5178_error(hass: HomeAssistant) -> None:
     assert len(hass.states.async_all()) == 0
     inject_bluetooth_service_info(hass, GVH5178_SERVICE_INFO_ERROR)
     await hass.async_block_till_done()
-    assert len(hass.states.async_all()) == 4
+    assert len(hass.states.async_all()) == 3
 
     temp_sensor = hass.states.get("sensor.b51782bc8_remote_temperature")
     assert temp_sensor.state == STATE_UNAVAILABLE
diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py
index afed01c1a08574..fe64b0ee7ef6bb 100644
--- a/tests/components/gree/test_climate.py
+++ b/tests/components/gree/test_climate.py
@@ -326,7 +326,7 @@ async def test_send_command_device_timeout(
     device().push_state_update.side_effect = DeviceTimeoutError
 
     # Send failure should not raise exceptions or change device state
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -342,7 +342,7 @@ async def test_send_power_on(hass: HomeAssistant, discovery, device, mock_now) -
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -362,7 +362,7 @@ async def test_send_power_off_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: ENTITY_ID},
@@ -393,7 +393,7 @@ async def test_send_target_temperature(
     # Make sure we're trying to test something that isn't the default
     assert fake_device.current_temperature != temperature
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: temperature},
@@ -428,7 +428,7 @@ async def test_send_target_temperature_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_TEMPERATURE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: temperature},
@@ -475,7 +475,7 @@ async def test_send_preset_mode(
     """Test for sending preset mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
@@ -517,7 +517,7 @@ async def test_send_preset_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_PRESET_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
@@ -565,7 +565,7 @@ async def test_send_hvac_mode(
     """Test for sending hvac mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
@@ -589,7 +589,7 @@ async def test_send_hvac_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_HVAC_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
@@ -636,7 +636,7 @@ async def test_send_fan_mode(
     """Test for sending fan mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_FAN_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
@@ -679,7 +679,7 @@ async def test_send_fan_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_FAN_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
@@ -717,7 +717,7 @@ async def test_send_swing_mode(
     """Test for sending swing mode command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_SWING_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
@@ -759,7 +759,7 @@ async def test_send_swing_mode_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SET_SWING_MODE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
diff --git a/tests/components/gree/test_switch.py b/tests/components/gree/test_switch.py
index aee9c985e8c44f..d8160d990403f0 100644
--- a/tests/components/gree/test_switch.py
+++ b/tests/components/gree/test_switch.py
@@ -66,7 +66,7 @@ async def test_send_switch_on(
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -96,7 +96,7 @@ async def test_send_switch_on_device_timeout(
 
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -124,7 +124,7 @@ async def test_send_switch_off(
     """Test for sending power on command to the device."""
     await async_setup_gree(hass)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: entity},
@@ -153,7 +153,7 @@ async def test_send_switch_toggle(
     await async_setup_gree(hass)
 
     # Turn the service on first
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: entity},
@@ -165,7 +165,7 @@ async def test_send_switch_toggle(
     assert state.state == STATE_ON
 
     # Toggle it off
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TOGGLE,
         {ATTR_ENTITY_ID: entity},
@@ -177,7 +177,7 @@ async def test_send_switch_toggle(
     assert state.state == STATE_OFF
 
     # Toggle is back on
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_TOGGLE,
         {ATTR_ENTITY_ID: entity},
diff --git a/tests/components/group/test_light.py b/tests/components/group/test_light.py
index f50d4486b39590..539a8c61414fe5 100644
--- a/tests/components/group/test_light.py
+++ b/tests/components/group/test_light.py
@@ -1,5 +1,4 @@
 """The tests for the Group Light platform."""
-import unittest.mock
 from unittest.mock import MagicMock, patch
 
 import async_timeout
@@ -16,7 +15,6 @@
     ATTR_COLOR_TEMP_KELVIN,
     ATTR_EFFECT,
     ATTR_EFFECT_LIST,
-    ATTR_FLASH,
     ATTR_HS_COLOR,
     ATTR_MAX_COLOR_TEMP_KELVIN,
     ATTR_MIN_COLOR_TEMP_KELVIN,
@@ -26,7 +24,6 @@
     ATTR_SUPPORTED_COLOR_MODES,
     ATTR_TRANSITION,
     ATTR_WHITE,
-    ATTR_XY_COLOR,
     DOMAIN as LIGHT_DOMAIN,
     SERVICE_TOGGLE,
     SERVICE_TURN_OFF,
@@ -39,16 +36,17 @@
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_SUPPORTED_FEATURES,
+    EVENT_CALL_SERVICE,
     STATE_OFF,
     STATE_ON,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
-from tests.common import get_fixture_path
+from tests.common import async_capture_events, get_fixture_path
 
 
 async def test_default_state(hass: HomeAssistant) -> None:
@@ -1443,6 +1441,7 @@ async def test_invalid_service_calls(hass: HomeAssistant) -> None:
     await group.async_setup_platform(
         hass, {"name": "test", "entities": ["light.test1", "light.test2"]}, add_entities
     )
+    await async_setup_component(hass, "light", {})
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
@@ -1451,35 +1450,38 @@ async def test_invalid_service_calls(hass: HomeAssistant) -> None:
     grouped_light = add_entities.call_args[0][0][0]
     grouped_light.hass = hass
 
-    with unittest.mock.patch.object(hass.services, "async_call") as mock_call:
-        await grouped_light.async_turn_on(brightness=150, four_oh_four="404")
-        data = {ATTR_ENTITY_ID: ["light.test1", "light.test2"], ATTR_BRIGHTNESS: 150}
-        mock_call.assert_called_once_with(
-            LIGHT_DOMAIN, SERVICE_TURN_ON, data, blocking=True, context=None
-        )
-        mock_call.reset_mock()
-
-        await grouped_light.async_turn_off(transition=4, four_oh_four="404")
-        data = {ATTR_ENTITY_ID: ["light.test1", "light.test2"], ATTR_TRANSITION: 4}
-        mock_call.assert_called_once_with(
-            LIGHT_DOMAIN, SERVICE_TURN_OFF, data, blocking=True, context=None
-        )
-        mock_call.reset_mock()
-
-        data = {
-            ATTR_BRIGHTNESS: 150,
-            ATTR_XY_COLOR: (0.5, 0.42),
-            ATTR_RGB_COLOR: (80, 120, 50),
-            ATTR_COLOR_TEMP_KELVIN: 1234,
-            ATTR_EFFECT: "Sunshine",
-            ATTR_TRANSITION: 4,
-            ATTR_FLASH: "long",
-        }
-        await grouped_light.async_turn_on(**data)
-        data[ATTR_ENTITY_ID] = ["light.test1", "light.test2"]
-        mock_call.assert_called_once_with(
-            LIGHT_DOMAIN, SERVICE_TURN_ON, data, blocking=True, context=None
-        )
+    service_call_events = async_capture_events(hass, EVENT_CALL_SERVICE)
+
+    await grouped_light.async_turn_on(brightness=150, four_oh_four="404")
+    data = {ATTR_ENTITY_ID: ["light.test1", "light.test2"], ATTR_BRIGHTNESS: 150}
+    assert len(service_call_events) == 1
+    service_event_call: Event = service_call_events[0]
+    assert service_event_call.data["domain"] == LIGHT_DOMAIN
+    assert service_event_call.data["service"] == SERVICE_TURN_ON
+    assert service_event_call.data["service_data"] == data
+    service_call_events.clear()
+
+    await grouped_light.async_turn_off(transition=4, four_oh_four="404")
+    data = {ATTR_ENTITY_ID: ["light.test1", "light.test2"], ATTR_TRANSITION: 4}
+    assert len(service_call_events) == 1
+    service_event_call: Event = service_call_events[0]
+    assert service_event_call.data["domain"] == LIGHT_DOMAIN
+    assert service_event_call.data["service"] == SERVICE_TURN_OFF
+    assert service_event_call.data["service_data"] == data
+    service_call_events.clear()
+
+    data = {
+        ATTR_BRIGHTNESS: 150,
+        ATTR_COLOR_TEMP_KELVIN: 1234,
+        ATTR_TRANSITION: 4,
+    }
+    await grouped_light.async_turn_on(**data)
+    data[ATTR_ENTITY_ID] = ["light.test1", "light.test2"]
+    service_event_call: Event = service_call_events[0]
+    assert service_event_call.data["domain"] == LIGHT_DOMAIN
+    assert service_event_call.data["service"] == SERVICE_TURN_ON
+    assert service_event_call.data["service_data"] == data
+    service_call_events.clear()
 
 
 async def test_reload(hass: HomeAssistant) -> None:
diff --git a/tests/components/habitica/test_init.py b/tests/components/habitica/test_init.py
index 69fe2e6fc395ee..91fa6f90e9f3db 100644
--- a/tests/components/habitica/test_init.py
+++ b/tests/components/habitica/test_init.py
@@ -123,7 +123,7 @@ async def test_service_call(
         ATTR_PATH: ["tasks", "user", "post"],
         ATTR_ARGS: TEST_API_CALL_ARGS,
     }
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_API_CALL, TEST_SERVICE_DATA, blocking=True
     )
 
diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py
index 678ba641e80e67..22051808cccf2a 100644
--- a/tests/components/hassio/conftest.py
+++ b/tests/components/hassio/conftest.py
@@ -98,6 +98,10 @@ def all_setup_requests(
     aioclient_mock: AiohttpClientMocker, request: pytest.FixtureRequest
 ):
     """Mock all setup requests."""
+    include_addons = hasattr(request, "param") and request.param.get(
+        "include_addons", False
+    )
+
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
     aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
@@ -157,7 +161,30 @@ def all_setup_requests(
                 "version": "1.0.0",
                 "version_latest": "1.0.0",
                 "auto_update": True,
-                "addons": [],
+                "addons": [
+                    {
+                        "name": "test",
+                        "slug": "test",
+                        "update_available": False,
+                        "version": "1.0.0",
+                        "version_latest": "1.0.0",
+                        "repository": "core",
+                        "state": "started",
+                        "icon": False,
+                    },
+                    {
+                        "name": "test2",
+                        "slug": "test2",
+                        "update_available": False,
+                        "version": "1.0.0",
+                        "version_latest": "1.0.0",
+                        "repository": "core",
+                        "state": "started",
+                        "icon": False,
+                    },
+                ]
+                if include_addons
+                else [],
             },
         },
     )
@@ -165,3 +192,106 @@ def all_setup_requests(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
     aioclient_mock.post("http://127.0.0.1/refresh_updates", json={"result": "ok"})
+
+    aioclient_mock.get("http://127.0.0.1/addons/test/changelog", text="")
+    aioclient_mock.get(
+        "http://127.0.0.1/addons/test/info",
+        json={
+            "result": "ok",
+            "data": {
+                "name": "test",
+                "slug": "test",
+                "update_available": False,
+                "version": "1.0.0",
+                "version_latest": "1.0.0",
+                "repository": "core",
+                "state": "started",
+                "icon": False,
+                "url": "https://github.com/home-assistant/addons/test",
+                "auto_update": True,
+            },
+        },
+    )
+    aioclient_mock.get("http://127.0.0.1/addons/test2/changelog", text="")
+    aioclient_mock.get(
+        "http://127.0.0.1/addons/test2/info",
+        json={
+            "result": "ok",
+            "data": {
+                "name": "test2",
+                "slug": "test2",
+                "update_available": False,
+                "version": "1.0.0",
+                "version_latest": "1.0.0",
+                "repository": "core",
+                "state": "started",
+                "icon": False,
+                "url": "https://github.com",
+                "auto_update": False,
+            },
+        },
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/core/stats",
+        json={
+            "result": "ok",
+            "data": {
+                "cpu_percent": 0.99,
+                "memory_usage": 182611968,
+                "memory_limit": 3977146368,
+                "memory_percent": 4.59,
+                "network_rx": 362570232,
+                "network_tx": 82374138,
+                "blk_read": 46010945536,
+                "blk_write": 15051526144,
+            },
+        },
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/supervisor/stats",
+        json={
+            "result": "ok",
+            "data": {
+                "cpu_percent": 0.99,
+                "memory_usage": 182611968,
+                "memory_limit": 3977146368,
+                "memory_percent": 4.59,
+                "network_rx": 362570232,
+                "network_tx": 82374138,
+                "blk_read": 46010945536,
+                "blk_write": 15051526144,
+            },
+        },
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/addons/test/stats",
+        json={
+            "result": "ok",
+            "data": {
+                "cpu_percent": 0.99,
+                "memory_usage": 182611968,
+                "memory_limit": 3977146368,
+                "memory_percent": 4.59,
+                "network_rx": 362570232,
+                "network_tx": 82374138,
+                "blk_read": 46010945536,
+                "blk_write": 15051526144,
+            },
+        },
+    )
+    aioclient_mock.get(
+        "http://127.0.0.1/addons/test2/stats",
+        json={
+            "result": "ok",
+            "data": {
+                "cpu_percent": 0.8,
+                "memory_usage": 51941376,
+                "memory_limit": 3977146368,
+                "memory_percent": 1.31,
+                "network_rx": 31338284,
+                "network_tx": 15692900,
+                "blk_read": 740077568,
+                "blk_write": 6004736,
+            },
+        },
+    )
diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py
index 1d86699d095207..0dff261d864092 100644
--- a/tests/components/hassio/test_init.py
+++ b/tests/components/hassio/test_init.py
@@ -483,6 +483,7 @@ async def test_service_register(hassio_env, hass: HomeAssistant) -> None:
     assert hass.services.has_service("hassio", "restore_partial")
 
 
+@pytest.mark.freeze_time("2021-11-13 11:48:00")
 async def test_service_calls(
     hassio_env,
     hass: HomeAssistant,
@@ -541,6 +542,7 @@ async def test_service_calls(
 
     assert aioclient_mock.call_count == 14
     assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "2021-11-13 11:48:00",
         "homeassistant": True,
         "addons": ["test"],
         "folders": ["ssl"],
@@ -571,6 +573,37 @@ async def test_service_calls(
         "password": "123456",
     }
 
+    await hass.services.async_call(
+        "hassio",
+        "backup_full",
+        {
+            "name": "backup_name",
+            "location": "backup_share",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert aioclient_mock.call_count == 17
+    assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "backup_name",
+        "location": "backup_share",
+    }
+
+    await hass.services.async_call(
+        "hassio",
+        "backup_full",
+        {
+            "location": "/backup",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert aioclient_mock.call_count == 18
+    assert aioclient_mock.mock_calls[-1][2] == {
+        "name": "2021-11-13 11:48:00",
+        "location": None,
+    }
+
 
 async def test_service_calls_core(
     hassio_env, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
diff --git a/tests/components/hassio/test_issues.py b/tests/components/hassio/test_issues.py
index c8ce5fcb490188..4d694b79e4647a 100644
--- a/tests/components/hassio/test_issues.py
+++ b/tests/components/hassio/test_issues.py
@@ -496,7 +496,7 @@ async def test_supervisor_issues(
             {
                 "uuid": "1237",
                 "type": "should_not_be_repair",
-                "context": "fake",
+                "context": "os",
                 "reference": None,
             },
         ],
@@ -715,3 +715,21 @@ async def test_supervisor_remove_missing_issue_without_error(
     msg = await client.receive_json()
     assert msg["success"]
     await hass.async_block_till_done()
+
+
+async def test_system_is_not_ready(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Ensure hassio starts despite error."""
+    aioclient_mock.get(
+        "http://127.0.0.1/resolution/info",
+        json={
+            "result": "",
+            "message": "System is not ready with state: setup",
+        },
+    )
+
+    assert await async_setup_component(hass, "hassio", {})
+    assert "Failed to update supervisor issues" in caplog.text
diff --git a/tests/components/hassio/test_repairs.py b/tests/components/hassio/test_repairs.py
index 76b6b48b460bc0..237c20a5272847 100644
--- a/tests/components/hassio/test_repairs.py
+++ b/tests/components/hassio/test_repairs.py
@@ -19,16 +19,11 @@
 
 
 @pytest.fixture(autouse=True)
-async def setup_repairs(hass):
+async def setup_repairs(hass: HomeAssistant):
     """Set up the repairs integration."""
     assert await async_setup_component(hass, REPAIRS_DOMAIN, {REPAIRS_DOMAIN: {}})
 
 
-@pytest.fixture(autouse=True)
-async def mock_all(all_setup_requests):
-    """Mock all setup requests."""
-
-
 @pytest.fixture(autouse=True)
 async def fixture_supervisor_environ():
     """Mock os environ for supervisor."""
@@ -40,9 +35,10 @@ async def test_supervisor_issue_repair_flow(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
 ) -> None:
     """Test fix flow for supervisor issue."""
-    issue_registry: ir.IssueRegistry = ir.async_get(hass)
     mock_resolution_info(
         aioclient_mock,
         issues=[
@@ -63,8 +59,7 @@ async def test_supervisor_issue_repair_flow(
         ],
     )
 
-    result = await async_setup_component(hass, "hassio", {})
-    assert result
+    assert await async_setup_component(hass, "hassio", {})
 
     repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
@@ -119,9 +114,10 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
 ) -> None:
     """Test fix flow for supervisor issue with multiple suggestions."""
-    issue_registry: ir.IssueRegistry = ir.async_get(hass)
     mock_resolution_info(
         aioclient_mock,
         issues=[
@@ -148,8 +144,7 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
         ],
     )
 
-    result = await async_setup_component(hass, "hassio", {})
-    assert result
+    assert await async_setup_component(hass, "hassio", {})
 
     repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
@@ -214,9 +209,10 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confir
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
 ) -> None:
     """Test fix flow for supervisor issue with multiple suggestions and choice requires confirmation."""
-    issue_registry: ir.IssueRegistry = ir.async_get(hass)
     mock_resolution_info(
         aioclient_mock,
         issues=[
@@ -243,8 +239,7 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confir
         ],
     )
 
-    result = await async_setup_component(hass, "hassio", {})
-    assert result
+    assert await async_setup_component(hass, "hassio", {})
 
     repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
@@ -327,9 +322,10 @@ async def test_supervisor_issue_repair_flow_skip_confirmation(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
     hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
 ) -> None:
     """Test confirmation skipped for fix flow for supervisor issue with one suggestion."""
-    issue_registry: ir.IssueRegistry = ir.async_get(hass)
     mock_resolution_info(
         aioclient_mock,
         issues=[
@@ -350,8 +346,7 @@ async def test_supervisor_issue_repair_flow_skip_confirmation(
         ],
     )
 
-    result = await async_setup_component(hass, "hassio", {})
-    assert result
+    assert await async_setup_component(hass, "hassio", {})
 
     repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
     assert repair_issue
@@ -400,3 +395,212 @@ async def test_supervisor_issue_repair_flow_skip_confirmation(
         str(aioclient_mock.mock_calls[-1][1])
         == "http://127.0.0.1/resolution/suggestion/1235"
     )
+
+
+async def test_mount_failed_repair_flow(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
+) -> None:
+    """Test repair flow for mount_failed issue."""
+    mock_resolution_info(
+        aioclient_mock,
+        issues=[
+            {
+                "uuid": "1234",
+                "type": "mount_failed",
+                "context": "mount",
+                "reference": "backup_share",
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_reload",
+                        "context": "mount",
+                        "reference": "backup_share",
+                    },
+                    {
+                        "uuid": "1236",
+                        "type": "execute_remove",
+                        "context": "mount",
+                        "reference": "backup_share",
+                    },
+                ],
+            },
+        ],
+    )
+
+    assert await async_setup_component(hass, "hassio", {})
+
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+    assert repair_issue
+
+    client = await hass_client()
+
+    resp = await client.post(
+        "/api/repairs/issues/fix",
+        json={"handler": "hassio", "issue_id": repair_issue.issue_id},
+    )
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    flow_id = data["flow_id"]
+    assert data == {
+        "type": "menu",
+        "flow_id": flow_id,
+        "handler": "hassio",
+        "step_id": "fix_menu",
+        "data_schema": [
+            {
+                "type": "select",
+                "options": [
+                    ["mount_execute_reload", "mount_execute_reload"],
+                    ["mount_execute_remove", "mount_execute_remove"],
+                ],
+                "name": "next_step_id",
+            }
+        ],
+        "menu_options": ["mount_execute_reload", "mount_execute_remove"],
+        "description_placeholders": {
+            "reference": "backup_share",
+            "storage_url": "/config/storage",
+        },
+    }
+
+    resp = await client.post(
+        f"/api/repairs/issues/fix/{flow_id}",
+        json={"next_step_id": "mount_execute_reload"},
+    )
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    flow_id = data["flow_id"]
+    assert data == {
+        "version": 1,
+        "type": "create_entry",
+        "flow_id": flow_id,
+        "handler": "hassio",
+        "description": None,
+        "description_placeholders": None,
+    }
+
+    assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+    assert aioclient_mock.mock_calls[-1][0] == "post"
+    assert (
+        str(aioclient_mock.mock_calls[-1][1])
+        == "http://127.0.0.1/resolution/suggestion/1235"
+    )
+
+
+@pytest.mark.parametrize(
+    "all_setup_requests", [{"include_addons": True}], indirect=True
+)
+async def test_supervisor_issue_docker_config_repair_flow(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    hass_client: ClientSessionGenerator,
+    issue_registry: ir.IssueRegistry,
+    all_setup_requests,
+) -> None:
+    """Test fix flow for supervisor issue."""
+    mock_resolution_info(
+        aioclient_mock,
+        issues=[
+            {
+                "uuid": "1234",
+                "type": "docker_config",
+                "context": "system",
+                "reference": None,
+                "suggestions": [
+                    {
+                        "uuid": "1235",
+                        "type": "execute_rebuild",
+                        "context": "system",
+                        "reference": None,
+                    }
+                ],
+            },
+            {
+                "uuid": "1236",
+                "type": "docker_config",
+                "context": "core",
+                "reference": None,
+                "suggestions": [
+                    {
+                        "uuid": "1237",
+                        "type": "execute_rebuild",
+                        "context": "core",
+                        "reference": None,
+                    }
+                ],
+            },
+            {
+                "uuid": "1238",
+                "type": "docker_config",
+                "context": "addon",
+                "reference": "test",
+                "suggestions": [
+                    {
+                        "uuid": "1239",
+                        "type": "execute_rebuild",
+                        "context": "addon",
+                        "reference": "test",
+                    }
+                ],
+            },
+        ],
+    )
+
+    assert await async_setup_component(hass, "hassio", {})
+
+    repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+    assert repair_issue
+
+    client = await hass_client()
+
+    resp = await client.post(
+        "/api/repairs/issues/fix",
+        json={"handler": "hassio", "issue_id": repair_issue.issue_id},
+    )
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    flow_id = data["flow_id"]
+    assert data == {
+        "type": "form",
+        "flow_id": flow_id,
+        "handler": "hassio",
+        "step_id": "system_execute_rebuild",
+        "data_schema": [],
+        "errors": None,
+        "description_placeholders": {"components": "Home Assistant\n- test"},
+        "last_step": True,
+    }
+
+    resp = await client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    assert resp.status == HTTPStatus.OK
+    data = await resp.json()
+
+    flow_id = data["flow_id"]
+    assert data == {
+        "version": 1,
+        "type": "create_entry",
+        "flow_id": flow_id,
+        "handler": "hassio",
+        "description": None,
+        "description_placeholders": None,
+    }
+
+    assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+    assert aioclient_mock.mock_calls[-1][0] == "post"
+    assert (
+        str(aioclient_mock.mock_calls[-1][1])
+        == "http://127.0.0.1/resolution/suggestion/1235"
+    )
diff --git a/tests/components/hassio/test_update.py b/tests/components/hassio/test_update.py
index 547e32dfddbe7e..3f12874ef52eb1 100644
--- a/tests/components/hassio/test_update.py
+++ b/tests/components/hassio/test_update.py
@@ -247,7 +247,7 @@ async def test_update_addon(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.test_update"},
@@ -276,7 +276,7 @@ async def test_update_os(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_operating_system_update"},
@@ -305,7 +305,7 @@ async def test_update_core(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_os_update"},
@@ -334,7 +334,7 @@ async def test_update_supervisor(
         json={"result": "ok", "data": {}},
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "update",
         "install",
         {"entity_id": "update.home_assistant_supervisor_update"},
diff --git a/tests/components/history/test_init.py b/tests/components/history/test_init.py
index 30c84c56f001a3..04384834282898 100644
--- a/tests/components/history/test_init.py
+++ b/tests/components/history/test_init.py
@@ -3,8 +3,9 @@
 from datetime import timedelta
 from http import HTTPStatus
 import json
-from unittest.mock import patch, sentinel
+from unittest.mock import sentinel
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import history
@@ -245,29 +246,18 @@ def set_state(state, **kwargs):
         points.append(start + timedelta(minutes=i))
 
     states = []
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("123", attributes={"attribute": 10.64})
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[0],
-    ):
+        freezer.move_to(points[0])
         # Attributes are different, state not
         states.append(set_state("123", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[1],
-    ):
+        freezer.move_to(points[1])
         # state is different, attributes not
         states.append(set_state("32", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[2],
-    ):
+        freezer.move_to(points[2])
         # everything is different
         states.append(set_state("412", attributes={"attribute": 54.23}))
 
@@ -335,9 +325,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=1)
 
     states = {therm: [], therm2: [], mp: [], mp2: [], mp3: [], script_c: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -351,17 +339,12 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm, 20, attributes={"current_temperature": 19.5})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         # This state will be skipped only different in time
         set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt3)})
         # This state will be skipped because domain is excluded
@@ -376,9 +359,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm2, 20, attributes={"current_temperature": 19})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[mp].append(
             set_state(mp, "Netflix", attributes={"media_title": str(sentinel.mt4)})
         )
diff --git a/tests/components/history/test_init_db_schema_30.py b/tests/components/history/test_init_db_schema_30.py
index 7f3d8c76aed6af..32358e95e41002 100644
--- a/tests/components/history/test_init_db_schema_30.py
+++ b/tests/components/history/test_init_db_schema_30.py
@@ -7,6 +7,7 @@
 import json
 from unittest.mock import patch, sentinel
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import recorder
@@ -261,29 +262,18 @@ def set_state(state, **kwargs):
         points.append(start + timedelta(minutes=i))
 
     states = []
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("123", attributes={"attribute": 10.64})
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[0],
-    ):
+        freezer.move_to(points[0])
         # Attributes are different, state not
         states.append(set_state("123", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[1],
-    ):
+        freezer.move_to(points[1])
         # state is different, attributes not
         states.append(set_state("32", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[2],
-    ):
+        freezer.move_to(points[2])
         # everything is different
         states.append(set_state("412", attributes={"attribute": 54.23}))
 
@@ -351,9 +341,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=1)
 
     states = {therm: [], therm2: [], mp: [], mp2: [], mp3: [], script_c: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -367,17 +355,12 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm, 20, attributes={"current_temperature": 19.5})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         # This state will be skipped only different in time
         set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt3)})
         # This state will be skipped because domain is excluded
@@ -392,9 +375,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm2, 20, attributes={"current_temperature": 19})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[mp].append(
             set_state(mp, "Netflix", attributes={"media_title": str(sentinel.mt4)})
         )
diff --git a/tests/components/history/test_websocket_api.py b/tests/components/history/test_websocket_api.py
index f8d4ec7d9f7591..4f00e50def1266 100644
--- a/tests/components/history/test_websocket_api.py
+++ b/tests/components/history/test_websocket_api.py
@@ -1,5 +1,6 @@
 """The tests the History component websocket_api."""
 # pylint: disable=protected-access,invalid-name
+import asyncio
 from datetime import timedelta
 from unittest.mock import patch
 
@@ -97,7 +98,7 @@ async def test_history_during_period(
     assert len(sensor_test_history) == 3
 
     assert sensor_test_history[0]["s"] == "on"
-    assert sensor_test_history[0]["a"] == {}
+    assert "a" not in sensor_test_history[0]  # no_attributes = True
     assert isinstance(sensor_test_history[0]["lu"], float)
     assert "lc" not in sensor_test_history[0]  # skipped if the same a last_updated (lu)
 
@@ -510,17 +511,13 @@ async def test_history_stream_historical_only(
             "start_time": now.timestamp(),
             "states": {
                 "sensor.four": [
-                    {"a": {}, "lu": sensor_four_last_updated.timestamp(), "s": "off"}
-                ],
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
+                    {"lu": sensor_four_last_updated.timestamp(), "s": "off"}
                 ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
                 "sensor.three": [
-                    {"a": {}, "lu": sensor_three_last_updated.timestamp(), "s": "off"}
-                ],
-                "sensor.two": [
-                    {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
+                    {"lu": sensor_three_last_updated.timestamp(), "s": "off"}
                 ],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
             },
         },
         "id": 1,
@@ -857,12 +854,8 @@ async def test_history_stream_live_no_attributes_minimal_response(
             "end_time": first_end_time,
             "start_time": now.timestamp(),
             "states": {
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
-                ],
-                "sensor.two": [
-                    {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
-                ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
             },
         },
         "id": 1,
@@ -1220,12 +1213,8 @@ async def test_history_stream_live_no_attributes_minimal_response_specific_entit
             "end_time": first_end_time,
             "start_time": now.timestamp(),
             "states": {
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
-                ],
-                "sensor.two": [
-                    {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
-                ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
             },
         },
         "id": 1,
@@ -1306,12 +1295,8 @@ async def test_history_stream_live_with_future_end_time(
             "end_time": first_end_time,
             "start_time": now.timestamp(),
             "states": {
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
-                ],
-                "sensor.two": [
-                    {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
-                ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
             },
         },
         "id": 1,
@@ -1505,10 +1490,10 @@ async def test_overflow_queue(
                 "start_time": now.timestamp(),
                 "states": {
                     "sensor.one": [
-                        {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
+                        {"lu": sensor_one_last_updated.timestamp(), "s": "on"}
                     ],
                     "sensor.two": [
-                        {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
+                        {"lu": sensor_two_last_updated.timestamp(), "s": "off"}
                     ],
                 },
             },
@@ -1722,9 +1707,7 @@ async def test_history_stream_for_invalid_entity_ids(
             "end_time": sensor_one_last_updated.timestamp(),
             "start_time": now.timestamp(),
             "states": {
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
-                ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
             },
         },
         "id": 1,
@@ -1754,12 +1737,8 @@ async def test_history_stream_for_invalid_entity_ids(
             "end_time": sensor_two_last_updated.timestamp(),
             "start_time": now.timestamp(),
             "states": {
-                "sensor.one": [
-                    {"a": {}, "lu": sensor_one_last_updated.timestamp(), "s": "on"}
-                ],
-                "sensor.two": [
-                    {"a": {}, "lu": sensor_two_last_updated.timestamp(), "s": "off"}
-                ],
+                "sensor.one": [{"lu": sensor_one_last_updated.timestamp(), "s": "on"}],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
             },
         },
         "id": 2,
@@ -1843,3 +1822,91 @@ async def test_history_stream_for_invalid_entity_ids(
         "type": "result",
         "success": False,
     }
+
+
+async def test_history_stream_historical_only_with_start_time_state_past(
+    recorder_mock: Recorder, hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test history stream."""
+    await async_setup_component(
+        hass,
+        "history",
+        {},
+    )
+    await async_setup_component(hass, "sensor", {})
+
+    hass.states.async_set("sensor.one", "first", attributes={"any": "attr"})
+    hass.states.get("sensor.one").last_updated
+    await async_recorder_block_till_done(hass)
+
+    await asyncio.sleep(0.00002)
+    now = dt_util.utcnow()
+    await async_recorder_block_till_done(hass)
+    hass.states.async_set("sensor.one", "second", attributes={"any": "attr"})
+    sensor_one_last_updated_second = hass.states.get("sensor.one").last_updated
+
+    await asyncio.sleep(0.00001)
+    hass.states.async_set("sensor.one", "third", attributes={"any": "attr"})
+    sensor_one_last_updated_third = hass.states.get("sensor.one").last_updated
+
+    await async_recorder_block_till_done(hass)
+    hass.states.async_set("sensor.two", "off", attributes={"any": "attr"})
+    sensor_two_last_updated = hass.states.get("sensor.two").last_updated
+    await async_recorder_block_till_done(hass)
+    hass.states.async_set("sensor.three", "off", attributes={"any": "changed"})
+    sensor_three_last_updated = hass.states.get("sensor.three").last_updated
+    await async_recorder_block_till_done(hass)
+    hass.states.async_set("sensor.four", "off", attributes={"any": "again"})
+    sensor_four_last_updated = hass.states.get("sensor.four").last_updated
+    await async_recorder_block_till_done(hass)
+    hass.states.async_set("switch.excluded", "off", attributes={"any": "again"})
+    await async_wait_recording_done(hass)
+
+    end_time = dt_util.utcnow()
+
+    client = await hass_ws_client()
+    await client.send_json(
+        {
+            "id": 1,
+            "type": "history/stream",
+            "entity_ids": ["sensor.one", "sensor.two", "sensor.three", "sensor.four"],
+            "start_time": now.isoformat(),
+            "end_time": end_time.isoformat(),
+            "include_start_time_state": True,
+            "significant_changes_only": False,
+            "no_attributes": True,
+            "minimal_response": True,
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["id"] == 1
+    assert response["type"] == "result"
+
+    response = await client.receive_json()
+
+    assert response == {
+        "event": {
+            "end_time": sensor_four_last_updated.timestamp(),
+            "start_time": now.timestamp(),
+            "states": {
+                "sensor.four": [
+                    {"lu": sensor_four_last_updated.timestamp(), "s": "off"}
+                ],
+                "sensor.one": [
+                    {
+                        "lu": now.timestamp(),
+                        "s": "first",
+                    },  # should use start time state
+                    {"lu": sensor_one_last_updated_second.timestamp(), "s": "second"},
+                    {"lu": sensor_one_last_updated_third.timestamp(), "s": "third"},
+                ],
+                "sensor.three": [
+                    {"lu": sensor_three_last_updated.timestamp(), "s": "off"}
+                ],
+                "sensor.two": [{"lu": sensor_two_last_updated.timestamp(), "s": "off"}],
+            },
+        },
+        "id": 1,
+        "type": "event",
+    }
diff --git a/tests/components/homeassistant/snapshots/test_exposed_entities.ambr b/tests/components/homeassistant/snapshots/test_exposed_entities.ambr
index 2f9d0b8017f97e..55b95186b495b1 100644
--- a/tests/components/homeassistant/snapshots/test_exposed_entities.ambr
+++ b/tests/components/homeassistant/snapshots/test_exposed_entities.ambr
@@ -1,7 +1,7 @@
 # serializer version: 1
 # name: test_get_assistant_settings
   dict({
-    'climate.test_unique1': mappingproxy({
+    'climate.test_unique1': ReadOnlyDict({
       'should_expose': True,
     }),
     'light.not_in_registry': dict({
diff --git a/tests/components/homeassistant/test_scene.py b/tests/components/homeassistant/test_scene.py
index 4e2e964112896a..085ed4f06410e8 100644
--- a/tests/components/homeassistant/test_scene.py
+++ b/tests/components/homeassistant/test_scene.py
@@ -49,13 +49,13 @@ async def test_apply_service(hass: HomeAssistant) -> None:
     assert await async_setup_component(hass, "light", {"light": {"platform": "demo"}})
     await hass.async_block_till_done()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene", "apply", {"entities": {"light.bed_light": "off"}}, blocking=True
     )
 
     assert hass.states.get("light.bed_light").state == "off"
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "apply",
         {"entities": {"light.bed_light": {"state": "on", "brightness": 50}}},
@@ -67,7 +67,7 @@ async def test_apply_service(hass: HomeAssistant) -> None:
     assert state.attributes["brightness"] == 50
 
     turn_on_calls = async_mock_service(hass, "light", "turn_on")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "apply",
         {
@@ -98,7 +98,7 @@ async def test_create_service(
     assert hass.states.get("scene.hallo") is None
     assert hass.states.get("scene.hallo_2") is not None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo", "entities": {}, "snapshot_entities": []},
@@ -108,7 +108,7 @@ async def test_create_service(
     assert "Empty scenes are not allowed" in caplog.text
     assert hass.states.get("scene.hallo") is None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -126,7 +126,7 @@ async def test_create_service(
     assert scene.state == STATE_UNKNOWN
     assert scene.attributes.get("entity_id") == ["light.bed_light"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -144,7 +144,7 @@ async def test_create_service(
     assert scene.state == STATE_UNKNOWN
     assert scene.attributes.get("entity_id") == ["light.kitchen_light"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -173,7 +173,7 @@ async def test_snapshot_service(
     hass.states.async_set("light.my_light", "on", {"hs_color": (345, 75)})
     assert hass.states.get("scene.hallo") is None
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo", "snapshot_entities": ["light.my_light"]},
@@ -186,7 +186,7 @@ async def test_snapshot_service(
 
     hass.states.async_set("light.my_light", "off", {"hs_color": (123, 45)})
     turn_on_calls = async_mock_service(hass, "light", "turn_on")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene", "turn_on", {"entity_id": "scene.hallo"}, blocking=True
     )
     await hass.async_block_till_done()
@@ -194,7 +194,7 @@ async def test_snapshot_service(
     assert turn_on_calls[0].data.get("entity_id") == "light.my_light"
     assert turn_on_calls[0].data.get("hs_color") == (345, 75)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {"scene_id": "hallo_2", "snapshot_entities": ["light.not_existent"]},
@@ -207,7 +207,7 @@ async def test_snapshot_service(
         in caplog.text
     )
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "scene",
         "create",
         {
@@ -230,7 +230,7 @@ async def test_ensure_no_intersection(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     with pytest.raises(vol.MultipleInvalid) as ex:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "scene",
             "create",
             {
diff --git a/tests/components/homeassistant/triggers/conftest.py b/tests/components/homeassistant/triggers/conftest.py
index 77520a1bf689d9..9dabbad99c9ddc 100644
--- a/tests/components/homeassistant/triggers/conftest.py
+++ b/tests/components/homeassistant/triggers/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for HA triggers."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/homeassistant/triggers/test_numeric_state.py b/tests/components/homeassistant/triggers/test_numeric_state.py
index ff82fa3e69c363..2098d266f0d13e 100644
--- a/tests/components/homeassistant/triggers/test_numeric_state.py
+++ b/tests/components/homeassistant/triggers/test_numeric_state.py
@@ -10,7 +10,12 @@
 from homeassistant.components.homeassistant.triggers import (
     numeric_state as numeric_state_trigger,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -1090,7 +1095,7 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls, above, below)
     hass.states.async_set("test.entity", 5)
     await hass.async_block_till_done()
 
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1107,13 +1112,14 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls, above, below)
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_for_without_above_below(
     hass: HomeAssistant, calls
 ) -> None:
     """Test for setup failures for missing above or below."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1128,6 +1134,7 @@ async def test_if_fails_setup_for_without_above_below(
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/homeassistant/triggers/test_state.py b/tests/components/homeassistant/triggers/test_state.py
index a16d542becd690..d58e3dd7c6e299 100644
--- a/tests/components/homeassistant/triggers/test_state.py
+++ b/tests/components/homeassistant/triggers/test_state.py
@@ -6,7 +6,12 @@
 
 import homeassistant.components.automation as automation
 from homeassistant.components.homeassistant.triggers import state as state_trigger
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant, ServiceCall
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
@@ -554,7 +559,7 @@ async def test_if_action(hass: HomeAssistant, calls) -> None:
 
 async def test_if_fails_setup_if_to_boolean_value(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for boolean to."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -569,11 +574,12 @@ async def test_if_fails_setup_if_to_boolean_value(hass: HomeAssistant, calls) ->
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_if_from_boolean_value(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for boolean from."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -588,11 +594,12 @@ async def test_if_fails_setup_if_from_boolean_value(hass: HomeAssistant, calls)
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls) -> None:
     """Test for setup failure for bad for."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -608,6 +615,7 @@ async def test_if_fails_setup_bad_for(hass: HomeAssistant, calls) -> None:
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_not_fires_on_entity_change_with_for(
@@ -1018,7 +1026,7 @@ async def test_if_fires_on_for_condition_attribute_change(
 
 async def test_if_fails_setup_for_without_time(hass: HomeAssistant, calls) -> None:
     """Test for setup failure if no time is provided."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1035,11 +1043,12 @@ async def test_if_fails_setup_for_without_time(hass: HomeAssistant, calls) -> No
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_if_fails_setup_for_without_entity(hass: HomeAssistant, calls) -> None:
     """Test for setup failure if no entity is provided."""
-    with assert_setup_component(0, automation.DOMAIN):
+    with assert_setup_component(1, automation.DOMAIN):
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -1055,6 +1064,7 @@ async def test_if_fails_setup_for_without_entity(hass: HomeAssistant, calls) ->
                 }
             },
         )
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 async def test_wait_template_with_trigger(hass: HomeAssistant, calls) -> None:
diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py
index 1af687a4f5dfeb..0a41df17c8d8a9 100644
--- a/tests/components/homeassistant/triggers/test_time.py
+++ b/tests/components/homeassistant/triggers/test_time.py
@@ -8,7 +8,12 @@
 from homeassistant.components import automation
 from homeassistant.components.homeassistant.triggers import time
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
@@ -210,7 +215,7 @@ async def test_if_not_fires_using_wrong_at(hass: HomeAssistant, calls) -> None:
     with patch(
         "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
     ):
-        with assert_setup_component(0, automation.DOMAIN):
+        with assert_setup_component(1, automation.DOMAIN):
             assert await async_setup_component(
                 hass,
                 automation.DOMAIN,
@@ -226,6 +231,7 @@ async def test_if_not_fires_using_wrong_at(hass: HomeAssistant, calls) -> None:
                 },
             )
         await hass.async_block_till_done()
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
     async_fire_time_changed(
         hass, now.replace(year=now.year + 1, hour=1, minute=0, second=5)
diff --git a/tests/components/homeassistant_alerts/test_init.py b/tests/components/homeassistant_alerts/test_init.py
index 7f060b09cf9cf3..c772c08850569b 100644
--- a/tests/components/homeassistant_alerts/test_init.py
+++ b/tests/components/homeassistant_alerts/test_init.py
@@ -7,6 +7,7 @@
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components.homeassistant_alerts import (
     COMPONENT_LOADED_COOLDOWN,
@@ -19,7 +20,7 @@
 from homeassistant.setup import ATTR_COMPONENT, async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import assert_lists_same, async_fire_time_changed, load_fixture
+from tests.common import async_fire_time_changed, load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import WebSocketGenerator
 
@@ -613,8 +614,7 @@ async def test_alerts_change(
     await client.send_json({"id": 1, "type": "repairs/list_issues"})
     msg = await client.receive_json()
     assert msg["success"]
-    assert_lists_same(
-        msg["result"]["issues"],
+    assert msg["result"]["issues"] == unordered(
         [
             {
                 "breaks_in_ha_version": None,
@@ -634,7 +634,7 @@ async def test_alerts_change(
                 },
             }
             for alert_id, integration in expected_alerts_1
-        ],
+        ]
     )
 
     fixture_2_content = load_fixture(fixture_2, "homeassistant_alerts")
@@ -653,8 +653,7 @@ async def test_alerts_change(
     await client.send_json({"id": 2, "type": "repairs/list_issues"})
     msg = await client.receive_json()
     assert msg["success"]
-    assert_lists_same(
-        msg["result"]["issues"],
+    assert msg["result"]["issues"] == unordered(
         [
             {
                 "breaks_in_ha_version": None,
@@ -674,5 +673,5 @@ async def test_alerts_change(
                 },
             }
             for alert_id, integration in expected_alerts_2
-        ],
+        ]
     )
diff --git a/tests/components/homeassistant_hardware/conftest.py b/tests/components/homeassistant_hardware/conftest.py
index 4add48781a9dbe..60c766c7204c0d 100644
--- a/tests/components/homeassistant_hardware/conftest.py
+++ b/tests/components/homeassistant_hardware/conftest.py
@@ -1,7 +1,7 @@
 """Test fixtures for the Home Assistant Hardware integration."""
 from collections.abc import Generator
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
@@ -32,6 +32,17 @@ def mock_probe(config: dict[str, Any]) -> None:
         yield
 
 
+@pytest.fixture(autouse=True)
+def mock_zha_get_last_network_settings() -> Generator[None, None, None]:
+    """Mock zha.api.async_get_last_network_settings."""
+
+    with patch(
+        "homeassistant.components.zha.api.async_get_last_network_settings",
+        AsyncMock(return_value=None),
+    ):
+        yield
+
+
 @pytest.fixture(name="addon_running")
 def mock_addon_running(addon_store_info, addon_info):
     """Mock add-on already running."""
diff --git a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
index a195899136dcce..a956214c098add 100644
--- a/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
+++ b/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py
@@ -11,18 +11,23 @@
 from homeassistant.components.homeassistant_hardware import silabs_multiprotocol_addon
 from homeassistant.components.zha.core.const import DOMAIN as ZHA_DOMAIN
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
+from homeassistant.const import EVENT_COMPONENT_LOADED
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResult, FlowResultType
+from homeassistant.setup import ATTR_COMPONENT
 
 from tests.common import (
     MockConfigEntry,
     MockModule,
+    MockPlatform,
+    flush_store,
     mock_config_flow,
     mock_integration,
     mock_platform,
 )
 
 TEST_DOMAIN = "test"
+TEST_DOMAIN_2 = "test_2"
 
 
 class FakeConfigFlow(ConfigFlow):
@@ -96,6 +101,54 @@ def config_flow_handler(
         yield
 
 
+class MockMultiprotocolPlatform(MockPlatform):
+    """A mock multiprotocol platform."""
+
+    channel = 15
+    using_multipan = True
+
+    def __init__(self, **kwargs: Any) -> None:
+        """Initialize."""
+        super().__init__(**kwargs)
+        self.change_channel_calls = []
+
+    async def async_change_channel(
+        self, hass: HomeAssistant, channel: int, delay: float
+    ) -> None:
+        """Set the channel to be used."""
+        self.change_channel_calls.append((channel, delay))
+
+    async def async_get_channel(self, hass: HomeAssistant) -> int | None:
+        """Return the channel."""
+        return self.channel
+
+    async def async_using_multipan(self, hass: HomeAssistant) -> bool:
+        """Return if the multiprotocol device is used."""
+        return self.using_multipan
+
+
+@pytest.fixture
+def mock_multiprotocol_platform(
+    hass: HomeAssistant,
+) -> Generator[FakeConfigFlow, None, None]:
+    """Fixture for a test silabs multiprotocol platform."""
+    hass.config.components.add(TEST_DOMAIN)
+    platform = MockMultiprotocolPlatform()
+    mock_platform(hass, f"{TEST_DOMAIN}.silabs_multiprotocol", platform)
+    return platform
+
+
+def get_suggested(schema, key):
+    """Get suggested value for key in voluptuous schema."""
+    for k in schema:
+        if k == key:
+            if k.description is None or "suggested_value" not in k.description:
+                return None
+            return k.description["suggested_value"]
+    # Wanted key absent from schema
+    raise Exception
+
+
 async def test_option_flow_install_multi_pan_addon(
     hass: HomeAssistant,
     addon_store_info,
@@ -215,7 +268,13 @@ async def test_option_flow_install_multi_pan_addon_zha(
     assert result["step_id"] == "configure_addon"
     install_addon.assert_called_once_with(hass, "core_silabs_multiprotocol")
 
-    result = await hass.config_entries.options.async_configure(result["flow_id"])
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    assert multipan_manager._channel is None
+    with patch(
+        "homeassistant.components.zha.silabs_multiprotocol.async_get_channel",
+        return_value=11,
+    ):
+        result = await hass.config_entries.options.async_configure(result["flow_id"])
     assert result["type"] == FlowResultType.SHOW_PROGRESS
     assert result["step_id"] == "start_addon"
     set_addon_options.assert_called_once_with(
@@ -230,6 +289,8 @@ async def test_option_flow_install_multi_pan_addon_zha(
             }
         },
     )
+    # Check the channel is initialized from ZHA
+    assert multipan_manager._channel == 11
     # Check the ZHA config entry data is updated
     assert zha_config_entry.data == {
         "device": {
@@ -393,7 +454,141 @@ async def test_option_flow_addon_installed_other_device(
     assert result["type"] == FlowResultType.CREATE_ENTRY
 
 
-async def test_option_flow_addon_installed_same_device(
+@pytest.mark.parametrize(
+    ("configured_channel", "suggested_channel"), [(None, "15"), (11, "11")]
+)
+async def test_option_flow_addon_installed_same_device_reconfigure_unexpected_users(
+    hass: HomeAssistant,
+    addon_info,
+    addon_store_info,
+    addon_installed,
+    mock_multiprotocol_platform: MockMultiprotocolPlatform,
+    configured_channel: int | None,
+    suggested_channel: int,
+) -> None:
+    """Test reconfiguring the multi pan addon."""
+    mock_integration(hass, MockModule("hassio"))
+    addon_info.return_value["options"]["device"] = "/dev/ttyTEST123"
+
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    multipan_manager._channel = configured_channel
+
+    # Setup the config entry
+    config_entry = MockConfigEntry(
+        data={},
+        domain=TEST_DOMAIN,
+        options={},
+        title="Test HW",
+    )
+    config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon.is_hassio",
+        side_effect=Mock(return_value=True),
+    ):
+        result = await hass.config_entries.options.async_init(config_entry.entry_id)
+        assert result["type"] == FlowResultType.MENU
+        assert result["step_id"] == "addon_menu"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        {"next_step_id": "reconfigure_addon"},
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "notify_unknown_multipan_user"
+
+    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "change_channel"
+    assert get_suggested(result["data_schema"].schema, "channel") == suggested_channel
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], {"channel": "14"}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "notify_channel_change"
+    assert result["description_placeholders"] == {"delay_minutes": "5"}
+
+    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+
+    assert mock_multiprotocol_platform.change_channel_calls == [(14, 300)]
+    assert multipan_manager._channel == 14
+
+
+@pytest.mark.parametrize(
+    ("configured_channel", "suggested_channel"), [(None, "15"), (11, "11")]
+)
+async def test_option_flow_addon_installed_same_device_reconfigure_expected_users(
+    hass: HomeAssistant,
+    addon_info,
+    addon_store_info,
+    addon_installed,
+    configured_channel: int | None,
+    suggested_channel: int,
+) -> None:
+    """Test reconfiguring the multi pan addon."""
+    mock_integration(hass, MockModule("hassio"))
+    addon_info.return_value["options"]["device"] = "/dev/ttyTEST123"
+
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    multipan_manager._channel = configured_channel
+
+    # Setup the config entry
+    config_entry = MockConfigEntry(
+        data={},
+        domain=TEST_DOMAIN,
+        options={},
+        title="Test HW",
+    )
+    config_entry.add_to_hass(hass)
+
+    mock_multiprotocol_platforms = {}
+    for domain in ["otbr", "zha"]:
+        mock_multiprotocol_platform = MockMultiprotocolPlatform()
+        mock_multiprotocol_platforms[domain] = mock_multiprotocol_platform
+        mock_multiprotocol_platform.channel = configured_channel
+        mock_multiprotocol_platform.using_multipan = True
+
+        hass.config.components.add(domain)
+        mock_platform(
+            hass, f"{domain}.silabs_multiprotocol", mock_multiprotocol_platform
+        )
+        hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: domain})
+    await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon.is_hassio",
+        side_effect=Mock(return_value=True),
+    ):
+        result = await hass.config_entries.options.async_init(config_entry.entry_id)
+        assert result["type"] == FlowResultType.MENU
+        assert result["step_id"] == "addon_menu"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        {"next_step_id": "reconfigure_addon"},
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "change_channel"
+    assert get_suggested(result["data_schema"].schema, "channel") == suggested_channel
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], {"channel": "14"}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "notify_channel_change"
+    assert result["description_placeholders"] == {"delay_minutes": "5"}
+
+    result = await hass.config_entries.options.async_configure(result["flow_id"], {})
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+
+    for domain in ["otbr", "zha"]:
+        assert mock_multiprotocol_platforms[domain].change_channel_calls == [(14, 300)]
+    assert multipan_manager._channel == 14
+
+
+async def test_option_flow_addon_installed_same_device_uninstall(
     hass: HomeAssistant,
     addon_info,
     addon_store_info,
@@ -417,8 +612,15 @@ async def test_option_flow_addon_installed_same_device(
         side_effect=Mock(return_value=True),
     ):
         result = await hass.config_entries.options.async_init(config_entry.entry_id)
-        assert result["type"] == FlowResultType.FORM
-        assert result["step_id"] == "show_revert_guide"
+        assert result["type"] == FlowResultType.MENU
+        assert result["step_id"] == "addon_menu"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        {"next_step_id": "uninstall_addon"},
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "show_revert_guide"
 
     result = await hass.config_entries.options.async_configure(result["flow_id"], {})
     assert result["type"] == FlowResultType.CREATE_ENTRY
@@ -806,3 +1008,116 @@ def test_is_multiprotocol_url() -> None:
         "http://core-silabs-multiprotocol:8081"
     )
     assert not silabs_multiprotocol_addon.is_multiprotocol_url("/dev/ttyAMA1")
+
+
+@pytest.mark.parametrize(
+    (
+        "initial_multipan_channel",
+        "platform_using_multipan",
+        "platform_channel",
+        "new_multipan_channel",
+    ),
+    [
+        (None, True, 15, 15),
+        (None, False, 15, None),
+        (11, True, 15, 11),
+        (None, True, None, None),
+    ],
+)
+async def test_import_channel(
+    hass: HomeAssistant,
+    initial_multipan_channel: int | None,
+    platform_using_multipan: bool,
+    platform_channel: int | None,
+    new_multipan_channel: int | None,
+) -> None:
+    """Test channel is initialized from first platform."""
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    multipan_manager._channel = initial_multipan_channel
+
+    mock_multiprotocol_platform = MockMultiprotocolPlatform()
+    mock_multiprotocol_platform.channel = platform_channel
+    mock_multiprotocol_platform.using_multipan = platform_using_multipan
+
+    hass.config.components.add(TEST_DOMAIN)
+    mock_platform(
+        hass, f"{TEST_DOMAIN}.silabs_multiprotocol", mock_multiprotocol_platform
+    )
+    hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: TEST_DOMAIN})
+    await hass.async_block_till_done()
+
+    assert multipan_manager.async_get_channel() == new_multipan_channel
+
+
+@pytest.mark.parametrize(
+    (
+        "platform_using_multipan",
+        "expected_calls",
+    ),
+    [
+        (True, [(15, 10)]),
+        (False, []),
+    ],
+)
+async def test_change_channel(
+    hass: HomeAssistant,
+    mock_multiprotocol_platform: MockMultiprotocolPlatform,
+    platform_using_multipan: bool,
+    expected_calls: list[int],
+) -> None:
+    """Test channel is initialized from first platform."""
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    mock_multiprotocol_platform.using_multipan = platform_using_multipan
+
+    await multipan_manager.async_change_channel(15, 10)
+    assert mock_multiprotocol_platform.change_channel_calls == expected_calls
+
+
+async def test_load_preferences(hass: HomeAssistant) -> None:
+    """Make sure that we can load/save data correctly."""
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+    assert multipan_manager._channel != 11
+    multipan_manager.async_set_channel(11)
+
+    await flush_store(multipan_manager._store)
+
+    multipan_manager2 = silabs_multiprotocol_addon.MultiprotocolAddonManager(hass)
+    await multipan_manager2.async_setup()
+
+    assert multipan_manager._channel == multipan_manager2._channel
+
+
+@pytest.mark.parametrize(
+    (
+        "multipan_platforms",
+        "active_platforms",
+    ),
+    [
+        ({}, []),
+        ({TEST_DOMAIN: False}, []),
+        ({TEST_DOMAIN: True}, [TEST_DOMAIN]),
+        ({TEST_DOMAIN: True, TEST_DOMAIN_2: False}, [TEST_DOMAIN]),
+        ({TEST_DOMAIN: True, TEST_DOMAIN_2: True}, [TEST_DOMAIN, TEST_DOMAIN_2]),
+    ],
+)
+async def test_active_plaforms(
+    hass: HomeAssistant,
+    multipan_platforms: dict[str, bool],
+    active_platforms: list[str],
+) -> None:
+    """Test async_active_platforms."""
+    multipan_manager = await silabs_multiprotocol_addon.get_addon_manager(hass)
+
+    for domain, platform_using_multipan in multipan_platforms.items():
+        mock_multiprotocol_platform = MockMultiprotocolPlatform()
+        mock_multiprotocol_platform.channel = 11
+        mock_multiprotocol_platform.using_multipan = platform_using_multipan
+
+        hass.config.components.add(domain)
+        mock_platform(
+            hass, f"{domain}.silabs_multiprotocol", mock_multiprotocol_platform
+        )
+        hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: domain})
+
+    await hass.async_block_till_done()
+    assert await multipan_manager.async_active_platforms() == active_platforms
diff --git a/tests/components/homeassistant_sky_connect/conftest.py b/tests/components/homeassistant_sky_connect/conftest.py
index 7fcc1f868805d8..3677b4ea8f1d87 100644
--- a/tests/components/homeassistant_sky_connect/conftest.py
+++ b/tests/components/homeassistant_sky_connect/conftest.py
@@ -1,6 +1,6 @@
 """Test fixtures for the Home Assistant SkyConnect integration."""
 from collections.abc import Generator
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
@@ -34,6 +34,17 @@ def mock_zha():
         yield
 
 
+@pytest.fixture(autouse=True)
+def mock_zha_get_last_network_settings() -> Generator[None, None, None]:
+    """Mock zha.api.async_get_last_network_settings."""
+
+    with patch(
+        "homeassistant.components.zha.api.async_get_last_network_settings",
+        AsyncMock(return_value=None),
+    ):
+        yield
+
+
 @pytest.fixture(name="addon_running")
 def mock_addon_running(addon_store_info, addon_info):
     """Mock add-on already running."""
diff --git a/tests/components/homeassistant_yellow/conftest.py b/tests/components/homeassistant_yellow/conftest.py
index bc48c6b01fd347..e4a666f9f04fc3 100644
--- a/tests/components/homeassistant_yellow/conftest.py
+++ b/tests/components/homeassistant_yellow/conftest.py
@@ -1,7 +1,7 @@
 """Test fixtures for the Home Assistant Yellow integration."""
 from collections.abc import Generator
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
@@ -32,6 +32,17 @@ def mock_probe(config: dict[str, Any]) -> None:
         yield
 
 
+@pytest.fixture(autouse=True)
+def mock_zha_get_last_network_settings() -> Generator[None, None, None]:
+    """Mock zha.api.async_get_last_network_settings."""
+
+    with patch(
+        "homeassistant.components.zha.api.async_get_last_network_settings",
+        AsyncMock(return_value=None),
+    ):
+        yield
+
+
 @pytest.fixture(name="addon_running")
 def mock_addon_running(addon_store_info, addon_info):
     """Mock add-on already running."""
diff --git a/tests/components/homekit/test_diagnostics.py b/tests/components/homekit/test_diagnostics.py
index 69e2aa2c8e279a..2f18c7a5a89c99 100644
--- a/tests/components/homekit/test_diagnostics.py
+++ b/tests/components/homekit/test_diagnostics.py
@@ -190,7 +190,7 @@ async def test_config_entry_accessory(
                                 "iid": 3,
                                 "perms": ["pr"],
                                 "type": "20",
-                                "value": "Home Assistant " "Light",
+                                "value": "Home Assistant Light",
                             },
                             {
                                 "format": "string",
@@ -475,7 +475,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 10,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Changed States",
+                                "value": "Ceiling Lights Changed States",
                             },
                             {
                                 "format": "uint8",
@@ -521,7 +521,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 16,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Turned Off",
+                                "value": "Ceiling Lights Turned Off",
                             },
                             {
                                 "format": "uint8",
@@ -567,7 +567,7 @@ async def test_config_entry_with_trigger_accessory(
                                 "iid": 22,
                                 "perms": ["pr"],
                                 "type": "23",
-                                "value": "Ceiling Lights " "Turned On",
+                                "value": "Ceiling Lights Turned On",
                             },
                             {
                                 "format": "uint8",
diff --git a/tests/components/homekit/test_homekit.py b/tests/components/homekit/test_homekit.py
index 0b74763c6a7a6f..112c138a8438a4 100644
--- a/tests/components/homekit/test_homekit.py
+++ b/tests/components/homekit/test_homekit.py
@@ -2,7 +2,9 @@
 from __future__ import annotations
 
 import asyncio
+from typing import Any
 from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
+from uuid import uuid1
 
 from pyhap.accessory import Accessory
 from pyhap.const import CATEGORY_CAMERA, CATEGORY_TELEVISION
@@ -23,6 +25,7 @@
 from homeassistant.components.homekit.const import (
     BRIDGE_NAME,
     BRIDGE_SERIAL_NUMBER,
+    CONF_ADVERTISE_IP,
     DEFAULT_PORT,
     DOMAIN,
     HOMEKIT,
@@ -115,7 +118,7 @@ def _mock_homekit(hass, entry, homekit_mode, entity_filter=None, devices=None):
         exclude_accessory_mode=False,
         entity_config={},
         homekit_mode=homekit_mode,
-        advertise_ip=None,
+        advertise_ips=None,
         entry_id=entry.entry_id,
         entry_title=entry.title,
         devices=devices,
@@ -169,7 +172,7 @@ async def test_setup_min(hass: HomeAssistant, mock_async_zeroconf: None) -> None
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -211,7 +214,7 @@ async def test_removing_entry(
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -244,7 +247,7 @@ async def test_homekit_setup(
         {},
         {},
         HOMEKIT_MODE_BRIDGE,
-        advertise_ip=None,
+        advertise_ips=None,
         entry_id=entry.entry_id,
         entry_title=entry.title,
     )
@@ -321,7 +324,81 @@ async def test_homekit_setup_ip_address(
     )
 
 
-async def test_homekit_setup_advertise_ip(
+async def test_homekit_with_single_advertise_ips(
+    hass: HomeAssistant,
+    hk_driver,
+    mock_async_zeroconf: None,
+    hass_storage: dict[str, Any],
+) -> None:
+    """Test setup with a single advertise ips."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_NAME: "mock_name", CONF_PORT: 12345, CONF_ADVERTISE_IP: "1.3.4.4"},
+        source=SOURCE_IMPORT,
+    )
+    entry.add_to_hass(hass)
+    with patch(f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver) as mock_driver:
+        mock_driver.async_start = AsyncMock()
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    mock_driver.assert_called_with(
+        hass,
+        entry.entry_id,
+        ANY,
+        entry.title,
+        loop=hass.loop,
+        address=[None],
+        port=ANY,
+        persist_file=ANY,
+        advertised_address="1.3.4.4",
+        async_zeroconf_instance=mock_async_zeroconf,
+        zeroconf_server=ANY,
+        loader=ANY,
+        iid_storage=ANY,
+    )
+
+
+async def test_homekit_with_many_advertise_ips(
+    hass: HomeAssistant,
+    hk_driver,
+    mock_async_zeroconf: None,
+    hass_storage: dict[str, Any],
+) -> None:
+    """Test setup with many advertise ips."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            CONF_NAME: "mock_name",
+            CONF_PORT: 12345,
+            CONF_ADVERTISE_IP: ["1.3.4.4", "4.3.2.2"],
+        },
+        source=SOURCE_IMPORT,
+    )
+    entry.add_to_hass(hass)
+    with patch(f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver) as mock_driver:
+        mock_driver.async_start = AsyncMock()
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    mock_driver.assert_called_with(
+        hass,
+        entry.entry_id,
+        ANY,
+        entry.title,
+        loop=hass.loop,
+        address=[None],
+        port=ANY,
+        persist_file=ANY,
+        advertised_address=["1.3.4.4", "4.3.2.2"],
+        async_zeroconf_instance=mock_async_zeroconf,
+        zeroconf_server=ANY,
+        loader=ANY,
+        iid_storage=ANY,
+    )
+
+
+async def test_homekit_setup_advertise_ips(
     hass: HomeAssistant, hk_driver, mock_async_zeroconf: None
 ) -> None:
     """Test setup with given IP address to advertise."""
@@ -868,11 +945,11 @@ async def test_homekit_unpair(
         homekit.driver.aio_stop_event = MagicMock()
 
         state = homekit.driver.state
-        state.add_paired_client("client1", "any", b"1")
-        state.add_paired_client("client2", "any", b"0")
-        state.add_paired_client("client3", "any", b"1")
-        state.add_paired_client("client4", "any", b"0")
-        state.add_paired_client("client5", "any", b"0")
+        state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"1")
+        state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
+        state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"1")
+        state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
+        state.add_paired_client(str(uuid1()).encode("utf-8"), "any", b"0")
 
         formatted_mac = dr.format_mac(state.mac)
         hk_bridge_dev = device_registry.async_get_device(
@@ -917,7 +994,8 @@ async def test_homekit_unpair_missing_device_id(
         homekit.driver.aio_stop_event = MagicMock()
 
         state = homekit.driver.state
-        state.add_paired_client("client1", "any", b"1")
+        client_1 = str(uuid1()).encode("utf-8")
+        state.add_paired_client(client_1, "any", b"1")
         with pytest.raises(HomeAssistantError):
             await hass.services.async_call(
                 DOMAIN,
@@ -926,7 +1004,7 @@ async def test_homekit_unpair_missing_device_id(
                 blocking=True,
             )
         await hass.async_block_till_done()
-        state.paired_clients = {"client1": "any"}
+        state.paired_clients = {client_1.decode("utf-8"): "any"}
         homekit.status = STATUS_STOPPED
 
 
@@ -967,7 +1045,8 @@ async def test_homekit_unpair_not_homekit_device(
         )
 
         state = homekit.driver.state
-        state.add_paired_client("client1", "any", b"1")
+        client_1 = str(uuid1()).encode("utf-8")
+        state.add_paired_client(client_1, "any", b"1")
         with pytest.raises(HomeAssistantError):
             await hass.services.async_call(
                 DOMAIN,
@@ -976,7 +1055,7 @@ async def test_homekit_unpair_not_homekit_device(
                 blocking=True,
             )
         await hass.async_block_till_done()
-        state.paired_clients = {"client1": "any"}
+        state.paired_clients = {client_1.decode("utf-8"): "any"}
         homekit.status = STATUS_STOPPED
 
 
@@ -1482,7 +1561,7 @@ async def test_yaml_updates_update_config_entry_for_name(
         ANY,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -1644,7 +1723,6 @@ async def test_homekit_ignored_missing_devices(
     light = entity_registry.async_get_or_create(
         "light", "powerwall", "demo", device_id=device_entry.id
     )
-    before_removal = entity_registry.entities.copy()
     # Delete the device to make sure we fallback
     # to using the platform
     device_registry.async_remove_device(device_entry.id)
@@ -1652,7 +1730,23 @@ async def test_homekit_ignored_missing_devices(
     await asyncio.sleep(0)
     await asyncio.sleep(0)
     # Restore the registry
-    entity_registry.entities = before_removal
+    entity_registry.async_get_or_create(
+        "binary_sensor",
+        "powerwall",
+        "battery_charging",
+        device_id=device_entry.id,
+        original_device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
+    )
+    entity_registry.async_get_or_create(
+        "sensor",
+        "powerwall",
+        "battery",
+        device_id=device_entry.id,
+        original_device_class=SensorDeviceClass.BATTERY,
+    )
+    light = entity_registry.async_get_or_create(
+        "light", "powerwall", "demo", device_id=device_entry.id
+    )
 
     hass.states.async_set(light.entity_id, STATE_ON)
     hass.states.async_set("light.two", STATE_ON)
@@ -1840,7 +1934,7 @@ async def test_reload(hass: HomeAssistant, mock_async_zeroconf: None) -> None:
         False,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
@@ -1875,7 +1969,7 @@ async def test_reload(hass: HomeAssistant, mock_async_zeroconf: None) -> None:
         False,
         {},
         HOMEKIT_MODE_BRIDGE,
-        "1.2.3.4",
+        ["1.2.3.4", "10.10.10.10"],
         entry.entry_id,
         entry.title,
         devices=[],
diff --git a/tests/components/homekit_controller/test_cover.py b/tests/components/homekit_controller/test_cover.py
index aa59c2af3ed6ae..5a389311daaf28 100644
--- a/tests/components/homekit_controller/test_cover.py
+++ b/tests/components/homekit_controller/test_cover.py
@@ -39,9 +39,28 @@ def create_window_covering_service_with_h_tilt(accessory):
 
     tilt_current = service.add_char(CharacteristicsTypes.HORIZONTAL_TILT_CURRENT)
     tilt_current.value = 0
+    tilt_current.minValue = 0
+    tilt_current.maxValue = 90
 
     tilt_target = service.add_char(CharacteristicsTypes.HORIZONTAL_TILT_TARGET)
     tilt_target.value = 0
+    tilt_target.minValue = 0
+    tilt_target.maxValue = 90
+
+
+def create_window_covering_service_with_h_tilt_2(accessory):
+    """Define a window-covering characteristics as per page 219 of HAP spec."""
+    service = create_window_covering_service(accessory)
+
+    tilt_current = service.add_char(CharacteristicsTypes.HORIZONTAL_TILT_CURRENT)
+    tilt_current.value = 0
+    tilt_current.minValue = -90
+    tilt_current.maxValue = 0
+
+    tilt_target = service.add_char(CharacteristicsTypes.HORIZONTAL_TILT_TARGET)
+    tilt_target.value = 0
+    tilt_target.minValue = -90
+    tilt_target.maxValue = 0
 
 
 def create_window_covering_service_with_v_tilt(accessory):
@@ -50,9 +69,28 @@ def create_window_covering_service_with_v_tilt(accessory):
 
     tilt_current = service.add_char(CharacteristicsTypes.VERTICAL_TILT_CURRENT)
     tilt_current.value = 0
+    tilt_current.minValue = 0
+    tilt_current.maxValue = 90
 
     tilt_target = service.add_char(CharacteristicsTypes.VERTICAL_TILT_TARGET)
     tilt_target.value = 0
+    tilt_target.minValue = 0
+    tilt_target.maxValue = 90
+
+
+def create_window_covering_service_with_v_tilt_2(accessory):
+    """Define a window-covering characteristics as per page 219 of HAP spec."""
+    service = create_window_covering_service(accessory)
+
+    tilt_current = service.add_char(CharacteristicsTypes.VERTICAL_TILT_CURRENT)
+    tilt_current.value = 0
+    tilt_current.minValue = -90
+    tilt_current.maxValue = 0
+
+    tilt_target = service.add_char(CharacteristicsTypes.VERTICAL_TILT_TARGET)
+    tilt_target.value = 0
+    tilt_target.minValue = -90
+    tilt_target.maxValue = 0
 
 
 async def test_change_window_cover_state(hass: HomeAssistant, utcnow) -> None:
@@ -124,7 +162,23 @@ async def test_read_window_cover_tilt_horizontal(hass: HomeAssistant, utcnow) ->
         {CharacteristicsTypes.HORIZONTAL_TILT_CURRENT: 75},
     )
     state = await helper.poll_and_get_state()
-    assert state.attributes["current_tilt_position"] == 75
+    # Expect converted value from arcdegree scale to percentage scale.
+    assert state.attributes["current_tilt_position"] == 83
+
+
+async def test_read_window_cover_tilt_horizontal_2(hass: HomeAssistant, utcnow) -> None:
+    """Test that horizontal tilt is handled correctly."""
+    helper = await setup_test_component(
+        hass, create_window_covering_service_with_h_tilt_2
+    )
+
+    await helper.async_update(
+        ServicesTypes.WINDOW_COVERING,
+        {CharacteristicsTypes.HORIZONTAL_TILT_CURRENT: -75},
+    )
+    state = await helper.poll_and_get_state()
+    # Expect converted value from arcdegree scale to percentage scale.
+    assert state.attributes["current_tilt_position"] == 83
 
 
 async def test_read_window_cover_tilt_vertical(hass: HomeAssistant, utcnow) -> None:
@@ -138,7 +192,23 @@ async def test_read_window_cover_tilt_vertical(hass: HomeAssistant, utcnow) -> N
         {CharacteristicsTypes.VERTICAL_TILT_CURRENT: 75},
     )
     state = await helper.poll_and_get_state()
-    assert state.attributes["current_tilt_position"] == 75
+    # Expect converted value from arcdegree scale to percentage scale.
+    assert state.attributes["current_tilt_position"] == 83
+
+
+async def test_read_window_cover_tilt_vertical_2(hass: HomeAssistant, utcnow) -> None:
+    """Test that vertical tilt is handled correctly."""
+    helper = await setup_test_component(
+        hass, create_window_covering_service_with_v_tilt_2
+    )
+
+    await helper.async_update(
+        ServicesTypes.WINDOW_COVERING,
+        {CharacteristicsTypes.VERTICAL_TILT_CURRENT: -75},
+    )
+    state = await helper.poll_and_get_state()
+    # Expect converted value from arcdegree scale to percentage scale.
+    assert state.attributes["current_tilt_position"] == 83
 
 
 async def test_write_window_cover_tilt_horizontal(hass: HomeAssistant, utcnow) -> None:
@@ -153,10 +223,34 @@ async def test_write_window_cover_tilt_horizontal(hass: HomeAssistant, utcnow) -
         {"entity_id": helper.entity_id, "tilt_position": 90},
         blocking=True,
     )
+    # Expect converted value from percentage scale to arcdegree scale.
     helper.async_assert_service_values(
         ServicesTypes.WINDOW_COVERING,
         {
-            CharacteristicsTypes.HORIZONTAL_TILT_TARGET: 90,
+            CharacteristicsTypes.HORIZONTAL_TILT_TARGET: 81,
+        },
+    )
+
+
+async def test_write_window_cover_tilt_horizontal_2(
+    hass: HomeAssistant, utcnow
+) -> None:
+    """Test that horizontal tilt is written correctly."""
+    helper = await setup_test_component(
+        hass, create_window_covering_service_with_h_tilt_2
+    )
+
+    await hass.services.async_call(
+        "cover",
+        "set_cover_tilt_position",
+        {"entity_id": helper.entity_id, "tilt_position": 90},
+        blocking=True,
+    )
+    # Expect converted value from percentage scale to arcdegree scale.
+    helper.async_assert_service_values(
+        ServicesTypes.WINDOW_COVERING,
+        {
+            CharacteristicsTypes.HORIZONTAL_TILT_TARGET: -81,
         },
     )
 
@@ -173,10 +267,32 @@ async def test_write_window_cover_tilt_vertical(hass: HomeAssistant, utcnow) ->
         {"entity_id": helper.entity_id, "tilt_position": 90},
         blocking=True,
     )
+    # Expect converted value from percentage scale to arcdegree scale.
+    helper.async_assert_service_values(
+        ServicesTypes.WINDOW_COVERING,
+        {
+            CharacteristicsTypes.VERTICAL_TILT_TARGET: 81,
+        },
+    )
+
+
+async def test_write_window_cover_tilt_vertical_2(hass: HomeAssistant, utcnow) -> None:
+    """Test that vertical tilt is written correctly."""
+    helper = await setup_test_component(
+        hass, create_window_covering_service_with_v_tilt_2
+    )
+
+    await hass.services.async_call(
+        "cover",
+        "set_cover_tilt_position",
+        {"entity_id": helper.entity_id, "tilt_position": 90},
+        blocking=True,
+    )
+    # Expect converted value from percentage scale to arcdegree scale.
     helper.async_assert_service_values(
         ServicesTypes.WINDOW_COVERING,
         {
-            CharacteristicsTypes.VERTICAL_TILT_TARGET: 90,
+            CharacteristicsTypes.VERTICAL_TILT_TARGET: -81,
         },
     )
 
diff --git a/tests/components/homekit_controller/test_device_trigger.py b/tests/components/homekit_controller/test_device_trigger.py
index 015d567ece7fd1..757823aba9ba97 100644
--- a/tests/components/homekit_controller/test_device_trigger.py
+++ b/tests/components/homekit_controller/test_device_trigger.py
@@ -2,6 +2,7 @@
 from aiohomekit.model.characteristics import CharacteristicsTypes
 from aiohomekit.model.services import ServicesTypes
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,11 +15,14 @@
 from .common import setup_test_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -87,16 +91,17 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_remote)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -104,7 +109,7 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -127,7 +132,7 @@ async def test_enumerate_remote(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
@@ -135,16 +140,17 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_button)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -152,7 +158,7 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -174,7 +180,7 @@ async def test_enumerate_button(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
@@ -182,16 +188,17 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
     await setup_test_component(hass, create_doorbell)
 
     entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get("sensor.testdevice_battery")
+    bat_sensor = entity_registry.async_get("sensor.testdevice_battery")
+    identify_button = entity_registry.async_get("button.testdevice_identify")
 
     device_registry = dr.async_get(hass)
-    device = device_registry.async_get(entry.device_id)
+    device = device_registry.async_get(bat_sensor.device_id)
 
     expected = [
         {
             "device_id": device.id,
             "domain": "sensor",
-            "entity_id": "sensor.testdevice_battery",
+            "entity_id": bat_sensor.id,
             "platform": "device",
             "type": "battery_level",
             "metadata": {"secondary": True},
@@ -199,7 +206,7 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
         {
             "device_id": device.id,
             "domain": "button",
-            "entity_id": "button.testdevice_identify",
+            "entity_id": identify_button.id,
             "platform": "device",
             "type": "pressed",
             "metadata": {"secondary": True},
@@ -221,7 +228,7 @@ async def test_enumerate_doorbell(hass: HomeAssistant, utcnow) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected)
+    assert triggers == unordered(expected)
 
 
 async def test_handle_events(hass: HomeAssistant, utcnow, calls) -> None:
diff --git a/tests/components/homekit_controller/test_diagnostics.py b/tests/components/homekit_controller/test_diagnostics.py
index 3978f46a72ef1b..7fd5b11d5d6fef 100644
--- a/tests/components/homekit_controller/test_diagnostics.py
+++ b/tests/components/homekit_controller/test_diagnostics.py
@@ -519,9 +519,7 @@ async def test_device(
                     "original_icon": None,
                     "original_name": "Koogeek-LS1-20833F Identify",
                     "state": {
-                        "attributes": {
-                            "friendly_name": "Koogeek-LS1-20833F " "Identify"
-                        },
+                        "attributes": {"friendly_name": "Koogeek-LS1-20833F Identify"},
                         "entity_id": "button.koogeek_ls1_20833f_identify",
                         "last_changed": ANY,
                         "last_updated": ANY,
diff --git a/tests/components/homekit_controller/test_humidifier.py b/tests/components/homekit_controller/test_humidifier.py
index a1909158d3370d..e412fed087814d 100644
--- a/tests/components/homekit_controller/test_humidifier.py
+++ b/tests/components/homekit_controller/test_humidifier.py
@@ -118,20 +118,24 @@ async def test_humidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         {
             CharacteristicsTypes.ACTIVE: True,
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD: 75,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 45,
         },
     )
     assert state.state == "on"
     assert state.attributes["humidity"] == 75
+    assert state.attributes["current_humidity"] == 45
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
         {
             CharacteristicsTypes.ACTIVE: False,
             CharacteristicsTypes.RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD: 10,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 30,
         },
     )
     assert state.state == "off"
     assert state.attributes["humidity"] == 10
+    assert state.attributes["current_humidity"] == 30
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -140,6 +144,7 @@ async def test_humidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         },
     )
     assert state.attributes["humidity"] == 10
+    assert state.attributes["current_humidity"] == 30
     assert state.state == "off"
 
 
@@ -152,20 +157,24 @@ async def test_dehumidifier_read_humidity(hass: HomeAssistant, utcnow) -> None:
         {
             CharacteristicsTypes.ACTIVE: True,
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD: 75,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 45,
         },
     )
     assert state.state == "on"
     assert state.attributes["humidity"] == 75
+    assert state.attributes["current_humidity"] == 45
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
         {
             CharacteristicsTypes.ACTIVE: False,
             CharacteristicsTypes.RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD: 40,
+            CharacteristicsTypes.RELATIVE_HUMIDITY_CURRENT: 39,
         },
     )
     assert state.state == "off"
     assert state.attributes["humidity"] == 40
+    assert state.attributes["current_humidity"] == 39
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -368,6 +377,7 @@ async def test_humidifier_target_humidity_modes(hass: HomeAssistant, utcnow) ->
     )
     assert state.attributes["mode"] == "auto"
     assert state.attributes["humidity"] == 37
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -377,6 +387,7 @@ async def test_humidifier_target_humidity_modes(hass: HomeAssistant, utcnow) ->
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 37
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -411,6 +422,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "auto"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -420,6 +432,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -429,6 +442,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
     state = await helper.async_update(
         ServicesTypes.HUMIDIFIER_DEHUMIDIFIER,
@@ -438,6 +452,7 @@ async def test_dehumidifier_target_humidity_modes(hass: HomeAssistant, utcnow) -
     )
     assert state.attributes["mode"] == "normal"
     assert state.attributes["humidity"] == 73
+    assert state.attributes["current_humidity"] == 51
 
 
 async def test_migrate_entity_ids(hass: HomeAssistant, utcnow) -> None:
diff --git a/tests/components/homewizard/test_sensor.py b/tests/components/homewizard/test_sensor.py
index 264d4dbb939764..7ad5140b815551 100644
--- a/tests/components/homewizard/test_sensor.py
+++ b/tests/components/homewizard/test_sensor.py
@@ -254,7 +254,7 @@ async def test_sensor_entity_wifi_strength(
     assert entry.disabled
 
 
-async def test_sensor_entity_total_power_import_t1_kwh(
+async def test_sensor_entity_total_power_import_tariff_1_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power import t1."""
@@ -277,9 +277,11 @@ async def test_sensor_entity_total_power_import_t1_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_import_t1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_import_t1"
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
     )
     assert entry
     assert state
@@ -288,7 +290,7 @@ async def test_sensor_entity_total_power_import_t1_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power import T1"
+        == "Product Name (aabbccddeeff) Total power import tariff 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -296,7 +298,7 @@ async def test_sensor_entity_total_power_import_t1_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_import_t2_kwh(
+async def test_sensor_entity_total_power_import_tariff_2_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power import t2."""
@@ -319,9 +321,11 @@ async def test_sensor_entity_total_power_import_t2_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_import_t2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_import_t2"
+        "sensor.product_name_aabbccddeeff_total_power_import_tariff_2"
     )
     assert entry
     assert state
@@ -330,7 +334,7 @@ async def test_sensor_entity_total_power_import_t2_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power import T2"
+        == "Product Name (aabbccddeeff) Total power import tariff 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -338,7 +342,7 @@ async def test_sensor_entity_total_power_import_t2_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_export_t1_kwh(
+async def test_sensor_entity_total_power_export_tariff_1_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power export t1."""
@@ -361,9 +365,11 @@ async def test_sensor_entity_total_power_export_t1_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_export_t1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t1"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
     )
     assert entry
     assert state
@@ -372,7 +378,7 @@ async def test_sensor_entity_total_power_export_t1_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power export T1"
+        == "Product Name (aabbccddeeff) Total power export tariff 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -380,7 +386,7 @@ async def test_sensor_entity_total_power_export_t1_kwh(
     assert ATTR_ICON not in state.attributes
 
 
-async def test_sensor_entity_total_power_export_t2_kwh(
+async def test_sensor_entity_total_power_export_tariff_2_kwh(
     hass: HomeAssistant, mock_config_entry_data, mock_config_entry
 ) -> None:
     """Test entity loads total power export t2."""
@@ -403,9 +409,11 @@ async def test_sensor_entity_total_power_export_t2_kwh(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_total_power_export_t2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t2"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
     )
     assert entry
     assert state
@@ -414,7 +422,7 @@ async def test_sensor_entity_total_power_export_t2_kwh(
     assert state.state == "1234.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Total power export T2"
+        == "Product Name (aabbccddeeff) Total power export tariff 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -481,9 +489,9 @@ async def test_sensor_entity_active_power_l1(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l1")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_1")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l1"
+        "sensor.product_name_aabbccddeeff_active_power_phase_1"
     )
     assert entry
     assert state
@@ -492,7 +500,7 @@ async def test_sensor_entity_active_power_l1(
     assert state.state == "123.123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L1"
+        == "Product Name (aabbccddeeff) Active power phase 1"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -521,9 +529,9 @@ async def test_sensor_entity_active_power_l2(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l2")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_2")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l2"
+        "sensor.product_name_aabbccddeeff_active_power_phase_2"
     )
     assert entry
     assert state
@@ -532,7 +540,7 @@ async def test_sensor_entity_active_power_l2(
     assert state.state == "456.456"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L2"
+        == "Product Name (aabbccddeeff) Active power phase 2"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -561,9 +569,9 @@ async def test_sensor_entity_active_power_l3(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_l3")
+    state = hass.states.get("sensor.product_name_aabbccddeeff_active_power_phase_3")
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l3"
+        "sensor.product_name_aabbccddeeff_active_power_phase_3"
     )
     assert entry
     assert state
@@ -572,7 +580,7 @@ async def test_sensor_entity_active_power_l3(
     assert state.state == "789.789"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Active power L3"
+        == "Product Name (aabbccddeeff) Active power phase 3"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
@@ -680,7 +688,7 @@ async def test_sensor_entity_active_voltage_l1(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l1"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_1"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -701,12 +709,14 @@ async def test_sensor_entity_active_voltage_l1(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l1")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_1"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L1"
+            == "Product Name (aabbccddeeff) Active voltage phase 1"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -739,7 +749,7 @@ async def test_sensor_entity_active_voltage_l2(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l2"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_2"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -760,12 +770,14 @@ async def test_sensor_entity_active_voltage_l2(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l2")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_2"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L2"
+            == "Product Name (aabbccddeeff) Active voltage phase 2"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -798,7 +810,7 @@ async def test_sensor_entity_active_voltage_l3(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_voltage_l3"
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_3"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -819,12 +831,14 @@ async def test_sensor_entity_active_voltage_l3(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_voltage_l3")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_voltage_phase_3"
+        )
         assert state
         assert state.state == "230.123"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active voltage L3"
+            == "Product Name (aabbccddeeff) Active voltage phase 3"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -857,7 +871,7 @@ async def test_sensor_entity_active_current_l1(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l1"
+            "sensor.product_name_aabbccddeeff_active_current_phase_1"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -878,12 +892,14 @@ async def test_sensor_entity_active_current_l1(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l1")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_1"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L1"
+            == "Product Name (aabbccddeeff) Active current phase 1"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -916,7 +932,7 @@ async def test_sensor_entity_active_current_l2(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l2"
+            "sensor.product_name_aabbccddeeff_active_current_phase_2"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -937,12 +953,14 @@ async def test_sensor_entity_active_current_l2(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l2")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_2"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L2"
+            == "Product Name (aabbccddeeff) Active current phase 2"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -975,7 +993,7 @@ async def test_sensor_entity_active_current_l3(
         entity_registry = er.async_get(hass)
 
         disabled_entry = entity_registry.async_get(
-            "sensor.product_name_aabbccddeeff_active_current_l3"
+            "sensor.product_name_aabbccddeeff_active_current_phase_3"
         )
         assert disabled_entry
         assert disabled_entry.disabled
@@ -996,12 +1014,14 @@ async def test_sensor_entity_active_current_l3(
         )
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.product_name_aabbccddeeff_active_current_l3")
+        state = hass.states.get(
+            "sensor.product_name_aabbccddeeff_active_current_phase_3"
+        )
         assert state
         assert state.state == "12.34"
         assert (
             state.attributes.get(ATTR_FRIENDLY_NAME)
-            == "Product Name (aabbccddeeff) Active current L3"
+            == "Product Name (aabbccddeeff) Active current phase 3"
         )
         assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
         assert (
@@ -1089,9 +1109,11 @@ async def test_sensor_entity_voltage_sag_count_l1(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l1")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_1"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_1"
     )
     assert entry
     assert state
@@ -1100,7 +1122,7 @@ async def test_sensor_entity_voltage_sag_count_l1(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L1"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 1"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1128,9 +1150,11 @@ async def test_sensor_entity_voltage_sag_count_l2(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l2")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_2"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_2"
     )
     assert entry
     assert state
@@ -1139,7 +1163,7 @@ async def test_sensor_entity_voltage_sag_count_l2(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L2"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 2"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1167,9 +1191,11 @@ async def test_sensor_entity_voltage_sag_count_l3(
 
     entity_registry = er.async_get(hass)
 
-    state = hass.states.get("sensor.product_name_aabbccddeeff_voltage_sags_detected_l3")
+    state = hass.states.get(
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_3"
+    )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_sags_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_sags_detected_phase_3"
     )
     assert entry
     assert state
@@ -1178,7 +1204,7 @@ async def test_sensor_entity_voltage_sag_count_l3(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage sags detected L3"
+        == "Product Name (aabbccddeeff) Voltage sags detected phase 3"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1207,10 +1233,10 @@ async def test_sensor_entity_voltage_swell_count_l1(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_1"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l1"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_1"
     )
     assert entry
     assert state
@@ -1219,7 +1245,7 @@ async def test_sensor_entity_voltage_swell_count_l1(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L1"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 1"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1248,10 +1274,10 @@ async def test_sensor_entity_voltage_swell_count_l2(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_2"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l2"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_2"
     )
     assert entry
     assert state
@@ -1260,7 +1286,7 @@ async def test_sensor_entity_voltage_swell_count_l2(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L2"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 2"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1289,10 +1315,10 @@ async def test_sensor_entity_voltage_swell_count_l3(
     entity_registry = er.async_get(hass)
 
     state = hass.states.get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_3"
     )
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_voltage_swells_detected_l3"
+        "sensor.product_name_aabbccddeeff_voltage_swells_detected_phase_3"
     )
     assert entry
     assert state
@@ -1301,7 +1327,7 @@ async def test_sensor_entity_voltage_swell_count_l3(
     assert state.state == "123"
     assert (
         state.attributes.get(ATTR_FRIENDLY_NAME)
-        == "Product Name (aabbccddeeff) Voltage swells detected L3"
+        == "Product Name (aabbccddeeff) Voltage swells detected phase 3"
     )
     assert ATTR_STATE_CLASS not in state.attributes
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
@@ -1582,12 +1608,12 @@ async def test_sensor_entity_disabled_when_null(
     entity_registry = er.async_get(hass)
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l2"
+        "sensor.product_name_aabbccddeeff_active_power_phase_2"
     )
     assert entry is None
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_active_power_l3"
+        "sensor.product_name_aabbccddeeff_active_power_phase_3"
     )
     assert entry is None
 
@@ -1633,13 +1659,13 @@ async def test_sensor_entity_export_disabled_when_unused(
     assert entry.disabled
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t1"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_1"
     )
     assert entry
     assert entry.disabled
 
     entry = entity_registry.async_get(
-        "sensor.product_name_aabbccddeeff_total_power_export_t2"
+        "sensor.product_name_aabbccddeeff_total_power_export_tariff_2"
     )
     assert entry
     assert entry.disabled
@@ -1669,7 +1695,7 @@ async def test_sensors_unreachable(
 
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1679,7 +1705,7 @@ async def test_sensors_unreachable(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "unavailable"
         )
@@ -1689,7 +1715,7 @@ async def test_sensors_unreachable(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1719,7 +1745,7 @@ async def test_api_disabled(
 
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "1234.123"
         )
@@ -1729,7 +1755,7 @@ async def test_api_disabled(
         await hass.async_block_till_done()
         assert (
             hass.states.get(
-                "sensor.product_name_aabbccddeeff_total_power_import_t1"
+                "sensor.product_name_aabbccddeeff_total_power_import_tariff_1"
             ).state
             == "unavailable"
         )
diff --git a/tests/components/honeywell/test_climate.py b/tests/components/honeywell/test_climate.py
index 01472144c594cc..afb49cbffcaada 100644
--- a/tests/components/honeywell/test_climate.py
+++ b/tests/components/honeywell/test_climate.py
@@ -296,6 +296,7 @@ async def test_service_calls_off_mode(
 
     device.set_setpoint_heat.reset_mock()
     device.set_setpoint_heat.side_effect = aiosomecomfort.SomeComfortError
+    caplog.clear()
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
@@ -308,8 +309,9 @@ async def test_service_calls_off_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
+    caplog.clear()
     reset_mock(device)
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -436,6 +438,7 @@ async def test_service_calls_cool_mode(
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
 
+    caplog.clear()
     device.set_setpoint_cool.reset_mock()
     device.set_setpoint_cool.side_effect = aiosomecomfort.SomeComfortError
     await hass.services.async_call(
@@ -450,7 +453,7 @@ async def test_service_calls_cool_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
     await hass.services.async_call(
@@ -467,6 +470,7 @@ async def test_service_calls_cool_mode(
     reset_mock(device)
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -478,7 +482,7 @@ async def test_service_calls_cool_mode(
     device.set_hold_cool.assert_called_once_with(True, 12)
     device.set_hold_heat.assert_not_called()
     device.set_setpoint_heat.assert_not_called()
-    assert "Temperature out of range" in caplog.messages[-1]
+    assert "Temperature out of range" in caplog.text
 
     reset_mock(device)
 
@@ -512,6 +516,7 @@ async def test_service_calls_cool_mode(
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -521,7 +526,7 @@ async def test_service_calls_cool_mode(
     )
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
 
@@ -536,6 +541,7 @@ async def test_service_calls_cool_mode(
     device.set_hold_cool.assert_called_once_with(False)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
 
@@ -548,7 +554,7 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_heat.assert_not_called()
     device.set_hold_cool.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
 
@@ -566,6 +572,8 @@ async def test_service_calls_cool_mode(
     device.set_hold_heat.assert_not_called()
 
     reset_mock(device)
+    caplog.clear()
+
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
 
     device.raw_ui_data["StatusHeat"] = 2
@@ -580,9 +588,10 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
@@ -597,7 +606,7 @@ async def test_service_calls_cool_mode(
 
     device.set_hold_cool.assert_not_called()
     device.set_hold_heat.assert_not_called()
-    assert "Invalid system mode returned" in caplog.messages[-2]
+    assert "Invalid system mode returned" in caplog.text
 
 
 async def test_service_calls_heat_mode(
@@ -638,8 +647,9 @@ async def test_service_calls_heat_mode(
     )
     device.set_hold_heat.assert_called_once_with(datetime.time(2, 30), 59)
     device.set_hold_heat.reset_mock()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
+    caplog.clear()
     await hass.services.async_call(
         CLIMATE_DOMAIN,
         SERVICE_SET_TEMPERATURE,
@@ -667,7 +677,7 @@ async def test_service_calls_heat_mode(
     )
     device.set_setpoint_cool.assert_called_with(95)
     device.set_setpoint_heat.assert_called_with(77)
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
     device.raw_ui_data["StatusHeat"] = 2
@@ -696,6 +706,7 @@ async def test_service_calls_heat_mode(
     device.set_setpoint_heat.assert_called_once()
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
 
@@ -710,7 +721,7 @@ async def test_service_calls_heat_mode(
     )
     device.set_hold_heat.assert_called_once_with(True)
     device.set_hold_cool.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
 
@@ -726,6 +737,7 @@ async def test_service_calls_heat_mode(
     device.set_setpoint_cool.assert_not_called()
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
 
@@ -739,9 +751,10 @@ async def test_service_calls_heat_mode(
     device.set_hold_heat.assert_called_once_with(True, 22)
     device.set_hold_cool.assert_not_called()
     device.set_setpoint_cool.assert_not_called()
-    assert "Temperature out of range" in caplog.messages[-1]
+    assert "Temperature out of range" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -765,7 +778,7 @@ async def test_service_calls_heat_mode(
     )
 
     device.set_hold_heat.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
     device.raw_ui_data["StatusHeat"] = 2
@@ -844,6 +857,7 @@ async def test_service_calls_auto_mode(
     device.set_setpoint_heat.assert_called_once_with(77)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_cool.side_effect = aiosomecomfort.SomeComfortError
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
@@ -855,9 +869,10 @@ async def test_service_calls_auto_mode(
         blocking=True,
     )
     device.set_setpoint_heat.assert_not_called()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_setpoint_heat.side_effect = aiosomecomfort.SomeComfortError
     device.set_setpoint_cool.side_effect = aiosomecomfort.SomeComfortError
@@ -872,9 +887,10 @@ async def test_service_calls_auto_mode(
         blocking=True,
     )
     device.set_setpoint_heat.assert_not_called()
-    assert "Invalid temperature" in caplog.messages[-1]
+    assert "Invalid temperature" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = None
     device.set_hold_cool.side_effect = None
@@ -893,6 +909,7 @@ async def test_service_calls_auto_mode(
     device.set_hold_heat.assert_called_once_with(True)
 
     reset_mock(device)
+    caplog.clear()
 
     device.set_hold_heat.side_effect = aiosomecomfort.SomeComfortError
     device.raw_ui_data["StatusHeat"] = 2
@@ -906,7 +923,7 @@ async def test_service_calls_auto_mode(
     )
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_called_once_with(True)
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
     reset_mock(device)
     device.set_setpoint_heat.side_effect = None
@@ -923,6 +940,7 @@ async def test_service_calls_auto_mode(
     device.set_hold_heat.assert_called_once_with(True, 22)
 
     reset_mock(device)
+    caplog.clear()
 
     await hass.services.async_call(
         CLIMATE_DOMAIN,
@@ -946,9 +964,10 @@ async def test_service_calls_auto_mode(
 
     device.set_hold_heat.assert_not_called()
     device.set_hold_cool.assert_called_once_with(False)
-    assert "Can not stop hold mode" in caplog.messages[-1]
+    assert "Can not stop hold mode" in caplog.text
 
     reset_mock(device)
+    caplog.clear()
 
     device.raw_ui_data["StatusHeat"] = 2
     device.raw_ui_data["StatusCool"] = 2
@@ -978,7 +997,7 @@ async def test_service_calls_auto_mode(
 
     device.set_hold_cool.assert_called_once_with(True)
     device.set_hold_heat.assert_not_called()
-    assert "Couldn't set permanent hold" in caplog.messages[-1]
+    assert "Couldn't set permanent hold" in caplog.text
 
 
 async def test_async_update_errors(
diff --git a/tests/components/http/test_ban.py b/tests/components/http/test_ban.py
index b34c8866ff117f..e6e237a7b677ad 100644
--- a/tests/components/http/test_ban.py
+++ b/tests/components/http/test_ban.py
@@ -25,6 +25,7 @@
 
 from . import mock_real_ip
 
+from tests.common import async_get_persistent_notifications
 from tests.typing import ClientSessionGenerator
 
 SUPERVISOR_IP = "1.2.3.4"
@@ -307,11 +308,10 @@ async def unauth_handler(request):
         assert resp.status == HTTPStatus.FORBIDDEN
         assert m_open.call_count == 1
 
+        notifications = async_get_persistent_notifications(hass)
+        assert len(notifications) == 2
         assert (
-            len(notifications := hass.states.async_all("persistent_notification")) == 2
-        )
-        assert (
-            notifications[0].attributes["message"]
+            notifications["http-login"]["message"]
             == "Login attempt or request with invalid authentication from example.com (200.201.202.204). See the log for details."
         )
 
diff --git a/tests/components/hue/test_device_trigger_v1.py b/tests/components/hue/test_device_trigger_v1.py
index 01add6a7dfd3e5..aea91c06e88d2c 100644
--- a/tests/components/hue/test_device_trigger_v1.py
+++ b/tests/components/hue/test_device_trigger_v1.py
@@ -1,19 +1,24 @@
 """The tests for Philips Hue device triggers for V1 bridge."""
+from pytest_unordered import unordered
+
 from homeassistant.components import automation, hue
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.hue.v1 import device_trigger
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
 from .conftest import setup_platform
 from .test_sensor_v1 import HUE_DIMMER_REMOTE_1, HUE_TAP_REMOTE_1
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 REMOTES_RESPONSE = {"7": HUE_TAP_REMOTE_1, "8": HUE_DIMMER_REMOTE_1}
 
 
-async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) -> None:
+async def test_get_triggers(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, mock_bridge_v1, device_reg
+) -> None:
     """Test we get the expected triggers from a hue remote."""
     mock_bridge_v1.mock_sensor_responses.append(REMOTES_RESPONSE)
     await setup_platform(hass, mock_bridge_v1, ["sensor", "binary_sensor"])
@@ -41,12 +46,15 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
         }
         for t_type, t_subtype in device_trigger.HUE_TAP_REMOTE
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
     # Get triggers for specific dimmer switch
     hue_dimmer_device = device_reg.async_get_device(
         {(hue.DOMAIN, "00:17:88:01:10:3e:3a:dc")}
     )
+    hue_bat_sensor = entity_registry.async_get(
+        "sensor.hue_dimmer_switch_1_battery_level"
+    )
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, hue_dimmer_device.id
     )
@@ -56,7 +64,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
         "domain": "sensor",
         "device_id": hue_dimmer_device.id,
         "type": "battery_level",
-        "entity_id": "sensor.hue_dimmer_switch_1_battery_level",
+        "entity_id": hue_bat_sensor.id,
         "metadata": {"secondary": True},
     }
     expected_triggers = [
@@ -73,7 +81,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_bridge_v1, device_reg) ->
             for t_type, t_subtype in device_trigger.HUE_DIMMER_REMOTE
         ),
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_state_change(
diff --git a/tests/components/hue/test_device_trigger_v2.py b/tests/components/hue/test_device_trigger_v2.py
index 81410b0658fda4..26c323617d294c 100644
--- a/tests/components/hue/test_device_trigger_v2.py
+++ b/tests/components/hue/test_device_trigger_v2.py
@@ -1,16 +1,17 @@
 """The tests for Philips Hue device triggers for V2 bridge."""
 from aiohue.v2.models.button import ButtonEvent
+from pytest_unordered import unordered
 
 from homeassistant.components import hue
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.hue.v2.device import async_setup_devices
 from homeassistant.components.hue.v2.hue_event import async_setup_hue_events
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from .conftest import setup_platform
 
 from tests.common import (
-    assert_lists_same,
     async_capture_events,
     async_get_device_automations,
 )
@@ -47,7 +48,11 @@ async def test_hue_event(
 
 
 async def test_get_triggers(
-    hass: HomeAssistant, mock_bridge_v2, v2_resources_test_data, device_reg
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_bridge_v2,
+    v2_resources_test_data,
+    device_reg,
 ) -> None:
     """Test we get the expected triggers from a hue remote."""
     await mock_bridge_v2.api.load_test_data(v2_resources_test_data)
@@ -57,6 +62,9 @@ async def test_get_triggers(
     hue_wall_switch_device = device_reg.async_get_device(
         {(hue.DOMAIN, "3ff06175-29e8-44a8-8fe7-af591b0025da")}
     )
+    hue_bat_sensor = entity_registry.async_get(
+        "sensor.wall_switch_with_2_controls_battery"
+    )
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, hue_wall_switch_device.id
     )
@@ -66,7 +74,7 @@ async def test_get_triggers(
         "domain": "sensor",
         "device_id": hue_wall_switch_device.id,
         "type": "battery_level",
-        "entity_id": "sensor.wall_switch_with_2_controls_battery",
+        "entity_id": hue_bat_sensor.id,
         "metadata": {"secondary": True},
     }
 
@@ -96,4 +104,4 @@ async def test_get_triggers(
         ),
     ]
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
diff --git a/tests/components/hue/test_init.py b/tests/components/hue/test_init.py
index 8a635497237c7f..bdca6ee135c325 100644
--- a/tests/components/hue/test_init.py
+++ b/tests/components/hue/test_init.py
@@ -9,7 +9,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_get_persistent_notifications
 
 
 @pytest.fixture
@@ -162,6 +162,6 @@ async def test_security_vuln_check(hass: HomeAssistant) -> None:
 
     await hass.async_block_till_done()
 
-    state = hass.states.get("persistent_notification.hue_hub_firmware")
-    assert state is not None
-    assert "CVE-2020-6007" in state.attributes["message"]
+    notifications = async_get_persistent_notifications(hass)
+    assert "hue_hub_firmware" in notifications
+    assert "CVE-2020-6007" in notifications["hue_hub_firmware"]["message"]
diff --git a/tests/components/huisbaasje/test_sensor.py b/tests/components/huisbaasje/test_sensor.py
index d3a65a0be6dc28..b324a5be9701a7 100644
--- a/tests/components/huisbaasje/test_sensor.py
+++ b/tests/components/huisbaasje/test_sensor.py
@@ -54,7 +54,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         # Assert data is loaded
-        current_power = hass.states.get("sensor.huisbaasje_current_power")
+        current_power = hass.states.get("sensor.current_power")
         assert current_power.state == "1012.0"
         assert (
             current_power.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
@@ -68,7 +68,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             current_power.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
         )
 
-        current_power_in = hass.states.get("sensor.huisbaasje_current_power_in_peak")
+        current_power_in = hass.states.get("sensor.current_power_in_peak")
         assert current_power_in.state == "1012.0"
         assert (
             current_power_in.attributes.get(ATTR_DEVICE_CLASS)
@@ -84,9 +84,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_in_low = hass.states.get(
-            "sensor.huisbaasje_current_power_in_off_peak"
-        )
+        current_power_in_low = hass.states.get("sensor.current_power_in_off_peak")
         assert current_power_in_low.state == "unknown"
         assert (
             current_power_in_low.attributes.get(ATTR_DEVICE_CLASS)
@@ -102,7 +100,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_out = hass.states.get("sensor.huisbaasje_current_power_out_peak")
+        current_power_out = hass.states.get("sensor.current_power_out_peak")
         assert current_power_out.state == "unknown"
         assert (
             current_power_out.attributes.get(ATTR_DEVICE_CLASS)
@@ -118,9 +116,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfPower.WATT
         )
 
-        current_power_out_low = hass.states.get(
-            "sensor.huisbaasje_current_power_out_off_peak"
-        )
+        current_power_out_low = hass.states.get("sensor.current_power_out_off_peak")
         assert current_power_out_low.state == "unknown"
         assert (
             current_power_out_low.attributes.get(ATTR_DEVICE_CLASS)
@@ -137,7 +133,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_consumption_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_consumption_peak_today"
+            "sensor.energy_consumption_peak_today"
         )
         assert energy_consumption_peak_today.state == "2.67"
         assert (
@@ -158,7 +154,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_consumption_off_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_consumption_off_peak_today"
+            "sensor.energy_consumption_off_peak_today"
         )
         assert energy_consumption_off_peak_today.state == "0.627"
         assert (
@@ -179,7 +175,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_production_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_production_peak_today"
+            "sensor.energy_production_peak_today"
         )
         assert energy_production_peak_today.state == "1.512"
         assert (
@@ -200,7 +196,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         )
 
         energy_production_off_peak_today = hass.states.get(
-            "sensor.huisbaasje_energy_production_off_peak_today"
+            "sensor.energy_production_off_peak_today"
         )
         assert energy_production_off_peak_today.state == "1.093"
         assert (
@@ -220,7 +216,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_today = hass.states.get("sensor.huisbaasje_energy_today")
+        energy_today = hass.states.get("sensor.energy_today")
         assert energy_today.state == "3.3"
         assert (
             energy_today.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
@@ -235,7 +231,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_week = hass.states.get("sensor.huisbaasje_energy_this_week")
+        energy_this_week = hass.states.get("sensor.energy_this_week")
         assert energy_this_week.state == "17.5"
         assert (
             energy_this_week.attributes.get(ATTR_DEVICE_CLASS)
@@ -251,7 +247,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_month = hass.states.get("sensor.huisbaasje_energy_this_month")
+        energy_this_month = hass.states.get("sensor.energy_this_month")
         assert energy_this_month.state == "103.3"
         assert (
             energy_this_month.attributes.get(ATTR_DEVICE_CLASS)
@@ -267,7 +263,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        energy_this_year = hass.states.get("sensor.huisbaasje_energy_this_year")
+        energy_this_year = hass.states.get("sensor.energy_this_year")
         assert energy_this_year.state == "673.0"
         assert (
             energy_this_year.attributes.get(ATTR_DEVICE_CLASS)
@@ -283,7 +279,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfEnergy.KILO_WATT_HOUR
         )
 
-        current_gas = hass.states.get("sensor.huisbaasje_current_gas")
+        current_gas = hass.states.get("sensor.current_gas")
         assert current_gas.state == "0.0"
         assert current_gas.attributes.get(ATTR_DEVICE_CLASS) is None
         assert current_gas.attributes.get(ATTR_ICON) == "mdi:fire"
@@ -295,7 +291,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR
         )
 
-        gas_today = hass.states.get("sensor.huisbaasje_gas_today")
+        gas_today = hass.states.get("sensor.gas_today")
         assert gas_today.state == "1.1"
         assert gas_today.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_today.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -308,7 +304,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_week = hass.states.get("sensor.huisbaasje_gas_this_week")
+        gas_this_week = hass.states.get("sensor.gas_this_week")
         assert gas_this_week.state == "5.6"
         assert gas_this_week.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_week.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -321,7 +317,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_month = hass.states.get("sensor.huisbaasje_gas_this_month")
+        gas_this_month = hass.states.get("sensor.gas_this_month")
         assert gas_this_month.state == "39.1"
         assert gas_this_month.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_month.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -334,7 +330,7 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
             == UnitOfVolume.CUBIC_METERS
         )
 
-        gas_this_year = hass.states.get("sensor.huisbaasje_gas_this_year")
+        gas_this_year = hass.states.get("sensor.gas_this_year")
         assert gas_this_year.state == "116.7"
         assert gas_this_year.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS
         assert gas_this_year.attributes.get(ATTR_ICON) == "mdi:counter"
@@ -381,42 +377,26 @@ async def test_setup_entry_absent_measurement(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         # Assert data is loaded
-        assert hass.states.get("sensor.huisbaasje_current_power").state == "1012.0"
-        assert (
-            hass.states.get("sensor.huisbaasje_current_power_in_peak").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_current_power_in_off_peak").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_current_power_out_peak").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_current_power_out_off_peak").state
-            == "unknown"
-        )
-        assert hass.states.get("sensor.huisbaasje_current_gas").state == "unknown"
-        assert hass.states.get("sensor.huisbaasje_energy_today").state == "3.3"
+        assert hass.states.get("sensor.current_power").state == "1012.0"
+        assert hass.states.get("sensor.current_power_in_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_in_off_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_out_peak").state == "unknown"
+        assert hass.states.get("sensor.current_power_out_off_peak").state == "unknown"
+        assert hass.states.get("sensor.current_gas").state == "unknown"
+        assert hass.states.get("sensor.energy_today").state == "3.3"
         assert (
-            hass.states.get("sensor.huisbaasje_energy_consumption_peak_today").state
-            == "unknown"
-        )
-        assert (
-            hass.states.get("sensor.huisbaasje_energy_consumption_off_peak_today").state
-            == "unknown"
+            hass.states.get("sensor.energy_consumption_peak_today").state == "unknown"
         )
         assert (
-            hass.states.get("sensor.huisbaasje_energy_production_peak_today").state
+            hass.states.get("sensor.energy_consumption_off_peak_today").state
             == "unknown"
         )
+        assert hass.states.get("sensor.energy_production_peak_today").state == "unknown"
         assert (
-            hass.states.get("sensor.huisbaasje_energy_production_off_peak_today").state
+            hass.states.get("sensor.energy_production_off_peak_today").state
             == "unknown"
         )
-        assert hass.states.get("sensor.huisbaasje_gas_today").state == "unknown"
+        assert hass.states.get("sensor.gas_today").state == "unknown"
 
         # Assert mocks are called
         assert len(mock_authenticate.mock_calls) == 1
diff --git a/tests/components/humidifier/test_device_action.py b/tests/components/humidifier/test_device_action.py
index 21957191836707..600be154fc7514 100644
--- a/tests/components/humidifier/test_device_action.py
+++ b/tests/components/humidifier/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Humidifier device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.mark.parametrize(
@@ -49,7 +53,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -61,13 +65,13 @@ async def test_get_actions(
             f"{DOMAIN}.test_5678", "attributes", {"supported_features": features_state}
         )
     expected_actions = []
-    basic_action_types = ["turn_on", "turn_off", "toggle", "set_humidity"]
+    basic_action_types = ["set_humidity", "turn_on", "turn_off", "toggle"]
     expected_actions += [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in basic_action_types
@@ -77,7 +81,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -85,7 +89,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -111,7 +115,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -120,27 +124,30 @@ async def test_get_actions_hidden_auxiliary(
         hidden_by=hidden_by,
         supported_features=0,
     )
+    basic_action_types = ["set_humidity", "turn_on", "turn_off", "toggle"]
     expected_actions = []
     expected_actions += [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for action in ["turn_on", "turn_off", "toggle", "set_humidity"]
+        for action in basic_action_types
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
     )
@@ -158,7 +165,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -170,7 +177,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -179,7 +186,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -191,7 +198,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "set_humidity",
                         "humidity": 35,
                     },
@@ -204,7 +211,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "set_mode",
                         "mode": const.MODE_AWAY,
                     },
@@ -265,6 +272,67 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(turn_off_calls) == 1
     assert len(toggle_calls) == 1
 
+    assert set_humidity_calls[0].domain == DOMAIN
+    assert set_humidity_calls[0].service == "set_humidity"
+    assert set_humidity_calls[0].data == {"entity_id": entry.entity_id, "humidity": 35}
+    assert set_mode_calls[0].domain == DOMAIN
+    assert set_mode_calls[0].service == "set_mode"
+    assert set_mode_calls[0].data == {"entity_id": entry.entity_id, "mode": "away"}
+    assert turn_on_calls[0].domain == DOMAIN
+    assert turn_on_calls[0].service == "turn_on"
+    assert turn_on_calls[0].data == {"entity_id": entry.entity_id}
+    assert turn_off_calls[0].domain == DOMAIN
+    assert turn_off_calls[0].service == "turn_off"
+    assert turn_off_calls[0].data == {"entity_id": entry.entity_id}
+    assert toggle_calls[0].domain == DOMAIN
+    assert toggle_calls[0].service == "toggle"
+    assert toggle_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_mode",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_mode",
+                        "mode": const.MODE_AWAY,
+                    },
+                },
+            ]
+        },
+    )
+
+    set_mode_calls = async_mock_service(hass, "humidifier", "set_mode")
+
+    hass.bus.async_fire("test_event_set_mode")
+    await hass.async_block_till_done()
+    assert len(set_mode_calls) == 1
+
+    assert set_mode_calls[0].domain == DOMAIN
+    assert set_mode_calls[0].service == "set_mode"
+    assert set_mode_calls[0].data == {"entity_id": entry.entity_id, "mode": "away"}
+
 
 @pytest.mark.parametrize(
     (
@@ -376,7 +444,7 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -395,7 +463,151 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "type": action,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "action",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {},
+            {},
+            "set_humidity",
+            [
+                {
+                    "name": "humidity",
+                    "required": True,
+                    "type": "integer",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "set_humidity",
+            [
+                {
+                    "name": "humidity",
+                    "required": True,
+                    "type": "integer",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            "set_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    action,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            f"{DOMAIN}.test_5678",
+            STATE_ON,
+            capabilities_state,
+        )
+
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.entity_id,
             "type": action,
         },
     )
@@ -414,7 +626,6 @@ async def test_capabilities(
     ("action", "capability_name", "extra"),
     [
         ("set_humidity", "humidity", {"type": "integer"}),
-        ("set_mode", "mode", {"type": "select", "options": []}),
     ],
 )
 async def test_capabilities_missing_entity(
diff --git a/tests/components/humidifier/test_device_condition.py b/tests/components/humidifier/test_device_condition.py
index db25bb04970bff..bf8eb98f456b43 100644
--- a/tests/components/humidifier/test_device_condition.py
+++ b/tests/components/humidifier/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Humidifier device conditions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -55,7 +59,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -74,7 +78,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in basic_condition_types
@@ -85,7 +89,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in expected_condition_types
@@ -93,7 +97,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -119,7 +123,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -133,7 +137,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -141,12 +145,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
 
     assert await async_setup_component(
         hass,
@@ -160,7 +168,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -179,7 +187,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -198,7 +206,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "humidifier.entity",
+                            "entity_id": entry.id,
                             "type": "is_mode",
                             "mode": "away",
                         }
@@ -214,7 +222,6 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get("humidifier.entity").state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -223,14 +230,14 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set("humidifier.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off event - test_event2"
 
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
 
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
@@ -238,7 +245,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_mode - event - test_event3"
 
-    hass.states.async_set("humidifier.entity", STATE_ON, {ATTR_MODE: const.MODE_HOME})
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_HOME})
 
     # Should not fire
     hass.bus.async_fire("test_event3")
@@ -246,6 +253,53 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_mode",
+                            "mode": "away",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_mode - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_ON, {ATTR_MODE: const.MODE_AWAY})
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_mode - event - test_event1"
+
+
 @pytest.mark.parametrize(
     (
         "set_state",
@@ -382,7 +436,177 @@ async def test_capabilities(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        capabilities=capabilities_reg,
+    )
+    if set_state:
+        hass.states.async_set(
+            entity_entry.entity_id,
+            STATE_ON,
+            capabilities_state,
+        )
+
+    capabilities = await device_condition.async_get_condition_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entity_entry.id,
+            "type": condition,
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert (
+        voluptuous_serialize.convert(
+            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+        )
+        == expected_capabilities
+    )
+
+
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "capabilities_reg",
+        "capabilities_state",
+        "condition",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "is_off",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            False,
+            {},
+            {},
+            "is_on",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {const.ATTR_AVAILABLE_MODES: [const.MODE_HOME, const.MODE_AWAY]},
+            "is_mode",
+            [
+                {
+                    "name": "mode",
+                    "options": [("home", "home"), ("away", "away")],
+                    "required": True,
+                    "type": "select",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_off",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+        (
+            True,
+            {},
+            {},
+            "is_on",
+            [
+                {
+                    "name": "for",
+                    "optional": True,
+                    "type": "positive_time_period_dict",
+                }
+            ],
+        ),
+    ],
+)
+async def test_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    capabilities_reg,
+    capabilities_state,
+    condition,
+    expected_capabilities,
+) -> None:
+    """Test getting capabilities."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -391,7 +615,7 @@ async def test_capabilities(
     )
     if set_state:
         hass.states.async_set(
-            f"{DOMAIN}.test_5678",
+            entity_entry.entity_id,
             STATE_ON,
             capabilities_state,
         )
@@ -401,7 +625,7 @@ async def test_capabilities(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.entity_id,
             "type": condition,
         },
     )
@@ -434,7 +658,7 @@ async def test_capabilities_missing_entity(
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": "0123456789",
             "type": condition,
         },
     )
diff --git a/tests/components/humidifier/test_device_trigger.py b/tests/components/humidifier/test_device_trigger.py
index 8c4d82e7bfb426..1953494e0c095a 100644
--- a/tests/components/humidifier/test_device_trigger.py
+++ b/tests/components/humidifier/test_device_trigger.py
@@ -2,6 +2,7 @@
 import datetime
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -26,12 +27,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -52,40 +56,48 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    entity_id = f"{DOMAIN}.test_5678"
     hass.states.async_set(
-        entity_id,
+        entity_entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
+            const.ATTR_CURRENT_HUMIDITY: 48,
             ATTR_MODE: "home",
             const.ATTR_AVAILABLE_MODES: ["home", "away"],
             ATTR_SUPPORTED_FEATURES: 1,
         },
     )
+    humidifier_trigger_types = ["current_humidity_changed", "target_humidity_changed"]
+    toggle_trigger_types = ["turned_on", "turned_off", "changed_states"]
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": entity_id,
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
-        for trigger in [
-            "target_humidity_changed",
-            "turned_off",
-            "turned_on",
-            "changed_states",
-        ]
+        for trigger in humidifier_trigger_types
+    ]
+    expected_triggers += [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": trigger,
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.id,
+            "metadata": {"secondary": False},
+        }
+        for trigger in toggle_trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -111,7 +123,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -119,35 +131,48 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
+    humidifier_trigger_types = ["target_humidity_changed"]
+    toggle_trigger_types = ["turned_on", "turned_off", "changed_states"]
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
+            "metadata": {"secondary": True},
+        }
+        for trigger in humidifier_trigger_types
+    ]
+    expected_triggers += [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "type": trigger,
+            "device_id": device_entry.id,
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for trigger in [
-            "target_humidity_changed",
-            "turned_off",
-            "turned_on",
-            "changed_states",
-        ]
+        for trigger in toggle_trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
+            const.ATTR_CURRENT_HUMIDITY: 35,
             ATTR_MODE: "home",
             const.ATTR_AVAILABLE_MODES: ["home", "away"],
             ATTR_SUPPORTED_FEATURES: 1,
@@ -164,7 +189,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "below": 20,
                     },
@@ -178,7 +203,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "above": 30,
                     },
@@ -192,7 +217,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "above": 30,
                         "for": {"seconds": 5},
@@ -207,7 +232,50 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "below": 30,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_below"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "above": 40,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_above"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "current_humidity_changed",
+                        "above": 40,
+                        "for": {"seconds": 5},
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "current_humidity_changed_above_for"},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -231,7 +299,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -255,7 +323,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -278,47 +346,137 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
         },
     )
 
-    # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 7})
+    # Fake that the humidity target is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 7, const.ATTR_CURRENT_HUMIDITY: 35},
+    )
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert calls[0].data["some"] == "target_humidity_changed_below"
 
-    # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 37})
+    # Fake that the current humidity is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 7, const.ATTR_CURRENT_HUMIDITY: 18},
+    )
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "target_humidity_changed_above"
+    assert calls[1].data["some"] == "current_humidity_changed_below"
+
+    # Fake that the humidity target is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 18},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 3
+    assert calls[2].data["some"] == "target_humidity_changed_above"
+
+    # Fake that the current humidity is changing
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 4
+    assert calls[3].data["some"] == "current_humidity_changed_above"
 
     # Wait 6 minutes
     async_fire_time_changed(hass, dt_util.utcnow() + datetime.timedelta(minutes=6))
     await hass.async_block_till_done()
-    assert len(calls) == 3
-    assert calls[2].data["some"] == "target_humidity_changed_above_for"
+    assert len(calls) == 6
+    assert {calls[4].data["some"], calls[5].data["some"]} == {
+        "current_humidity_changed_above_for",
+        "target_humidity_changed_above_for",
+    }
 
     # Fake turn off
-    hass.states.async_set("humidifier.entity", STATE_OFF, {const.ATTR_HUMIDITY: 37})
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_OFF,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
     await hass.async_block_till_done()
-    assert len(calls) == 5
-    assert {calls[3].data["some"], calls[4].data["some"]} == {
-        "turn_off device - humidifier.entity - on - off - None",
-        "turn_on_or_off device - humidifier.entity - on - off - None",
+    assert len(calls) == 8
+    assert {calls[6].data["some"], calls[7].data["some"]} == {
+        "turn_off device - humidifier.test_5678 - on - off - None",
+        "turn_on_or_off device - humidifier.test_5678 - on - off - None",
     }
 
     # Fake turn on
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 37})
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {const.ATTR_HUMIDITY: 37, const.ATTR_CURRENT_HUMIDITY: 41},
+    )
     await hass.async_block_till_done()
-    assert len(calls) == 7
-    assert {calls[5].data["some"], calls[6].data["some"]} == {
-        "turn_on device - humidifier.entity - off - on - None",
-        "turn_on_or_off device - humidifier.entity - off - on - None",
+    assert len(calls) == 10
+    assert {calls[8].data["some"], calls[9].data["some"]} == {
+        "turn_on device - humidifier.test_5678 - off - on - None",
+        "turn_on_or_off device - humidifier.test_5678 - off - on - None",
     }
 
 
-async def test_invalid_config(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id,
+        STATE_ON,
+        {
+            const.ATTR_HUMIDITY: 23,
+            ATTR_MODE: "home",
+            const.ATTR_AVAILABLE_MODES: ["home", "away"],
+            ATTR_SUPPORTED_FEATURES: 1,
+        },
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "target_humidity_changed",
+                        "below": 20,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": "target_humidity_changed_below"},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the humidity is changing
+    hass.states.async_set(entry.entity_id, STATE_ON, {const.ATTR_HUMIDITY: 7})
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "target_humidity_changed_below"
+
+
+async def test_invalid_config(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "humidifier.entity",
+        entry.entity_id,
         STATE_ON,
         {
             const.ATTR_HUMIDITY: 23,
@@ -338,7 +496,7 @@ async def test_invalid_config(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "humidifier.entity",
+                        "entity_id": entry.id,
                         "type": "target_humidity_changed",
                         "below": 20,
                         "invalid": "invalid",
@@ -353,7 +511,7 @@ async def test_invalid_config(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the humidity is changing
-    hass.states.async_set("humidifier.entity", STATE_ON, {const.ATTR_HUMIDITY: 7})
+    hass.states.async_set(entry.entity_id, STATE_ON, {const.ATTR_HUMIDITY: 7})
     await hass.async_block_till_done()
     # Should not trigger for invalid config
     assert len(calls) == 0
@@ -367,7 +525,7 @@ async def test_get_trigger_capabilities_on(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "turned_on",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
@@ -387,7 +545,7 @@ async def test_get_trigger_capabilities_off(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "turned_off",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
@@ -407,7 +565,7 @@ async def test_get_trigger_capabilities_humidity(hass: HomeAssistant) -> None:
             "platform": "device",
             "domain": "humidifier",
             "type": "target_humidity_changed",
-            "entity_id": "humidifier.upstairs",
+            "entity_id": "01234568901234568901234568901",
             "above": "23",
         },
     )
diff --git a/tests/components/humidifier/test_recorder.py b/tests/components/humidifier/test_recorder.py
index 4ac765d7f50e08..0a38ff05080865 100644
--- a/tests/components/humidifier/test_recorder.py
+++ b/tests/components/humidifier/test_recorder.py
@@ -34,7 +34,7 @@ async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant)
     states = await hass.async_add_executor_job(
         get_significant_states, hass, now, None, hass.states.async_entity_ids()
     )
-    assert len(states) > 1
+    assert len(states) >= 1
     for entity_states in states.values():
         for state in entity_states:
             assert ATTR_MIN_HUMIDITY not in state.attributes
diff --git a/tests/components/hyperion/__init__.py b/tests/components/hyperion/__init__.py
index 80a585f9740327..382a168bc4434e 100644
--- a/tests/components/hyperion/__init__.py
+++ b/tests/components/hyperion/__init__.py
@@ -27,7 +27,6 @@
 TEST_ENTITY_ID_1 = "light.test_instance_1"
 TEST_ENTITY_ID_2 = "light.test_instance_2"
 TEST_ENTITY_ID_3 = "light.test_instance_3"
-TEST_PRIORITY_LIGHT_ENTITY_ID_1 = "light.test_instance_1_priority"
 TEST_TITLE = f"{TEST_HOST}:{TEST_PORT}"
 
 TEST_TOKEN = "sekr1t"
diff --git a/tests/components/hyperion/test_config_flow.py b/tests/components/hyperion/test_config_flow.py
index ad71f392bc6d4c..f9cef677eadf54 100644
--- a/tests/components/hyperion/test_config_flow.py
+++ b/tests/components/hyperion/test_config_flow.py
@@ -150,8 +150,6 @@ async def _configure_flow(
     user_input = user_input or {}
 
     with patch(
-        "homeassistant.components.hyperion.async_setup", return_value=True
-    ), patch(
         "homeassistant.components.hyperion.async_setup_entry",
         return_value=True,
     ):
@@ -797,10 +795,8 @@ async def test_options_effect_show_list(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
         assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
 
-        # effect1 and effect3 only, so effect2 & external sources are hidden.
-        assert result["data"][CONF_EFFECT_HIDE_LIST] == sorted(
-            ["effect2"] + const.KEY_COMPONENTID_EXTERNAL_SOURCES
-        )
+        # effect1 and effect3 only, so effect2 is hidden.
+        assert result["data"][CONF_EFFECT_HIDE_LIST] == ["effect2"]
 
 
 async def test_options_effect_hide_list_cannot_connect(hass: HomeAssistant) -> None:
@@ -836,9 +832,7 @@ async def test_reauth_success(hass: HomeAssistant) -> None:
 
     with patch(
         "homeassistant.components.hyperion.client.HyperionClient", return_value=client
-    ), patch("homeassistant.components.hyperion.async_setup", return_value=True), patch(
-        "homeassistant.components.hyperion.async_setup_entry", return_value=True
-    ):
+    ), patch("homeassistant.components.hyperion.async_setup_entry", return_value=True):
         result = await _init_flow(
             hass,
             source=SOURCE_REAUTH,
diff --git a/tests/components/hyperion/test_light.py b/tests/components/hyperion/test_light.py
index e7bde1661e95e4..667c73a20ac65c 100644
--- a/tests/components/hyperion/test_light.py
+++ b/tests/components/hyperion/test_light.py
@@ -1,7 +1,6 @@
 """Tests for the Hyperion integration."""
 from __future__ import annotations
 
-from datetime import timedelta
 from unittest.mock import AsyncMock, Mock, call, patch
 
 from hyperion import const
@@ -17,7 +16,6 @@
     DOMAIN,
     HYPERION_MANUFACTURER_NAME,
     HYPERION_MODEL_NAME,
-    TYPE_HYPERION_PRIORITY_LIGHT,
 )
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -27,12 +25,7 @@
     ColorMode,
     LightEntityFeature,
 )
-from homeassistant.config_entries import (
-    RELOAD_AFTER_UPDATE_DELAY,
-    SOURCE_REAUTH,
-    ConfigEntry,
-    ConfigEntryState,
-)
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_HOST,
@@ -44,8 +37,6 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
-import homeassistant.util.color as color_util
 
 from . import (
     TEST_AUTH_NOT_REQUIRED_RESP,
@@ -62,19 +53,13 @@
     TEST_INSTANCE_3,
     TEST_PORT,
     TEST_PRIORITY,
-    TEST_PRIORITY_LIGHT_ENTITY_ID_1,
     TEST_SYSINFO_ID,
     add_test_config_entry,
     call_registered_callback,
     create_mock_client,
-    register_test_entity,
     setup_test_config_entry,
 )
 
-from tests.common import async_fire_time_changed
-
-COLOR_BLACK = color_util.COLORS["black"]
-
 
 def _get_config_entry_from_unique_id(
     hass: HomeAssistant, unique_id: str
@@ -247,6 +232,7 @@ async def test_setup_config_entry_dynamic_instances(hass: HomeAssistant) -> None
 async def test_light_basic_properties(hass: HomeAssistant) -> None:
     """Test the basic properties."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -257,8 +243,8 @@ async def test_light_basic_properties(hass: HomeAssistant) -> None:
     assert entity_state.attributes["icon"] == hyperion_light.ICON_LIGHTBULB
     assert entity_state.attributes["effect"] == hyperion_light.KEY_EFFECT_SOLID
 
-    # By default the effect list is the 3 external sources + 'Solid'.
-    assert len(entity_state.attributes["effect_list"]) == 4
+    # By default the effect list contains only 'Solid'.
+    assert len(entity_state.attributes["effect_list"]) == 1
 
     assert entity_state.attributes["color_mode"] == ColorMode.HS
     assert entity_state.attributes["supported_color_modes"] == [ColorMode.HS]
@@ -268,6 +254,7 @@ async def test_light_basic_properties(hass: HomeAssistant) -> None:
 async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     """Test turning the light on."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     # On (=), 100% (=), solid (=), [255,255,255] (=)
@@ -345,10 +332,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     )
 
     # Simulate a state callback from Hyperion.
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 255, 255)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 255, 255)},
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -385,54 +375,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     assert entity_state
     assert entity_state.attributes["brightness"] == brightness
 
-    # On (=), 100% (=), "USB Capture (!), [0,255,255] (=)
-    component = "V4L"
-    effect = const.KEY_COMPONENTID_TO_NAME[component]
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=True)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: effect},
-        blocking=True,
-    )
-
-    assert client.async_send_clear.call_args == call(
-        **{const.KEY_PRIORITY: TEST_PRIORITY}
-    )
-    assert client.async_send_set_component.call_args_list == [
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[0],
-                    const.KEY_STATE: False,
-                }
-            }
-        ),
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[1],
-                    const.KEY_STATE: False,
-                }
-            }
-        ),
-        call(
-            **{
-                const.KEY_COMPONENTSTATE: {
-                    const.KEY_COMPONENT: const.KEY_COMPONENTID_EXTERNAL_SOURCES[2],
-                    const.KEY_STATE: True,
-                }
-            }
-        ),
-    ]
-    client.visible_priority = {const.KEY_COMPONENTID: component}
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_EXTERNAL_SOURCE
-    assert entity_state.attributes["effect"] == effect
-
     # On (=), 100% (=), "Warm Blobs" (!), [0,255,255] (=)
     effect = "Warm Blobs"
     client.async_send_clear = AsyncMock(return_value=True)
@@ -445,9 +387,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
         blocking=True,
     )
 
-    assert client.async_send_clear.call_args == call(
-        **{const.KEY_PRIORITY: TEST_PRIORITY}
-    )
     assert client.async_send_set_effect.call_args == call(
         **{
             const.KEY_PRIORITY: TEST_PRIORITY,
@@ -455,10 +394,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
             const.KEY_ORIGIN: DEFAULT_ORIGIN,
         }
     )
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
-        const.KEY_OWNER: effect,
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
+            const.KEY_OWNER: effect,
+        }
+    ]
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -484,10 +426,13 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
         }
     )
     # Simulate a state callback from Hyperion.
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 0, 255)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 0, 255)},
+        }
+    ]
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -509,82 +454,6 @@ async def test_light_async_turn_on(hass: HomeAssistant) -> None:
     assert not client.async_send_set_effect.called
 
 
-async def test_light_async_turn_on_fail_async_send_set_component(
-    hass: HomeAssistant,
-) -> None:
-    """Test set_component failure when turning the light on."""
-    client = create_mock_client()
-    client.async_send_set_component = AsyncMock(return_value=False)
-    client.is_on = Mock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: TEST_ENTITY_ID_1}, blocking=True
-    )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "ALL", "state": True}
-    )
-
-
-async def test_light_async_turn_on_fail_async_send_set_component_source(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_set_component failure when selecting the source."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=False)
-    client.is_on = Mock(return_value=True)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {
-            ATTR_ENTITY_ID: TEST_ENTITY_ID_1,
-            ATTR_EFFECT: const.KEY_COMPONENTID_TO_NAME["V4L"],
-        },
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "BOBLIGHTSERVER", "state": False}
-    )
-
-
-async def test_light_async_turn_on_fail_async_send_clear_source(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning the light on."""
-    client = create_mock_client()
-    client.is_on = Mock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {
-            ATTR_ENTITY_ID: TEST_ENTITY_ID_1,
-            ATTR_EFFECT: const.KEY_COMPONENTID_TO_NAME["V4L"],
-        },
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
-
-
-async def test_light_async_turn_on_fail_async_send_clear_effect(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning on an effect."""
-    client = create_mock_client()
-    client.is_on = Mock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=False)
-    await setup_test_config_entry(hass, hyperion_client=client)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: "Warm Mood Blobs"},
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
-
-
 async def test_light_async_turn_on_fail_async_send_set_effect(
     hass: HomeAssistant,
 ) -> None:
@@ -625,12 +494,12 @@ async def test_light_async_turn_on_fail_async_send_set_color(
     )
 
 
-async def test_light_async_turn_off_fail_async_send_set_component(
+async def test_light_async_turn_off_fail_async_send_send_clear(
     hass: HomeAssistant,
 ) -> None:
-    """Test async_send_set_component failure when turning off the light."""
+    """Test async_send_clear failure when turning off the light."""
     client = create_mock_client()
-    client.async_send_set_component = AsyncMock(return_value=False)
+    client.async_send_clear = AsyncMock(return_value=False)
     await setup_test_config_entry(hass, hyperion_client=client)
 
     await hass.services.async_call(
@@ -639,30 +508,7 @@ async def test_light_async_turn_off_fail_async_send_set_component(
         {ATTR_ENTITY_ID: TEST_ENTITY_ID_1},
         blocking=True,
     )
-    assert client.method_calls[-1] == call.async_send_set_component(
-        componentstate={"component": "LEDDEVICE", "state": False}
-    )
-
-
-async def test_priority_light_async_turn_off_fail_async_send_clear(
-    hass: HomeAssistant,
-) -> None:
-    """Test async_send_clear failure when turning off a priority light."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=False)
-    with patch(
-        "homeassistant.components.hyperion.light.HyperionPriorityLight.entity_registry_enabled_default"
-    ) as enabled_by_default_mock:
-        enabled_by_default_mock.return_value = True
-        await setup_test_config_entry(hass, hyperion_client=client)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-    assert client.method_calls[-1] == call.async_send_clear(priority=180)
+    assert client.method_calls[-1] == call.async_send_clear(priority=TEST_PRIORITY)
 
 
 async def test_light_async_turn_off(hass: HomeAssistant) -> None:
@@ -670,7 +516,7 @@ async def test_light_async_turn_off(hass: HomeAssistant) -> None:
     client = create_mock_client()
     await setup_test_config_entry(hass, hyperion_client=client)
 
-    client.async_send_set_component = AsyncMock(return_value=True)
+    client.async_send_clear = AsyncMock(return_value=True)
     await hass.services.async_call(
         LIGHT_DOMAIN,
         SERVICE_TURN_OFF,
@@ -678,40 +524,18 @@ async def test_light_async_turn_off(hass: HomeAssistant) -> None:
         blocking=True,
     )
 
-    assert client.async_send_set_component.call_args == call(
-        **{
-            const.KEY_COMPONENTSTATE: {
-                const.KEY_COMPONENT: const.KEY_COMPONENTID_LEDDEVICE,
-                const.KEY_STATE: False,
-            }
-        }
-    )
-
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_LIGHTBULB
-
-    # No calls if no state loaded.
-    client.has_loaded_state = False
-    client.async_send_set_component = AsyncMock(return_value=True)
-    call_registered_callback(client, "client-update", {"loaded-state": False})
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_ENTITY_ID_1},
-        blocking=True,
+    assert client.async_send_clear.called
+    assert client.async_send_clear.call_args == call(
+        **{const.KEY_PRIORITY: TEST_PRIORITY}
     )
 
-    assert not client.async_send_set_component.called
-
 
 async def test_light_async_updates_from_hyperion_client(
     hass: HomeAssistant,
 ) -> None:
     """Test receiving a variety of Hyperion client callbacks."""
     client = create_mock_client()
+    client.priorities = [{const.KEY_PRIORITY: TEST_PRIORITY}]
     await setup_test_config_entry(hass, hyperion_client=client)
 
     # Bright change gets accepted.
@@ -720,6 +544,7 @@ async def test_light_async_updates_from_hyperion_client(
     call_registered_callback(client, "adjustment-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
+    assert entity_state.state == "on"
     assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
 
     # Broken brightness value is ignored.
@@ -728,40 +553,18 @@ async def test_light_async_updates_from_hyperion_client(
     call_registered_callback(client, "adjustment-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
-    assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
-
-    # Update components.
-    client.is_on.return_value = True
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
     assert entity_state.state == "on"
-
-    client.is_on.return_value = False
-    call_registered_callback(client, "components-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Update priorities (V4L)
-    client.is_on.return_value = True
-    client.visible_priority = {const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L}
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["icon"] == hyperion_light.ICON_EXTERNAL_SOURCE
-    assert entity_state.attributes["hs_color"] == (0.0, 0.0)
-    assert (
-        entity_state.attributes["effect"]
-        == const.KEY_COMPONENTID_TO_NAME[const.KEY_COMPONENTID_V4L]
-    )
+    assert entity_state.attributes["brightness"] == round(255 * (brightness / 100.0))
 
     # Update priorities (Effect)
     effect = "foo"
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
-        const.KEY_OWNER: effect,
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_EFFECT,
+            const.KEY_OWNER: effect,
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -772,10 +575,13 @@ async def test_light_async_updates_from_hyperion_client(
 
     # Update priorities (Color)
     rgb = (0, 100, 100)
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: rgb},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: rgb},
+        }
+    ]
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -785,7 +591,7 @@ async def test_light_async_updates_from_hyperion_client(
     assert entity_state.attributes["hs_color"] == (180.0, 100.0)
 
     # Update priorities (None)
-    client.visible_priority = None
+    client.priorities = []
 
     call_registered_callback(client, "priorities-update")
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
@@ -800,12 +606,7 @@ async def test_light_async_updates_from_hyperion_client(
     assert entity_state
     assert entity_state.attributes["effect_list"] == [
         hyperion_light.KEY_EFFECT_SOLID
-    ] + [
-        const.KEY_COMPONENTID_TO_NAME[component]
-        for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES
-    ] + [
-        effect[const.KEY_NAME] for effect in effects
-    ]
+    ] + [effect[const.KEY_NAME] for effect in effects]
 
     # Update connection status (e.g. disconnection).
 
@@ -818,10 +619,13 @@ async def test_light_async_updates_from_hyperion_client(
 
     # Update connection status (e.g. re-connection)
     client.has_loaded_state = True
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: rgb},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: rgb},
+        }
+    ]
     call_registered_callback(client, "client-update", {"loaded-state": True})
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
@@ -835,10 +639,13 @@ async def test_full_state_loaded_on_start(hass: HomeAssistant) -> None:
     # Update full state (should call all update methods).
     brightness = 25
     client.adjustment = [{const.KEY_BRIGHTNESS: brightness}]
-    client.visible_priority = {
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (0, 100, 100)},
-    }
+    client.priorities = [
+        {
+            const.KEY_PRIORITY: TEST_PRIORITY,
+            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
+            const.KEY_VALUE: {const.KEY_RGB: (0, 100, 100)},
+        }
+    ]
     client.effects = [{const.KEY_NAME: "One"}, {const.KEY_NAME: "Two"}]
 
     await setup_test_config_entry(hass, hyperion_client=client)
@@ -940,358 +747,6 @@ async def test_setup_entry_bad_token_reauth(hass: HomeAssistant) -> None:
         assert config_entry.state is ConfigEntryState.SETUP_ERROR
 
 
-async def test_priority_light_async_updates(
-    hass: HomeAssistant,
-) -> None:
-    """Test receiving a variety of Hyperion client callbacks to a HyperionPriorityLight."""
-    priority_template = {
-        const.KEY_ACTIVE: True,
-        const.KEY_VISIBLE: True,
-        const.KEY_PRIORITY: TEST_PRIORITY,
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-        const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-    }
-
-    client = create_mock_client()
-    client.priorities = [{**priority_template}]
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    # == Scenario: Color at HA priority will show light as on.
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == (0.0, 0.0)
-
-    # == Scenario: Color going to black shows the light as off.
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: Lower priority than HA priority should have no impact on what HA
-    # shows when the HA priority is present.
-    client.priorities = [
-        {**priority_template, const.KEY_PRIORITY: TEST_PRIORITY - 1},
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: Fresh color at HA priority should turn HA entity on (even though
-    # there's a lower priority enabled/visible in Hyperion).
-    client.priorities = [
-        {**priority_template, const.KEY_PRIORITY: TEST_PRIORITY - 1},
-        {
-            **priority_template,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == (240.0, 33.333)
-
-    # == Scenario: V4L at a higher priority, with no other HA priority at all, should
-    # have no effect.
-
-    # Emulate HA turning the light off with black at the HA priority.
-    client.priorities = []
-    client.visible_priority = None
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Emulate V4L turning on.
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_PRIORITY: 240,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-        },
-    ]
-    client.visible_priority = client.priorities[0]
-
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A lower priority input (lower priority than HA) should have no effect.
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VISIBLE: True,
-            const.KEY_PRIORITY: TEST_PRIORITY - 1,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (255, 0, 0)},
-        },
-        {
-            **priority_template,
-            const.KEY_PRIORITY: 240,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_V4L,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 150)},
-            const.KEY_VISIBLE: False,
-        },
-    ]
-
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A non-active priority is ignored.
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: False,
-            const.KEY_VISIBLE: False,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-    client.visible_priority = None
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # == Scenario: A priority with no ... priority ... is ignored.
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: True,
-            const.KEY_VISIBLE: True,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-    client.visible_priority = None
-    call_registered_callback(client, "priorities-update")
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-
-async def test_priority_light_async_updates_off_sets_black(
-    hass: HomeAssistant,
-) -> None:
-    """Test turning the HyperionPriorityLight off."""
-    client = create_mock_client()
-    client.priorities = [
-        {
-            const.KEY_ACTIVE: True,
-            const.KEY_VISIBLE: True,
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-            const.KEY_VALUE: {const.KEY_RGB: (100, 100, 100)},
-        }
-    ]
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_color = AsyncMock(return_value=True)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_clear.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-        }
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: COLOR_BLACK,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-
-async def test_priority_light_prior_color_preserved_after_black(
-    hass: HomeAssistant,
-) -> None:
-    """Test that color is preserved in an on->off->on cycle for a HyperionPriorityLight.
-
-    For a HyperionPriorityLight the color black is used to indicate off. This test
-    ensures that a cycle through 'off' will preserve the original color.
-    """
-    priority_template = {
-        const.KEY_ACTIVE: True,
-        const.KEY_VISIBLE: True,
-        const.KEY_PRIORITY: TEST_PRIORITY,
-        const.KEY_COMPONENTID: const.KEY_COMPONENTID_COLOR,
-    }
-
-    client = create_mock_client()
-    client.async_send_set_color = AsyncMock(return_value=True)
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.priorities = []
-    client.visible_priority = None
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    # Turn the light on full green...
-    # On (=), 100% (=), solid (=), [0,0,255] (=)
-    hs_color = (240.0, 100.0)
-    rgb_color = (0, 0, 255)
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1, ATTR_HS_COLOR: hs_color},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: rgb_color,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: rgb_color},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == hs_color
-
-    # Then turn it off.
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_OFF,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: COLOR_BLACK,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: COLOR_BLACK},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "off"
-
-    # Then turn it back on and ensure it's still green.
-    # On (=), 100% (=), solid (=), [0,0,255] (=)
-    await hass.services.async_call(
-        LIGHT_DOMAIN,
-        SERVICE_TURN_ON,
-        {ATTR_ENTITY_ID: TEST_PRIORITY_LIGHT_ENTITY_ID_1},
-        blocking=True,
-    )
-
-    assert client.async_send_set_color.call_args == call(
-        **{
-            const.KEY_PRIORITY: TEST_PRIORITY,
-            const.KEY_COLOR: rgb_color,
-            const.KEY_ORIGIN: DEFAULT_ORIGIN,
-        }
-    )
-
-    client.priorities = [
-        {
-            **priority_template,
-            const.KEY_VALUE: {const.KEY_RGB: rgb_color},
-        }
-    ]
-    client.visible_priority = client.priorities[0]
-    call_registered_callback(client, "priorities-update")
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.state == "on"
-    assert entity_state.attributes["hs_color"] == hs_color
-
-
-async def test_priority_light_has_no_external_sources(hass: HomeAssistant) -> None:
-    """Ensure a HyperionPriorityLight does not list external sources."""
-    client = create_mock_client()
-    client.priorities = []
-
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-    assert entity_state.attributes["effect_list"] == [hyperion_light.KEY_EFFECT_SOLID]
-
-
 async def test_light_option_effect_hide_list(hass: HomeAssistant) -> None:
     """Test the effect_hide_list option."""
     client = create_mock_client()
@@ -1300,15 +755,13 @@ async def test_light_option_effect_hide_list(hass: HomeAssistant) -> None:
     await setup_test_config_entry(
         hass,
         hyperion_client=client,
-        options={CONF_EFFECT_HIDE_LIST: ["Two", "USB Capture"]},
+        options={CONF_EFFECT_HIDE_LIST: ["Two", "Three"]},
     )
 
     entity_state = hass.states.get(TEST_ENTITY_ID_1)
     assert entity_state
     assert entity_state.attributes["effect_list"] == [
         "Solid",
-        "Boblight Server",
-        "Platform Capture",
         "One",
     ]
 
@@ -1317,12 +770,6 @@ async def test_device_info(hass: HomeAssistant) -> None:
     """Verify device information includes expected details."""
     client = create_mock_client()
 
-    register_test_entity(
-        hass,
-        LIGHT_DOMAIN,
-        TYPE_HYPERION_PRIORITY_LIGHT,
-        TEST_PRIORITY_LIGHT_ENTITY_ID_1,
-    )
     await setup_test_config_entry(hass, hyperion_client=client)
 
     device_id = get_hyperion_device_id(TEST_SYSINFO_ID, TEST_INSTANCE)
@@ -1341,82 +788,4 @@ async def test_device_info(hass: HomeAssistant) -> None:
         entry.entity_id
         for entry in er.async_entries_for_device(entity_registry, device.id)
     ]
-    assert TEST_PRIORITY_LIGHT_ENTITY_ID_1 in entities_from_device
     assert TEST_ENTITY_ID_1 in entities_from_device
-
-
-async def test_lights_can_be_enabled(hass: HomeAssistant) -> None:
-    """Verify lights can be enabled."""
-    client = create_mock_client()
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    entity_registry = er.async_get(hass)
-    entry = entity_registry.async_get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entry
-    assert entry.disabled
-    assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert not entity_state
-
-    with patch(
-        "homeassistant.components.hyperion.client.HyperionClient",
-        return_value=client,
-    ):
-        updated_entry = entity_registry.async_update_entity(
-            TEST_PRIORITY_LIGHT_ENTITY_ID_1, disabled_by=None
-        )
-        assert not updated_entry.disabled
-        await hass.async_block_till_done()
-
-        async_fire_time_changed(
-            hass,
-            dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
-        )
-        await hass.async_block_till_done()
-
-    entity_state = hass.states.get(TEST_PRIORITY_LIGHT_ENTITY_ID_1)
-    assert entity_state
-
-
-async def test_deprecated_effect_names(
-    caplog: pytest.LogCaptureFixture, hass: HomeAssistant
-) -> None:
-    """Test deprecated effects function and issue a warning."""
-    client = create_mock_client()
-    client.async_send_clear = AsyncMock(return_value=True)
-    client.async_send_set_component = AsyncMock(return_value=True)
-
-    await setup_test_config_entry(hass, hyperion_client=client)
-
-    for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-        await hass.services.async_call(
-            LIGHT_DOMAIN,
-            SERVICE_TURN_ON,
-            {ATTR_ENTITY_ID: TEST_ENTITY_ID_1, ATTR_EFFECT: component},
-            blocking=True,
-        )
-        assert f"Use of Hyperion effect '{component}' is deprecated" in caplog.text
-
-        # Simulate a state callback from Hyperion.
-        client.visible_priority = {
-            const.KEY_COMPONENTID: component,
-        }
-        call_registered_callback(client, "priorities-update")
-
-        entity_state = hass.states.get(TEST_ENTITY_ID_1)
-        assert entity_state
-        assert (
-            entity_state.attributes["effect"]
-            == const.KEY_COMPONENTID_TO_NAME[component]
-        )
-
-
-async def test_deprecated_effect_names_not_in_effect_list(
-    hass: HomeAssistant,
-) -> None:
-    """Test deprecated effects are not in shown effect list."""
-    await setup_test_config_entry(hass)
-    entity_state = hass.states.get(TEST_ENTITY_ID_1)
-    assert entity_state
-    for component in const.KEY_COMPONENTID_EXTERNAL_SOURCES:
-        assert component not in entity_state.attributes["effect_list"]
diff --git a/tests/components/hyperion/test_switch.py b/tests/components/hyperion/test_switch.py
index cd1dbdcda5be0d..49338c72c5d023 100644
--- a/tests/components/hyperion/test_switch.py
+++ b/tests/components/hyperion/test_switch.py
@@ -22,7 +22,7 @@
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt, slugify
+from homeassistant.util import dt as dt_util, slugify
 
 from . import (
     TEST_CONFIG_ENTRY_ID,
@@ -215,7 +215,7 @@ async def test_switches_can_be_enabled(hass: HomeAssistant) -> None:
 
             async_fire_time_changed(
                 hass,
-                dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+                dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
             )
             await hass.async_block_till_done()
 
diff --git a/tests/components/ibeacon/test_sensor.py b/tests/components/ibeacon/test_sensor.py
index fbe8d4b523693b..30a50305d2da27 100644
--- a/tests/components/ibeacon/test_sensor.py
+++ b/tests/components/ibeacon/test_sensor.py
@@ -56,7 +56,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "2"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -70,7 +70,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "0"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -97,7 +97,7 @@ async def test_sensors_updates_fixed_mac_address(hass: HomeAssistant) -> None:
     assert distance_sensor.state == "14"
     assert (
         distance_attributes[ATTR_FRIENDLY_NAME]
-        == "BlueCharm_177999 8105 Estimated Distance"
+        == "BlueCharm_177999 8105 Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -204,7 +204,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "400"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -217,7 +217,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "0"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -230,7 +230,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "400"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
@@ -239,7 +239,7 @@ async def test_multiple_uuids_same_beacon(hass: HomeAssistant) -> None:
     distance_attributes = distance_sensor.attributes
     assert distance_sensor.state == "0"
     assert (
-        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated Distance"
+        distance_attributes[ATTR_FRIENDLY_NAME] == "FSC-BP108 EEFF Estimated distance"
     )
     assert distance_attributes[ATTR_UNIT_OF_MEASUREMENT] == "m"
     assert distance_attributes[ATTR_STATE_CLASS] == "measurement"
diff --git a/tests/components/image/__init__.py b/tests/components/image/__init__.py
new file mode 100644
index 00000000000000..eacf56cc206524
--- /dev/null
+++ b/tests/components/image/__init__.py
@@ -0,0 +1 @@
+"""The tests for the image integration."""
diff --git a/tests/components/image/conftest.py b/tests/components/image/conftest.py
new file mode 100644
index 00000000000000..6c9deea852f470
--- /dev/null
+++ b/tests/components/image/conftest.py
@@ -0,0 +1,190 @@
+"""Test helpers for image."""
+from collections.abc import Generator
+
+import pytest
+
+from homeassistant.components import image
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
+
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+)
+
+TEST_DOMAIN = "test"
+
+
+class MockImageEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageEntityInvalidContentType(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time and assign and incorrect content type."""
+        self._attr_content_type = "text/json"
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockURLImageEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_image_url = "https://example.com/myimage.jpg"
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+
+class MockImageNoStateEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageSyncEntity(image.ImageEntity):
+    """Mock image entity."""
+
+    _attr_name = "Test"
+
+    async def async_added_to_hass(self):
+        """Set the update time."""
+        self._attr_image_last_updated = dt_util.utcnow()
+
+    def image(self) -> bytes | None:
+        """Return bytes of image."""
+        return b"Test"
+
+
+class MockImageConfigEntry:
+    """A mock image config entry."""
+
+    def __init__(self, entities: list[image.ImageEntity]) -> None:
+        """Initialize."""
+        self._entities = entities
+
+    async def async_setup_entry(
+        self,
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test image platform via config entry."""
+        async_add_entities([self._entities])
+
+
+class MockImagePlatform:
+    """A mock image platform."""
+
+    PLATFORM_SCHEMA = image.PLATFORM_SCHEMA
+
+    def __init__(self, entities: list[image.ImageEntity]) -> None:
+        """Initialize."""
+        self._entities = entities
+
+    async def async_setup_platform(
+        self,
+        hass: HomeAssistant,
+        config: ConfigType,
+        async_add_entities: AddEntitiesCallback,
+        discovery_info: DiscoveryInfoType | None = None,
+    ) -> None:
+        """Set up the mock image platform."""
+        async_add_entities(self._entities)
+
+
+@pytest.fixture(name="config_flow")
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+
+    class MockFlow(ConfigFlow):
+        """Test flow."""
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+@pytest.fixture(name="mock_image_config_entry")
+async def mock_image_config_entry_fixture(
+    hass: HomeAssistant, config_flow: None
+) -> ConfigEntry:
+    """Initialize a mock image config_entry."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, image.DOMAIN)
+        return True
+
+    async def async_unload_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Unload test config entry."""
+        await hass.config_entries.async_forward_entry_unload(config_entry, image.DOMAIN)
+        return True
+
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+            async_unload_entry=async_unload_entry_init,
+        ),
+    )
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{image.DOMAIN}",
+        MockImageConfigEntry(MockImageEntity(hass)),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    return config_entry
+
+
+@pytest.fixture(name="mock_image_platform")
+async def mock_image_platform_fixture(hass: HomeAssistant) -> None:
+    """Initialize a mock image platform."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
diff --git a/tests/components/image/test_init.py b/tests/components/image/test_init.py
new file mode 100644
index 00000000000000..0950d6f42e5ee9
--- /dev/null
+++ b/tests/components/image/test_init.py
@@ -0,0 +1,289 @@
+"""The tests for the image component."""
+from http import HTTPStatus
+import ssl
+from unittest.mock import MagicMock, patch
+
+from aiohttp import hdrs
+import httpx
+import pytest
+import respx
+
+from homeassistant.components import image
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from .conftest import (
+    MockImageEntity,
+    MockImageEntityInvalidContentType,
+    MockImageNoStateEntity,
+    MockImagePlatform,
+    MockImageSyncEntity,
+    MockURLImageEntity,
+)
+
+from tests.common import MockModule, mock_integration, mock_platform
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_state(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test image state."""
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_config_entry(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_image_config_entry: ConfigEntry,
+) -> None:
+    """Test setting up an image platform from a config entry."""
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_state_attr(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test image state with entity picture from attr."""
+    mock_integration(hass, MockModule(domain="test"))
+    entity = MockImageEntity(hass)
+    entity._attr_entity_picture = "abcd"
+    mock_platform(hass, "test.image", MockImagePlatform([entity]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": "abcd",
+        "friendly_name": "Test",
+    }
+
+
+async def test_no_state(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test image state."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageNoStateEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "unknown"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+
+async def test_no_valid_content_type(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test invalid content type."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(
+        hass, "test.image", MockImagePlatform([MockImageEntityInvalidContentType(hass)])
+    )
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    state = hass.states.get("image.test")
+    # assert state.state == "unknown"
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+    resp = await client.get(f"/api/image_proxy/image.test?token={access_token}")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+async def test_fetch_image_authenticated(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+    resp = await client.get("/api/image_proxy/image.unknown")
+    assert resp.status == HTTPStatus.NOT_FOUND
+
+
+async def test_fetch_image_fail(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, mock_image_platform: None
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    with patch.object(MockImageEntity, "async_image", side_effect=TimeoutError):
+        resp = await client.get("/api/image_proxy/image.test")
+        assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+async def test_fetch_image_sync(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockImageSyncEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+
+async def test_fetch_image_unauthenticated(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mock_image_platform: None,
+) -> None:
+    """Test fetching an image with an unauthenticated client."""
+    client = await hass_client_no_auth()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.FORBIDDEN
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.FORBIDDEN
+
+    resp = await client.get(
+        "/api/image_proxy/image.test", headers={hdrs.AUTHORIZATION: "blabla"}
+    )
+    assert resp.status == HTTPStatus.UNAUTHORIZED
+
+    state = hass.states.get("image.test")
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+    resp = await client.get("/api/image_proxy/image.unknown")
+    assert resp.status == HTTPStatus.NOT_FOUND
+
+
+@respx.mock
+async def test_fetch_image_url_success(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"Test"
+    )
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"Test"
+
+
+@respx.mock
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        httpx.RequestError("server offline", request=MagicMock()),
+        httpx.TimeoutException,
+        ssl.SSLError,
+    ],
+)
+async def test_fetch_image_url_exception(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    side_effect: Exception,
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").mock(side_effect=side_effect)
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+@respx.mock
+@pytest.mark.parametrize(
+    "content_type",
+    [
+        None,
+        "text/plain",
+    ],
+)
+async def test_fetch_image_url_wrong_content_type(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    content_type: str | None,
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    respx.get("https://example.com/myimage.jpg").respond(
+        status_code=HTTPStatus.OK, content_type=content_type, content=b"Test"
+    )
+
+    mock_integration(hass, MockModule(domain="test"))
+    mock_platform(hass, "test.image", MockImagePlatform([MockURLImageEntity(hass)]))
+    assert await async_setup_component(
+        hass, image.DOMAIN, {"image": {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+
+    resp = await client.get("/api/image_proxy/image.test")
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
diff --git a/tests/components/image/test_recorder.py b/tests/components/image/test_recorder.py
new file mode 100644
index 00000000000000..f0ecc43e6dcc85
--- /dev/null
+++ b/tests/components/image/test_recorder.py
@@ -0,0 +1,40 @@
+"""The tests for image recorder."""
+from __future__ import annotations
+
+from datetime import timedelta
+
+from homeassistant.components.recorder import Recorder
+from homeassistant.components.recorder.history import get_significant_states
+from homeassistant.const import (
+    ATTR_ATTRIBUTION,
+    ATTR_ENTITY_PICTURE,
+    ATTR_FRIENDLY_NAME,
+    ATTR_SUPPORTED_FEATURES,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_time_changed
+from tests.components.recorder.common import async_wait_recording_done
+
+
+async def test_exclude_attributes(
+    recorder_mock: Recorder, hass: HomeAssistant, mock_image_platform
+) -> None:
+    """Test camera registered attributes to be excluded."""
+    now = dt_util.utcnow()
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5))
+    await hass.async_block_till_done()
+    await async_wait_recording_done(hass)
+
+    states = await hass.async_add_executor_job(
+        get_significant_states, hass, now, None, hass.states.async_entity_ids()
+    )
+    assert len(states) == 1
+    for entity_states in states.values():
+        for state in entity_states:
+            assert "access_token" not in state.attributes
+            assert ATTR_ENTITY_PICTURE not in state.attributes
+            assert ATTR_ATTRIBUTION not in state.attributes
+            assert ATTR_SUPPORTED_FEATURES not in state.attributes
+            assert ATTR_FRIENDLY_NAME in state.attributes
diff --git a/tests/components/image_upload/test_init.py b/tests/components/image_upload/test_init.py
index 0764b34ee60629..486f98e92c2349 100644
--- a/tests/components/image_upload/test_init.py
+++ b/tests/components/image_upload/test_init.py
@@ -8,7 +8,7 @@
 from homeassistant.components.websocket_api import const as ws_const
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt as util_dt
+from homeassistant.util import dt as dt_util
 
 from . import TEST_IMAGE
 
@@ -21,7 +21,7 @@ async def test_upload_image(
     hass_ws_client: WebSocketGenerator,
 ) -> None:
     """Test we can upload an image."""
-    now = util_dt.utcnow()
+    now = dt_util.utcnow()
 
     with tempfile.TemporaryDirectory() as tempdir, patch.object(
         hass.config, "path", return_value=tempdir
diff --git a/tests/components/imap/const.py b/tests/components/imap/const.py
index 7c774527b31b53..e7fca106ff76cc 100644
--- a/tests/components/imap/const.py
+++ b/tests/components/imap/const.py
@@ -3,7 +3,10 @@
 
 DATE_HEADER1 = b"Date: Fri, 24 Mar 2023 13:52:00 +0100\r\n"
 DATE_HEADER2 = b"Date: Fri, 24 Mar 2023 13:52:00 +0100 (CET)\r\n"
-DATE_HEADER_INVALID = b"2023-03-27T13:52:00 +0100\r\n"
+DATE_HEADER3 = b"Date: 24 Mar 2023 13:52:00 +0100\r\n"
+DATE_HEADER_INVALID1 = b"2023-03-27T13:52:00 +0100\r\n"
+DATE_HEADER_INVALID2 = b"Date: 2023-03-27T13:52:00 +0100\r\n"
+DATE_HEADER_INVALID3 = b"Date: Fri, 2023-03-27T13:52:00 +0100\r\n"
 
 TEST_MESSAGE_HEADERS1 = (
     b"Return-Path: <john.doe@example.com>\r\nDelivered-To: notify@example.com\r\n"
@@ -21,11 +24,24 @@
     b"Subject: Test subject\r\n"
 )
 
+TEST_MESSAGE_HEADERS3 = b""
+
 TEST_MESSAGE = TEST_MESSAGE_HEADERS1 + DATE_HEADER1 + TEST_MESSAGE_HEADERS2
+TEST_MESSAGE_NO_SUBJECT_TO_FROM = (
+    TEST_MESSAGE_HEADERS1 + DATE_HEADER1 + TEST_MESSAGE_HEADERS3
+)
 TEST_MESSAGE_ALT = TEST_MESSAGE_HEADERS1 + DATE_HEADER2 + TEST_MESSAGE_HEADERS2
-TEST_INVALID_DATE = TEST_MESSAGE_HEADERS1 + DATE_HEADER_INVALID + TEST_MESSAGE_HEADERS2
+TEST_INVALID_DATE1 = (
+    TEST_MESSAGE_HEADERS1 + DATE_HEADER_INVALID1 + TEST_MESSAGE_HEADERS2
+)
+TEST_INVALID_DATE2 = (
+    TEST_MESSAGE_HEADERS1 + DATE_HEADER_INVALID2 + TEST_MESSAGE_HEADERS2
+)
+TEST_INVALID_DATE3 = (
+    TEST_MESSAGE_HEADERS1 + DATE_HEADER_INVALID3 + TEST_MESSAGE_HEADERS2
+)
 
-TEST_CONTENT_TEXT_BARE = b"\r\n" b"Test body\r\n" b"\r\n"
+TEST_CONTENT_TEXT_BARE = b"\r\nTest body\r\n\r\n"
 
 TEST_CONTENT_BINARY = (
     b"Content-Type: application/binary\r\n"
@@ -110,13 +126,35 @@
     ],
 )
 
-TEST_FETCH_RESPONSE_INVALID_DATE = (
+TEST_FETCH_RESPONSE_INVALID_DATE1 = (
+    "OK",
+    [
+        b"1 FETCH (BODY[] {"
+        + str(len(TEST_INVALID_DATE1 + TEST_CONTENT_TEXT_PLAIN)).encode("utf-8")
+        + b"}",
+        bytearray(TEST_INVALID_DATE1 + TEST_CONTENT_TEXT_PLAIN),
+        b")",
+        b"Fetch completed (0.0001 + 0.000 secs).",
+    ],
+)
+TEST_FETCH_RESPONSE_INVALID_DATE2 = (
     "OK",
     [
         b"1 FETCH (BODY[] {"
-        + str(len(TEST_INVALID_DATE + TEST_CONTENT_TEXT_PLAIN)).encode("utf-8")
+        + str(len(TEST_INVALID_DATE2 + TEST_CONTENT_TEXT_PLAIN)).encode("utf-8")
         + b"}",
-        bytearray(TEST_INVALID_DATE + TEST_CONTENT_TEXT_PLAIN),
+        bytearray(TEST_INVALID_DATE2 + TEST_CONTENT_TEXT_PLAIN),
+        b")",
+        b"Fetch completed (0.0001 + 0.000 secs).",
+    ],
+)
+TEST_FETCH_RESPONSE_INVALID_DATE3 = (
+    "OK",
+    [
+        b"1 FETCH (BODY[] {"
+        + str(len(TEST_INVALID_DATE3 + TEST_CONTENT_TEXT_PLAIN)).encode("utf-8")
+        + b"}",
+        bytearray(TEST_INVALID_DATE3 + TEST_CONTENT_TEXT_PLAIN),
         b")",
         b"Fetch completed (0.0001 + 0.000 secs).",
     ],
@@ -171,4 +209,19 @@
     ],
 )
 
+
+TEST_FETCH_RESPONSE_NO_SUBJECT_TO_FROM = (
+    "OK",
+    [
+        b"1 FETCH (BODY[] {"
+        + str(len(TEST_MESSAGE_NO_SUBJECT_TO_FROM + TEST_CONTENT_TEXT_PLAIN)).encode(
+            "utf-8"
+        )
+        + b"}",
+        bytearray(TEST_MESSAGE_NO_SUBJECT_TO_FROM + TEST_CONTENT_TEXT_PLAIN),
+        b")",
+        b"Fetch completed (0.0001 + 0.000 secs).",
+    ],
+)
+
 RESPONSE_BAD = ("BAD", [])
diff --git a/tests/components/imap/test_config_flow.py b/tests/components/imap/test_config_flow.py
index b8242a87be843d..fb4347b08a7a27 100644
--- a/tests/components/imap/test_config_flow.py
+++ b/tests/components/imap/test_config_flow.py
@@ -404,6 +404,21 @@ async def test_key_options_in_options_form(hass: HomeAssistant) -> None:
         ({"max_message_size": "8192"}, data_entry_flow.FlowResultType.CREATE_ENTRY),
         ({"max_message_size": "1024"}, data_entry_flow.FlowResultType.FORM),
         ({"max_message_size": "65536"}, data_entry_flow.FlowResultType.FORM),
+        (
+            {"custom_event_data_template": "{{ subject }}"},
+            data_entry_flow.FlowResultType.CREATE_ENTRY,
+        ),
+        (
+            {"custom_event_data_template": "{{ invalid_syntax"},
+            data_entry_flow.FlowResultType.FORM,
+        ),
+    ],
+    ids=[
+        "valid_message_size",
+        "invalid_message_size_low",
+        "invalid_message_size_high",
+        "valid_template",
+        "invalid_template",
     ],
 )
 async def test_advanced_options_form(
@@ -438,9 +453,13 @@ async def test_advanced_options_form(
                 result["flow_id"], new_config
             )
             assert result2["type"] == assert_result
-            # Check if entry was updated
-            for key, value in new_config.items():
-                assert str(entry.data[key]) == value
+
+            if result2.get("errors") is not None:
+                assert assert_result == data_entry_flow.FlowResultType.FORM
+            else:
+                # Check if entry was updated
+                for key, value in new_config.items():
+                    assert str(entry.data[key]) == value
     except vol.MultipleInvalid:
         # Check if form was expected with these options
         assert assert_result == data_entry_flow.FlowResultType.FORM
@@ -514,12 +533,14 @@ async def test_import_flow_connection_error(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize("cipher_list", ["python_default", "modern", "intermediate"])
-async def test_config_flow_with_cipherlist(
-    hass: HomeAssistant, mock_setup_entry: AsyncMock, cipher_list: str
+@pytest.mark.parametrize("verify_ssl", [False, True])
+async def test_config_flow_with_cipherlist_and_ssl_verify(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, cipher_list: str, verify_ssl: True
 ) -> None:
-    """Test with alternate cipherlist."""
+    """Test with alternate cipherlist or disabled ssl verification."""
     config = MOCK_CONFIG.copy()
     config["ssl_cipher_list"] = cipher_list
+    config["verify_ssl"] = verify_ssl
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": config_entries.SOURCE_USER, "show_advanced_options": True},
@@ -543,3 +564,49 @@ async def test_config_flow_with_cipherlist(
     assert result2["title"] == "email@email.com"
     assert result2["data"] == config
     assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_config_flow_from_with_advanced_settings(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test if advanced settings show correctly."""
+    config = MOCK_CONFIG.copy()
+    config["ssl_cipher_list"] = "python_default"
+    config["verify_ssl"] = True
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER, "show_advanced_options": True},
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.imap.config_flow.connect_to_server",
+        side_effect=asyncio.TimeoutError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"], config
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"]["base"] == "cannot_connect"
+    assert "ssl_cipher_list" in result2["data_schema"].schema
+
+    config["ssl_cipher_list"] = "modern"
+    with patch(
+        "homeassistant.components.imap.config_flow.connect_to_server"
+    ) as mock_client:
+        mock_client.return_value.search.return_value = (
+            "OK",
+            [b""],
+        )
+        result3 = await hass.config_entries.flow.async_configure(
+            result2["flow_id"], config
+        )
+        await hass.async_block_till_done()
+
+    assert result3["type"] == FlowResultType.CREATE_ENTRY
+    assert result3["title"] == "email@email.com"
+    assert result3["data"] == config
+    assert len(mock_setup_entry.mock_calls) == 1
diff --git a/tests/components/imap/test_init.py b/tests/components/imap/test_init.py
index 26c0325a50c284..ff94942361431b 100644
--- a/tests/components/imap/test_init.py
+++ b/tests/components/imap/test_init.py
@@ -1,6 +1,6 @@
 """Test the imap entry initialization."""
 import asyncio
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -9,6 +9,7 @@
 
 from homeassistant.components.imap import DOMAIN
 from homeassistant.components.imap.errors import InvalidAuth, InvalidFolder
+from homeassistant.components.sensor.const import SensorStateClass
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.util.dt import utcnow
@@ -18,8 +19,11 @@
     EMPTY_SEARCH_RESPONSE,
     TEST_FETCH_RESPONSE_BINARY,
     TEST_FETCH_RESPONSE_HTML,
-    TEST_FETCH_RESPONSE_INVALID_DATE,
+    TEST_FETCH_RESPONSE_INVALID_DATE1,
+    TEST_FETCH_RESPONSE_INVALID_DATE2,
+    TEST_FETCH_RESPONSE_INVALID_DATE3,
     TEST_FETCH_RESPONSE_MULTIPART,
+    TEST_FETCH_RESPONSE_NO_SUBJECT_TO_FROM,
     TEST_FETCH_RESPONSE_TEXT_BARE,
     TEST_FETCH_RESPONSE_TEXT_OTHER,
     TEST_FETCH_RESPONSE_TEXT_PLAIN,
@@ -32,16 +36,28 @@
 
 
 @pytest.mark.parametrize(
-    "cipher_list", [None, "python_default", "modern", "intermediate"]
+    ("cipher_list", "verify_ssl"),
+    [
+        (None, None),
+        ("python_default", True),
+        ("python_default", False),
+        ("modern", True),
+        ("intermediate", True),
+    ],
 )
 @pytest.mark.parametrize("imap_has_capability", [True, False], ids=["push", "poll"])
 async def test_entry_startup_and_unload(
-    hass: HomeAssistant, mock_imap_protocol: MagicMock, cipher_list: str
+    hass: HomeAssistant,
+    mock_imap_protocol: MagicMock,
+    cipher_list: str | None,
+    verify_ssl: bool | None,
 ) -> None:
     """Test imap entry startup and unload with push and polling coordinator and alternate ciphers."""
     config = MOCK_CONFIG.copy()
-    if cipher_list:
+    if cipher_list is not None:
         config["ssl_cipher_list"] = cipher_list
+    if verify_ssl is not None:
+        config["verify_ssl"] = verify_ssl
 
     config_entry = MockConfigEntry(domain=DOMAIN, data=config)
     config_entry.add_to_hass(hass)
@@ -81,7 +97,9 @@ async def test_entry_startup_fails(
         (TEST_FETCH_RESPONSE_TEXT_BARE, True),
         (TEST_FETCH_RESPONSE_TEXT_PLAIN, True),
         (TEST_FETCH_RESPONSE_TEXT_PLAIN_ALT, True),
-        (TEST_FETCH_RESPONSE_INVALID_DATE, False),
+        (TEST_FETCH_RESPONSE_INVALID_DATE1, False),
+        (TEST_FETCH_RESPONSE_INVALID_DATE2, False),
+        (TEST_FETCH_RESPONSE_INVALID_DATE3, False),
         (TEST_FETCH_RESPONSE_TEXT_OTHER, True),
         (TEST_FETCH_RESPONSE_HTML, True),
         (TEST_FETCH_RESPONSE_MULTIPART, True),
@@ -91,7 +109,9 @@ async def test_entry_startup_fails(
         "bare",
         "plain",
         "plain_alt",
-        "invalid_date",
+        "invalid_date1",
+        "invalid_date2",
+        "invalid_date3",
         "other",
         "html",
         "multipart",
@@ -116,6 +136,7 @@ async def test_receiving_message_successfully(
     # we should have received one message
     assert state is not None
     assert state.state == "1"
+    assert state.attributes["state_class"] == SensorStateClass.MEASUREMENT
 
     # we should have received one event
     assert len(event_called) == 1
@@ -135,6 +156,44 @@ async def test_receiving_message_successfully(
     )
 
 
+@pytest.mark.parametrize("imap_search", [TEST_SEARCH_RESPONSE])
+@pytest.mark.parametrize("imap_fetch", [TEST_FETCH_RESPONSE_NO_SUBJECT_TO_FROM])
+@pytest.mark.parametrize("imap_has_capability", [True, False], ids=["push", "poll"])
+async def test_receiving_message_no_subject_to_from(
+    hass: HomeAssistant, mock_imap_protocol: MagicMock
+) -> None:
+    """Test receiving a message successfully without subject, to and from in body."""
+    event_called = async_capture_events(hass, "imap_content")
+
+    config_entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    # Make sure we have had one update (when polling)
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=5))
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.imap_email_email_com")
+    # we should have received one message
+    assert state is not None
+    assert state.state == "1"
+
+    # we should have received one event
+    assert len(event_called) == 1
+    data: dict[str, Any] = event_called[0].data
+    assert data["server"] == "imap.server.com"
+    assert data["username"] == "email@email.com"
+    assert data["search"] == "UnSeen UnDeleted"
+    assert data["folder"] == "INBOX"
+    assert data["sender"] == ""
+    assert data["subject"] == ""
+    assert data["date"] == datetime(
+        2023, 3, 24, 13, 52, tzinfo=timezone(timedelta(seconds=3600))
+    )
+    assert data["text"] == "Test body\r\n\r\n"
+    assert data["headers"]["Return-Path"] == ("<john.doe@example.com>",)
+    assert data["headers"]["Delivered-To"] == ("notify@example.com",)
+
+
 @pytest.mark.parametrize("imap_has_capability", [True, False], ids=["push", "poll"])
 @pytest.mark.parametrize(
     ("imap_login_state", "success"), [(AUTH, True), (NONAUTH, False)]
@@ -505,3 +564,57 @@ async def test_message_is_truncated(
 
     event_data = event_called[0].data
     assert len(event_data["text"]) == 3
+
+
+@pytest.mark.parametrize(
+    ("imap_search", "imap_fetch"),
+    [(TEST_SEARCH_RESPONSE, TEST_FETCH_RESPONSE_TEXT_PLAIN)],
+    ids=["plain"],
+)
+@pytest.mark.parametrize("imap_has_capability", [True, False], ids=["push", "poll"])
+@pytest.mark.parametrize(
+    ("custom_template", "result", "error"),
+    [
+        ("{{ subject }}", "Test subject", None),
+        ('{{ "@example.com" in sender }}', True, None),
+        ("{% bad template }}", None, "Error rendering imap custom template"),
+    ],
+    ids=["subject_test", "sender_filter", "template_error"],
+)
+async def test_custom_template(
+    hass: HomeAssistant,
+    mock_imap_protocol: MagicMock,
+    caplog: pytest.LogCaptureFixture,
+    custom_template: str,
+    result: str | bool | None,
+    error: str | None,
+) -> None:
+    """Test the custom template event data."""
+    event_called = async_capture_events(hass, "imap_content")
+
+    config = MOCK_CONFIG.copy()
+    config["custom_event_data_template"] = custom_template
+    config_entry = MockConfigEntry(domain=DOMAIN, data=config)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+    # Make sure we have had one update (when polling)
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=5))
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.imap_email_email_com")
+    # we should have received one message
+    assert state is not None
+    assert state.state == "1"
+
+    # we should have received one event
+    assert len(event_called) == 1
+    data: dict[str, Any] = event_called[0].data
+    assert data["server"] == "imap.server.com"
+    assert data["username"] == "email@email.com"
+    assert data["search"] == "UnSeen UnDeleted"
+    assert data["folder"] == "INBOX"
+    assert data["sender"] == "john.doe@example.com"
+    assert data["subject"] == "Test subject"
+    assert data["text"]
+    assert data["custom"] == result
+    assert error in caplog.text if error is not None else True
diff --git a/tests/components/influxdb/test_init.py b/tests/components/influxdb/test_init.py
index 683c69807b2338..a1234b7a470f88 100644
--- a/tests/components/influxdb/test_init.py
+++ b/tests/components/influxdb/test_init.py
@@ -2,14 +2,13 @@
 from dataclasses import dataclass
 import datetime
 from http import HTTPStatus
-from unittest.mock import MagicMock, Mock, call, patch
+from unittest.mock import ANY, MagicMock, Mock, call, patch
 
 import pytest
 
 import homeassistant.components.influxdb as influxdb
 from homeassistant.components.influxdb.const import DEFAULT_BUCKET
 from homeassistant.const import (
-    EVENT_STATE_CHANGED,
     PERCENTAGE,
     STATE_OFF,
     STATE_ON,
@@ -39,7 +38,6 @@ class FilterTest:
 @pytest.fixture(autouse=True)
 def mock_batch_timeout(hass, monkeypatch):
     """Mock the event bus listener and the batch timeout for tests."""
-    hass.bus.listen = MagicMock()
     monkeypatch.setattr(
         f"{INFLUX_PATH}.InfluxThread.batch_timeout",
         Mock(return_value=0),
@@ -129,8 +127,6 @@ async def test_setup_config_full(
 
     assert await async_setup_component(hass, influxdb.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
     assert get_write_api(mock_client).call_count == 1
 
 
@@ -263,8 +259,6 @@ async def test_setup_config_ssl(
         assert await async_setup_component(hass, influxdb.DOMAIN, config)
         await hass.async_block_till_done()
 
-        assert hass.bus.listen.called
-        assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
         assert expected_client_args.items() <= mock_client.call_args.kwargs.items()
 
 
@@ -285,8 +279,6 @@ async def test_setup_minimal_config(
 
     assert await async_setup_component(hass, influxdb.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
     assert get_write_api(mock_client).call_count == 1
 
 
@@ -347,7 +339,6 @@ async def _setup(hass, mock_influx_client, config_ext, get_write_api):
     # A call is made to the write API during setup to test the connection.
     # Therefore we reset the write API mock here before the test begins.
     get_write_api(mock_influx_client).reset_mock()
-    return hass.bus.listen.call_args_list[0][0][1]
 
 
 @pytest.mark.parametrize(
@@ -372,7 +363,7 @@ async def test_event_listener(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
     # map of HA State to valid influxdb [state, value] fields
     valid = {
@@ -394,19 +385,11 @@ async def test_event_listener(
             "updated_at": datetime.datetime(2017, 1, 1, 0, 0),
             "multi_periods": "0.120.240.2023873",
         }
-        state = MagicMock(
-            state=in_,
-            domain="fake",
-            entity_id="fake.entity-id",
-            object_id="entity",
-            attributes=attrs,
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
                 "measurement": "foobars",
-                "tags": {"domain": "fake", "entity_id": "entity"},
-                "time": 12345,
+                "tags": {"domain": "fake", "entity_id": "entity_id"},
+                "time": ANY,
                 "fields": {
                     "longitude": 1.1,
                     "latitude": 2.2,
@@ -427,7 +410,8 @@ async def test_event_listener(
         if out[1] is not None:
             body[0]["fields"]["value"] = out[1]
 
-        handler_method(event)
+        hass.states.async_set("fake.entity_id", in_, attrs)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -458,30 +442,23 @@ async def test_event_listener_no_units(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener for missing units."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
-    for unit in (None, ""):
+    for unit in ("",):
         if unit:
             attrs = {"unit_of_measurement": unit}
         else:
             attrs = {}
-        state = MagicMock(
-            state=1,
-            domain="fake",
-            entity_id="fake.entity-id",
-            object_id="entity",
-            attributes=attrs,
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
-                "measurement": "fake.entity-id",
-                "tags": {"domain": "fake", "entity_id": "entity"},
-                "time": 12345,
+                "measurement": "fake.entity_id",
+                "tags": {"domain": "fake", "entity_id": "entity_id"},
+                "time": ANY,
                 "fields": {"value": 1},
             }
         ]
-        handler_method(event)
+        hass.states.async_set("fake.entity_id", 1, attrs)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -512,26 +489,19 @@ async def test_event_listener_inf(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener with large or invalid numbers."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
     attrs = {"bignumstring": "9" * 999, "nonumstring": "nan"}
-    state = MagicMock(
-        state=8,
-        domain="fake",
-        entity_id="fake.entity-id",
-        object_id="entity",
-        attributes=attrs,
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
     body = [
         {
-            "measurement": "fake.entity-id",
-            "tags": {"domain": "fake", "entity_id": "entity"},
-            "time": 12345,
+            "measurement": "fake.entity_id",
+            "tags": {"domain": "fake", "entity_id": "entity_id"},
+            "time": ANY,
             "fields": {"value": 8},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("fake.entity_id", 8, attrs)
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -561,26 +531,19 @@ async def test_event_listener_states(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener against ignored states."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
-
-    for state_state in (1, "unknown", "", "unavailable", None):
-        state = MagicMock(
-            state=state_state,
-            domain="fake",
-            entity_id="fake.entity-id",
-            object_id="entity",
-            attributes={},
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config_ext, get_write_api)
+
+    for state_state in (1, "unknown", "", "unavailable"):
         body = [
             {
-                "measurement": "fake.entity-id",
-                "tags": {"domain": "fake", "entity_id": "entity"},
-                "time": 12345,
+                "measurement": "fake.entity_id",
+                "tags": {"domain": "fake", "entity_id": "entity_id"},
+                "time": ANY,
                 "fields": {"value": 1},
             }
         ]
-        handler_method(event)
+        hass.states.async_set("fake.entity_id", state_state)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -592,27 +555,20 @@ async def test_event_listener_states(
         write_api.reset_mock()
 
 
-def execute_filter_test(hass, tests, handler_method, write_api, get_mock_call):
+async def execute_filter_test(hass: HomeAssistant, tests, write_api, get_mock_call):
     """Execute all tests for a given filtering test."""
     for test in tests:
         domain, entity_id = split_entity_id(test.id)
-        state = MagicMock(
-            state=1,
-            domain=domain,
-            entity_id=test.id,
-            object_id=entity_id,
-            attributes={},
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
                 "measurement": test.id,
                 "tags": {"domain": domain, "entity_id": entity_id},
-                "time": 12345,
+                "time": ANY,
                 "fields": {"value": 1},
             }
         ]
-        handler_method(event)
+        hass.states.async_set(test.id, 1)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         if test.should_pass:
@@ -647,14 +603,14 @@ async def test_event_listener_denylist(
     """Test the event listener against a denylist."""
     config = {"exclude": {"entities": ["fake.denylisted"]}, "include": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.ok", True),
         FilterTest("fake.denylisted", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -681,14 +637,14 @@ async def test_event_listener_denylist_domain(
     """Test the event listener against a domain denylist."""
     config = {"exclude": {"domains": ["another_fake"]}, "include": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.ok", True),
         FilterTest("another_fake.denylisted", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -715,14 +671,14 @@ async def test_event_listener_denylist_glob(
     """Test the event listener against a glob denylist."""
     config = {"exclude": {"entity_globs": ["*.excluded_*"]}, "include": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.ok", True),
         FilterTest("fake.excluded_entity", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -749,14 +705,14 @@ async def test_event_listener_allowlist(
     """Test the event listener against an allowlist."""
     config = {"include": {"entities": ["fake.included"]}, "exclude": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.included", True),
         FilterTest("fake.excluded", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -783,14 +739,14 @@ async def test_event_listener_allowlist_domain(
     """Test the event listener against a domain allowlist."""
     config = {"include": {"domains": ["fake"]}, "exclude": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.ok", True),
         FilterTest("another_fake.excluded", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -817,14 +773,14 @@ async def test_event_listener_allowlist_glob(
     """Test the event listener against a glob allowlist."""
     config = {"include": {"entity_globs": ["*.included_*"]}, "exclude": {}}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
         FilterTest("fake.included_entity", True),
         FilterTest("fake.denied", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -862,7 +818,7 @@ async def test_event_listener_filtered_allowlist(
         },
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
@@ -874,7 +830,7 @@ async def test_event_listener_filtered_allowlist(
         FilterTest("fake.excluded_entity", False),
         FilterTest("another_fake.included_entity", True),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -904,7 +860,7 @@ async def test_event_listener_filtered_denylist(
         "exclude": {"domains": ["another_fake"], "entity_globs": "*.excluded_*"},
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
 
     tests = [
@@ -914,7 +870,7 @@ async def test_event_listener_filtered_denylist(
         FilterTest("another_fake.denied", False),
         FilterTest("fake.excluded_entity", False),
     ]
-    execute_filter_test(hass, tests, handler_method, write_api, get_mock_call)
+    await execute_filter_test(hass, tests, write_api, get_mock_call)
 
 
 @pytest.mark.parametrize(
@@ -939,7 +895,7 @@ async def test_event_listener_invalid_type(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener when an attribute has an invalid type."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
     # map of HA State to valid influxdb [state, value] fields
     valid = {
@@ -957,19 +913,11 @@ async def test_event_listener_invalid_type(
             "latitude": "2.2",
             "invalid_attribute": ["value1", "value2"],
         }
-        state = MagicMock(
-            state=in_,
-            domain="fake",
-            entity_id="fake.entity-id",
-            object_id="entity",
-            attributes=attrs,
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
                 "measurement": "foobars",
-                "tags": {"domain": "fake", "entity_id": "entity"},
-                "time": 12345,
+                "tags": {"domain": "fake", "entity_id": "entity_id"},
+                "time": ANY,
                 "fields": {
                     "longitude": 1.1,
                     "latitude": 2.2,
@@ -982,7 +930,8 @@ async def test_event_listener_invalid_type(
         if out[1] is not None:
             body[0]["fields"]["value"] = out[1]
 
-        handler_method(event)
+        hass.states.async_set("fake.entity_id", in_, attrs)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -1015,25 +964,17 @@ async def test_event_listener_default_measurement(
     """Test the event listener with a default measurement."""
     config = {"default_measurement": "state"}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
-
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="fake.ok",
-        object_id="ok",
-        attributes={},
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config, get_write_api)
     body = [
         {
             "measurement": "state",
             "tags": {"domain": "fake", "entity_id": "ok"},
-            "time": 12345,
+            "time": ANY,
             "fields": {"value": 1},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("fake.ok", 1)
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -1065,26 +1006,19 @@ async def test_event_listener_unit_of_measurement_field(
     """Test the event listener for unit of measurement field."""
     config = {"override_measurement": "state"}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     attrs = {"unit_of_measurement": "foobars"}
-    state = MagicMock(
-        state="foo",
-        domain="fake",
-        entity_id="fake.entity-id",
-        object_id="entity",
-        attributes=attrs,
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
     body = [
         {
             "measurement": "state",
-            "tags": {"domain": "fake", "entity_id": "entity"},
-            "time": 12345,
+            "tags": {"domain": "fake", "entity_id": "entity_id"},
+            "time": ANY,
             "fields": {"state": "foo", "unit_of_measurement_str": "foobars"},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("fake.entity_id", "foo", attrs)
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -1116,17 +1050,9 @@ async def test_event_listener_tags_attributes(
     """Test the event listener when some attributes should be tags."""
     config = {"tags_attributes": ["friendly_fake"]}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     attrs = {"friendly_fake": "tag_str", "field_fake": "field_str"}
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="fake.something",
-        object_id="something",
-        attributes=attrs,
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
     body = [
         {
             "measurement": "fake.something",
@@ -1135,11 +1061,12 @@ async def test_event_listener_tags_attributes(
                 "entity_id": "something",
                 "friendly_fake": "tag_str",
             },
-            "time": 12345,
+            "time": ANY,
             "fields": {"value": 1, "field_fake_str": "field_str"},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("fake.something", 1, attrs)
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -1179,7 +1106,7 @@ async def test_event_listener_component_override_measurement(
         "component_config_domain": {"climate": {"override_measurement": "hvac"}},
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     test_components = [
         {"domain": "sensor", "id": "fake_humidity", "res": "humidity"},
@@ -1188,23 +1115,16 @@ async def test_event_listener_component_override_measurement(
         {"domain": "other", "id": "just_fake", "res": "other.just_fake"},
     ]
     for comp in test_components:
-        state = MagicMock(
-            state=1,
-            domain=comp["domain"],
-            entity_id=f"{comp['domain']}.{comp['id']}",
-            object_id=comp["id"],
-            attributes={},
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
                 "measurement": comp["res"],
                 "tags": {"domain": comp["domain"], "entity_id": comp["id"]},
-                "time": 12345,
+                "time": ANY,
                 "fields": {"value": 1},
             }
         ]
-        handler_method(event)
+        hass.states.async_set(f"{comp['domain']}.{comp['id']}", 1)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -1246,7 +1166,7 @@ async def test_event_listener_component_measurement_attr(
         "component_config_domain": {"climate": {"override_measurement": "hvac"}},
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     test_components = [
         {
@@ -1261,23 +1181,16 @@ async def test_event_listener_component_measurement_attr(
         {"domain": "other", "id": "just_fake", "attrs": {}, "res": "other"},
     ]
     for comp in test_components:
-        state = MagicMock(
-            state=1,
-            domain=comp["domain"],
-            entity_id=f"{comp['domain']}.{comp['id']}",
-            object_id=comp["id"],
-            attributes=comp["attrs"],
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         body = [
             {
                 "measurement": comp["res"],
                 "tags": {"domain": comp["domain"], "entity_id": comp["id"]},
-                "time": 12345,
+                "time": ANY,
                 "fields": {"value": 1},
             }
         ]
-        handler_method(event)
+        hass.states.async_set(f"{comp['domain']}.{comp['id']}", 1, comp["attrs"])
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -1321,7 +1234,7 @@ async def test_event_listener_ignore_attributes(
         },
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     test_components = [
         {
@@ -1342,30 +1255,27 @@ async def test_event_listener_ignore_attributes(
     ]
     for comp in test_components:
         entity_id = f"{comp['domain']}.{comp['id']}"
-        state = MagicMock(
-            state=1,
-            domain=comp["domain"],
-            entity_id=entity_id,
-            object_id=comp["id"],
-            attributes={
-                "ignore": 1,
-                "id_ignore": 1,
-                "glob_ignore": 1,
-                "domain_ignore": 1,
-            },
-        )
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
         fields = {"value": 1}
         fields.update(comp["attrs"])
         body = [
             {
                 "measurement": entity_id,
                 "tags": {"domain": comp["domain"], "entity_id": comp["id"]},
-                "time": 12345,
+                "time": ANY,
                 "fields": fields,
             }
         ]
-        handler_method(event)
+        hass.states.async_set(
+            entity_id,
+            1,
+            {
+                "ignore": 1,
+                "id_ignore": 1,
+                "glob_ignore": 1,
+                "domain_ignore": 1,
+            },
+        )
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api = get_write_api(mock_client)
@@ -1401,25 +1311,17 @@ async def test_event_listener_ignore_attributes_overlapping_entities(
         "component_config_domain": {"sensor": {"ignore_attributes": ["ignore"]}},
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
-
-    state = MagicMock(
-        state=1,
-        domain="sensor",
-        entity_id="sensor.fake",
-        object_id="fake",
-        attributes={"ignore": 1},
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config, get_write_api)
     body = [
         {
             "measurement": "units",
             "tags": {"domain": "sensor", "entity_id": "fake"},
-            "time": 12345,
+            "time": ANY,
             "fields": {"value": 1},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("sensor.fake", 1, {"ignore": 1})
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -1452,22 +1354,14 @@ async def test_event_listener_scheduled_write(
     """Test the event listener retries after a write failure."""
     config = {"max_retries": 1}
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
-
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="entity.id",
-        object_id="entity",
-        attributes={},
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config, get_write_api)
     write_api = get_write_api(mock_client)
     write_api.side_effect = OSError("foo")
 
     # Write fails
     with patch.object(influxdb.time, "sleep") as mock_sleep:
-        handler_method(event)
+        hass.states.async_set("entity.entity_id", 1)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
         assert mock_sleep.called
     assert write_api.call_count == 2
@@ -1475,7 +1369,8 @@ async def test_event_listener_scheduled_write(
     # Write works again
     write_api.side_effect = None
     with patch.object(influxdb.time, "sleep") as mock_sleep:
-        handler_method(event)
+        hass.states.async_set("entity.entity_id", "2")
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
         assert not mock_sleep.called
     assert write_api.call_count == 3
@@ -1503,16 +1398,7 @@ async def test_event_listener_backlog_full(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener drops old events when backlog gets full."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
-
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="entity.id",
-        object_id="entity",
-        attributes={},
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
     monotonic_time = 0
 
@@ -1523,7 +1409,8 @@ def fast_monotonic():
         return monotonic_time
 
     with patch("homeassistant.components.influxdb.time.monotonic", new=fast_monotonic):
-        handler_method(event)
+        hass.states.async_set("entity.id", 1)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         assert get_write_api(mock_client).call_count == 0
@@ -1551,26 +1438,17 @@ async def test_event_listener_attribute_name_conflict(
     hass: HomeAssistant, mock_client, config_ext, get_write_api, get_mock_call
 ) -> None:
     """Test the event listener when an attribute conflicts with another field."""
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
-
-    attrs = {"value": "value_str"}
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="fake.something",
-        object_id="something",
-        attributes=attrs,
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
+    await _setup(hass, mock_client, config_ext, get_write_api)
     body = [
         {
             "measurement": "fake.something",
             "tags": {"domain": "fake", "entity_id": "something"},
-            "time": 12345,
+            "time": ANY,
             "fields": {"value": 1, "value__str": "value_str"},
         }
     ]
-    handler_method(event)
+    hass.states.async_set("fake.something", 1, {"value": "value_str"})
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
@@ -1642,7 +1520,6 @@ async def test_connection_failure_on_startup(
             == 1
         )
         event_helper.call_later.assert_called_once()
-        hass.bus.listen.assert_not_called()
 
 
 @pytest.mark.parametrize(
@@ -1686,21 +1563,14 @@ async def test_invalid_inputs_error(
     But Influx is an external service so there may be edge cases that
     haven't been encountered yet.
     """
-    handler_method = await _setup(hass, mock_client, config_ext, get_write_api)
+    await _setup(hass, mock_client, config_ext, get_write_api)
 
     write_api = get_write_api(mock_client)
     write_api.side_effect = test_exception
-    state = MagicMock(
-        state=1,
-        domain="fake",
-        entity_id="fake.something",
-        object_id="something",
-        attributes={},
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
 
     with patch(f"{INFLUX_PATH}.time.sleep") as sleep:
-        handler_method(event)
+        hass.states.async_set("fake.something", 1)
+        await hass.async_block_till_done()
         hass.data[influxdb.DOMAIN].block_till_done()
 
         write_api.assert_called_once()
@@ -1786,29 +1656,25 @@ async def test_precision(
         "precision": precision,
     }
     config.update(config_ext)
-    handler_method = await _setup(hass, mock_client, config, get_write_api)
+    await _setup(hass, mock_client, config, get_write_api)
 
     value = "1.9"
-    attrs = {
-        "unit_of_measurement": "foobars",
-    }
-    state = MagicMock(
-        state=value,
-        domain="fake",
-        entity_id="fake.entity-id",
-        object_id="entity",
-        attributes=attrs,
-    )
-    event = MagicMock(data={"new_state": state}, time_fired=12345)
     body = [
         {
             "measurement": "foobars",
-            "tags": {"domain": "fake", "entity_id": "entity"},
-            "time": 12345,
+            "tags": {"domain": "fake", "entity_id": "entity_id"},
+            "time": ANY,
             "fields": {"value": float(value)},
         }
     ]
-    handler_method(event)
+    hass.states.async_set(
+        "fake.entity_id",
+        value,
+        {
+            "unit_of_measurement": "foobars",
+        },
+    )
+    await hass.async_block_till_done()
     hass.data[influxdb.DOMAIN].block_till_done()
 
     write_api = get_write_api(mock_client)
diff --git a/tests/components/input_datetime/test_init.py b/tests/components/input_datetime/test_init.py
index 834da847b7a2af..e9f9458611a933 100644
--- a/tests/components/input_datetime/test_init.py
+++ b/tests/components/input_datetime/test_init.py
@@ -19,12 +19,16 @@
     CONFIG_SCHEMA,
     DEFAULT_TIME,
     DOMAIN,
-    FMT_DATE,
-    FMT_DATETIME,
-    FMT_TIME,
     SERVICE_RELOAD,
 )
-from homeassistant.const import ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, ATTR_NAME
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_FRIENDLY_NAME,
+    ATTR_NAME,
+    FORMAT_DATE,
+    FORMAT_DATETIME,
+    FORMAT_TIME,
+)
 from homeassistant.core import Context, CoreState, HomeAssistant, State
 from homeassistant.exceptions import Unauthorized
 from homeassistant.helpers import entity_registry as er
@@ -136,7 +140,7 @@ async def test_set_datetime(hass: HomeAssistant) -> None:
     await async_set_date_and_time(hass, entity_id, dt_obj)
 
     state = hass.states.get(entity_id)
-    assert state.state == dt_obj.strftime(FMT_DATETIME)
+    assert state.state == dt_obj.strftime(FORMAT_DATETIME)
     assert state.attributes["has_time"]
     assert state.attributes["has_date"]
 
@@ -164,7 +168,7 @@ async def test_set_datetime_2(hass: HomeAssistant) -> None:
     await async_set_datetime(hass, entity_id, dt_obj)
 
     state = hass.states.get(entity_id)
-    assert state.state == dt_obj.strftime(FMT_DATETIME)
+    assert state.state == dt_obj.strftime(FORMAT_DATETIME)
     assert state.attributes["has_time"]
     assert state.attributes["has_date"]
 
@@ -192,7 +196,7 @@ async def test_set_datetime_3(hass: HomeAssistant) -> None:
     await async_set_timestamp(hass, entity_id, dt_util.as_utc(dt_obj).timestamp())
 
     state = hass.states.get(entity_id)
-    assert state.state == dt_obj.strftime(FMT_DATETIME)
+    assert state.state == dt_obj.strftime(FORMAT_DATETIME)
     assert state.attributes["has_time"]
     assert state.attributes["has_date"]
 
@@ -218,7 +222,7 @@ async def test_set_datetime_time(hass: HomeAssistant) -> None:
     await async_set_date_and_time(hass, entity_id, dt_obj)
 
     state = hass.states.get(entity_id)
-    assert state.state == dt_obj.strftime(FMT_TIME)
+    assert state.state == dt_obj.strftime(FORMAT_TIME)
     assert state.attributes["has_time"]
     assert not state.attributes["has_date"]
 
@@ -337,7 +341,7 @@ async def test_restore_state(hass: HomeAssistant) -> None:
                 "test_bogus_data": {
                     "has_time": True,
                     "has_date": True,
-                    "initial": initial.strftime(FMT_DATETIME),
+                    "initial": initial.strftime(FORMAT_DATETIME),
                 },
                 "test_was_time": {"has_time": False, "has_date": True},
                 "test_was_date": {"has_time": True, "has_date": False},
@@ -347,22 +351,22 @@ async def test_restore_state(hass: HomeAssistant) -> None:
 
     dt_obj = datetime.datetime(2017, 9, 7, 19, 46)
     state_time = hass.states.get("input_datetime.test_time")
-    assert state_time.state == dt_obj.strftime(FMT_TIME)
+    assert state_time.state == dt_obj.strftime(FORMAT_TIME)
 
     state_date = hass.states.get("input_datetime.test_date")
-    assert state_date.state == dt_obj.strftime(FMT_DATE)
+    assert state_date.state == dt_obj.strftime(FORMAT_DATE)
 
     state_datetime = hass.states.get("input_datetime.test_datetime")
-    assert state_datetime.state == dt_obj.strftime(FMT_DATETIME)
+    assert state_datetime.state == dt_obj.strftime(FORMAT_DATETIME)
 
     state_bogus = hass.states.get("input_datetime.test_bogus_data")
-    assert state_bogus.state == initial.strftime(FMT_DATETIME)
+    assert state_bogus.state == initial.strftime(FORMAT_DATETIME)
 
     state_was_time = hass.states.get("input_datetime.test_was_time")
-    assert state_was_time.state == default.strftime(FMT_DATE)
+    assert state_was_time.state == default.strftime(FORMAT_DATE)
 
     state_was_date = hass.states.get("input_datetime.test_was_date")
-    assert state_was_date.state == default.strftime(FMT_TIME)
+    assert state_was_date.state == default.strftime(FORMAT_TIME)
 
 
 async def test_default_value(hass: HomeAssistant) -> None:
@@ -381,15 +385,15 @@ async def test_default_value(hass: HomeAssistant) -> None:
 
     dt_obj = datetime.datetime.combine(datetime.date.today(), DEFAULT_TIME)
     state_time = hass.states.get("input_datetime.test_time")
-    assert state_time.state == dt_obj.strftime(FMT_TIME)
+    assert state_time.state == dt_obj.strftime(FORMAT_TIME)
     assert state_time.attributes.get("timestamp") is not None
 
     state_date = hass.states.get("input_datetime.test_date")
-    assert state_date.state == dt_obj.strftime(FMT_DATE)
+    assert state_date.state == dt_obj.strftime(FORMAT_DATE)
     assert state_date.attributes.get("timestamp") is not None
 
     state_datetime = hass.states.get("input_datetime.test_datetime")
-    assert state_datetime.state == dt_obj.strftime(FMT_DATETIME)
+    assert state_datetime.state == dt_obj.strftime(FORMAT_DATETIME)
     assert state_datetime.attributes.get("timestamp") is not None
 
 
@@ -446,7 +450,7 @@ async def test_reload(
     assert state_1 is not None
     assert state_2 is None
     assert state_3 is not None
-    assert dt_obj.strftime(FMT_DATE) == state_1.state
+    assert dt_obj.strftime(FORMAT_DATE) == state_1.state
     assert ent_reg.async_get_entity_id(DOMAIN, DOMAIN, "dt1") == f"{DOMAIN}.dt1"
     assert ent_reg.async_get_entity_id(DOMAIN, DOMAIN, "dt2") is None
     assert ent_reg.async_get_entity_id(DOMAIN, DOMAIN, "dt3") == f"{DOMAIN}.dt3"
@@ -484,10 +488,10 @@ async def test_reload(
     assert state_1 is not None
     assert state_2 is not None
     assert state_3 is None
-    assert state_1.state == DEFAULT_TIME.strftime(FMT_TIME)
+    assert state_1.state == DEFAULT_TIME.strftime(FORMAT_TIME)
     assert state_2.state == datetime.datetime.combine(
         datetime.date.today(), DEFAULT_TIME
-    ).strftime(FMT_DATETIME)
+    ).strftime(FORMAT_DATETIME)
 
     assert ent_reg.async_get_entity_id(DOMAIN, DOMAIN, "dt1") == f"{DOMAIN}.dt1"
     assert ent_reg.async_get_entity_id(DOMAIN, DOMAIN, "dt2") == f"{DOMAIN}.dt2"
@@ -705,7 +709,7 @@ async def test_timestamp(hass: HomeAssistant) -> None:
     assert (
         dt_util.as_local(
             dt_util.utc_from_timestamp(state_with_tz.attributes[ATTR_TIMESTAMP])
-        ).strftime(FMT_DATETIME)
+        ).strftime(FORMAT_DATETIME)
         == "2020-12-13 01:00:00"
     )
 
@@ -719,13 +723,13 @@ async def test_timestamp(hass: HomeAssistant) -> None:
     assert (
         dt_util.utc_from_timestamp(
             state_without_tz.attributes[ATTR_TIMESTAMP]
-        ).strftime(FMT_DATETIME)
+        ).strftime(FORMAT_DATETIME)
         == "2020-12-13 18:00:00"
     )
     assert (
         dt_util.as_local(
             dt_util.utc_from_timestamp(state_without_tz.attributes[ATTR_TIMESTAMP])
-        ).strftime(FMT_DATETIME)
+        ).strftime(FORMAT_DATETIME)
         == "2020-12-13 10:00:00"
     )
     # Use datetime.datetime.fromtimestamp
@@ -734,7 +738,7 @@ async def test_timestamp(hass: HomeAssistant) -> None:
             datetime.datetime.fromtimestamp(
                 state_without_tz.attributes[ATTR_TIMESTAMP], datetime.timezone.utc
             )
-        ).strftime(FMT_DATETIME)
+        ).strftime(FORMAT_DATETIME)
         == "2020-12-13 10:00:00"
     )
 
diff --git a/tests/components/input_select/test_init.py b/tests/components/input_select/test_init.py
index 315392702ebe7f..6908a1c532e2dd 100644
--- a/tests/components/input_select/test_init.py
+++ b/tests/components/input_select/test_init.py
@@ -102,12 +102,13 @@ async def test_select_option(hass: HomeAssistant) -> None:
     state = hass.states.get(entity_id)
     assert state.state == "another option"
 
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: "non existing option"},
-        blocking=True,
-    )
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: "non existing option"},
+            blocking=True,
+        )
     state = hass.states.get(entity_id)
     assert state.state == "another option"
 
@@ -305,12 +306,13 @@ async def test_set_options_service(hass: HomeAssistant) -> None:
     state = hass.states.get(entity_id)
     assert state.state == "test1"
 
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SELECT_OPTION,
-        {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: "first option"},
-        blocking=True,
-    )
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SELECT_OPTION,
+            {ATTR_ENTITY_ID: entity_id, ATTR_OPTION: "first option"},
+            blocking=True,
+        )
     state = hass.states.get(entity_id)
     assert state.state == "test1"
 
diff --git a/tests/components/input_select/test_reproduce_state.py b/tests/components/input_select/test_reproduce_state.py
index d6e9274fa8d668..a00b6b02ade4d6 100644
--- a/tests/components/input_select/test_reproduce_state.py
+++ b/tests/components/input_select/test_reproduce_state.py
@@ -2,6 +2,7 @@
 import pytest
 
 from homeassistant.core import HomeAssistant, State
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.state import async_reproduce_state
 from homeassistant.setup import async_setup_component
 
@@ -60,7 +61,8 @@ async def test_reproducing_states(
     assert hass.states.get(ENTITY).state == VALID_OPTION3
 
     # Test setting state to invalid state
-    await async_reproduce_state(hass, [State(ENTITY, INVALID_OPTION)])
+    with pytest.raises(HomeAssistantError):
+        await async_reproduce_state(hass, [State(ENTITY, INVALID_OPTION)])
 
     # The entity state should be unchanged
     assert hass.states.get(ENTITY).state == VALID_OPTION3
diff --git a/tests/components/insteon/const.py b/tests/components/insteon/const.py
index eb25f2ed43e62b..e731c51d6c651e 100644
--- a/tests/components/insteon/const.py
+++ b/tests/components/insteon/const.py
@@ -3,11 +3,8 @@
     CONF_CAT,
     CONF_DIM_STEPS,
     CONF_HOUSECODE,
-    CONF_HUB_VERSION,
-    CONF_OVERRIDE,
     CONF_SUBCAT,
     CONF_UNITCODE,
-    CONF_X10,
     X10_PLATFORMS,
 )
 from homeassistant.const import (
@@ -73,28 +70,6 @@
     CONF_DIM_STEPS: MOCK_X10_STEPS,
 }
 
-MOCK_IMPORT_CONFIG_PLM = {CONF_PORT: MOCK_DEVICE}
-
-MOCK_IMPORT_MINIMUM_HUB_V2 = {
-    CONF_HOST: MOCK_HOSTNAME,
-    CONF_USERNAME: MOCK_USERNAME,
-    CONF_PASSWORD: MOCK_PASSWORD,
-}
-MOCK_IMPORT_MINIMUM_HUB_V1 = {CONF_HOST: MOCK_HOSTNAME, CONF_HUB_VERSION: 1}
-MOCK_IMPORT_FULL_CONFIG_PLM = MOCK_IMPORT_CONFIG_PLM.copy()
-MOCK_IMPORT_FULL_CONFIG_PLM[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
-MOCK_IMPORT_FULL_CONFIG_HUB_V2 = MOCK_USER_INPUT_HUB_V2.copy()
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_HUB_VERSION] = 2
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
-MOCK_IMPORT_FULL_CONFIG_HUB_V1 = MOCK_USER_INPUT_HUB_V1.copy()
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_HUB_VERSION] = 1
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_OVERRIDE] = [MOCK_DEVICE_OVERRIDE_CONFIG]
-MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_X10] = [MOCK_X10_CONFIG_1, MOCK_X10_CONFIG_2]
-
 PATCH_CONNECTION = "homeassistant.components.insteon.config_flow.async_connect"
 PATCH_CONNECTION_CLOSE = "homeassistant.components.insteon.config_flow.async_close"
 PATCH_DEVICES = "homeassistant.components.insteon.config_flow.devices"
diff --git a/tests/components/insteon/mock_devices.py b/tests/components/insteon/mock_devices.py
index dd0ab0b56a0f58..dea9fb4e34ff12 100644
--- a/tests/components/insteon/mock_devices.py
+++ b/tests/components/insteon/mock_devices.py
@@ -151,11 +151,11 @@ def fill_properties(self, address, props_dict):
             for flag in operating_flags:
                 value = operating_flags[flag]
                 if device.operating_flags.get(flag):
-                    device.operating_flags[flag].load(value)
+                    device.operating_flags[flag].set_value(value)
             for flag in properties:
                 value = properties[flag]
                 if device.properties.get(flag):
-                    device.properties[flag].load(value)
+                    device.properties[flag].set_value(value)
 
     async def async_add_device(self, address=None, multiple=False):
         """Mock the async_add_device method."""
diff --git a/tests/components/insteon/test_api_properties.py b/tests/components/insteon/test_api_properties.py
index a667e2144d0162..850ccc854119fa 100644
--- a/tests/components/insteon/test_api_properties.py
+++ b/tests/components/insteon/test_api_properties.py
@@ -119,7 +119,7 @@ async def test_get_read_only_properties(
     mock_read_only = ExtendedProperty(
         "44.44.44", "mock_read_only", bool, is_read_only=True
     )
-    mock_read_only.load(False)
+    mock_read_only.set_value(False)
 
     ws_client, devices = await _setup(
         hass, hass_ws_client, "44.44.44", iolinc_properties_data
@@ -368,7 +368,7 @@ async def test_change_float_property(
     )
     device = devices["44.44.44"]
     delay_prop = device.configuration[MOMENTARY_DELAY]
-    delay_prop.load(0)
+    delay_prop.set_value(0)
     with patch.object(insteon.api.properties, "devices", devices):
         await ws_client.send_json(
             {
diff --git a/tests/components/insteon/test_config_flow.py b/tests/components/insteon/test_config_flow.py
index 70bb8fb37e27c6..e15b7b2a287825 100644
--- a/tests/components/insteon/test_config_flow.py
+++ b/tests/components/insteon/test_config_flow.py
@@ -42,15 +42,9 @@
 
 from .const import (
     MOCK_DEVICE,
-    MOCK_HOSTNAME,
-    MOCK_IMPORT_CONFIG_PLM,
-    MOCK_IMPORT_MINIMUM_HUB_V1,
-    MOCK_IMPORT_MINIMUM_HUB_V2,
-    MOCK_PASSWORD,
     MOCK_USER_INPUT_HUB_V1,
     MOCK_USER_INPUT_HUB_V2,
     MOCK_USER_INPUT_PLM,
-    MOCK_USERNAME,
     PATCH_ASYNC_SETUP,
     PATCH_ASYNC_SETUP_ENTRY,
     PATCH_CONNECTION,
@@ -243,30 +237,6 @@ async def test_failed_connection_hub(hass: HomeAssistant) -> None:
     assert result2["errors"] == {"base": "cannot_connect"}
 
 
-async def _import_config(hass, config):
-    """Run the import step."""
-    with patch(
-        PATCH_CONNECTION,
-        new=mock_successful_connection,
-    ), patch(
-        PATCH_ASYNC_SETUP, return_value=True
-    ), patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
-        return await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=config
-        )
-
-
-async def test_import_plm(hass: HomeAssistant) -> None:
-    """Test importing a minimum PLM config from yaml."""
-
-    result = await _import_config(hass, MOCK_IMPORT_CONFIG_PLM)
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data == MOCK_IMPORT_CONFIG_PLM
-
-
 async def _options_init_form(hass, entry_id, step):
     """Run the init options form."""
     with patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
@@ -282,75 +252,6 @@ async def _options_init_form(hass, entry_id, step):
     return result2
 
 
-async def test_import_min_hub_v2(hass: HomeAssistant) -> None:
-    """Test importing a minimum Hub v2 config from yaml."""
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2}
-    )
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data[CONF_HOST] == MOCK_HOSTNAME
-        assert entry.data[CONF_PORT] == 25105
-        assert entry.data[CONF_USERNAME] == MOCK_USERNAME
-        assert entry.data[CONF_PASSWORD] == MOCK_PASSWORD
-        assert entry.data[CONF_HUB_VERSION] == 2
-
-
-async def test_import_min_hub_v1(hass: HomeAssistant) -> None:
-    """Test importing a minimum Hub v1 config from yaml."""
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V1, CONF_PORT: 9761, CONF_HUB_VERSION: 1}
-    )
-
-    assert result["type"] == "create_entry"
-    assert hass.config_entries.async_entries(DOMAIN)
-    for entry in hass.config_entries.async_entries(DOMAIN):
-        assert entry.data[CONF_HOST] == MOCK_HOSTNAME
-        assert entry.data[CONF_PORT] == 9761
-        assert entry.data[CONF_HUB_VERSION] == 1
-
-
-async def test_import_existing(hass: HomeAssistant) -> None:
-    """Test we fail on an existing config imported."""
-    config_entry = MockConfigEntry(
-        domain=DOMAIN,
-        entry_id="abcde12345",
-        data={**MOCK_USER_INPUT_HUB_V2, CONF_HUB_VERSION: 2},
-        options={},
-    )
-    config_entry.add_to_hass(hass)
-    assert config_entry.state is config_entries.ConfigEntryState.NOT_LOADED
-
-    result = await _import_config(
-        hass, {**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2}
-    )
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "single_instance_allowed"
-
-
-async def test_import_failed_connection(hass: HomeAssistant) -> None:
-    """Test a failed connection on import."""
-
-    with patch(
-        PATCH_CONNECTION,
-        new=mock_failed_connection,
-    ), patch(
-        PATCH_ASYNC_SETUP, return_value=True
-    ), patch(PATCH_ASYNC_SETUP_ENTRY, return_value=True):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={**MOCK_IMPORT_MINIMUM_HUB_V2, CONF_PORT: 25105, CONF_HUB_VERSION: 2},
-        )
-
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
-
-
 async def _options_form(
     hass, flow_id, user_input, connection=mock_successful_connection
 ):
diff --git a/tests/components/insteon/test_init.py b/tests/components/insteon/test_init.py
index ecab741d5fea6f..1c4e2abf123017 100644
--- a/tests/components/insteon/test_init.py
+++ b/tests/components/insteon/test_init.py
@@ -2,45 +2,15 @@
 import asyncio
 from unittest.mock import patch
 
-from pyinsteon.address import Address
 import pytest
 
 from homeassistant.components import insteon
-from homeassistant.components.insteon.const import (
-    CONF_CAT,
-    CONF_DEV_PATH,
-    CONF_OVERRIDE,
-    CONF_SUBCAT,
-    CONF_X10,
-    DOMAIN,
-    PORT_HUB_V1,
-    PORT_HUB_V2,
-)
-from homeassistant.const import (
-    CONF_ADDRESS,
-    CONF_DEVICE,
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_USERNAME,
-    EVENT_HOMEASSISTANT_STOP,
-)
+from homeassistant.components.insteon.const import CONF_DEV_PATH, DOMAIN
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from .const import (
-    MOCK_ADDRESS,
-    MOCK_CAT,
-    MOCK_IMPORT_CONFIG_PLM,
-    MOCK_IMPORT_FULL_CONFIG_HUB_V1,
-    MOCK_IMPORT_FULL_CONFIG_HUB_V2,
-    MOCK_IMPORT_FULL_CONFIG_PLM,
-    MOCK_IMPORT_MINIMUM_HUB_V1,
-    MOCK_IMPORT_MINIMUM_HUB_V2,
-    MOCK_SUBCAT,
-    MOCK_USER_INPUT_PLM,
-    PATCH_CONNECTION,
-)
+from .const import MOCK_USER_INPUT_PLM, PATCH_CONNECTION
 from .mock_devices import MockDevices
 
 from tests.common import MockConfigEntry
@@ -79,137 +49,6 @@ async def test_setup_entry(hass: HomeAssistant) -> None:
         assert mock_close.called
 
 
-async def test_import_plm(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a PLM."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-    assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_DEVICE] == MOCK_IMPORT_CONFIG_PLM[CONF_PORT]
-    assert CONF_PORT not in data
-
-
-async def test_import_hub1(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a hub v1."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_MINIMUM_HUB_V1
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-        assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_HOST] == MOCK_IMPORT_FULL_CONFIG_HUB_V1[CONF_HOST]
-    assert data[CONF_PORT] == PORT_HUB_V1
-    assert CONF_USERNAME not in data
-    assert CONF_PASSWORD not in data
-
-
-async def test_import_hub2(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML to a hub v2."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_MINIMUM_HUB_V2
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)
-        assert hass.config_entries.async_entries(DOMAIN)
-    data = hass.config_entries.async_entries(DOMAIN)[0].data
-    assert data[CONF_HOST] == MOCK_IMPORT_FULL_CONFIG_HUB_V2[CONF_HOST]
-    assert data[CONF_PORT] == PORT_HUB_V2
-    assert data[CONF_USERNAME] == MOCK_IMPORT_MINIMUM_HUB_V2[CONF_USERNAME]
-    assert data[CONF_PASSWORD] == MOCK_IMPORT_MINIMUM_HUB_V2[CONF_PASSWORD]
-
-
-async def test_import_options(hass: HomeAssistant) -> None:
-    """Test setting up the entry from YAML including options."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_FULL_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_successful_connection
-    ), patch.object(insteon, "close_insteon_connection"), patch.object(
-        insteon, "devices", new=MockDevices()
-    ), patch(
-        PATCH_CONNECTION, new=mock_successful_connection
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        await asyncio.sleep(0.01)  # Need to yield to async processes
-        # pylint: disable=no-member
-        assert insteon.devices.add_x10_device.call_count == 2
-        assert insteon.devices.set_id.call_count == 1
-    options = hass.config_entries.async_entries(DOMAIN)[0].options
-    assert len(options[CONF_OVERRIDE]) == 1
-    assert options[CONF_OVERRIDE][0][CONF_ADDRESS] == str(Address(MOCK_ADDRESS))
-    assert options[CONF_OVERRIDE][0][CONF_CAT] == MOCK_CAT
-    assert options[CONF_OVERRIDE][0][CONF_SUBCAT] == MOCK_SUBCAT
-
-    assert len(options[CONF_X10]) == 2
-    assert options[CONF_X10][0] == MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10][0]
-    assert options[CONF_X10][1] == MOCK_IMPORT_FULL_CONFIG_PLM[CONF_X10][1]
-
-
-async def test_import_failed_connection(hass: HomeAssistant) -> None:
-    """Test a failed connection in import does not create a config entry."""
-    config = {}
-    config[DOMAIN] = MOCK_IMPORT_CONFIG_PLM
-
-    with patch.object(
-        insteon, "async_connect", new=mock_failed_connection
-    ), patch.object(insteon, "async_close"), patch.object(
-        insteon, "devices", new=MockDevices(connected=False)
-    ):
-        assert await async_setup_component(
-            hass,
-            insteon.DOMAIN,
-            config,
-        )
-        await hass.async_block_till_done()
-        assert not hass.config_entries.async_entries(DOMAIN)
-
-
 async def test_setup_entry_failed_connection(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/integration/test_sensor.py b/tests/components/integration/test_sensor.py
index b2ad0b36b68eb3..a552d401681b3f 100644
--- a/tests/components/integration/test_sensor.py
+++ b/tests/components/integration/test_sensor.py
@@ -1,9 +1,10 @@
 """The tests for the integration sensor platform."""
 from datetime import timedelta
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
 
+from homeassistant.components.integration.const import DOMAIN
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
@@ -16,10 +17,15 @@
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
-from tests.common import mock_restore_cache
+from tests.common import (
+    MockConfigEntry,
+    mock_restore_cache,
+    mock_restore_cache_with_extra_data,
+)
 
 
 @pytest.mark.parametrize("method", ["trapezoidal", "left", "right"])
@@ -36,7 +42,7 @@ async def test_state(hass: HomeAssistant, method) -> None:
     }
 
     now = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         assert await async_setup_component(hass, "sensor", config)
 
         entity_id = config["sensor"]["source"]
@@ -51,7 +57,7 @@ async def test_state(hass: HomeAssistant, method) -> None:
     assert "device_class" not in state.attributes
 
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             1,
@@ -75,7 +81,7 @@ async def test_state(hass: HomeAssistant, method) -> None:
 
     # 1 hour after last update, power sensor is unavailable
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             STATE_UNAVAILABLE,
@@ -92,7 +98,7 @@ async def test_state(hass: HomeAssistant, method) -> None:
 
     # 1 hour after last update, power sensor is back to normal at 2 KiloWatts and stays for 1 hour += 2kWh
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             2,
@@ -111,7 +117,7 @@ async def test_state(hass: HomeAssistant, method) -> None:
     )
 
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             2,
@@ -163,6 +169,100 @@ async def test_restore_state(hass: HomeAssistant) -> None:
     assert state.state == "100.00"
     assert state.attributes.get("unit_of_measurement") == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get("device_class") == SensorDeviceClass.ENERGY
+    assert state.attributes.get("last_good_state") is None
+
+
+async def test_restore_unavailable_state(hass: HomeAssistant) -> None:
+    """Test integration sensor state is restored correctly."""
+    mock_restore_cache_with_extra_data(
+        hass,
+        [
+            (
+                State(
+                    "sensor.integration",
+                    STATE_UNAVAILABLE,
+                    {
+                        "device_class": SensorDeviceClass.ENERGY,
+                        "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR,
+                    },
+                ),
+                {
+                    "native_value": None,
+                    "native_unit_of_measurement": "kWh",
+                    "source_entity": "sensor.power",
+                    "last_valid_state": "100.00",
+                },
+            ),
+        ],
+    )
+    config = {
+        "sensor": {
+            "platform": "integration",
+            "name": "integration",
+            "source": "sensor.power",
+            "round": 2,
+        }
+    }
+
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.integration")
+    assert state
+    assert state.state == "100.00"
+
+
+@pytest.mark.parametrize(
+    "extra_attributes",
+    [
+        {
+            "native_unit_of_measurement": "kWh",
+            "source_entity": "sensor.power",
+            "last_valid_state": "100.00",
+        },
+        {
+            "native_value": None,
+            "native_unit_of_measurement": "kWh",
+            "source_entity": "sensor.power",
+            "last_valid_state": "None",
+        },
+    ],
+)
+async def test_restore_unavailable_state_failed(
+    hass: HomeAssistant, extra_attributes
+) -> None:
+    """Test integration sensor state is restored correctly."""
+    mock_restore_cache_with_extra_data(
+        hass,
+        [
+            (
+                State(
+                    "sensor.integration",
+                    STATE_UNAVAILABLE,
+                    {
+                        "device_class": SensorDeviceClass.ENERGY,
+                        "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR,
+                    },
+                ),
+                extra_attributes,
+            ),
+        ],
+    )
+    config = {
+        "sensor": {
+            "platform": "integration",
+            "name": "integration",
+            "source": "sensor.power",
+            "round": 2,
+        }
+    }
+
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.integration")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_restore_state_failed(hass: HomeAssistant) -> None:
@@ -217,10 +317,11 @@ async def test_trapezoidal(hass: HomeAssistant) -> None:
     hass.states.async_set(entity_id, 0, {})
     await hass.async_block_till_done()
 
-    # Testing a power sensor with non-monotonic intervals and values
-    for time, value in [(20, 10), (30, 30), (40, 5), (50, 0)]:
-        now = dt_util.utcnow() + timedelta(minutes=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+    start_time = dt_util.utcnow()
+    with freeze_time(start_time) as freezer:
+        # Testing a power sensor with non-monotonic intervals and values
+        for time, value in [(20, 10), (30, 30), (40, 5), (50, 0)]:
+            freezer.move_to(start_time + timedelta(minutes=time))
             hass.states.async_set(
                 entity_id,
                 value,
@@ -260,7 +361,7 @@ async def test_left(hass: HomeAssistant) -> None:
     # Testing a power sensor with non-monotonic intervals and values
     for time, value in [(20, 10), (30, 30), (40, 5), (50, 0)]:
         now = dt_util.utcnow() + timedelta(minutes=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+        with freeze_time(now):
             hass.states.async_set(
                 entity_id,
                 value,
@@ -300,7 +401,7 @@ async def test_right(hass: HomeAssistant) -> None:
     # Testing a power sensor with non-monotonic intervals and values
     for time, value in [(20, 10), (30, 30), (40, 5), (50, 0)]:
         now = dt_util.utcnow() + timedelta(minutes=time)
-        with patch("homeassistant.util.dt.utcnow", return_value=now):
+        with freeze_time(now):
             hass.states.async_set(
                 entity_id,
                 value,
@@ -336,7 +437,7 @@ async def test_prefix(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     now = dt_util.utcnow() + timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             1000,
@@ -375,7 +476,7 @@ async def test_suffix(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     now = dt_util.utcnow() + timedelta(seconds=10)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             1000,
@@ -411,7 +512,7 @@ async def test_suffix_2(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
     now = dt_util.utcnow() + timedelta(hours=1)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(
             entity_id,
             1000,
@@ -556,7 +657,7 @@ async def test_calc_errors(hass: HomeAssistant, method) -> None:
     # Moving from an unknown state to a value is a calc error and should
     # not change the value of the Reimann sensor, unless the method used is "right".
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(entity_id, 0, {"device_class": None})
         await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -568,7 +669,7 @@ async def test_calc_errors(hass: HomeAssistant, method) -> None:
     # With the source sensor updated successfully, the Reimann sensor
     # should have a zero (known) value.
     now += timedelta(seconds=3600)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with freeze_time(now):
         hass.states.async_set(entity_id, 1, {"device_class": None})
         await hass.async_block_till_done()
     await hass.async_block_till_done()
@@ -576,3 +677,48 @@ async def test_calc_errors(hass: HomeAssistant, method) -> None:
     state = hass.states.get("sensor.integration")
     assert state is not None
     assert round(float(state.state)) == 0 if method != "right" else 1
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Riemann sum integral."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    integration_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "method": "trapezoidal",
+            "name": "integration",
+            "round": 1.0,
+            "source": "sensor.test_source",
+            "unit_prefix": "k",
+            "unit_time": "min",
+        },
+        title="Integration",
+    )
+
+    integration_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(integration_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    integration_entity = entity_registry.async_get("sensor.integration")
+    assert integration_entity is not None
+    assert integration_entity.device_id == source_entity.device_id
diff --git a/tests/components/intent_script/fixtures/configuration.yaml b/tests/components/intent_script/fixtures/configuration.yaml
new file mode 100644
index 00000000000000..93b4ebe5e265a9
--- /dev/null
+++ b/tests/components/intent_script/fixtures/configuration.yaml
@@ -0,0 +1,4 @@
+intent_script:
+  NewIntent2:
+    speech:
+      text: Hello World
diff --git a/tests/components/intent_script/fixtures/configuration_no_entry.yaml b/tests/components/intent_script/fixtures/configuration_no_entry.yaml
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tests/components/intent_script/test_init.py b/tests/components/intent_script/test_init.py
index 044bbcaa7e7da5..a68b2a9be2426e 100644
--- a/tests/components/intent_script/test_init.py
+++ b/tests/components/intent_script/test_init.py
@@ -1,9 +1,14 @@
 """Test intent_script component."""
+from unittest.mock import patch
+
+from homeassistant import config as hass_config
 from homeassistant.bootstrap import async_setup_component
+from homeassistant.components.intent_script import DOMAIN
+from homeassistant.const import SERVICE_RELOAD
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import intent
 
-from tests.common import async_mock_service
+from tests.common import async_mock_service, get_fixture_path
 
 
 async def test_intent_script(hass: HomeAssistant) -> None:
@@ -134,3 +139,49 @@ async def test_intent_script_falsy_reprompt(hass: HomeAssistant) -> None:
 
     assert response.card["simple"]["title"] == "Hello Paulus"
     assert response.card["simple"]["content"] == "Content for Paulus"
+
+
+async def test_reload(hass: HomeAssistant) -> None:
+    """Verify we can reload intent config."""
+
+    config = {"intent_script": {"NewIntent1": {"speech": {"text": "HelloWorld123"}}}}
+
+    await async_setup_component(hass, "intent_script", config)
+    await hass.async_block_till_done()
+
+    intents = hass.data.get(intent.DATA_KEY)
+
+    assert len(intents) == 1
+    assert intents.get("NewIntent1")
+
+    yaml_path = get_fixture_path("configuration.yaml", "intent_script")
+
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    assert len(intents) == 1
+
+    assert intents.get("NewIntent1") is None
+    assert intents.get("NewIntent2")
+
+    yaml_path = get_fixture_path("configuration_no_entry.yaml", "intent_script")
+
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    # absence of intent_script from the configuration.yaml should delete all intents.
+    assert len(intents) == 0
+    assert intents.get("NewIntent1") is None
+    assert intents.get("NewIntent2") is None
diff --git a/tests/components/ipma/__init__.py b/tests/components/ipma/__init__.py
index 4a002140437be9..ba172fc7bb8fe2 100644
--- a/tests/components/ipma/__init__.py
+++ b/tests/components/ipma/__init__.py
@@ -15,6 +15,18 @@
 class MockLocation:
     """Mock Location from pyipma."""
 
+    async def fire_risk(self, api):
+        """Mock Fire Risk."""
+        RCM = namedtuple(
+            "RCM",
+            [
+                "dico",
+                "rcm",
+                "coordinates",
+            ],
+        )
+        return RCM("some place", 3, (0, 0))
+
     async def observation(self, api):
         """Mock Observation."""
         Observation = namedtuple(
diff --git a/tests/components/ipma/test_sensor.py b/tests/components/ipma/test_sensor.py
new file mode 100644
index 00000000000000..cbbad9c590fa71
--- /dev/null
+++ b/tests/components/ipma/test_sensor.py
@@ -0,0 +1,24 @@
+"""The sensor tests for the IPMA platform."""
+
+from unittest.mock import patch
+
+from . import ENTRY_CONFIG, MockLocation
+
+from tests.common import MockConfigEntry
+
+
+async def test_ipma_fire_risk_create_sensors(hass):
+    """Test creation of fire risk sensors."""
+
+    with patch(
+        "pyipma.location.Location.get",
+        return_value=MockLocation(),
+    ):
+        entry = MockConfigEntry(domain="ipma", data=ENTRY_CONFIG)
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.hometown_fire_risk")
+
+    assert state.state == "3"
diff --git a/tests/components/jellyfin/conftest.py b/tests/components/jellyfin/conftest.py
index 423e4ad395069b..671c9881ae0529 100644
--- a/tests/components/jellyfin/conftest.py
+++ b/tests/components/jellyfin/conftest.py
@@ -74,6 +74,8 @@ def mock_api() -> MagicMock:
     jf_api.sessions.return_value = load_json_fixture("sessions.json")
 
     jf_api.artwork.side_effect = api_artwork_side_effect
+    jf_api.audio_url.side_effect = api_audio_url_side_effect
+    jf_api.video_url.side_effect = api_video_url_side_effect
     jf_api.user_items.side_effect = api_user_items_side_effect
     jf_api.get_item.side_effect = api_get_item_side_effect
     jf_api.get_media_folders.return_value = load_json_fixture("get-media-folders.json")
@@ -86,7 +88,7 @@ def mock_api() -> MagicMock:
 def mock_config() -> MagicMock:
     """Return a mocked JellyfinClient."""
     jf_config = create_autospec(Config)
-    jf_config.data = {}
+    jf_config.data = {"auth.server": "http://localhost"}
 
     return jf_config
 
@@ -138,6 +140,18 @@ def api_artwork_side_effect(*args, **kwargs):
     return f"http://localhost/Items/{item_id}/Images/{art}.{ext}"
 
 
+def api_audio_url_side_effect(*args, **kwargs):
+    """Handle variable responses for audio_url method."""
+    item_id = args[0]
+    return f"http://localhost/Audio/{item_id}/universal?UserId=test-username,DeviceId=TEST-UUID,MaxStreamingBitrate=140000000"
+
+
+def api_video_url_side_effect(*args, **kwargs):
+    """Handle variable responses for video_url method."""
+    item_id = args[0]
+    return f"http://localhost/Videos/{item_id}/stream?static=true,DeviceId=TEST-UUID,api_key=TEST-API-KEY"
+
+
 def api_get_item_side_effect(*args):
     """Handle variable responses for get_item method."""
     return load_json_fixture("get-item-collection.json")
diff --git a/tests/components/jellyfin/fixtures/album.json b/tests/components/jellyfin/fixtures/album.json
new file mode 100644
index 00000000000000..b748b125e4a895
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/album.json
@@ -0,0 +1,12 @@
+{
+  "AlbumArtist": "ARTIST",
+  "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+  "Artists": ["ARTIST"],
+  "Id": "ALBUM-UUID",
+  "ImageTags": {},
+  "IsFolder": true,
+  "Name": "ALBUM",
+  "PrimaryImageAspectRatio": 1,
+  "ServerId": "ServerId",
+  "Type": "MusicAlbum"
+}
diff --git a/tests/components/jellyfin/fixtures/albums.json b/tests/components/jellyfin/fixtures/albums.json
new file mode 100644
index 00000000000000..e557018a89e90c
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/albums.json
@@ -0,0 +1,16 @@
+{
+  "Items": [
+    {
+      "AlbumArtist": "ARTIST",
+      "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "Artists": ["ARTIST"],
+      "Id": "ALBUM-UUID",
+      "ImageTags": {},
+      "IsFolder": true,
+      "Name": "ALBUM",
+      "PrimaryImageAspectRatio": 1,
+      "ServerId": "ServerId",
+      "Type": "MusicAlbum"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/artist.json b/tests/components/jellyfin/fixtures/artist.json
new file mode 100644
index 00000000000000..95e59d33820e14
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/artist.json
@@ -0,0 +1,15 @@
+{
+  "AlbumCount": 1,
+  "Id": "ARTIST-UUID",
+  "ImageTags": {
+    "Logo": "string",
+    "Primary": "string"
+  },
+  "IsFolder": true,
+  "Name": "ARTIST",
+  "ParentId": "MUSIC-COLLECTION-FOLDER-UUID",
+  "Path": "/media/music/artist",
+  "PrimaryImageAspectRatio": 1,
+  "ServerId": "string",
+  "Type": "MusicArtist"
+}
diff --git a/tests/components/jellyfin/fixtures/artists.json b/tests/components/jellyfin/fixtures/artists.json
new file mode 100644
index 00000000000000..bb57ef451a24e4
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/artists.json
@@ -0,0 +1,19 @@
+{
+  "Items": [
+    {
+      "AlbumCount": 1,
+      "Id": "ARTIST-UUID",
+      "ImageTags": {
+        "Logo": "string",
+        "Primary": "string"
+      },
+      "IsFolder": true,
+      "Name": "ARTIST",
+      "ParentId": "MUSIC-COLLECTION-FOLDER-UUID",
+      "Path": "/media/music/artist",
+      "PrimaryImageAspectRatio": 1,
+      "ServerId": "string",
+      "Type": "MusicArtist"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/episode.json b/tests/components/jellyfin/fixtures/episode.json
new file mode 100644
index 00000000000000..49f30434eac108
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/episode.json
@@ -0,0 +1,504 @@
+{
+  "Name": "EPISODE",
+  "OriginalTitle": "string",
+  "ServerId": "SERVER-UUID",
+  "Id": "EPISODE-UUID",
+  "Etag": "string",
+  "SourceType": "string",
+  "PlaylistItemId": "string",
+  "DateCreated": "2019-08-24T14:15:22Z",
+  "DateLastMediaAdded": "2019-08-24T14:15:22Z",
+  "ExtraType": "string",
+  "AirsBeforeSeasonNumber": 0,
+  "AirsAfterSeasonNumber": 0,
+  "AirsBeforeEpisodeNumber": 0,
+  "CanDelete": true,
+  "CanDownload": true,
+  "HasSubtitles": true,
+  "PreferredMetadataLanguage": "string",
+  "PreferredMetadataCountryCode": "string",
+  "SupportsSync": true,
+  "Container": "string",
+  "SortName": "string",
+  "ForcedSortName": "string",
+  "Video3DFormat": "HalfSideBySide",
+  "PremiereDate": "2019-08-24T14:15:22Z",
+  "ExternalUrls": [
+    {
+      "Name": "string",
+      "Url": "string"
+    }
+  ],
+  "MediaSources": [
+    {
+      "Protocol": "File",
+      "Id": "string",
+      "Path": "/media/tvshows/Series/Season 01/S01E01.mp4",
+      "EncoderPath": "string",
+      "EncoderProtocol": "File",
+      "Type": "Default",
+      "Container": "string",
+      "Size": 0,
+      "Name": "string",
+      "IsRemote": true,
+      "ETag": "string",
+      "RunTimeTicks": 0,
+      "ReadAtNativeFramerate": true,
+      "IgnoreDts": true,
+      "IgnoreIndex": true,
+      "GenPtsInput": true,
+      "SupportsTranscoding": true,
+      "SupportsDirectStream": true,
+      "SupportsDirectPlay": true,
+      "IsInfiniteStream": true,
+      "RequiresOpening": true,
+      "OpenToken": "string",
+      "RequiresClosing": true,
+      "LiveStreamId": "string",
+      "BufferMs": 0,
+      "RequiresLooping": true,
+      "SupportsProbing": true,
+      "VideoType": "VideoFile",
+      "IsoType": "Dvd",
+      "Video3DFormat": "HalfSideBySide",
+      "MediaStreams": [
+        {
+          "Codec": "string",
+          "CodecTag": "string",
+          "Language": "string",
+          "ColorRange": "string",
+          "ColorSpace": "string",
+          "ColorTransfer": "string",
+          "ColorPrimaries": "string",
+          "DvVersionMajor": 0,
+          "DvVersionMinor": 0,
+          "DvProfile": 0,
+          "DvLevel": 0,
+          "RpuPresentFlag": 0,
+          "ElPresentFlag": 0,
+          "BlPresentFlag": 0,
+          "DvBlSignalCompatibilityId": 0,
+          "Comment": "string",
+          "TimeBase": "string",
+          "CodecTimeBase": "string",
+          "Title": "string",
+          "VideoRange": "string",
+          "VideoRangeType": "string",
+          "VideoDoViTitle": "string",
+          "LocalizedUndefined": "string",
+          "LocalizedDefault": "string",
+          "LocalizedForced": "string",
+          "LocalizedExternal": "string",
+          "DisplayTitle": "string",
+          "NalLengthSize": "string",
+          "IsInterlaced": true,
+          "IsAVC": true,
+          "ChannelLayout": "string",
+          "BitRate": 0,
+          "BitDepth": 0,
+          "RefFrames": 0,
+          "PacketLength": 0,
+          "Channels": 0,
+          "SampleRate": 0,
+          "IsDefault": true,
+          "IsForced": true,
+          "Height": 0,
+          "Width": 0,
+          "AverageFrameRate": 0,
+          "RealFrameRate": 0,
+          "Profile": "string",
+          "Type": "Audio",
+          "AspectRatio": "string",
+          "Index": 0,
+          "Score": 0,
+          "IsExternal": true,
+          "DeliveryMethod": "Encode",
+          "DeliveryUrl": "string",
+          "IsExternalUrl": true,
+          "IsTextSubtitleStream": true,
+          "SupportsExternalStream": true,
+          "Path": "string",
+          "PixelFormat": "string",
+          "Level": 0,
+          "IsAnamorphic": true
+        }
+      ],
+      "MediaAttachments": [
+        {
+          "Codec": "string",
+          "CodecTag": "string",
+          "Comment": "string",
+          "Index": 0,
+          "FileName": "string",
+          "MimeType": "string",
+          "DeliveryUrl": "string"
+        }
+      ],
+      "Formats": ["string"],
+      "Bitrate": 0,
+      "Timestamp": "None",
+      "RequiredHttpHeaders": {
+        "property1": "string",
+        "property2": "string"
+      },
+      "TranscodingUrl": "string",
+      "TranscodingSubProtocol": "string",
+      "TranscodingContainer": "string",
+      "AnalyzeDurationMs": 0,
+      "DefaultAudioStreamIndex": 0,
+      "DefaultSubtitleStreamIndex": 0
+    }
+  ],
+  "CriticRating": 0,
+  "ProductionLocations": ["string"],
+  "Path": "string",
+  "EnableMediaSourceDisplay": true,
+  "OfficialRating": "string",
+  "CustomRating": "string",
+  "ChannelId": "04b0b2a5-93cb-474d-8ea9-3df0f84eb0ff",
+  "ChannelName": "string",
+  "Overview": "string",
+  "Taglines": ["string"],
+  "Genres": ["string"],
+  "CommunityRating": 0,
+  "CumulativeRunTimeTicks": 0,
+  "RunTimeTicks": 0,
+  "PlayAccess": "Full",
+  "AspectRatio": "string",
+  "ProductionYear": 0,
+  "IsPlaceHolder": true,
+  "Number": "string",
+  "ChannelNumber": "string",
+  "IndexNumber": 0,
+  "IndexNumberEnd": 0,
+  "ParentIndexNumber": 0,
+  "RemoteTrailers": [
+    {
+      "Url": "string",
+      "Name": "string"
+    }
+  ],
+  "ProviderIds": {
+    "property1": "string",
+    "property2": "string"
+  },
+  "IsHD": true,
+  "IsFolder": false,
+  "ParentId": "FOLDER-UUID",
+  "Type": "Episode",
+  "People": [
+    {
+      "Name": "string",
+      "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43",
+      "Role": "string",
+      "Type": "string",
+      "PrimaryImageTag": "string",
+      "ImageBlurHashes": {
+        "Primary": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Art": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Backdrop": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Banner": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Logo": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Thumb": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Disc": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Box": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Screenshot": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Menu": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Chapter": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "BoxRear": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Profile": {
+          "property1": "string",
+          "property2": "string"
+        }
+      }
+    }
+  ],
+  "Studios": [
+    {
+      "Name": "string",
+      "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+    }
+  ],
+  "GenreItems": [
+    {
+      "Name": "string",
+      "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+    }
+  ],
+  "ParentLogoItemId": "c78d400f-de5c-421e-8714-4fb05d387233",
+  "ParentBackdropItemId": "c22fd826-17fc-44f4-9b04-1eb3e8fb9173",
+  "ParentBackdropImageTags": ["string"],
+  "LocalTrailerCount": 0,
+  "UserData": {
+    "Rating": 0,
+    "PlayedPercentage": 0,
+    "UnplayedItemCount": 0,
+    "PlaybackPositionTicks": 0,
+    "PlayCount": 0,
+    "IsFavorite": true,
+    "Likes": true,
+    "LastPlayedDate": "2019-08-24T14:15:22Z",
+    "Played": true,
+    "Key": "string",
+    "ItemId": "string"
+  },
+  "RecursiveItemCount": 0,
+  "ChildCount": 0,
+  "SeriesName": "string",
+  "SeriesId": "c7b70af4-4902-4a7e-95ab-28349b6c7afc",
+  "SeasonId": "badb6463-e5b7-45c5-8141-71204420ec8f",
+  "SpecialFeatureCount": 0,
+  "DisplayPreferencesId": "string",
+  "Status": "string",
+  "AirTime": "string",
+  "AirDays": ["Sunday"],
+  "Tags": ["string"],
+  "PrimaryImageAspectRatio": 0,
+  "Artists": ["string"],
+  "ArtistItems": [
+    {
+      "Name": "string",
+      "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+    }
+  ],
+  "Album": "string",
+  "CollectionType": "string",
+  "DisplayOrder": "string",
+  "AlbumId": "21af9851-8e39-43a9-9c47-513d3b9e99fc",
+  "AlbumPrimaryImageTag": "string",
+  "SeriesPrimaryImageTag": "string",
+  "AlbumArtist": "string",
+  "AlbumArtists": [
+    {
+      "Name": "string",
+      "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+    }
+  ],
+  "SeasonName": "string",
+  "MediaStreams": [
+    {
+      "Codec": "string",
+      "CodecTag": "string",
+      "Language": "string",
+      "ColorRange": "string",
+      "ColorSpace": "string",
+      "ColorTransfer": "string",
+      "ColorPrimaries": "string",
+      "DvVersionMajor": 0,
+      "DvVersionMinor": 0,
+      "DvProfile": 0,
+      "DvLevel": 0,
+      "RpuPresentFlag": 0,
+      "ElPresentFlag": 0,
+      "BlPresentFlag": 0,
+      "DvBlSignalCompatibilityId": 0,
+      "Comment": "string",
+      "TimeBase": "string",
+      "CodecTimeBase": "string",
+      "Title": "string",
+      "VideoRange": "string",
+      "VideoRangeType": "string",
+      "VideoDoViTitle": "string",
+      "LocalizedUndefined": "string",
+      "LocalizedDefault": "string",
+      "LocalizedForced": "string",
+      "LocalizedExternal": "string",
+      "DisplayTitle": "string",
+      "NalLengthSize": "string",
+      "IsInterlaced": true,
+      "IsAVC": true,
+      "ChannelLayout": "string",
+      "BitRate": 0,
+      "BitDepth": 0,
+      "RefFrames": 0,
+      "PacketLength": 0,
+      "Channels": 0,
+      "SampleRate": 0,
+      "IsDefault": true,
+      "IsForced": true,
+      "Height": 0,
+      "Width": 0,
+      "AverageFrameRate": 0,
+      "RealFrameRate": 0,
+      "Profile": "string",
+      "Type": "Audio",
+      "AspectRatio": "string",
+      "Index": 0,
+      "Score": 0,
+      "IsExternal": true,
+      "DeliveryMethod": "Encode",
+      "DeliveryUrl": "string",
+      "IsExternalUrl": true,
+      "IsTextSubtitleStream": true,
+      "SupportsExternalStream": true,
+      "Path": "string",
+      "PixelFormat": "string",
+      "Level": 0,
+      "IsAnamorphic": true
+    }
+  ],
+  "VideoType": "VideoFile",
+  "PartCount": 0,
+  "MediaSourceCount": 0,
+  "ImageTags": {
+    "property1": "string",
+    "property2": "string"
+  },
+  "BackdropImageTags": ["string"],
+  "ScreenshotImageTags": ["string"],
+  "ParentLogoImageTag": "string",
+  "ParentArtItemId": "10c1875b-b82c-48e8-bae9-939a5e68dc2f",
+  "ParentArtImageTag": "string",
+  "SeriesThumbImageTag": "string",
+  "ImageBlurHashes": {
+    "Primary": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Art": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Backdrop": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Banner": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Logo": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Thumb": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Disc": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Box": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Screenshot": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Menu": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Chapter": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "BoxRear": {
+      "property1": "string",
+      "property2": "string"
+    },
+    "Profile": {
+      "property1": "string",
+      "property2": "string"
+    }
+  },
+  "SeriesStudio": "string",
+  "ParentThumbItemId": "ae6ff707-333d-4994-be6d-b83ca1b35f46",
+  "ParentThumbImageTag": "string",
+  "ParentPrimaryImageItemId": "string",
+  "ParentPrimaryImageTag": "string",
+  "Chapters": [
+    {
+      "StartPositionTicks": 0,
+      "Name": "string",
+      "ImagePath": "string",
+      "ImageDateModified": "2019-08-24T14:15:22Z",
+      "ImageTag": "string"
+    }
+  ],
+  "LocationType": "FileSystem",
+  "IsoType": "Dvd",
+  "MediaType": "string",
+  "EndDate": "2019-08-24T14:15:22Z",
+  "LockedFields": ["Cast"],
+  "TrailerCount": 0,
+  "MovieCount": 0,
+  "SeriesCount": 0,
+  "ProgramCount": 0,
+  "EpisodeCount": 0,
+  "SongCount": 0,
+  "AlbumCount": 0,
+  "ArtistCount": 0,
+  "MusicVideoCount": 0,
+  "LockData": true,
+  "Width": 0,
+  "Height": 0,
+  "CameraMake": "string",
+  "CameraModel": "string",
+  "Software": "string",
+  "ExposureTime": 0,
+  "FocalLength": 0,
+  "ImageOrientation": "TopLeft",
+  "Aperture": 0,
+  "ShutterSpeed": 0,
+  "Latitude": 0,
+  "Longitude": 0,
+  "Altitude": 0,
+  "IsoSpeedRating": 0,
+  "SeriesTimerId": "string",
+  "ProgramId": "string",
+  "ChannelPrimaryImageTag": "string",
+  "StartDate": "2019-08-24T14:15:22Z",
+  "CompletionPercentage": 0,
+  "IsRepeat": true,
+  "EpisodeTitle": "string",
+  "ChannelType": "TV",
+  "Audio": "Mono",
+  "IsMovie": true,
+  "IsSports": true,
+  "IsSeries": true,
+  "IsLive": true,
+  "IsNews": true,
+  "IsKids": true,
+  "IsPremiere": true,
+  "TimerId": "string",
+  "CurrentProgram": {}
+}
diff --git a/tests/components/jellyfin/fixtures/episodes.json b/tests/components/jellyfin/fixtures/episodes.json
new file mode 100644
index 00000000000000..31b2fe76558ecf
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/episodes.json
@@ -0,0 +1,509 @@
+{
+  "Items": [
+    {
+      "Name": "EPISODE",
+      "OriginalTitle": "string",
+      "ServerId": "SERVER-UUID",
+      "Id": "EPISODE-UUID",
+      "Etag": "string",
+      "SourceType": "string",
+      "PlaylistItemId": "string",
+      "DateCreated": "2019-08-24T14:15:22Z",
+      "DateLastMediaAdded": "2019-08-24T14:15:22Z",
+      "ExtraType": "string",
+      "AirsBeforeSeasonNumber": 0,
+      "AirsAfterSeasonNumber": 0,
+      "AirsBeforeEpisodeNumber": 0,
+      "CanDelete": true,
+      "CanDownload": true,
+      "HasSubtitles": true,
+      "PreferredMetadataLanguage": "string",
+      "PreferredMetadataCountryCode": "string",
+      "SupportsSync": true,
+      "Container": "string",
+      "SortName": "string",
+      "ForcedSortName": "string",
+      "Video3DFormat": "HalfSideBySide",
+      "PremiereDate": "2019-08-24T14:15:22Z",
+      "ExternalUrls": [
+        {
+          "Name": "string",
+          "Url": "string"
+        }
+      ],
+      "MediaSources": [
+        {
+          "Protocol": "File",
+          "Id": "string",
+          "Path": "/media/tvshows/Series/Season 01/S01E01.mp4",
+          "EncoderPath": "string",
+          "EncoderProtocol": "File",
+          "Type": "Default",
+          "Container": "string",
+          "Size": 0,
+          "Name": "string",
+          "IsRemote": true,
+          "ETag": "string",
+          "RunTimeTicks": 0,
+          "ReadAtNativeFramerate": true,
+          "IgnoreDts": true,
+          "IgnoreIndex": true,
+          "GenPtsInput": true,
+          "SupportsTranscoding": true,
+          "SupportsDirectStream": true,
+          "SupportsDirectPlay": true,
+          "IsInfiniteStream": true,
+          "RequiresOpening": true,
+          "OpenToken": "string",
+          "RequiresClosing": true,
+          "LiveStreamId": "string",
+          "BufferMs": 0,
+          "RequiresLooping": true,
+          "SupportsProbing": true,
+          "VideoType": "VideoFile",
+          "IsoType": "Dvd",
+          "Video3DFormat": "HalfSideBySide",
+          "MediaStreams": [
+            {
+              "Codec": "string",
+              "CodecTag": "string",
+              "Language": "string",
+              "ColorRange": "string",
+              "ColorSpace": "string",
+              "ColorTransfer": "string",
+              "ColorPrimaries": "string",
+              "DvVersionMajor": 0,
+              "DvVersionMinor": 0,
+              "DvProfile": 0,
+              "DvLevel": 0,
+              "RpuPresentFlag": 0,
+              "ElPresentFlag": 0,
+              "BlPresentFlag": 0,
+              "DvBlSignalCompatibilityId": 0,
+              "Comment": "string",
+              "TimeBase": "string",
+              "CodecTimeBase": "string",
+              "Title": "string",
+              "VideoRange": "string",
+              "VideoRangeType": "string",
+              "VideoDoViTitle": "string",
+              "LocalizedUndefined": "string",
+              "LocalizedDefault": "string",
+              "LocalizedForced": "string",
+              "LocalizedExternal": "string",
+              "DisplayTitle": "string",
+              "NalLengthSize": "string",
+              "IsInterlaced": true,
+              "IsAVC": true,
+              "ChannelLayout": "string",
+              "BitRate": 0,
+              "BitDepth": 0,
+              "RefFrames": 0,
+              "PacketLength": 0,
+              "Channels": 0,
+              "SampleRate": 0,
+              "IsDefault": true,
+              "IsForced": true,
+              "Height": 0,
+              "Width": 0,
+              "AverageFrameRate": 0,
+              "RealFrameRate": 0,
+              "Profile": "string",
+              "Type": "Audio",
+              "AspectRatio": "string",
+              "Index": 0,
+              "Score": 0,
+              "IsExternal": true,
+              "DeliveryMethod": "Encode",
+              "DeliveryUrl": "string",
+              "IsExternalUrl": true,
+              "IsTextSubtitleStream": true,
+              "SupportsExternalStream": true,
+              "Path": "string",
+              "PixelFormat": "string",
+              "Level": 0,
+              "IsAnamorphic": true
+            }
+          ],
+          "MediaAttachments": [
+            {
+              "Codec": "string",
+              "CodecTag": "string",
+              "Comment": "string",
+              "Index": 0,
+              "FileName": "string",
+              "MimeType": "string",
+              "DeliveryUrl": "string"
+            }
+          ],
+          "Formats": ["string"],
+          "Bitrate": 0,
+          "Timestamp": "None",
+          "RequiredHttpHeaders": {
+            "property1": "string",
+            "property2": "string"
+          },
+          "TranscodingUrl": "string",
+          "TranscodingSubProtocol": "string",
+          "TranscodingContainer": "string",
+          "AnalyzeDurationMs": 0,
+          "DefaultAudioStreamIndex": 0,
+          "DefaultSubtitleStreamIndex": 0
+        }
+      ],
+      "CriticRating": 0,
+      "ProductionLocations": ["string"],
+      "Path": "string",
+      "EnableMediaSourceDisplay": true,
+      "OfficialRating": "string",
+      "CustomRating": "string",
+      "ChannelId": "04b0b2a5-93cb-474d-8ea9-3df0f84eb0ff",
+      "ChannelName": "string",
+      "Overview": "string",
+      "Taglines": ["string"],
+      "Genres": ["string"],
+      "CommunityRating": 0,
+      "CumulativeRunTimeTicks": 0,
+      "RunTimeTicks": 0,
+      "PlayAccess": "Full",
+      "AspectRatio": "string",
+      "ProductionYear": 0,
+      "IsPlaceHolder": true,
+      "Number": "string",
+      "ChannelNumber": "string",
+      "IndexNumber": 0,
+      "IndexNumberEnd": 0,
+      "ParentIndexNumber": 0,
+      "RemoteTrailers": [
+        {
+          "Url": "string",
+          "Name": "string"
+        }
+      ],
+      "ProviderIds": {
+        "property1": "string",
+        "property2": "string"
+      },
+      "IsHD": true,
+      "IsFolder": false,
+      "ParentId": "FOLDER-UUID",
+      "Type": "Episode",
+      "People": [
+        {
+          "Name": "string",
+          "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43",
+          "Role": "string",
+          "Type": "string",
+          "PrimaryImageTag": "string",
+          "ImageBlurHashes": {
+            "Primary": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Art": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Backdrop": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Banner": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Logo": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Thumb": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Disc": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Box": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Screenshot": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Menu": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Chapter": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "BoxRear": {
+              "property1": "string",
+              "property2": "string"
+            },
+            "Profile": {
+              "property1": "string",
+              "property2": "string"
+            }
+          }
+        }
+      ],
+      "Studios": [
+        {
+          "Name": "string",
+          "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+        }
+      ],
+      "GenreItems": [
+        {
+          "Name": "string",
+          "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+        }
+      ],
+      "ParentLogoItemId": "c78d400f-de5c-421e-8714-4fb05d387233",
+      "ParentBackdropItemId": "c22fd826-17fc-44f4-9b04-1eb3e8fb9173",
+      "ParentBackdropImageTags": ["string"],
+      "LocalTrailerCount": 0,
+      "UserData": {
+        "Rating": 0,
+        "PlayedPercentage": 0,
+        "UnplayedItemCount": 0,
+        "PlaybackPositionTicks": 0,
+        "PlayCount": 0,
+        "IsFavorite": true,
+        "Likes": true,
+        "LastPlayedDate": "2019-08-24T14:15:22Z",
+        "Played": true,
+        "Key": "string",
+        "ItemId": "string"
+      },
+      "RecursiveItemCount": 0,
+      "ChildCount": 0,
+      "SeriesName": "string",
+      "SeriesId": "c7b70af4-4902-4a7e-95ab-28349b6c7afc",
+      "SeasonId": "badb6463-e5b7-45c5-8141-71204420ec8f",
+      "SpecialFeatureCount": 0,
+      "DisplayPreferencesId": "string",
+      "Status": "string",
+      "AirTime": "string",
+      "AirDays": ["Sunday"],
+      "Tags": ["string"],
+      "PrimaryImageAspectRatio": 0,
+      "Artists": ["string"],
+      "ArtistItems": [
+        {
+          "Name": "string",
+          "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+        }
+      ],
+      "Album": "string",
+      "CollectionType": "string",
+      "DisplayOrder": "string",
+      "AlbumId": "21af9851-8e39-43a9-9c47-513d3b9e99fc",
+      "AlbumPrimaryImageTag": "string",
+      "SeriesPrimaryImageTag": "string",
+      "AlbumArtist": "string",
+      "AlbumArtists": [
+        {
+          "Name": "string",
+          "Id": "38a5a5bb-dc30-49a2-b175-1de0d1488c43"
+        }
+      ],
+      "SeasonName": "string",
+      "MediaStreams": [
+        {
+          "Codec": "string",
+          "CodecTag": "string",
+          "Language": "string",
+          "ColorRange": "string",
+          "ColorSpace": "string",
+          "ColorTransfer": "string",
+          "ColorPrimaries": "string",
+          "DvVersionMajor": 0,
+          "DvVersionMinor": 0,
+          "DvProfile": 0,
+          "DvLevel": 0,
+          "RpuPresentFlag": 0,
+          "ElPresentFlag": 0,
+          "BlPresentFlag": 0,
+          "DvBlSignalCompatibilityId": 0,
+          "Comment": "string",
+          "TimeBase": "string",
+          "CodecTimeBase": "string",
+          "Title": "string",
+          "VideoRange": "string",
+          "VideoRangeType": "string",
+          "VideoDoViTitle": "string",
+          "LocalizedUndefined": "string",
+          "LocalizedDefault": "string",
+          "LocalizedForced": "string",
+          "LocalizedExternal": "string",
+          "DisplayTitle": "string",
+          "NalLengthSize": "string",
+          "IsInterlaced": true,
+          "IsAVC": true,
+          "ChannelLayout": "string",
+          "BitRate": 0,
+          "BitDepth": 0,
+          "RefFrames": 0,
+          "PacketLength": 0,
+          "Channels": 0,
+          "SampleRate": 0,
+          "IsDefault": true,
+          "IsForced": true,
+          "Height": 0,
+          "Width": 0,
+          "AverageFrameRate": 0,
+          "RealFrameRate": 0,
+          "Profile": "string",
+          "Type": "Audio",
+          "AspectRatio": "string",
+          "Index": 0,
+          "Score": 0,
+          "IsExternal": true,
+          "DeliveryMethod": "Encode",
+          "DeliveryUrl": "string",
+          "IsExternalUrl": true,
+          "IsTextSubtitleStream": true,
+          "SupportsExternalStream": true,
+          "Path": "string",
+          "PixelFormat": "string",
+          "Level": 0,
+          "IsAnamorphic": true
+        }
+      ],
+      "VideoType": "VideoFile",
+      "PartCount": 0,
+      "MediaSourceCount": 0,
+      "ImageTags": {
+        "Primary": "string"
+      },
+      "BackdropImageTags": ["string"],
+      "ScreenshotImageTags": ["string"],
+      "ParentLogoImageTag": "string",
+      "ParentArtItemId": "10c1875b-b82c-48e8-bae9-939a5e68dc2f",
+      "ParentArtImageTag": "string",
+      "SeriesThumbImageTag": "string",
+      "ImageBlurHashes": {
+        "Primary": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Art": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Backdrop": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Banner": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Logo": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Thumb": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Disc": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Box": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Screenshot": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Menu": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Chapter": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "BoxRear": {
+          "property1": "string",
+          "property2": "string"
+        },
+        "Profile": {
+          "property1": "string",
+          "property2": "string"
+        }
+      },
+      "SeriesStudio": "string",
+      "ParentThumbItemId": "ae6ff707-333d-4994-be6d-b83ca1b35f46",
+      "ParentThumbImageTag": "string",
+      "ParentPrimaryImageItemId": "string",
+      "ParentPrimaryImageTag": "string",
+      "Chapters": [
+        {
+          "StartPositionTicks": 0,
+          "Name": "string",
+          "ImagePath": "string",
+          "ImageDateModified": "2019-08-24T14:15:22Z",
+          "ImageTag": "string"
+        }
+      ],
+      "LocationType": "FileSystem",
+      "IsoType": "Dvd",
+      "MediaType": "string",
+      "EndDate": "2019-08-24T14:15:22Z",
+      "LockedFields": ["Cast"],
+      "TrailerCount": 0,
+      "MovieCount": 0,
+      "SeriesCount": 0,
+      "ProgramCount": 0,
+      "EpisodeCount": 0,
+      "SongCount": 0,
+      "AlbumCount": 0,
+      "ArtistCount": 0,
+      "MusicVideoCount": 0,
+      "LockData": true,
+      "Width": 0,
+      "Height": 0,
+      "CameraMake": "string",
+      "CameraModel": "string",
+      "Software": "string",
+      "ExposureTime": 0,
+      "FocalLength": 0,
+      "ImageOrientation": "TopLeft",
+      "Aperture": 0,
+      "ShutterSpeed": 0,
+      "Latitude": 0,
+      "Longitude": 0,
+      "Altitude": 0,
+      "IsoSpeedRating": 0,
+      "SeriesTimerId": "string",
+      "ProgramId": "string",
+      "ChannelPrimaryImageTag": "string",
+      "StartDate": "2019-08-24T14:15:22Z",
+      "CompletionPercentage": 0,
+      "IsRepeat": true,
+      "EpisodeTitle": "string",
+      "ChannelType": "TV",
+      "Audio": "Mono",
+      "IsMovie": true,
+      "IsSports": true,
+      "IsSeries": true,
+      "IsLive": true,
+      "IsNews": true,
+      "IsKids": true,
+      "IsPremiere": true,
+      "TimerId": "string",
+      "CurrentProgram": {}
+    }
+  ],
+  "TotalRecordCount": 1,
+  "StartIndex": 0
+}
diff --git a/tests/components/jellyfin/fixtures/get-item-collection.json b/tests/components/jellyfin/fixtures/get-item-collection.json
index 90ad63a39e4ce0..c58074d999f3fc 100644
--- a/tests/components/jellyfin/fixtures/get-item-collection.json
+++ b/tests/components/jellyfin/fixtures/get-item-collection.json
@@ -298,7 +298,7 @@
     }
   ],
   "Album": "string",
-  "CollectionType": "string",
+  "CollectionType": "tvshows",
   "DisplayOrder": "string",
   "AlbumId": "21af9851-8e39-43a9-9c47-513d3b9e99fc",
   "AlbumPrimaryImageTag": "string",
diff --git a/tests/components/jellyfin/fixtures/media-source-root.json b/tests/components/jellyfin/fixtures/media-source-root.json
new file mode 100644
index 00000000000000..9d8d2a8231ad79
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/media-source-root.json
@@ -0,0 +1,23 @@
+{
+  "title": "Jellyfin",
+  "media_class": "directory",
+  "media_content_type": "",
+  "media_content_id": "media-source://jellyfin",
+  "children_media_class": "directory",
+  "can_play": false,
+  "can_expand": true,
+  "thumbnail": null,
+  "not_shown": 0,
+  "children": [
+    {
+      "title": "COLLECTION FOLDER",
+      "media_class": "directory",
+      "media_content_type": "",
+      "media_content_id": "media-source://jellyfin/COLLECTION-FOLDER-UUID",
+      "children_media_class": null,
+      "can_play": false,
+      "can_expand": true,
+      "thumbnail": null
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/movie-collection.json b/tests/components/jellyfin/fixtures/movie-collection.json
new file mode 100644
index 00000000000000..1a3c262440dc5c
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/movie-collection.json
@@ -0,0 +1,45 @@
+{
+  "BackdropImageTags": [],
+  "CanDelete": false,
+  "CanDownload": false,
+  "ChannelId": "",
+  "ChildCount": 1,
+  "CollectionType": "movies",
+  "DateCreated": "string",
+  "DisplayPreferencesId": "string",
+  "EnableMediaSourceDisplay": true,
+  "Etag": "string",
+  "ExternalUrls": [],
+  "GenreItems": [],
+  "Genres": [],
+  "Id": "MOVIE-COLLECTION-FOLDER-UUID",
+  "ImageBlurHashes": { "Primary": { "string": "string" } },
+  "ImageTags": { "Primary": "string" },
+  "IsFolder": true,
+  "LocalTrailerCount": 0,
+  "LocationType": "FileSystem",
+  "LockData": false,
+  "LockedFields": [],
+  "Name": "Movies",
+  "ParentId": "string",
+  "Path": "string",
+  "People": [],
+  "PlayAccess": "Full",
+  "PrimaryImageAspectRatio": 1.7777777777777777,
+  "ProviderIds": {},
+  "RemoteTrailers": [],
+  "ServerId": "string",
+  "SortName": "movies",
+  "SpecialFeatureCount": 0,
+  "Studios": [],
+  "Taglines": [],
+  "Tags": [],
+  "Type": "CollectionFolder",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "string",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false
+  }
+}
diff --git a/tests/components/jellyfin/fixtures/movie.json b/tests/components/jellyfin/fixtures/movie.json
new file mode 100644
index 00000000000000..47eaddd4cfcf70
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/movie.json
@@ -0,0 +1,153 @@
+{
+  "BackdropImageTags": ["string"],
+  "CanDelete": true,
+  "CanDownload": true,
+  "ChannelId": "",
+  "Chapters": [],
+  "CommunityRating": 0,
+  "Container": "string",
+  "CriticRating": 0,
+  "DateCreated": "string",
+  "DisplayPreferencesId": "string",
+  "EnableMediaSourceDisplay": true,
+  "Etag": "string",
+  "ExternalUrls": [],
+  "GenreItems": [],
+  "Genres": ["string"],
+  "Height": 0,
+  "Id": "MOVIE-UUID",
+  "ImageBlurHashes": {
+    "Backdrop": { "string": "string" },
+    "Primary": { "string": "string" }
+  },
+  "ImageTags": { "Primary": "string" },
+  "IsFolder": false,
+  "IsHD": true,
+  "LocalTrailerCount": 0,
+  "LocationType": "FileSystem",
+  "LockData": false,
+  "LockedFields": [],
+  "MediaSources": [
+    {
+      "Bitrate": 0,
+      "Container": "string",
+      "DefaultAudioStreamIndex": 1,
+      "ETag": "string",
+      "Formats": [],
+      "GenPtsInput": false,
+      "Id": "string",
+      "IgnoreDts": false,
+      "IgnoreIndex": false,
+      "IsInfiniteStream": false,
+      "IsRemote": false,
+      "MediaAttachments": [],
+      "MediaStreams": [
+        {
+          "AspectRatio": "string",
+          "AverageFrameRate": 0,
+          "BitRate": 0,
+          "Codec": "string",
+          "CodecTimeBase": "string",
+          "ColorPrimaries": "string",
+          "ColorTransfer": "string",
+          "DisplayTitle": "string",
+          "Height": 0,
+          "Index": 0,
+          "IsDefault": true,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "PixelFormat": "string",
+          "Profile": "Main",
+          "RealFrameRate": 0,
+          "RefFrames": 0,
+          "SupportsExternalStream": false,
+          "TimeBase": "string",
+          "Type": "Video",
+          "VideoRange": "string",
+          "VideoRangeType": "string",
+          "Width": 0
+        }
+      ],
+      "Name": "MOVIE",
+      "Path": "/media/movies/MOVIE/MOVIE.mp4",
+      "Protocol": "File",
+      "ReadAtNativeFramerate": false,
+      "RequiredHttpHeaders": {},
+      "RequiresClosing": false,
+      "RequiresLooping": false,
+      "RequiresOpening": false,
+      "RunTimeTicks": 0,
+      "Size": 0,
+      "SupportsDirectPlay": true,
+      "SupportsDirectStream": true,
+      "SupportsProbing": true,
+      "SupportsTranscoding": false,
+      "Type": "Default",
+      "VideoType": "VideoFile"
+    }
+  ],
+  "MediaStreams": [
+    {
+      "AspectRatio": "string",
+      "AverageFrameRate": 0,
+      "BitRate": 0,
+      "Codec": "string",
+      "CodecTimeBase": "string",
+      "ColorPrimaries": "string",
+      "ColorTransfer": "string",
+      "DisplayTitle": "string",
+      "Height": 0,
+      "Index": 0,
+      "IsDefault": true,
+      "IsExternal": false,
+      "IsForced": false,
+      "IsInterlaced": false,
+      "IsTextSubtitleStream": false,
+      "Level": 0,
+      "PixelFormat": "string",
+      "Profile": "string",
+      "RealFrameRate": 0,
+      "RefFrames": 0,
+      "SupportsExternalStream": false,
+      "TimeBase": "string",
+      "Type": "Video",
+      "VideoRange": "string",
+      "VideoRangeType": "string",
+      "Width": 0
+    }
+  ],
+  "MediaType": "Video",
+  "Name": "MOVIE",
+  "OfficialRating": "string",
+  "OriginalTitle": "MOVIE",
+  "Overview": "string",
+  "Path": "/media/movies/MOVIE/MOVIE.mp4",
+  "People": [],
+  "PlayAccess": "string",
+  "PremiereDate": "string",
+  "PrimaryImageAspectRatio": 0,
+  "ProductionLocations": ["string"],
+  "ProductionYear": 0,
+  "ProviderIds": { "Imdb": "string", "Tmdb": "string" },
+  "RemoteTrailers": [],
+  "RunTimeTicks": 0,
+  "ServerId": "string",
+  "SortName": "string",
+  "SpecialFeatureCount": 0,
+  "Studios": [],
+  "Taglines": ["string"],
+  "Tags": [],
+  "Type": "Movie",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "0",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false
+  },
+  "VideoType": "VideoFile",
+  "Width": 0
+}
diff --git a/tests/components/jellyfin/fixtures/movies.json b/tests/components/jellyfin/fixtures/movies.json
new file mode 100644
index 00000000000000..78706456b9b760
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/movies.json
@@ -0,0 +1,159 @@
+{
+  "Items": [
+    {
+      "BackdropImageTags": ["string"],
+      "CanDelete": true,
+      "CanDownload": true,
+      "ChannelId": "",
+      "Chapters": [],
+      "CommunityRating": 0,
+      "Container": "string",
+      "CriticRating": 0,
+      "DateCreated": "string",
+      "DisplayPreferencesId": "string",
+      "EnableMediaSourceDisplay": true,
+      "Etag": "string",
+      "ExternalUrls": [],
+      "GenreItems": [],
+      "Genres": ["string"],
+      "Height": 0,
+      "Id": "MOVIE-UUID",
+      "ImageBlurHashes": {
+        "Backdrop": { "string": "string" },
+        "Primary": { "string": "string" }
+      },
+      "ImageTags": { "Primary": "string" },
+      "IsFolder": false,
+      "IsHD": true,
+      "LocalTrailerCount": 0,
+      "LocationType": "FileSystem",
+      "LockData": false,
+      "LockedFields": [],
+      "MediaSources": [
+        {
+          "Bitrate": 0,
+          "Container": "string",
+          "DefaultAudioStreamIndex": 1,
+          "ETag": "string",
+          "Formats": [],
+          "GenPtsInput": false,
+          "Id": "string",
+          "IgnoreDts": false,
+          "IgnoreIndex": false,
+          "IsInfiniteStream": false,
+          "IsRemote": false,
+          "MediaAttachments": [],
+          "MediaStreams": [
+            {
+              "AspectRatio": "string",
+              "AverageFrameRate": 0,
+              "BitRate": 0,
+              "Codec": "string",
+              "CodecTimeBase": "string",
+              "ColorPrimaries": "string",
+              "ColorTransfer": "string",
+              "DisplayTitle": "string",
+              "Height": 0,
+              "Index": 0,
+              "IsDefault": true,
+              "IsExternal": false,
+              "IsForced": false,
+              "IsInterlaced": false,
+              "IsTextSubtitleStream": false,
+              "Level": 0,
+              "PixelFormat": "string",
+              "Profile": "Main",
+              "RealFrameRate": 0,
+              "RefFrames": 0,
+              "SupportsExternalStream": false,
+              "TimeBase": "string",
+              "Type": "Video",
+              "VideoRange": "string",
+              "VideoRangeType": "string",
+              "Width": 0
+            }
+          ],
+          "Name": "MOVIE",
+          "Path": "/media/movies/MOVIE/MOVIE.mp4",
+          "Protocol": "File",
+          "ReadAtNativeFramerate": false,
+          "RequiredHttpHeaders": {},
+          "RequiresClosing": false,
+          "RequiresLooping": false,
+          "RequiresOpening": false,
+          "RunTimeTicks": 0,
+          "Size": 0,
+          "SupportsDirectPlay": true,
+          "SupportsDirectStream": true,
+          "SupportsProbing": true,
+          "SupportsTranscoding": false,
+          "Type": "Default",
+          "VideoType": "VideoFile"
+        }
+      ],
+      "MediaStreams": [
+        {
+          "AspectRatio": "string",
+          "AverageFrameRate": 0,
+          "BitRate": 0,
+          "Codec": "string",
+          "CodecTimeBase": "string",
+          "ColorPrimaries": "string",
+          "ColorTransfer": "string",
+          "DisplayTitle": "string",
+          "Height": 0,
+          "Index": 0,
+          "IsDefault": true,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "PixelFormat": "string",
+          "Profile": "string",
+          "RealFrameRate": 0,
+          "RefFrames": 0,
+          "SupportsExternalStream": false,
+          "TimeBase": "string",
+          "Type": "Video",
+          "VideoRange": "string",
+          "VideoRangeType": "string",
+          "Width": 0
+        }
+      ],
+      "MediaType": "Video",
+      "Name": "MOVIE",
+      "OfficialRating": "string",
+      "OriginalTitle": "MOVIE",
+      "Overview": "string",
+      "Path": "/media/movies/MOVIE/MOVIE.mp4",
+      "People": [],
+      "PlayAccess": "string",
+      "PremiereDate": "string",
+      "PrimaryImageAspectRatio": 0,
+      "ProductionLocations": ["string"],
+      "ProductionYear": 0,
+      "ProviderIds": { "Imdb": "string", "Tmdb": "string" },
+      "RemoteTrailers": [],
+      "RunTimeTicks": 0,
+      "ServerId": "string",
+      "SortName": "string",
+      "SpecialFeatureCount": 0,
+      "Studios": [],
+      "Taglines": ["string"],
+      "Tags": [],
+      "Type": "Movie",
+      "UserData": {
+        "IsFavorite": false,
+        "Key": "0",
+        "PlayCount": 0,
+        "PlaybackPositionTicks": 0,
+        "Played": false
+      },
+      "VideoType": "VideoFile",
+      "Width": 0
+    }
+  ],
+  "StartIndex": 0,
+  "TotalRecordCount": 1
+}
diff --git a/tests/components/jellyfin/fixtures/music-collection.json b/tests/components/jellyfin/fixtures/music-collection.json
new file mode 100644
index 00000000000000..0ae91d7badd49f
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/music-collection.json
@@ -0,0 +1,45 @@
+{
+  "BackdropImageTags": [],
+  "CanDelete": false,
+  "CanDownload": false,
+  "ChannelId": "",
+  "ChildCount": 0,
+  "CollectionType": "music",
+  "DateCreated": "string",
+  "DisplayPreferencesId": "string",
+  "EnableMediaSourceDisplay": true,
+  "Etag": "string",
+  "ExternalUrls": [],
+  "GenreItems": [],
+  "Genres": [],
+  "Id": "MUSIC-COLLECTION-FOLDER-UUID",
+  "ImageBlurHashes": { "Primary": { "string": "string" } },
+  "ImageTags": { "Primary": "string" },
+  "IsFolder": true,
+  "LocalTrailerCount": 0,
+  "LocationType": "FileSystem",
+  "LockData": false,
+  "LockedFields": [],
+  "Name": "Music",
+  "ParentId": "string",
+  "Path": "string",
+  "People": [],
+  "PlayAccess": "Full",
+  "PrimaryImageAspectRatio": 1.7777777777777777,
+  "ProviderIds": {},
+  "RemoteTrailers": [],
+  "ServerId": "string",
+  "SortName": "music",
+  "SpecialFeatureCount": 0,
+  "Studios": [],
+  "Taglines": [],
+  "Tags": [],
+  "Type": "CollectionFolder",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "string",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false
+  }
+}
diff --git a/tests/components/jellyfin/fixtures/season.json b/tests/components/jellyfin/fixtures/season.json
new file mode 100644
index 00000000000000..b8fb80042f3636
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/season.json
@@ -0,0 +1,23 @@
+{
+  "BackdropImageTags": [],
+  "ChannelId": "string",
+  "Id": "SEASON-UUID",
+  "ImageBlurHashes": {},
+  "ImageTags": {},
+  "IndexNumber": 0,
+  "IsFolder": true,
+  "LocationType": "FileSystem",
+  "Name": "SEASON",
+  "SeriesId": "SERIES-UUID",
+  "SeriesName": "SERIES",
+  "ServerId": "SEASON-UUID",
+  "Type": "Season",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "string",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false,
+    "UnplayedItemCount": 0
+  }
+}
diff --git a/tests/components/jellyfin/fixtures/seasons.json b/tests/components/jellyfin/fixtures/seasons.json
new file mode 100644
index 00000000000000..dc070d78352beb
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/seasons.json
@@ -0,0 +1,29 @@
+{
+  "Items": [
+    {
+      "BackdropImageTags": [],
+      "ChannelId": "string",
+      "Id": "SEASON-UUID",
+      "ImageBlurHashes": {},
+      "ImageTags": {},
+      "IndexNumber": 0,
+      "IsFolder": true,
+      "LocationType": "FileSystem",
+      "Name": "SEASON",
+      "SeriesId": "SERIES-UUID",
+      "SeriesName": "SERIES",
+      "ServerId": "SEASON-UUID",
+      "Type": "Season",
+      "UserData": {
+        "IsFavorite": false,
+        "Key": "string",
+        "PlayCount": 0,
+        "PlaybackPositionTicks": 0,
+        "Played": false,
+        "UnplayedItemCount": 0
+      }
+    }
+  ],
+  "StartIndex": 0,
+  "TotalRecordCount": 1
+}
diff --git a/tests/components/jellyfin/fixtures/series-list.json b/tests/components/jellyfin/fixtures/series-list.json
new file mode 100644
index 00000000000000..3209ccfb2c4747
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/series-list.json
@@ -0,0 +1,34 @@
+{
+  "Items": [
+    {
+      "AirDays": ["string"],
+      "AirTime": "string",
+      "BackdropImageTags": [],
+      "ChannelId": "string",
+      "CommunityRating": 0,
+      "EndDate": "string",
+      "Id": "SERIES-UUID",
+      "ImageBlurHashes": { "Banner": { "string": "string" } },
+      "ImageTags": { "Banner": "string" },
+      "IsFolder": true,
+      "LocationType": "FileSystem",
+      "Name": "SERIES",
+      "PremiereDate": "string",
+      "ProductionYear": 0,
+      "RunTimeTicks": 0,
+      "ServerId": "string",
+      "Status": "string",
+      "Type": "Series",
+      "UserData": {
+        "IsFavorite": false,
+        "Key": "string",
+        "PlayCount": 0,
+        "PlaybackPositionTicks": 0,
+        "Played": false,
+        "UnplayedItemCount": 0
+      }
+    }
+  ],
+  "TotalRecordCount": 1,
+  "StartIndex": 0
+}
diff --git a/tests/components/jellyfin/fixtures/series.json b/tests/components/jellyfin/fixtures/series.json
new file mode 100644
index 00000000000000..879680ec591c76
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/series.json
@@ -0,0 +1,28 @@
+{
+  "AirDays": ["string"],
+  "AirTime": "string",
+  "BackdropImageTags": [],
+  "ChannelId": "string",
+  "CommunityRating": 0,
+  "EndDate": "string",
+  "Id": "SERIES-UUID",
+  "ImageBlurHashes": { "Banner": { "string": "string" } },
+  "ImageTags": { "Banner": "string" },
+  "IsFolder": true,
+  "LocationType": "FileSystem",
+  "Name": "SERIES",
+  "PremiereDate": "string",
+  "ProductionYear": 0,
+  "RunTimeTicks": 0,
+  "ServerId": "string",
+  "Status": "string",
+  "Type": "Series",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "string",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false,
+    "UnplayedItemCount": 0
+  }
+}
diff --git a/tests/components/jellyfin/fixtures/track.json b/tests/components/jellyfin/fixtures/track.json
new file mode 100644
index 00000000000000..e9297549387d61
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/track.json
@@ -0,0 +1,91 @@
+{
+  "Album": "ALBUM_NAME",
+  "AlbumArtist": "ARTIST",
+  "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+  "AlbumId": "ALBUM-UUID",
+  "AlbumPrimaryImageTag": "string",
+  "ArtistItems": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+  "Artists": ["ARTIST"],
+  "Id": "TRACK-UUID",
+  "ImageTags": { "Primary": "string" },
+  "IndexNumber": 1,
+  "IsFolder": false,
+  "MediaSources": [
+    {
+      "Bitrate": 1,
+      "Container": "flac",
+      "DefaultAudioStreamIndex": 0,
+      "Formats": [],
+      "GenPtsInput": false,
+      "Id": "string",
+      "IgnoreDts": false,
+      "IgnoreIndex": false,
+      "IsInfiniteStream": false,
+      "IsRemote": false,
+      "MediaAttachments": [],
+      "MediaStreams": [
+        {
+          "BitDepth": 16,
+          "ChannelLayout": "stereo",
+          "Channels": 2,
+          "Codec": "flac",
+          "CodecTimeBase": "1/44100",
+          "DisplayTitle": "FLAC - Stereo",
+          "Index": 0,
+          "IsDefault": false,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "SampleRate": 44100,
+          "SupportsExternalStream": false,
+          "TimeBase": "1/44100",
+          "Type": "Audio"
+        }
+      ],
+      "Name": "string",
+      "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.flac",
+      "Protocol": "string",
+      "ReadAtNativeFramerate": false,
+      "RequiredHttpHeaders": {},
+      "RequiresClosing": false,
+      "RequiresLooping": false,
+      "RequiresOpening": false,
+      "RunTimeTicks": 2954933248,
+      "Size": 30074476,
+      "SupportsDirectPlay": true,
+      "SupportsDirectStream": true,
+      "SupportsProbing": true,
+      "SupportsTranscoding": true,
+      "Type": "Default"
+    }
+  ],
+  "MediaStreams": [
+    {
+      "BitDepth": 16,
+      "ChannelLayout": "stereo",
+      "Channels": 2,
+      "Codec": "flac",
+      "CodecTimeBase": "1/44100",
+      "DisplayTitle": "FLAC - Stereo",
+      "Index": 0,
+      "IsDefault": false,
+      "IsExternal": false,
+      "IsForced": false,
+      "IsInterlaced": false,
+      "IsTextSubtitleStream": false,
+      "Level": 0,
+      "SampleRate": 44100,
+      "SupportsExternalStream": false,
+      "TimeBase": "1/44100",
+      "Type": "Audio"
+    }
+  ],
+  "MediaType": "Audio",
+  "Name": "TRACK",
+  "ParentId": "ALBUM-UUID",
+  "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.flac",
+  "ServerId": "string",
+  "Type": "Audio"
+}
diff --git a/tests/components/jellyfin/fixtures/tracks-nopath.json b/tests/components/jellyfin/fixtures/tracks-nopath.json
new file mode 100644
index 00000000000000..75e87e1a05b67c
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/tracks-nopath.json
@@ -0,0 +1,93 @@
+{
+  "Items": [
+    {
+      "Album": "ALBUM_NAME",
+      "AlbumArtist": "ARTIST",
+      "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "AlbumId": "ALBUM-UUID",
+      "AlbumPrimaryImageTag": "string",
+      "ArtistItems": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "Artists": ["ARTIST"],
+      "Id": "TRACK-UUID",
+      "ImageTags": { "Primary": "string" },
+      "IndexNumber": 1,
+      "IsFolder": false,
+      "MediaSources": [
+        {
+          "Bitrate": 1,
+          "Container": "flac",
+          "DefaultAudioStreamIndex": 0,
+          "Formats": [],
+          "GenPtsInput": false,
+          "Id": "string",
+          "IgnoreDts": false,
+          "IgnoreIndex": false,
+          "IsInfiniteStream": false,
+          "IsRemote": false,
+          "MediaAttachments": [],
+          "MediaStreams": [
+            {
+              "BitDepth": 16,
+              "ChannelLayout": "stereo",
+              "Channels": 2,
+              "Codec": "flac",
+              "CodecTimeBase": "1/44100",
+              "DisplayTitle": "FLAC - Stereo",
+              "Index": 0,
+              "IsDefault": false,
+              "IsExternal": false,
+              "IsForced": false,
+              "IsInterlaced": false,
+              "IsTextSubtitleStream": false,
+              "Level": 0,
+              "SampleRate": 44100,
+              "SupportsExternalStream": false,
+              "TimeBase": "1/44100",
+              "Type": "Audio"
+            }
+          ],
+          "Name": "string",
+          "Protocol": "string",
+          "ReadAtNativeFramerate": false,
+          "RequiredHttpHeaders": {},
+          "RequiresClosing": false,
+          "RequiresLooping": false,
+          "RequiresOpening": false,
+          "RunTimeTicks": 2954933248,
+          "Size": 30074476,
+          "SupportsDirectPlay": true,
+          "SupportsDirectStream": true,
+          "SupportsProbing": true,
+          "SupportsTranscoding": true,
+          "Type": "Default"
+        }
+      ],
+      "MediaStreams": [
+        {
+          "BitDepth": 16,
+          "ChannelLayout": "stereo",
+          "Channels": 2,
+          "Codec": "flac",
+          "CodecTimeBase": "1/44100",
+          "DisplayTitle": "FLAC - Stereo",
+          "Index": 0,
+          "IsDefault": false,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "SampleRate": 44100,
+          "SupportsExternalStream": false,
+          "TimeBase": "1/44100",
+          "Type": "Audio"
+        }
+      ],
+      "MediaType": "Audio",
+      "Name": "TRACK",
+      "ParentId": "ALBUM-UUID",
+      "ServerId": "string",
+      "Type": "Audio"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/tracks-nosource.json b/tests/components/jellyfin/fixtures/tracks-nosource.json
new file mode 100644
index 00000000000000..02509f13196e99
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/tracks-nosource.json
@@ -0,0 +1,23 @@
+{
+  "Items": [
+    {
+      "Album": "ALBUM_NAME",
+      "AlbumArtist": "ARTIST",
+      "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "AlbumId": "ALBUM-UUID",
+      "AlbumPrimaryImageTag": "string",
+      "ArtistItems": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "Artists": ["ARTIST"],
+      "Id": "TRACK-UUID",
+      "ImageTags": { "Primary": "string" },
+      "IndexNumber": 1,
+      "IsFolder": false,
+      "MediaType": "Audio",
+      "Name": "TRACK",
+      "ParentId": "ALBUM-UUID",
+      "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.flac",
+      "ServerId": "string",
+      "Type": "Audio"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/tracks-unknown-extension.json b/tests/components/jellyfin/fixtures/tracks-unknown-extension.json
new file mode 100644
index 00000000000000..b3beaa1d75870c
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/tracks-unknown-extension.json
@@ -0,0 +1,95 @@
+{
+  "Items": [
+    {
+      "Album": "ALBUM_NAME",
+      "AlbumArtist": "ARTIST",
+      "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "AlbumId": "ALBUM-UUID",
+      "AlbumPrimaryImageTag": "string",
+      "ArtistItems": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "Artists": ["ARTIST"],
+      "Id": "TRACK-UUID",
+      "ImageTags": { "Primary": "string" },
+      "IndexNumber": 1,
+      "IsFolder": false,
+      "MediaSources": [
+        {
+          "Bitrate": 1,
+          "Container": "flac",
+          "DefaultAudioStreamIndex": 0,
+          "Formats": [],
+          "GenPtsInput": false,
+          "Id": "string",
+          "IgnoreDts": false,
+          "IgnoreIndex": false,
+          "IsInfiniteStream": false,
+          "IsRemote": false,
+          "MediaAttachments": [],
+          "MediaStreams": [
+            {
+              "BitDepth": 16,
+              "ChannelLayout": "stereo",
+              "Channels": 2,
+              "Codec": "flac",
+              "CodecTimeBase": "1/44100",
+              "DisplayTitle": "FLAC - Stereo",
+              "Index": 0,
+              "IsDefault": false,
+              "IsExternal": false,
+              "IsForced": false,
+              "IsInterlaced": false,
+              "IsTextSubtitleStream": false,
+              "Level": 0,
+              "SampleRate": 44100,
+              "SupportsExternalStream": false,
+              "TimeBase": "1/44100",
+              "Type": "Audio"
+            }
+          ],
+          "Name": "string",
+          "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.uke",
+          "Protocol": "string",
+          "ReadAtNativeFramerate": false,
+          "RequiredHttpHeaders": {},
+          "RequiresClosing": false,
+          "RequiresLooping": false,
+          "RequiresOpening": false,
+          "RunTimeTicks": 2954933248,
+          "Size": 30074476,
+          "SupportsDirectPlay": true,
+          "SupportsDirectStream": true,
+          "SupportsProbing": true,
+          "SupportsTranscoding": true,
+          "Type": "Default"
+        }
+      ],
+      "MediaStreams": [
+        {
+          "BitDepth": 16,
+          "ChannelLayout": "stereo",
+          "Channels": 2,
+          "Codec": "flac",
+          "CodecTimeBase": "1/44100",
+          "DisplayTitle": "FLAC - Stereo",
+          "Index": 0,
+          "IsDefault": false,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "SampleRate": 44100,
+          "SupportsExternalStream": false,
+          "TimeBase": "1/44100",
+          "Type": "Audio"
+        }
+      ],
+      "MediaType": "Audio",
+      "Name": "TRACK",
+      "ParentId": "ALBUM-UUID",
+      "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.uke",
+      "ServerId": "string",
+      "Type": "Audio"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/tracks.json b/tests/components/jellyfin/fixtures/tracks.json
new file mode 100644
index 00000000000000..63a0fd9deaff62
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/tracks.json
@@ -0,0 +1,95 @@
+{
+  "Items": [
+    {
+      "Album": "ALBUM_NAME",
+      "AlbumArtist": "ARTIST",
+      "AlbumArtists": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "AlbumId": "ALBUM-UUID",
+      "AlbumPrimaryImageTag": "string",
+      "ArtistItems": [{ "Id": "ARTIST-UUID", "Name": "ARTIST" }],
+      "Artists": ["ARTIST"],
+      "Id": "TRACK-UUID",
+      "ImageTags": { "Primary": "string" },
+      "IndexNumber": 1,
+      "IsFolder": false,
+      "MediaSources": [
+        {
+          "Bitrate": 1,
+          "Container": "flac",
+          "DefaultAudioStreamIndex": 0,
+          "Formats": [],
+          "GenPtsInput": false,
+          "Id": "string",
+          "IgnoreDts": false,
+          "IgnoreIndex": false,
+          "IsInfiniteStream": false,
+          "IsRemote": false,
+          "MediaAttachments": [],
+          "MediaStreams": [
+            {
+              "BitDepth": 16,
+              "ChannelLayout": "stereo",
+              "Channels": 2,
+              "Codec": "flac",
+              "CodecTimeBase": "1/44100",
+              "DisplayTitle": "FLAC - Stereo",
+              "Index": 0,
+              "IsDefault": false,
+              "IsExternal": false,
+              "IsForced": false,
+              "IsInterlaced": false,
+              "IsTextSubtitleStream": false,
+              "Level": 0,
+              "SampleRate": 44100,
+              "SupportsExternalStream": false,
+              "TimeBase": "1/44100",
+              "Type": "Audio"
+            }
+          ],
+          "Name": "string",
+          "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.flac",
+          "Protocol": "string",
+          "ReadAtNativeFramerate": false,
+          "RequiredHttpHeaders": {},
+          "RequiresClosing": false,
+          "RequiresLooping": false,
+          "RequiresOpening": false,
+          "RunTimeTicks": 2954933248,
+          "Size": 30074476,
+          "SupportsDirectPlay": true,
+          "SupportsDirectStream": true,
+          "SupportsProbing": true,
+          "SupportsTranscoding": true,
+          "Type": "Default"
+        }
+      ],
+      "MediaStreams": [
+        {
+          "BitDepth": 16,
+          "ChannelLayout": "stereo",
+          "Channels": 2,
+          "Codec": "flac",
+          "CodecTimeBase": "1/44100",
+          "DisplayTitle": "FLAC - Stereo",
+          "Index": 0,
+          "IsDefault": false,
+          "IsExternal": false,
+          "IsForced": false,
+          "IsInterlaced": false,
+          "IsTextSubtitleStream": false,
+          "Level": 0,
+          "SampleRate": 44100,
+          "SupportsExternalStream": false,
+          "TimeBase": "1/44100",
+          "Type": "Audio"
+        }
+      ],
+      "MediaType": "Audio",
+      "Name": "TRACK",
+      "ParentId": "ALBUM-UUID",
+      "Path": "/media/music/MockArtist/MockAlbum/01 - Track - MockAlbum - MockArtist.flac",
+      "ServerId": "string",
+      "Type": "Audio"
+    }
+  ]
+}
diff --git a/tests/components/jellyfin/fixtures/tv-collection.json b/tests/components/jellyfin/fixtures/tv-collection.json
new file mode 100644
index 00000000000000..0817352edae93c
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/tv-collection.json
@@ -0,0 +1,45 @@
+{
+  "BackdropImageTags": [],
+  "CanDelete": false,
+  "CanDownload": false,
+  "ChannelId": "",
+  "ChildCount": 0,
+  "CollectionType": "tvshows",
+  "DateCreated": "string",
+  "DisplayPreferencesId": "string",
+  "EnableMediaSourceDisplay": true,
+  "Etag": "string",
+  "ExternalUrls": [],
+  "GenreItems": [],
+  "Genres": [],
+  "Id": "TV-COLLECTION-FOLDER-UUID",
+  "ImageBlurHashes": { "Primary": { "string": "string" } },
+  "ImageTags": { "Primary": "string" },
+  "IsFolder": true,
+  "LocalTrailerCount": 0,
+  "LocationType": "FileSystem",
+  "LockData": false,
+  "LockedFields": [],
+  "Name": "TVShows",
+  "ParentId": "string",
+  "Path": "string",
+  "People": [],
+  "PlayAccess": "Full",
+  "PrimaryImageAspectRatio": 1.7777777777777777,
+  "ProviderIds": {},
+  "RemoteTrailers": [],
+  "ServerId": "string",
+  "SortName": "music",
+  "SpecialFeatureCount": 0,
+  "Studios": [],
+  "Taglines": [],
+  "Tags": [],
+  "Type": "CollectionFolder",
+  "UserData": {
+    "IsFavorite": false,
+    "Key": "string",
+    "PlayCount": 0,
+    "PlaybackPositionTicks": 0,
+    "Played": false
+  }
+}
diff --git a/tests/components/jellyfin/fixtures/unsupported-item.json b/tests/components/jellyfin/fixtures/unsupported-item.json
new file mode 100644
index 00000000000000..5d97447808a1e8
--- /dev/null
+++ b/tests/components/jellyfin/fixtures/unsupported-item.json
@@ -0,0 +1,5 @@
+{
+  "Id": "Unsupported-UUID",
+  "Type": "Unsupported",
+  "MediaType": "Unsupported"
+}
diff --git a/tests/components/jellyfin/snapshots/test_media_source.ambr b/tests/components/jellyfin/snapshots/test_media_source.ambr
new file mode 100644
index 00000000000000..6d629f245a0c8d
--- /dev/null
+++ b/tests/components/jellyfin/snapshots/test_media_source.ambr
@@ -0,0 +1,135 @@
+# serializer version: 1
+# name: test_movie_library
+  dict({
+    'can_expand': False,
+    'can_play': True,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'MOVIE-UUID',
+    'media_class': <MediaClass.MOVIE: 'movie'>,
+    'media_content_id': 'media-source://jellyfin/MOVIE-UUID',
+    'media_content_type': 'video/mp4',
+    'not_shown': 0,
+    'thumbnail': 'http://localhost/Items/MOVIE-UUID/Images/Primary.jpg',
+    'title': 'MOVIE',
+  })
+# ---
+# name: test_music_library
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'ALBUM-UUID',
+    'media_class': <MediaClass.ARTIST: 'artist'>,
+    'media_content_id': 'media-source://jellyfin/ALBUM-UUID',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'ALBUM',
+  })
+# ---
+# name: test_music_library.1
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'ALBUM-UUID',
+    'media_class': <MediaClass.ALBUM: 'album'>,
+    'media_content_id': 'media-source://jellyfin/ALBUM-UUID',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'ALBUM',
+  })
+# ---
+# name: test_music_library.2
+  dict({
+    'can_expand': False,
+    'can_play': True,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'TRACK-UUID',
+    'media_class': <MediaClass.TRACK: 'track'>,
+    'media_content_id': 'media-source://jellyfin/TRACK-UUID',
+    'media_content_type': 'audio/flac',
+    'not_shown': 0,
+    'thumbnail': 'http://localhost/Items/TRACK-UUID/Images/Primary.jpg',
+    'title': 'TRACK',
+  })
+# ---
+# name: test_resolve
+  'http://localhost/Audio/TRACK-UUID/universal?UserId=test-username,DeviceId=TEST-UUID,MaxStreamingBitrate=140000000'
+# ---
+# name: test_resolve.1
+  'http://localhost/Videos/MOVIE-UUID/stream?static=true,DeviceId=TEST-UUID,api_key=TEST-API-KEY'
+# ---
+# name: test_root
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'COLLECTION-FOLDER-UUID',
+    'media_class': <MediaClass.DIRECTORY: 'directory'>,
+    'media_content_id': 'media-source://jellyfin/COLLECTION-FOLDER-UUID',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'COLLECTION FOLDER',
+  })
+# ---
+# name: test_tv_library
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'SERIES-UUID',
+    'media_class': <MediaClass.TV_SHOW: 'tv_show'>,
+    'media_content_id': 'media-source://jellyfin/SERIES-UUID',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'SERIES',
+  })
+# ---
+# name: test_tv_library.1
+  dict({
+    'can_expand': True,
+    'can_play': False,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'SEASON-UUID',
+    'media_class': <MediaClass.TV_SHOW: 'tv_show'>,
+    'media_content_id': 'media-source://jellyfin/SEASON-UUID',
+    'media_content_type': '',
+    'not_shown': 0,
+    'thumbnail': None,
+    'title': 'SEASON',
+  })
+# ---
+# name: test_tv_library.2
+  dict({
+    'can_expand': False,
+    'can_play': True,
+    'children': None,
+    'children_media_class': None,
+    'domain': 'jellyfin',
+    'identifier': 'EPISODE-UUID',
+    'media_class': <MediaClass.EPISODE: 'episode'>,
+    'media_content_id': 'media-source://jellyfin/EPISODE-UUID',
+    'media_content_type': 'video/mp4',
+    'not_shown': 0,
+    'thumbnail': 'http://localhost/Items/EPISODE-UUID/Images/Primary.jpg',
+    'title': 'EPISODE',
+  })
+# ---
diff --git a/tests/components/jellyfin/test_init.py b/tests/components/jellyfin/test_init.py
index 542be0736c7881..56e352bd71f984 100644
--- a/tests/components/jellyfin/test_init.py
+++ b/tests/components/jellyfin/test_init.py
@@ -29,6 +29,26 @@ async def test_config_entry_not_ready(
     assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
 
 
+async def test_invalid_auth(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_client: MagicMock,
+) -> None:
+    """Test the Jellyfin integration handling invalid credentials."""
+    mock_client.auth.connect_to_address.return_value = await async_load_json_fixture(
+        hass,
+        "auth-connect-address.json",
+    )
+    mock_client.auth.login.return_value = await async_load_json_fixture(
+        hass,
+        "auth-login-failure.json",
+    )
+
+    mock_config_entry.add_to_hass(hass)
+    assert not await hass.config_entries.async_setup(mock_config_entry.entry_id)
+
+
 async def test_load_unload_config_entry(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
diff --git a/tests/components/jellyfin/test_media_source.py b/tests/components/jellyfin/test_media_source.py
new file mode 100644
index 00000000000000..5f8871e62428ef
--- /dev/null
+++ b/tests/components/jellyfin/test_media_source.py
@@ -0,0 +1,303 @@
+"""Tests for the Jellyfin media_player platform."""
+from unittest.mock import MagicMock
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.jellyfin.const import DOMAIN
+from homeassistant.components.media_player.errors import BrowseError
+from homeassistant.components.media_source import (
+    DOMAIN as MEDIA_SOURCE_DOMAIN,
+    URI_SCHEME,
+    async_browse_media,
+    async_resolve_media,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from . import load_json_fixture
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(autouse=True)
+async def setup_component(hass: HomeAssistant) -> None:
+    """Set up component."""
+    assert await async_setup_component(hass, MEDIA_SOURCE_DOMAIN, {})
+
+
+async def test_resolve(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test resolving Jellyfin media items."""
+
+    # Test resolving a track
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("track.json")
+
+    play_media = await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/TRACK-UUID")
+
+    assert play_media.mime_type == "audio/flac"
+    assert play_media.url == snapshot
+
+    # Test resolving a movie
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("movie.json")
+
+    play_media = await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/MOVIE-UUID")
+
+    assert play_media.mime_type == "video/mp4"
+    assert play_media.url == snapshot
+
+    # Test resolving an unsupported item
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("unsupported-item.json")
+
+    with pytest.raises(BrowseError):
+        await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/UNSUPPORTED-ITEM-UUID")
+
+
+async def test_root(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing the Jellyfin root."""
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier is None
+    assert browse.title == "Jellyfin"
+    assert vars(browse.children[0]) == snapshot
+
+
+async def test_tv_library(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a Jellyfin TV Library."""
+
+    # Test browsing an empty tv library
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("tv-collection.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = {"Items": []}
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/TV-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "TV-COLLECTION-FOLDER-UUID"
+    assert browse.title == "TVShows"
+    assert browse.children == []
+
+    # Test browsing a tv library containing series
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("series-list.json")
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/TV-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "TV-COLLECTION-FOLDER-UUID"
+    assert browse.title == "TVShows"
+    assert vars(browse.children[0]) == snapshot
+
+    # Test browsing a series
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("series.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("seasons.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/SERIES-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "SERIES-UUID"
+    assert browse.title == "SERIES"
+    assert vars(browse.children[0]) == snapshot
+
+    # Test browsing a season
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("season.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("episodes.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/SEASON-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "SEASON-UUID"
+    assert browse.title == "SEASON"
+    assert vars(browse.children[0]) == snapshot
+
+
+async def test_movie_library(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a Jellyfin Movie Library."""
+
+    # Test empty movie library
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("movie-collection.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = {"Items": []}
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/MOVIE-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "MOVIE-COLLECTION-FOLDER-UUID"
+    assert browse.title == "Movies"
+    assert browse.children == []
+
+    # Test browsing a movie library containing movies
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("movies.json")
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/MOVIE-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "MOVIE-COLLECTION-FOLDER-UUID"
+    assert browse.title == "Movies"
+    assert vars(browse.children[0]) == snapshot
+
+
+async def test_music_library(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test browsing a Jellyfin Music Library."""
+
+    # Test browsinng an empty music library
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("music-collection.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = {"Items": []}
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/MUSIC-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "MUSIC-COLLECTION-FOLDER-UUID"
+    assert browse.title == "Music"
+    assert browse.children == []
+
+    # Test browsing a music library containing albums
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("albums.json")
+
+    browse = await async_browse_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/MUSIC-COLLECTION-FOLDER-UUID"
+    )
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "MUSIC-COLLECTION-FOLDER-UUID"
+    assert browse.title == "Music"
+    assert vars(browse.children[0]) == snapshot
+
+    # Test browsing an artist
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("artist.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("albums.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/ARTIST-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "ARTIST-UUID"
+    assert browse.title == "ARTIST"
+    assert vars(browse.children[0]) == snapshot
+
+    # Test browsing an album
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("album.json")
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("tracks.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/ALBUM-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "ALBUM-UUID"
+    assert browse.title == "ALBUM"
+    assert vars(browse.children[0]) == snapshot
+
+    # Test browsing an album with a track with no source
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("tracks-nosource.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/ALBUM-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "ALBUM-UUID"
+    assert browse.title == "ALBUM"
+
+    assert browse.children == []
+
+    # Test browsing an album with a track with no path
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture("tracks-nopath.json")
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/ALBUM-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "ALBUM-UUID"
+    assert browse.title == "ALBUM"
+
+    assert browse.children == []
+
+    # Test browsing an album with a track with an unknown file extension
+    mock_api.user_items.side_effect = None
+    mock_api.user_items.return_value = load_json_fixture(
+        "tracks-unknown-extension.json"
+    )
+
+    browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/ALBUM-UUID")
+
+    assert browse.domain == DOMAIN
+    assert browse.identifier == "ALBUM-UUID"
+    assert browse.title == "ALBUM"
+
+    assert browse.children == []
+
+
+async def test_browse_unsupported(
+    hass: HomeAssistant,
+    mock_client: MagicMock,
+    init_integration: MockConfigEntry,
+    mock_jellyfin: MagicMock,
+    mock_api: MagicMock,
+) -> None:
+    """Test browsing an unsupported item."""
+
+    mock_api.get_item.side_effect = None
+    mock_api.get_item.return_value = load_json_fixture("unsupported-item.json")
+
+    with pytest.raises(BrowseError):
+        await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/UNSUPPORTED-ITEM-UUID")
diff --git a/tests/components/kaleidescape/test_sensor.py b/tests/components/kaleidescape/test_sensor.py
index 0ae2dc15619531..3fbff29e3e9e98 100644
--- a/tests/components/kaleidescape/test_sensor.py
+++ b/tests/components/kaleidescape/test_sensor.py
@@ -27,7 +27,7 @@ async def test_sensors(
     assert entity
     assert entity.state == "none"
     assert (
-        entity.attributes.get(ATTR_FRIENDLY_NAME) == f"{FRIENDLY_NAME} Media Location"
+        entity.attributes.get(ATTR_FRIENDLY_NAME) == f"{FRIENDLY_NAME} Media location"
     )
     assert entry
     assert entry.unique_id == f"{MOCK_SERIAL}-media_location"
@@ -36,7 +36,7 @@ async def test_sensors(
     entry = er.async_get(hass).async_get(f"{ENTITY_ID}_play_status")
     assert entity
     assert entity.state == "none"
-    assert entity.attributes.get(ATTR_FRIENDLY_NAME) == f"{FRIENDLY_NAME} Play Status"
+    assert entity.attributes.get(ATTR_FRIENDLY_NAME) == f"{FRIENDLY_NAME} Play status"
     assert entry
     assert entry.unique_id == f"{MOCK_SERIAL}-play_status"
 
diff --git a/tests/components/kitchen_sink/snapshots/test_lock.ambr b/tests/components/kitchen_sink/snapshots/test_lock.ambr
new file mode 100644
index 00000000000000..9303401bdd56f3
--- /dev/null
+++ b/tests/components/kitchen_sink/snapshots/test_lock.ambr
@@ -0,0 +1,49 @@
+# serializer version: 1
+# name: test_states
+  set({
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Another basic lock',
+        'supported_features': <LockEntityFeature: 0>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.another_basic_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unlocked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Another openable lock',
+        'supported_features': <LockEntityFeature: 1>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.another_openable_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unlocked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Basic lock',
+        'supported_features': <LockEntityFeature: 0>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.basic_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'locked',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Openable lock',
+        'supported_features': <LockEntityFeature: 1>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'lock.openable_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'locked',
+    }),
+  })
+# ---
diff --git a/tests/components/kitchen_sink/snapshots/test_sensor.ambr b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000000..de3297b7fd8568
--- /dev/null
+++ b/tests/components/kitchen_sink/snapshots/test_sensor.ambr
@@ -0,0 +1,40 @@
+# serializer version: 1
+# name: test_states
+  set({
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 1',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_1',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 2',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': 'dogs',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_2',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'Statistics issue 3',
+        'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.statistics_issue_3',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': '100',
+    }),
+  })
+# ---
diff --git a/tests/components/kitchen_sink/test_image.py b/tests/components/kitchen_sink/test_image.py
new file mode 100644
index 00000000000000..4c64bd77eb2773
--- /dev/null
+++ b/tests/components/kitchen_sink/test_image.py
@@ -0,0 +1,60 @@
+"""The tests for the kitchen_sink image platform."""
+from http import HTTPStatus
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.kitchen_sink import DOMAIN, image
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.typing import ClientSessionGenerator
+
+
+@pytest.fixture
+async def image_only() -> None:
+    """Enable only the image platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.IMAGE],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, image_only):
+    """Set up demo component."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+
+
+async def test_states(hass: HomeAssistant) -> None:
+    """Test the expected image entities are added."""
+    states = hass.states.async_all()
+    assert len(states) == 1
+    state = states[0]
+
+    access_token = state.attributes["access_token"]
+    assert state.entity_id == "image.qr_code"
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.qr_code?token={access_token}",
+        "friendly_name": "QR Code",
+    }
+
+
+async def test_fetch_image(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test fetching an image with an authenticated client."""
+    client = await hass_client()
+
+    image_path = Path(image.__file__).parent / "qr_code.png"
+    expected_data = await hass.async_add_executor_job(image_path.read_bytes)
+
+    resp = await client.get("/api/image_proxy/image.qr_code")
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == expected_data
diff --git a/tests/components/kitchen_sink/test_lock.py b/tests/components/kitchen_sink/test_lock.py
new file mode 100644
index 00000000000000..a74c9a19a23fa5
--- /dev/null
+++ b/tests/components/kitchen_sink/test_lock.py
@@ -0,0 +1,105 @@
+"""The tests for the kitchen_sink lock platform."""
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.kitchen_sink import DOMAIN
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_LOCKING,
+    STATE_UNLOCKED,
+    STATE_UNLOCKING,
+)
+from homeassistant.const import ATTR_ENTITY_ID, EVENT_STATE_CHANGED, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import async_capture_events, async_mock_service
+
+LOCKED_LOCK = "lock.basic_lock"
+OPENABLE_LOCK = "lock.openable_lock"
+UNLOCKED_LOCK = "lock.another_basic_lock"
+
+
+@pytest.fixture
+async def lock_only() -> None:
+    """Enable only the lock platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.LOCK],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, lock_only):
+    """Set up demo component."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+
+
+async def test_states(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
+    """Test the expected lock entities are added."""
+    states = hass.states.async_all()
+    assert set(states) == snapshot
+
+
+async def test_locking(hass: HomeAssistant) -> None:
+    """Test the locking of a lock."""
+    state = hass.states.get(UNLOCKED_LOCK)
+    assert state.state == STATE_UNLOCKED
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_LOCK, {ATTR_ENTITY_ID: UNLOCKED_LOCK}, blocking=False
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == UNLOCKED_LOCK
+    assert state_changes[0].data["new_state"].state == STATE_LOCKING
+
+    assert state_changes[1].data["entity_id"] == UNLOCKED_LOCK
+    assert state_changes[1].data["new_state"].state == STATE_LOCKED
+
+
+async def test_unlocking(hass: HomeAssistant) -> None:
+    """Test the unlocking of a lock."""
+    state = hass.states.get(LOCKED_LOCK)
+    assert state.state == STATE_LOCKED
+    await hass.async_block_till_done()
+
+    state_changes = async_capture_events(hass, EVENT_STATE_CHANGED)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_UNLOCK, {ATTR_ENTITY_ID: LOCKED_LOCK}, blocking=False
+    )
+    await hass.async_block_till_done()
+
+    assert state_changes[0].data["entity_id"] == LOCKED_LOCK
+    assert state_changes[0].data["new_state"].state == STATE_UNLOCKING
+
+    assert state_changes[1].data["entity_id"] == LOCKED_LOCK
+    assert state_changes[1].data["new_state"].state == STATE_UNLOCKED
+
+
+async def test_opening_mocked(hass: HomeAssistant) -> None:
+    """Test the opening of a lock."""
+    calls = async_mock_service(hass, LOCK_DOMAIN, SERVICE_OPEN)
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_OPEN, {ATTR_ENTITY_ID: OPENABLE_LOCK}, blocking=True
+    )
+    assert len(calls) == 1
+
+
+async def test_opening(hass: HomeAssistant) -> None:
+    """Test the opening of a lock."""
+    await hass.services.async_call(
+        LOCK_DOMAIN, SERVICE_OPEN, {ATTR_ENTITY_ID: OPENABLE_LOCK}, blocking=True
+    )
+    state = hass.states.get(OPENABLE_LOCK)
+    assert state.state == STATE_UNLOCKED
diff --git a/tests/components/kitchen_sink/test_sensor.py b/tests/components/kitchen_sink/test_sensor.py
new file mode 100644
index 00000000000000..8d3f611f15d6a7
--- /dev/null
+++ b/tests/components/kitchen_sink/test_sensor.py
@@ -0,0 +1,33 @@
+"""The tests for the kitchen_sink sensor platform."""
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.kitchen_sink import DOMAIN
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+
+@pytest.fixture
+async def sensor_only() -> None:
+    """Enable only the sensor platform."""
+    with patch(
+        "homeassistant.components.kitchen_sink.COMPONENTS_WITH_DEMO_PLATFORM",
+        [Platform.SENSOR],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def setup_comp(hass: HomeAssistant, sensor_only):
+    """Set up demo component."""
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
+    await hass.async_block_till_done()
+
+
+async def test_states(hass: HomeAssistant, snapshot: SnapshotAssertion) -> None:
+    """Test the expected sensor entities are added."""
+    states = hass.states.async_all()
+    assert set(states) == snapshot
diff --git a/tests/components/knx/conftest.py b/tests/components/knx/conftest.py
index 084a3a37c27037..a06206fd98290d 100644
--- a/tests/components/knx/conftest.py
+++ b/tests/components/knx/conftest.py
@@ -140,11 +140,11 @@ async def assert_telegram(
         await self.hass.async_block_till_done()
         try:
             telegram = self._outgoing_telegrams.get_nowait()
-        except asyncio.QueueEmpty:
+        except asyncio.QueueEmpty as err:
             raise AssertionError(
                 f"No Telegram found. Expected: {apci_type.__name__} -"
                 f" {group_address} - {payload}"
-            )
+            ) from err
 
         assert isinstance(
             telegram.payload, apci_type
diff --git a/tests/components/knx/test_binary_sensor.py b/tests/components/knx/test_binary_sensor.py
index 61b7247037ed15..47715433a5215b 100644
--- a/tests/components/knx/test_binary_sensor.py
+++ b/tests/components/knx/test_binary_sensor.py
@@ -12,7 +12,7 @@
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import KNXTestKit
 
@@ -147,7 +147,7 @@ async def test_binary_sensor_ignore_internal_state(
 
 async def test_binary_sensor_counter(hass: HomeAssistant, knx: KNXTestKit) -> None:
     """Test KNX binary_sensor with context timeout."""
-    async_fire_time_changed(hass, dt.utcnow())
+    async_fire_time_changed(hass, dt_util.utcnow())
     context_timeout = 1
 
     await knx.setup_integration(
@@ -172,7 +172,7 @@ async def test_binary_sensor_counter(hass: HomeAssistant, knx: KNXTestKit) -> No
     state = hass.states.get("binary_sensor.test")
     assert state.state is STATE_OFF
     assert state.attributes.get("counter") == 0
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=context_timeout))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=context_timeout))
     await hass.async_block_till_done()
     await knx.xknx.task_registry.block_till_done()
     # state changed twice after context timeout - once to ON with counter 1 and once to counter 0
@@ -196,7 +196,7 @@ async def test_binary_sensor_counter(hass: HomeAssistant, knx: KNXTestKit) -> No
     state = hass.states.get("binary_sensor.test")
     assert state.state is STATE_ON
     assert state.attributes.get("counter") == 0
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=context_timeout))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=context_timeout))
     await knx.xknx.task_registry.block_till_done()
     await hass.async_block_till_done()
     state = hass.states.get("binary_sensor.test")
@@ -213,7 +213,7 @@ async def test_binary_sensor_counter(hass: HomeAssistant, knx: KNXTestKit) -> No
 
 async def test_binary_sensor_reset(hass: HomeAssistant, knx: KNXTestKit) -> None:
     """Test KNX binary_sensor with reset_after function."""
-    async_fire_time_changed(hass, dt.utcnow())
+    async_fire_time_changed(hass, dt_util.utcnow())
 
     await knx.setup_integration(
         {
@@ -233,7 +233,7 @@ async def test_binary_sensor_reset(hass: HomeAssistant, knx: KNXTestKit) -> None
     await hass.async_block_till_done()
     state = hass.states.get("binary_sensor.test")
     assert state.state is STATE_ON
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done()
     await hass.async_block_till_done()
     # state reset after after timeout
diff --git a/tests/components/knx/test_button.py b/tests/components/knx/test_button.py
index eb3fee7eaf51fa..3e8519feb98323 100644
--- a/tests/components/knx/test_button.py
+++ b/tests/components/knx/test_button.py
@@ -13,7 +13,7 @@
 from homeassistant.components.knx.schema import ButtonSchema
 from homeassistant.const import CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import KNXTestKit
 
@@ -42,7 +42,7 @@ async def test_button_simple(hass: HomeAssistant, knx: KNXTestKit) -> None:
 
     # received telegrams on button GA are ignored by the entity
     old_state = hass.states.get("button.test")
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=3))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
     await knx.receive_write("1/2/3", False)
     await knx.receive_write("1/2/3", True)
     new_state = hass.states.get("button.test")
diff --git a/tests/components/knx/test_device_trigger.py b/tests/components/knx/test_device_trigger.py
index c706399758582a..c3d3ed67b03223 100644
--- a/tests/components/knx/test_device_trigger.py
+++ b/tests/components/knx/test_device_trigger.py
@@ -56,6 +56,7 @@ async def test_if_fires_on_telegram(
         identifiers={(DOMAIN, f"_{knx.mock_config_entry.entry_id}_interface")}
     )
 
+    # "id" field added to action to test if `trigger_data` passed correctly in `async_attach_trigger`
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -71,7 +72,8 @@ async def test_if_fires_on_telegram(
                     "action": {
                         "service": "test.automation",
                         "data_template": {
-                            "catch_all": ("telegram - {{ trigger.destination }}")
+                            "catch_all": ("telegram - {{ trigger.destination }}"),
+                            "id": (" {{ trigger.id }}"),
                         },
                     },
                 },
@@ -82,11 +84,13 @@ async def test_if_fires_on_telegram(
                         "device_id": device_entry.id,
                         "type": "telegram",
                         "destination": ["1/2/3", "1/2/4"],
+                        "id": "test-id",
                     },
                     "action": {
                         "service": "test.automation",
                         "data_template": {
-                            "specific": ("telegram - {{ trigger.destination }}")
+                            "specific": ("telegram - {{ trigger.destination }}"),
+                            "id": (" {{ trigger.id }}"),
                         },
                     },
                 },
@@ -96,12 +100,18 @@ async def test_if_fires_on_telegram(
 
     await knx.receive_write("0/0/1", (0x03, 0x2F))
     assert len(calls) == 1
-    assert calls.pop().data["catch_all"] == "telegram - 0/0/1"
+    test_call = calls.pop()
+    assert test_call.data["catch_all"] == "telegram - 0/0/1"
+    assert test_call.data["id"] == 0
 
     await knx.receive_write("1/2/4", (0x03, 0x2F))
     assert len(calls) == 2
-    assert calls.pop().data["specific"] == "telegram - 1/2/4"
-    assert calls.pop().data["catch_all"] == "telegram - 1/2/4"
+    test_call = calls.pop()
+    assert test_call.data["specific"] == "telegram - 1/2/4"
+    assert test_call.data["id"] == "test-id"
+    test_call = calls.pop()
+    assert test_call.data["catch_all"] == "telegram - 1/2/4"
+    assert test_call.data["id"] == 0
 
 
 async def test_remove_device_trigger(
diff --git a/tests/components/knx/test_expose.py b/tests/components/knx/test_expose.py
index bec76f29eeca5f..ca3fc5c7f5872a 100644
--- a/tests/components/knx/test_expose.py
+++ b/tests/components/knx/test_expose.py
@@ -9,7 +9,7 @@
 from homeassistant.components.knx.schema import ExposeSchema
 from homeassistant.const import CONF_ATTRIBUTE, CONF_ENTITY_ID, CONF_TYPE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import KNXTestKit
 
@@ -192,7 +192,9 @@ async def test_expose_cooldown(hass: HomeAssistant, knx: KNXTestKit) -> None:
     hass.states.async_set(entity_id, "3", {})
     await knx.assert_no_telegram()
     # Wait for cooldown to pass
-    async_fire_time_changed_exact(hass, dt.utcnow() + timedelta(seconds=cooldown_time))
+    async_fire_time_changed_exact(
+        hass, dt_util.utcnow() + timedelta(seconds=cooldown_time)
+    )
     await hass.async_block_till_done()
     await knx.assert_write("1/1/8", (3,))
 
diff --git a/tests/components/knx/test_interface_device.py b/tests/components/knx/test_interface_device.py
index 6eab80d52cb2d3..12ae0ac7d0ea06 100644
--- a/tests/components/knx/test_interface_device.py
+++ b/tests/components/knx/test_interface_device.py
@@ -8,7 +8,7 @@
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import KNXTestKit
 
@@ -47,7 +47,7 @@ async def test_diagnostic_entities(
     knx.xknx.connection_manager.cemi_count_outgoing_error = 2
 
     events = async_capture_events(hass, "state_changed")
-    async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL)
+    async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
     await hass.async_block_till_done()
 
     assert len(events) == 3  # 5 polled sensors - 2 disabled
@@ -99,11 +99,11 @@ async def test_removed_entity(
     hass: HomeAssistant, knx: KNXTestKit, entity_registry: er.EntityRegistry
 ) -> None:
     """Test unregister callback when entity is removed."""
-    await knx.setup_integration({})
-
-    with patch.object(
-        knx.xknx.connection_manager, "unregister_connection_state_changed_cb"
+    with patch(
+        "xknx.core.connection_manager.ConnectionManager.unregister_connection_state_changed_cb"
     ) as unregister_mock:
+        await knx.setup_integration({})
+
         entity_registry.async_update_entity(
             "sensor.knx_interface_connection_established",
             disabled_by=er.RegistryEntryDisabler.USER,
diff --git a/tests/components/knx/test_light.py b/tests/components/knx/test_light.py
index a445d1a6fd359f..1f2f23e9cca60c 100644
--- a/tests/components/knx/test_light.py
+++ b/tests/components/knx/test_light.py
@@ -18,7 +18,7 @@
 )
 from homeassistant.const import CONF_NAME, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import KNXTestKit
 
@@ -764,7 +764,7 @@ async def test_light_rgbw_individual(hass: HomeAssistant, knx: KNXTestKit) -> No
     # # individual color debounce takes 0.2 seconds if not all 4 addresses received
     knx.assert_state("light.test", STATE_ON)
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=XknxLight.DEBOUNCE_TIMEOUT)
+        hass, dt_util.utcnow() + timedelta(seconds=XknxLight.DEBOUNCE_TIMEOUT)
     )
     await knx.xknx.task_registry.block_till_done()
     knx.assert_state("light.test", STATE_OFF)
diff --git a/tests/components/knx/test_services.py b/tests/components/knx/test_services.py
index 5e6f856ee44413..5796eae8393e6c 100644
--- a/tests/components/knx/test_services.py
+++ b/tests/components/knx/test_services.py
@@ -1,7 +1,10 @@
 """Test KNX services."""
+from unittest.mock import patch
+
 import pytest
 from xknx.telegram.apci import GroupValueResponse, GroupValueWrite
 
+from homeassistant.components.knx import async_unload_entry as knx_async_unload_entry
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 
@@ -250,3 +253,24 @@ async def test_exposure_register(hass: HomeAssistant, knx: KNXTestKit) -> None:
     hass.states.async_set(test_entity, STATE_OFF, {test_attribute: 25})
     await knx.assert_telegram_count(1)
     await knx.assert_write(test_address, (25,))
+
+
+async def test_reload_service(
+    hass: HomeAssistant,
+    knx: KNXTestKit,
+) -> None:
+    """Test reload service."""
+    await knx.setup_integration({})
+
+    with patch(
+        "homeassistant.components.knx.async_unload_entry", wraps=knx_async_unload_entry
+    ) as mock_unload_entry, patch(
+        "homeassistant.components.knx.async_setup_entry"
+    ) as mock_setup_entry:
+        await hass.services.async_call(
+            "knx",
+            "reload",
+            blocking=True,
+        )
+        mock_unload_entry.assert_called_once()
+        mock_setup_entry.assert_called_once()
diff --git a/tests/components/knx/test_time.py b/tests/components/knx/test_time.py
new file mode 100644
index 00000000000000..25a22fe8146f9a
--- /dev/null
+++ b/tests/components/knx/test_time.py
@@ -0,0 +1,86 @@
+"""Test KNX time."""
+from homeassistant.components.knx.const import CONF_RESPOND_TO_READ, KNX_ADDRESS
+from homeassistant.components.knx.schema import TimeSchema
+from homeassistant.components.time import ATTR_TIME, DOMAIN, SERVICE_SET_VALUE
+from homeassistant.const import CONF_NAME
+from homeassistant.core import HomeAssistant, State
+
+from .conftest import KNXTestKit
+
+from tests.common import mock_restore_cache
+
+
+async def test_time(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX time."""
+    test_address = "1/1/1"
+    await knx.setup_integration(
+        {
+            TimeSchema.PLATFORM: {
+                CONF_NAME: "test",
+                KNX_ADDRESS: test_address,
+            }
+        }
+    )
+    # set value
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_VALUE,
+        {"entity_id": "time.test", ATTR_TIME: "01:02:03"},
+        blocking=True,
+    )
+    await knx.assert_write(
+        test_address,
+        (0x01, 0x02, 0x03),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "01:02:03"
+
+    # update from KNX
+    await knx.receive_write(
+        test_address,
+        (0x0C, 0x10, 0x3B),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "12:16:59"
+
+
+async def test_time_restore_and_respond(hass: HomeAssistant, knx: KNXTestKit) -> None:
+    """Test KNX time with passive_address, restoring state and respond_to_read."""
+    test_address = "1/1/1"
+    test_passive_address = "3/3/3"
+
+    fake_state = State("time.test", "01:02:03")
+    mock_restore_cache(hass, (fake_state,))
+
+    await knx.setup_integration(
+        {
+            TimeSchema.PLATFORM: {
+                CONF_NAME: "test",
+                KNX_ADDRESS: [test_address, test_passive_address],
+                CONF_RESPOND_TO_READ: True,
+            }
+        }
+    )
+    # restored state - doesn't send telegram
+    state = hass.states.get("time.test")
+    assert state.state == "01:02:03"
+    await knx.assert_telegram_count(0)
+
+    # respond with restored state
+    await knx.receive_read(test_address)
+    await knx.assert_response(
+        test_address,
+        (0x01, 0x02, 0x03),
+    )
+
+    # don't respond to passive address
+    await knx.receive_read(test_passive_address)
+    await knx.assert_no_telegram()
+
+    # update from KNX passive address
+    await knx.receive_write(
+        test_passive_address,
+        (0x0C, 0x00, 0x00),
+    )
+    state = hass.states.get("time.test")
+    assert state.state == "12:00:00"
diff --git a/tests/components/knx/test_websocket.py b/tests/components/knx/test_websocket.py
index 115b92f70e8d38..76a9544552fa17 100644
--- a/tests/components/knx/test_websocket.py
+++ b/tests/components/knx/test_websocket.py
@@ -183,22 +183,22 @@ async def test_knx_subscribe_telegrams_command_recent_telegrams(
 
     recent_tgs = res["result"]["recent_telegrams"]
     assert len(recent_tgs) == 2
-    # telegrams are sorted from newest to oldest
-    assert recent_tgs[0]["destination_address"] == "1/2/4"
-    assert recent_tgs[0]["payload"] == "1"
-    assert recent_tgs[0]["type"] == "GroupValueWrite"
+    # telegrams are sorted from oldest to newest
+    assert recent_tgs[0]["destination"] == "1/3/4"
+    assert recent_tgs[0]["payload"] == 1
+    assert recent_tgs[0]["telegramtype"] == "GroupValueWrite"
+    assert recent_tgs[0]["source"] == "1.2.3"
+    assert recent_tgs[0]["direction"] == "Incoming"
+    assert isinstance(recent_tgs[0]["timestamp"], str)
+
+    assert recent_tgs[1]["destination"] == "1/2/4"
+    assert recent_tgs[1]["payload"] == 1
+    assert recent_tgs[1]["telegramtype"] == "GroupValueWrite"
     assert (
-        recent_tgs[0]["source_address"] == "0.0.0"
+        recent_tgs[1]["source"] == "0.0.0"
     )  # needs to be the IA currently connected to
-    assert recent_tgs[0]["direction"] == "group_monitor_outgoing"
-    assert recent_tgs[0]["timestamp"] is not None
-
-    assert recent_tgs[1]["destination_address"] == "1/3/4"
-    assert recent_tgs[1]["payload"] == "1"
-    assert recent_tgs[1]["type"] == "GroupValueWrite"
-    assert recent_tgs[1]["source_address"] == "1.2.3"
-    assert recent_tgs[1]["direction"] == "group_monitor_incoming"
-    assert recent_tgs[1]["timestamp"] is not None
+    assert recent_tgs[1]["direction"] == "Outgoing"
+    assert isinstance(recent_tgs[1]["timestamp"], str)
 
 
 async def test_knx_subscribe_telegrams_command_no_project(
@@ -231,45 +231,45 @@ async def test_knx_subscribe_telegrams_command_no_project(
 
     # receive events
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/2/3"
-    assert res["event"]["payload"] == ""
-    assert res["event"]["type"] == "GroupValueRead"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/2/3"
+    assert res["event"]["payload"] is None
+    assert res["event"]["telegramtype"] == "GroupValueRead"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/4"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/4"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/4"
-    assert res["event"]["payload"] == "0"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/4"
+    assert res["event"]["payload"] == 0
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/3/8"
-    assert res["event"]["payload"] == "0x3445"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "1/3/8"
+    assert res["event"]["payload"] == [52, 69]
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "1/2/4"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
+    assert res["event"]["destination"] == "1/2/4"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
     assert (
-        res["event"]["source_address"] == "0.0.0"
+        res["event"]["source"] == "0.0.0"
     )  # needs to be the IA currently connected to
-    assert res["event"]["direction"] == "group_monitor_outgoing"
+    assert res["event"]["direction"] == "Outgoing"
     assert res["event"]["timestamp"] is not None
 
 
@@ -289,42 +289,45 @@ async def test_knx_subscribe_telegrams_command_project(
     # incoming DPT 1 telegram
     await knx.receive_write("0/0/1", True)
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/0/1"
-    assert res["event"]["destination_text"] == "Binary"
-    assert res["event"]["payload"] == "1"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.2.3"
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["destination"] == "0/0/1"
+    assert res["event"]["destination_name"] == "Binary"
+    assert res["event"]["payload"] == 1
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.2.3"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     # incoming DPT 5 telegram
     await knx.receive_write("0/1/1", (0x50,), source="1.1.6")
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/1/1"
-    assert res["event"]["destination_text"] == "percent"
-    assert res["event"]["payload"] == "0x50"
-    assert res["event"]["value"] == "31 %"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.1.6"
+    assert res["event"]["destination"] == "0/1/1"
+    assert res["event"]["destination_name"] == "percent"
+    assert res["event"]["payload"] == [
+        80,
+    ]
+    assert res["event"]["value"] == 31
+    assert res["event"]["unit"] == "%"
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.1.6"
     assert (
-        res["event"]["source_text"]
+        res["event"]["source_name"]
         == "Enertex Bayern GmbH Enertex KNX LED Dimmsequenzer 20A/5x REG"
     )
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
 
     # incoming undecodable telegram (wrong payload type)
     await knx.receive_write("0/1/1", True, source="1.1.6")
     res = await client.receive_json()
-    assert res["event"]["destination_address"] == "0/1/1"
-    assert res["event"]["destination_text"] == "percent"
-    assert res["event"]["payload"] == "1"
+    assert res["event"]["destination"] == "0/1/1"
+    assert res["event"]["destination_name"] == "percent"
+    assert res["event"]["payload"] == 1
     assert res["event"]["value"] == "Error decoding value"
-    assert res["event"]["type"] == "GroupValueWrite"
-    assert res["event"]["source_address"] == "1.1.6"
+    assert res["event"]["telegramtype"] == "GroupValueWrite"
+    assert res["event"]["source"] == "1.1.6"
     assert (
-        res["event"]["source_text"]
+        res["event"]["source_name"]
         == "Enertex Bayern GmbH Enertex KNX LED Dimmsequenzer 20A/5x REG"
     )
-    assert res["event"]["direction"] == "group_monitor_incoming"
+    assert res["event"]["direction"] == "Incoming"
     assert res["event"]["timestamp"] is not None
diff --git a/tests/components/kodi/test_device_trigger.py b/tests/components/kodi/test_device_trigger.py
index 7278cb6680ebc7..3181f9781128e4 100644
--- a/tests/components/kodi/test_device_trigger.py
+++ b/tests/components/kodi/test_device_trigger.py
@@ -16,7 +16,11 @@
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -44,7 +48,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         identifiers={(DOMAIN, "host", 1234)},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         MP_DOMAIN, DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -53,7 +57,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{MP_DOMAIN}.kodi_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["turn_off", "turn_on"]
@@ -70,9 +74,11 @@ async def test_get_triggers(
 
 
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, kodi_media_player
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, kodi_media_player
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(kodi_media_player)
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -83,7 +89,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": kodi_media_player,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                     "action": {
@@ -100,7 +106,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": kodi_media_player,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                     "action": {
@@ -138,3 +144,48 @@ async def test_if_fires_on_state_change(
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == f"turn_off - {kodi_media_player} - 0"
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls, kodi_media_player
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get(kodi_media_player)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "turn_on - {{ trigger.entity_id }} - {{ trigger.id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        "turn_on",
+        {"entity_id": kodi_media_player},
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == f"turn_on - {kodi_media_player} - 0"
diff --git a/tests/components/kostal_plenticore/test_number.py b/tests/components/kostal_plenticore/test_number.py
index 009184a699cddf..dd5ba7127a83bd 100644
--- a/tests/components/kostal_plenticore/test_number.py
+++ b/tests/components/kostal_plenticore/test_number.py
@@ -16,7 +16,7 @@
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_registry import async_get
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -168,7 +168,7 @@ async def test_number_has_value(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=3))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
     await hass.async_block_till_done()
 
     state = hass.states.get("number.scb_battery_min_soc")
@@ -191,7 +191,7 @@ async def test_number_is_unavailable(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=3))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
     await hass.async_block_till_done()
 
     state = hass.states.get("number.scb_battery_min_soc")
@@ -214,7 +214,7 @@ async def test_set_value(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=3))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
     await hass.async_block_till_done()
 
     await hass.services.async_call(
diff --git a/tests/components/lametric/conftest.py b/tests/components/lametric/conftest.py
index 177204b6f241e0..b3a9f2d866509c 100644
--- a/tests/components/lametric/conftest.py
+++ b/tests/components/lametric/conftest.py
@@ -67,8 +67,14 @@ def mock_lametric_cloud() -> Generator[MagicMock, None, None]:
 
 
 @pytest.fixture
-def mock_lametric() -> Generator[MagicMock, None, None]:
-    """Return a mocked LaMetric client."""
+def device_fixture() -> str:
+    """Return the device fixture for a specific device."""
+    return "device"
+
+
+@pytest.fixture
+def mock_lametric(request, device_fixture: str) -> Generator[MagicMock, None, None]:
+    """Return a mocked LaMetric TIME client."""
     with patch(
         "homeassistant.components.lametric.coordinator.LaMetricDevice", autospec=True
     ) as lametric_mock, patch(
@@ -79,7 +85,7 @@ def mock_lametric() -> Generator[MagicMock, None, None]:
         lametric.api_key = "mock-api-key"
         lametric.host = "127.0.0.1"
         lametric.device.return_value = Device.parse_raw(
-            load_fixture("device.json", DOMAIN)
+            load_fixture(f"{device_fixture}.json", DOMAIN)
         )
         yield lametric
 
diff --git a/tests/components/lametric/fixtures/device_sa5.json b/tests/components/lametric/fixtures/device_sa5.json
new file mode 100644
index 00000000000000..47120f672efdab
--- /dev/null
+++ b/tests/components/lametric/fixtures/device_sa5.json
@@ -0,0 +1,71 @@
+{
+  "audio": {
+    "volume": 100,
+    "volume_limit": {
+      "max": 100,
+      "min": 0
+    },
+    "volume_range": {
+      "max": 100,
+      "min": 0
+    }
+  },
+  "bluetooth": {
+    "active": true,
+    "address": "AA:BB:CC:DD:EE:FF",
+    "available": true,
+    "discoverable": true,
+    "low_energy": {
+      "active": true,
+      "advertising": true,
+      "connectable": true
+    },
+    "name": "SKY0123",
+    "pairable": false
+  },
+  "display": {
+    "brightness": 66,
+    "brightness_limit": {
+      "max": 100,
+      "min": 2
+    },
+    "brightness_mode": "manual",
+    "brightness_range": {
+      "max": 100,
+      "min": 0
+    },
+    "height": 8,
+    "on": true,
+    "screensaver": {
+      "enabled": true,
+      "modes": {
+        "screen_off": {
+          "enabled": false
+        },
+        "time_based": {
+          "enabled": false
+        }
+      },
+      "widget": ""
+    },
+    "type": "mixed",
+    "width": 64
+  },
+  "id": "12345",
+  "mode": "manual",
+  "model": "sa5",
+  "name": "spyfly's LaMetric SKY",
+  "os_version": "3.0.13",
+  "serial_number": "SA52100000123TBNC",
+  "wifi": {
+    "active": true,
+    "mac": "AA:BB:CC:DD:EE:FF",
+    "available": true,
+    "encryption": "WPA",
+    "ssid": "IoT",
+    "ip": "127.0.0.1",
+    "mode": "dhcp",
+    "netmask": "255.255.255.0",
+    "strength": 58
+  }
+}
diff --git a/tests/components/lametric/test_config_flow.py b/tests/components/lametric/test_config_flow.py
index 8fd0ef061ac146..0fa3a2d983822b 100644
--- a/tests/components/lametric/test_config_flow.py
+++ b/tests/components/lametric/test_config_flow.py
@@ -6,6 +6,9 @@
     LaMetricConnectionError,
     LaMetricConnectionTimeoutError,
     LaMetricError,
+    Notification,
+    NotificationSound,
+    Sound,
 )
 import pytest
 
@@ -238,6 +241,10 @@ async def test_full_manual(
 
     assert len(mock_lametric.device.mock_calls) == 1
     assert len(mock_lametric.notify.mock_calls) == 1
+
+    notification: Notification = mock_lametric.notify.mock_calls[0][2]["notification"]
+    assert notification.model.sound == Sound(sound=NotificationSound.WIN)
+
     assert len(mock_setup_entry.mock_calls) == 1
 
 
@@ -894,3 +901,48 @@ async def test_reauth_manual(
 
     assert len(mock_lametric.device.mock_calls) == 1
     assert len(mock_lametric.notify.mock_calls) == 1
+
+
+@pytest.mark.usefixtures("mock_setup_entry")
+@pytest.mark.parametrize("device_fixture", ["device_sa5"])
+async def test_reauth_manual_sky(
+    hass: HomeAssistant,
+    mock_lametric: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test reauth flow with manual entry for LaMetric Sky."""
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={
+            "source": SOURCE_REAUTH,
+            "unique_id": mock_config_entry.unique_id,
+            "entry_id": mock_config_entry.entry_id,
+        },
+        data=mock_config_entry.data,
+    )
+
+    flow_id = result["flow_id"]
+
+    await hass.config_entries.flow.async_configure(
+        flow_id, user_input={"next_step_id": "manual_entry"}
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        flow_id, user_input={CONF_API_KEY: "mock-api-key"}
+    )
+
+    assert result2.get("type") == FlowResultType.ABORT
+    assert result2.get("reason") == "reauth_successful"
+    assert mock_config_entry.data == {
+        CONF_HOST: "127.0.0.1",
+        CONF_API_KEY: "mock-api-key",
+        CONF_MAC: "AA:BB:CC:DD:EE:FF",
+    }
+
+    assert len(mock_lametric.device.mock_calls) == 1
+    assert len(mock_lametric.notify.mock_calls) == 1
+
+    notification: Notification = mock_lametric.notify.mock_calls[0][2]["notification"]
+    assert notification.model.sound is None
diff --git a/tests/components/lastfm/__init__.py b/tests/components/lastfm/__init__.py
index 4e7cfffa833a51..dde914d51cc182 100644
--- a/tests/components/lastfm/__init__.py
+++ b/tests/components/lastfm/__init__.py
@@ -1 +1,106 @@
 """The tests for lastfm."""
+from unittest.mock import patch
+
+from pylast import PyLastError, Track
+
+from homeassistant.components.lastfm.const import CONF_MAIN_USER, CONF_USERS
+from homeassistant.const import CONF_API_KEY
+
+API_KEY = "asdasdasdasdasd"
+USERNAME_1 = "testaccount1"
+USERNAME_2 = "testaccount2"
+
+CONF_DATA = {
+    CONF_API_KEY: API_KEY,
+    CONF_MAIN_USER: USERNAME_1,
+    CONF_USERS: [USERNAME_1, USERNAME_2],
+}
+CONF_USER_DATA = {CONF_API_KEY: API_KEY, CONF_MAIN_USER: USERNAME_1}
+CONF_FRIENDS_DATA = {CONF_USERS: [USERNAME_2]}
+
+
+class MockNetwork:
+    """Mock _Network object for pylast."""
+
+    def __init__(self, username: str) -> None:
+        """Initialize the mock."""
+        self.username = username
+
+
+class MockTopTrack:
+    """Mock TopTrack object for pylast."""
+
+    def __init__(self, item: Track) -> None:
+        """Initialize the mock."""
+        self.item = item
+
+
+class MockLastTrack:
+    """Mock LastTrack object for pylast."""
+
+    def __init__(self, track: Track) -> None:
+        """Initialize the mock."""
+        self.track = track
+
+
+class MockUser:
+    """Mock User object for pylast."""
+
+    def __init__(
+        self,
+        username: str = USERNAME_1,
+        now_playing_result: Track | None = None,
+        thrown_error: Exception | None = None,
+        friends: list = [],
+        recent_tracks: list[Track] = [],
+        top_tracks: list[Track] = [],
+    ) -> None:
+        """Initialize the mock."""
+        self._now_playing_result = now_playing_result
+        self._thrown_error = thrown_error
+        self._friends = friends
+        self._recent_tracks = recent_tracks
+        self._top_tracks = top_tracks
+        self.name = username
+
+    def get_name(self, capitalized: bool) -> str:
+        """Get name of the user."""
+        return self.name
+
+    def get_playcount(self) -> int:
+        """Get mock play count."""
+        if self._thrown_error:
+            raise self._thrown_error
+        return len(self._recent_tracks)
+
+    def get_image(self) -> str:
+        """Get mock image."""
+        return ""
+
+    def get_recent_tracks(self, limit: int) -> list[MockLastTrack]:
+        """Get mock recent tracks."""
+        return [MockLastTrack(track) for track in self._recent_tracks]
+
+    def get_top_tracks(self, limit: int) -> list[MockTopTrack]:
+        """Get mock top tracks."""
+        return [MockTopTrack(track) for track in self._recent_tracks]
+
+    def get_now_playing(self) -> Track:
+        """Get mock now playing."""
+        return self._now_playing_result
+
+    def get_friends(self) -> list[any]:
+        """Get mock friends."""
+        if len(self._friends) == 0:
+            raise PyLastError("network", "status", "Page not found")
+        return self._friends
+
+
+def patch_user(user: MockUser) -> MockUser:
+    """Patch interface."""
+    return patch("pylast.User", return_value=user)
+
+
+def patch_setup_entry() -> bool:
+    """Patch interface."""
+    return patch("homeassistant.components.lastfm.async_setup_entry", return_value=True)
diff --git a/tests/components/lastfm/conftest.py b/tests/components/lastfm/conftest.py
new file mode 100644
index 00000000000000..119d4796f57a38
--- /dev/null
+++ b/tests/components/lastfm/conftest.py
@@ -0,0 +1,67 @@
+"""Configure tests for the LastFM integration."""
+from collections.abc import Awaitable, Callable
+from unittest.mock import patch
+
+from pylast import Track
+import pytest
+
+from homeassistant.components.lastfm.const import CONF_MAIN_USER, CONF_USERS, DOMAIN
+from homeassistant.const import CONF_API_KEY
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+from tests.components.lastfm import (
+    API_KEY,
+    USERNAME_1,
+    USERNAME_2,
+    MockNetwork,
+    MockUser,
+)
+
+ComponentSetup = Callable[[MockConfigEntry, MockUser], Awaitable[None]]
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry() -> MockConfigEntry:
+    """Create LastFM entry in Home Assistant."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        data={},
+        options={
+            CONF_API_KEY: API_KEY,
+            CONF_MAIN_USER: USERNAME_1,
+            CONF_USERS: [USERNAME_1, USERNAME_2],
+        },
+    )
+
+
+@pytest.fixture(name="setup_integration")
+async def mock_setup_integration(
+    hass: HomeAssistant,
+) -> Callable[[MockConfigEntry, MockUser], Awaitable[None]]:
+    """Fixture for setting up the component."""
+
+    async def func(mock_config_entry: MockConfigEntry, mock_user: MockUser) -> None:
+        mock_config_entry.add_to_hass(hass)
+        with patch("pylast.User", return_value=mock_user):
+            assert await async_setup_component(hass, DOMAIN, {})
+            await hass.async_block_till_done()
+
+    return func
+
+
+@pytest.fixture(name="default_user")
+def mock_default_user() -> MockUser:
+    """Return default mock user."""
+    return MockUser(
+        now_playing_result=Track("artist", "title", MockNetwork("lastfm")),
+        top_tracks=[Track("artist", "title", MockNetwork("lastfm"))],
+        recent_tracks=[Track("artist", "title", MockNetwork("lastfm"))],
+    )
+
+
+@pytest.fixture(name="first_time_user")
+def mock_first_time_user() -> MockUser:
+    """Return first time mock user."""
+    return MockUser(now_playing_result=None, top_tracks=[], recent_tracks=[])
diff --git a/tests/components/lastfm/test_config_flow.py b/tests/components/lastfm/test_config_flow.py
new file mode 100644
index 00000000000000..ce28638c3f3167
--- /dev/null
+++ b/tests/components/lastfm/test_config_flow.py
@@ -0,0 +1,308 @@
+"""Test Lastfm config flow."""
+from unittest.mock import patch
+
+from pylast import WSError
+import pytest
+
+from homeassistant import data_entry_flow
+from homeassistant.components.lastfm.const import (
+    CONF_MAIN_USER,
+    CONF_USERS,
+    DEFAULT_NAME,
+    DOMAIN,
+)
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.const import CONF_API_KEY
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import (
+    API_KEY,
+    CONF_DATA,
+    CONF_FRIENDS_DATA,
+    CONF_USER_DATA,
+    USERNAME_1,
+    USERNAME_2,
+    MockUser,
+    patch_setup_entry,
+)
+from .conftest import ComponentSetup
+
+from tests.common import MockConfigEntry
+
+
+async def test_full_user_flow(hass: HomeAssistant, default_user: MockUser) -> None:
+    """Test the full user configuration flow."""
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input=CONF_USER_DATA,
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert not result["errors"]
+        assert result["step_id"] == "friends"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_FRIENDS_DATA
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["title"] == DEFAULT_NAME
+        assert result["options"] == CONF_DATA
+
+
+@pytest.mark.parametrize(
+    ("error", "message"),
+    [
+        (
+            WSError(
+                "network",
+                "status",
+                "Invalid API key - You must be granted a valid key by last.fm",
+            ),
+            "invalid_auth",
+        ),
+        (WSError("network", "status", "User not found"), "invalid_account"),
+        (Exception(), "unknown"),
+        (WSError("network", "status", "Something strange"), "unknown"),
+    ],
+)
+async def test_flow_fails(
+    hass: HomeAssistant, error: Exception, message: str, default_user: MockUser
+) -> None:
+    """Test user initialized flow with invalid username."""
+    with patch("pylast.User", return_value=MockUser(thrown_error=error)):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_USER}, data=CONF_USER_DATA
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "user"
+        assert result["errors"]["base"] == message
+
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input=CONF_USER_DATA,
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert not result["errors"]
+        assert result["step_id"] == "friends"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_FRIENDS_DATA
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["title"] == DEFAULT_NAME
+        assert result["options"] == CONF_DATA
+
+
+async def test_flow_friends_invalid_username(
+    hass: HomeAssistant, default_user: MockUser
+) -> None:
+    """Test user initialized flow with invalid username."""
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input=CONF_USER_DATA,
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "friends"
+
+    with patch(
+        "pylast.User",
+        return_value=MockUser(
+            thrown_error=WSError("network", "status", "User not found")
+        ),
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_FRIENDS_DATA
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "friends"
+        assert result["errors"]["base"] == "invalid_account"
+
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input=CONF_FRIENDS_DATA
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["title"] == DEFAULT_NAME
+        assert result["options"] == CONF_DATA
+
+
+async def test_flow_friends_no_friends(
+    hass: HomeAssistant, default_user: MockUser
+) -> None:
+    """Test options is empty when user has no friends."""
+    with patch("pylast.User", return_value=default_user), patch_setup_entry():
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_USER},
+        )
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input=CONF_USER_DATA,
+        )
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "friends"
+        assert len(result["data_schema"].schema[CONF_USERS].config["options"]) == 0
+
+
+async def test_import_flow_success(hass: HomeAssistant, default_user: MockUser) -> None:
+    """Test import flow."""
+    with patch("pylast.User", return_value=default_user):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_IMPORT},
+            data={CONF_API_KEY: API_KEY, CONF_USERS: [USERNAME_1, USERNAME_2]},
+        )
+        await hass.async_block_till_done()
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["title"] == "LastFM"
+    assert result["options"] == {
+        "api_key": "asdasdasdasdasd",
+        "main_user": None,
+        "users": ["testaccount1", "testaccount2"],
+    }
+
+
+async def test_import_flow_already_exist(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test import of yaml already exist."""
+    await setup_integration(config_entry, default_user)
+
+    with patch("pylast.User", return_value=default_user):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_IMPORT},
+            data=CONF_DATA,
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_options_flow(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test updating options."""
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
+        result = await hass.config_entries.options.async_init(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "init"
+
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_USERS: [USERNAME_1]},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_API_KEY: API_KEY,
+        CONF_MAIN_USER: USERNAME_1,
+        CONF_USERS: [USERNAME_1],
+    }
+
+
+async def test_options_flow_incorrect_username(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test updating options doesn't work with incorrect username."""
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
+        result = await hass.config_entries.options.async_init(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "init"
+
+    with patch(
+        "pylast.User",
+        return_value=MockUser(
+            thrown_error=WSError("network", "status", "User not found")
+        ),
+    ):
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_USERS: [USERNAME_1]},
+        )
+        await hass.async_block_till_done()
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "init"
+        assert result["errors"]["base"] == "invalid_account"
+
+    with patch("pylast.User", return_value=default_user):
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_USERS: [USERNAME_1]},
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        CONF_API_KEY: API_KEY,
+        CONF_MAIN_USER: USERNAME_1,
+        CONF_USERS: [USERNAME_1],
+    }
+
+
+async def test_options_flow_from_import(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test updating options gained from import."""
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
+        result = await hass.config_entries.options.async_init(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "init"
+        assert len(result["data_schema"].schema[CONF_USERS].config["options"]) == 0
+
+
+async def test_options_flow_without_friends(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test updating options for someone without friends."""
+    await setup_integration(config_entry, default_user)
+    with patch("pylast.User", return_value=default_user):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
+        result = await hass.config_entries.options.async_init(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["step_id"] == "init"
+        assert len(result["data_schema"].schema[CONF_USERS].config["options"]) == 0
diff --git a/tests/components/lastfm/test_init.py b/tests/components/lastfm/test_init.py
new file mode 100644
index 00000000000000..8f731385e6f794
--- /dev/null
+++ b/tests/components/lastfm/test_init.py
@@ -0,0 +1,30 @@
+"""Test LastFM component setup process."""
+from __future__ import annotations
+
+from homeassistant.components.lastfm.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+from . import MockUser
+from .conftest import ComponentSetup
+
+from tests.common import MockConfigEntry
+
+
+async def test_load_unload_entry(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test load and unload entry."""
+    await setup_integration(config_entry, default_user)
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+
+    state = hass.states.get("sensor.testaccount1")
+    assert state
+
+    await hass.config_entries.async_remove(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.testaccount1")
+    assert not state
diff --git a/tests/components/lastfm/test_sensor.py b/tests/components/lastfm/test_sensor.py
index d9de78b8f8a4ea..e46cf99ffdc58d 100644
--- a/tests/components/lastfm/test_sensor.py
+++ b/tests/components/lastfm/test_sensor.py
@@ -1,95 +1,113 @@
 """Tests for the lastfm sensor."""
 from unittest.mock import patch
 
-from pylast import Track
-import pytest
-
-from homeassistant.components import sensor
-from homeassistant.components.lastfm.const import STATE_NOT_SCROBBLING
+from pylast import WSError
+
+from homeassistant.components.lastfm.const import (
+    ATTR_LAST_PLAYED,
+    ATTR_PLAY_COUNT,
+    ATTR_TOP_PLAYED,
+    CONF_USERS,
+    DOMAIN,
+    STATE_NOT_SCROBBLING,
+)
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_API_KEY, CONF_PLATFORM, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
 
+from . import API_KEY, USERNAME_1, MockUser
+from .conftest import ComponentSetup
+
+from tests.common import MockConfigEntry
+
+LEGACY_CONFIG = {
+    Platform.SENSOR: [
+        {CONF_PLATFORM: DOMAIN, CONF_API_KEY: API_KEY, CONF_USERS: [USERNAME_1]}
+    ]
+}
+
+
+async def test_legacy_migration(hass: HomeAssistant) -> None:
+    """Test migration from yaml to config flow."""
+    with patch("pylast.User", return_value=None):
+        assert await async_setup_component(hass, Platform.SENSOR, LEGACY_CONFIG)
+        await hass.async_block_till_done()
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+    issue_registry = ir.async_get(hass)
+    assert len(issue_registry.issues) == 1
+
+
+async def test_user_unavailable(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test update when user can't be fetched."""
+    await setup_integration(
+        config_entry,
+        MockUser(thrown_error=WSError("network", "status", "User not found")),
+    )
 
-class MockNetwork:
-    """Mock _Network object for pylast."""
-
-    def __init__(self, username: str):
-        """Initialize the mock."""
-        self.username = username
-
-
-class MockUser:
-    """Mock User object for pylast."""
-
-    def __init__(self, now_playing_result):
-        """Initialize the mock."""
-        self._now_playing_result = now_playing_result
-        self.name = "test"
+    entity_id = "sensor.testaccount1"
 
-    def get_playcount(self):
-        """Get mock play count."""
-        return 1
+    state = hass.states.get(entity_id)
 
-    def get_image(self):
-        """Get mock image."""
+    assert state.state == "unavailable"
 
-    def get_recent_tracks(self, limit):
-        """Get mock recent tracks."""
-        return []
 
-    def get_top_tracks(self, limit):
-        """Get mock top tracks."""
-        return []
+async def test_first_time_user(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    first_time_user: MockUser,
+) -> None:
+    """Test first time user."""
+    await setup_integration(config_entry, first_time_user)
 
-    def get_now_playing(self):
-        """Get mock now playing."""
-        return self._now_playing_result
+    entity_id = "sensor.testaccount1"
 
+    state = hass.states.get(entity_id)
 
-@pytest.fixture(name="lastfm_network")
-def lastfm_network_fixture():
-    """Create fixture for LastFMNetwork."""
-    with patch(
-        "homeassistant.components.lastfm.sensor.LastFMNetwork"
-    ) as lastfm_network:
-        yield lastfm_network
+    assert state.state == STATE_NOT_SCROBBLING
+    assert state.attributes[ATTR_LAST_PLAYED] is None
+    assert state.attributes[ATTR_TOP_PLAYED] is None
+    assert state.attributes[ATTR_PLAY_COUNT] == 0
 
 
-async def test_update_not_playing(hass: HomeAssistant, lastfm_network) -> None:
+async def test_update_not_playing(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    first_time_user: MockUser,
+) -> None:
     """Test update when no playing song."""
+    await setup_integration(config_entry, first_time_user)
 
-    lastfm_network.return_value.get_user.return_value = MockUser(None)
-
-    assert await async_setup_component(
-        hass,
-        sensor.DOMAIN,
-        {"sensor": {"platform": "lastfm", "api_key": "secret-key", "users": ["test"]}},
-    )
-    await hass.async_block_till_done()
-
-    entity_id = "sensor.test"
+    entity_id = "sensor.testaccount1"
 
     state = hass.states.get(entity_id)
 
     assert state.state == STATE_NOT_SCROBBLING
 
 
-async def test_update_playing(hass: HomeAssistant, lastfm_network) -> None:
-    """Test update when song playing."""
-
-    lastfm_network.return_value.get_user.return_value = MockUser(
-        Track("artist", "title", MockNetwork("test"))
-    )
-
-    assert await async_setup_component(
-        hass,
-        sensor.DOMAIN,
-        {"sensor": {"platform": "lastfm", "api_key": "secret-key", "users": ["test"]}},
-    )
-    await hass.async_block_till_done()
+async def test_update_playing(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    config_entry: MockConfigEntry,
+    default_user: MockUser,
+) -> None:
+    """Test update when playing a song."""
+    await setup_integration(config_entry, default_user)
 
-    entity_id = "sensor.test"
+    entity_id = "sensor.testaccount1"
 
     state = hass.states.get(entity_id)
 
     assert state.state == "artist - title"
+    assert state.attributes[ATTR_LAST_PLAYED] == "artist - title"
+    assert state.attributes[ATTR_TOP_PLAYED] == "artist - title"
+    assert state.attributes[ATTR_PLAY_COUNT] == 1
diff --git a/tests/components/lcn/test_device_trigger.py b/tests/components/lcn/test_device_trigger.py
index a4fb396c700952..637aeec1b0b1e6 100644
--- a/tests/components/lcn/test_device_trigger.py
+++ b/tests/components/lcn/test_device_trigger.py
@@ -2,6 +2,7 @@
 from pypck.inputs import ModSendKeysHost, ModStatusAccessControl
 from pypck.lcn_addr import LcnAddr
 from pypck.lcn_defs import AccessControlPeriphery, KeyAction, SendKeyCommand
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -15,7 +16,7 @@
 
 from .conftest import get_device
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 
 async def test_get_triggers_module_device(
@@ -44,7 +45,7 @@ async def test_get_triggers_module_device(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_non_module_device(
diff --git a/tests/components/lifx/test_light.py b/tests/components/lifx/test_light.py
index 67bf2754d11e93..f64af98c9b5c0b 100644
--- a/tests/components/lifx/test_light.py
+++ b/tests/components/lifx/test_light.py
@@ -683,7 +683,7 @@ async def test_matrix_flame_morph_effects(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_flame"},
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 1
     assert len(bulb.set_tile_effect.calls) == 1
 
@@ -824,7 +824,7 @@ async def test_lightstrip_move_effect(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_move"},
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 1
     assert len(bulb.set_multizone_effect.calls) == 1
 
@@ -881,6 +881,7 @@ async def test_lightstrip_move_effect(hass: HomeAssistant) -> None:
         {ATTR_ENTITY_ID: entity_id, ATTR_EFFECT: "effect_stop"},
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(bulb.set_power.calls) == 0
     assert len(bulb.set_multizone_effect.calls) == 1
     call_dict = bulb.set_multizone_effect.calls[0][1]
diff --git a/tests/components/light/test_device_action.py b/tests/components/light/test_device_action.py
index 5fd33ced82cc9b..dcb52d68a796ed 100644
--- a/tests/components/light/test_device_action.py
+++ b/tests/components/light/test_device_action.py
@@ -1,5 +1,6 @@
 """The test for light device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -11,20 +12,26 @@
     ColorMode,
     LightEntityFeature,
 )
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import (
+    device_registry as dr,
+    entity_registry as er,
+)
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -45,7 +52,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -53,28 +60,27 @@ async def test_get_actions(
         supported_features=LightEntityFeature.FLASH,
         capabilities={"supported_color_modes": ["brightness"]},
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in [
-            "turn_off",
-            "turn_on",
-            "toggle",
             "brightness_decrease",
             "brightness_increase",
             "flash",
+            "turn_off",
+            "turn_on",
+            "toggle",
         ]
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -100,7 +106,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -116,7 +122,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off", "toggle"]
@@ -124,7 +130,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_capabilities(
@@ -164,7 +170,7 @@ async def test_get_action_capabilities(
         capabilities = await async_get_device_automation_capabilities(
             hass, DeviceAutomationType.ACTION, action
         )
-        assert capabilities == {"extra_fields": []}
+        assert capabilities == {"extra_fields": []} or capabilities == {}
 
 
 @pytest.mark.parametrize(
@@ -314,17 +320,162 @@ async def test_get_action_capabilities_features(
         assert capabilities == expected
 
 
-async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+@pytest.mark.parametrize(
+    (
+        "set_state",
+        "expected_actions",
+        "supported_features_reg",
+        "supported_features_state",
+        "capabilities_reg",
+        "attributes_state",
+        "expected_capabilities",
+    ),
+    [
+        (
+            False,
+            {
+                "turn_on",
+                "toggle",
+                "turn_off",
+                "brightness_increase",
+                "brightness_decrease",
+            },
+            0,
+            0,
+            {ATTR_SUPPORTED_COLOR_MODES: [ColorMode.BRIGHTNESS]},
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "brightness_pct",
+                        "optional": True,
+                        "type": "float",
+                        "valueMax": 100,
+                        "valueMin": 0,
+                    }
+                ]
+            },
+        ),
+        (
+            True,
+            {
+                "turn_on",
+                "toggle",
+                "turn_off",
+                "brightness_increase",
+                "brightness_decrease",
+            },
+            0,
+            0,
+            None,
+            {ATTR_SUPPORTED_COLOR_MODES: [ColorMode.BRIGHTNESS]},
+            {
+                "turn_on": [
+                    {
+                        "name": "brightness_pct",
+                        "optional": True,
+                        "type": "float",
+                        "valueMax": 100,
+                        "valueMin": 0,
+                    }
+                ]
+            },
+        ),
+        (
+            False,
+            {"turn_on", "toggle", "turn_off", "flash"},
+            LightEntityFeature.FLASH,
+            0,
+            None,
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "flash",
+                        "optional": True,
+                        "type": "select",
+                        "options": [("short", "short"), ("long", "long")],
+                    }
+                ]
+            },
+        ),
+        (
+            True,
+            {"turn_on", "toggle", "turn_off", "flash"},
+            0,
+            LightEntityFeature.FLASH,
+            None,
+            {},
+            {
+                "turn_on": [
+                    {
+                        "name": "flash",
+                        "optional": True,
+                        "type": "select",
+                        "options": [("short", "short"), ("long", "long")],
+                    }
+                ]
+            },
+        ),
+    ],
+)
+async def test_get_action_capabilities_features_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    expected_actions,
+    supported_features_reg,
+    supported_features_state,
+    capabilities_reg,
+    attributes_state,
+    expected_capabilities,
 ) -> None:
-    """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test we get the expected capabilities from a light action."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        "5678",
+        device_id=device_entry.id,
+        supported_features=supported_features_reg,
+        capabilities=capabilities_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"supported_features": supported_features_state, **attributes_state},
+        )
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    actions = await async_get_device_automations(
+        hass, DeviceAutomationType.ACTION, device_entry.id
+    )
+    assert len(actions) == len(expected_actions)
+    action_types = {action["type"] for action in actions}
+    assert action_types == expected_actions
+    for action in actions:
+        action["entity_id"] = entity_registry.async_get(action["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.ACTION, action
+        )
+        expected = {"extra_fields": expected_capabilities.get(action["type"], [])}
+        assert capabilities == expected
 
-    ent1 = platform.ENTITIES[0]
+
+async def test_action(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -336,7 +487,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -345,7 +496,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -354,7 +505,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -363,7 +514,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "flash",
                     },
                 },
@@ -372,7 +523,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "flash",
                         "flash": "long",
                     },
@@ -385,7 +536,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "brightness_increase",
                     },
                 },
@@ -397,7 +548,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "brightness_decrease",
                     },
                 },
@@ -406,7 +557,7 @@ async def test_action(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                         "brightness_pct": 75,
                     },
@@ -415,89 +566,95 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
-
-    hass.bus.async_fire("test_off")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_off")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
 
-    hass.bus.async_fire("test_on")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_on")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    hass.bus.async_fire("test_toggle")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
-
-    hass.bus.async_fire("test_flash_short")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
 
     hass.bus.async_fire("test_toggle")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_flash_long")
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-
-    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
     hass.bus.async_fire("test_brightness_increase")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 1
-    assert turn_on_calls[0].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[0].data["brightness_step_pct"] == 10
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_step_pct": 10,
+    }
 
     hass.bus.async_fire("test_brightness_decrease")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 2
-    assert turn_on_calls[1].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[1].data["brightness_step_pct"] == -10
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_step_pct": -10,
+    }
 
     hass.bus.async_fire("test_brightness")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 3
-    assert turn_on_calls[2].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[2].data["brightness_pct"] == 75
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "brightness_pct": 75,
+    }
 
     hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 4
-    assert turn_on_calls[3].data["entity_id"] == ent1.entity_id
-    assert "brightness_pct" not in turn_on_calls[3].data
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
     hass.bus.async_fire("test_flash_short")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 5
-    assert turn_on_calls[4].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[4].data["flash"] == FLASH_SHORT
+    assert turn_on_calls[-1].data == {
+        "entity_id": entry.entity_id,
+        "flash": FLASH_SHORT,
+    }
 
     hass.bus.async_fire("test_flash_long")
     await hass.async_block_till_done()
-
     assert len(turn_on_calls) == 6
-    assert turn_on_calls[5].data["entity_id"] == ent1.entity_id
-    assert turn_on_calls[5].data["flash"] == FLASH_LONG
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id, "flash": FLASH_LONG}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/light/test_device_condition.py b/tests/components/light/test_device_condition.py
index 79c5d88c513d64..b38c225347ae5e 100644
--- a/tests/components/light/test_device_condition.py
+++ b/tests/components/light/test_device_condition.py
@@ -1,8 +1,9 @@
 """The test for light device automation."""
 from datetime import timedelta
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -16,12 +17,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -51,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -85,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -107,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -140,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a light condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -164,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -183,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -199,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -208,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -216,10 +251,65 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
@@ -232,8 +322,7 @@ async def test_if_fires_on_for_condition(
 
     ent1, ent2, ent3 = platform.ENTITIES
 
-    with patch("homeassistant.core.dt_util.utcnow") as mock_utcnow:
-        mock_utcnow.return_value = point1
+    with freeze_time(point1) as freezer:
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -245,7 +334,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -263,7 +352,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -271,18 +359,18 @@ async def test_if_fires_on_for_condition(
         assert len(calls) == 0
 
         # Time travel 10 secs into the future
-        mock_utcnow.return_value = point2
+        freezer.move_to(point2)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
         # Time travel 20 secs into the future
-        mock_utcnow.return_value = point3
+        freezer.move_to(point3)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 1
diff --git a/tests/components/light/test_device_trigger.py b/tests/components/light/test_device_trigger.py
index 44a677a5da28a5..085193e3b34c57 100644
--- a/tests/components/light/test_device_trigger.py
+++ b/tests/components/light/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.light import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -51,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -59,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -107,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -140,19 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
-async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
-    """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test we get the expected capabilities from a light trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
 
-    platform.init()
-    await hass.async_block_till_done()
 
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -164,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -188,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -212,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -235,39 +267,89 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
-    platform.init()
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
+    assert len(calls) == 0
 
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"] == f"turn_on device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -279,7 +361,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -303,16 +385,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py
index 4b4c027541e4cf..2dc8e504898deb 100644
--- a/tests/components/light/test_init.py
+++ b/tests/components/light/test_init.py
@@ -872,7 +872,7 @@ async def test_light_context(
 
 
 async def test_light_turn_on_auth(
-    hass: HomeAssistant, hass_admin_user: MockUser, enable_custom_integrations: None
+    hass: HomeAssistant, hass_read_only_user: MockUser, enable_custom_integrations: None
 ) -> None:
     """Test that light context works."""
     platform = getattr(hass.components, "test.light")
@@ -883,7 +883,7 @@ async def test_light_turn_on_auth(
     state = hass.states.get("light.ceiling")
     assert state is not None
 
-    hass_admin_user.mock_policy({})
+    hass_read_only_user.mock_policy({})
 
     with pytest.raises(Unauthorized):
         await hass.services.async_call(
@@ -891,7 +891,7 @@ async def test_light_turn_on_auth(
             "turn_on",
             {"entity_id": state.entity_id},
             blocking=True,
-            context=core.Context(user_id=hass_admin_user.id),
+            context=core.Context(user_id=hass_read_only_user.id),
         )
 
 
diff --git a/tests/components/light/test_recorder.py b/tests/components/light/test_recorder.py
index 2c85dac0bd45c2..edf691b6099bca 100644
--- a/tests/components/light/test_recorder.py
+++ b/tests/components/light/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import light
 from homeassistant.components.light import (
@@ -14,7 +17,7 @@
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -23,6 +26,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def light_only() -> None:
+    """Enable only the light platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.LIGHT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test light registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/litejet/test_trigger.py b/tests/components/litejet/test_trigger.py
index 40511c3f45ba4d..e3d7caad65e396 100644
--- a/tests/components/litejet/test_trigger.py
+++ b/tests/components/litejet/test_trigger.py
@@ -14,7 +14,12 @@
 from . import async_init_integration
 
 from tests.common import async_fire_time_changed_exact, async_mock_service
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/tests/components/litterrobot/test_time.py b/tests/components/litterrobot/test_time.py
new file mode 100644
index 00000000000000..6532f2a3bc7b65
--- /dev/null
+++ b/tests/components/litterrobot/test_time.py
@@ -0,0 +1,35 @@
+"""Test the Litter-Robot time entity."""
+from __future__ import annotations
+
+from datetime import time
+from unittest.mock import MagicMock
+
+from pylitterbot import LitterRobot3
+
+from homeassistant.components.time import DOMAIN as PLATFORM_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant
+
+from .conftest import setup_integration
+
+SLEEP_START_TIME_ENTITY_ID = "time.test_sleep_mode_start_time"
+
+
+async def test_sleep_mode_start_time(
+    hass: HomeAssistant, mock_account: MagicMock
+) -> None:
+    """Tests the sleep mode start time."""
+    await setup_integration(hass, mock_account, PLATFORM_DOMAIN)
+
+    entity = hass.states.get(SLEEP_START_TIME_ENTITY_ID)
+    assert entity
+    assert entity.state == "17:16:00"
+
+    robot: LitterRobot3 = mock_account.robots[0]
+    await hass.services.async_call(
+        PLATFORM_DOMAIN,
+        "set_value",
+        {ATTR_ENTITY_ID: SLEEP_START_TIME_ENTITY_ID, "time": time(23, 0)},
+        blocking=True,
+    )
+    robot.set_sleep_mode.assert_awaited_once_with(True, time(23, 0))
diff --git a/tests/components/local_calendar/test_init.py b/tests/components/local_calendar/test_init.py
new file mode 100644
index 00000000000000..e5ca209e8a667e
--- /dev/null
+++ b/tests/components/local_calendar/test_init.py
@@ -0,0 +1,18 @@
+"""Tests for init platform of local calendar."""
+
+from unittest.mock import patch
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_remove_config_entry(
+    hass: HomeAssistant, setup_integration: None, config_entry: MockConfigEntry
+) -> None:
+    """Test removing a config entry."""
+
+    with patch("homeassistant.components.local_calendar.Path.unlink") as unlink_mock:
+        assert await hass.config_entries.async_remove(config_entry.entry_id)
+        await hass.async_block_till_done()
+        unlink_mock.assert_called_once()
diff --git a/tests/components/local_ip/test_init.py b/tests/components/local_ip/test_init.py
index 21becc39a94fa3..5c9e9b4f551a3d 100644
--- a/tests/components/local_ip/test_init.py
+++ b/tests/components/local_ip/test_init.py
@@ -3,8 +3,7 @@
 
 from homeassistant import config_entries
 from homeassistant.components.local_ip import DOMAIN
-from homeassistant.components.network import async_get_source_ip
-from homeassistant.components.zeroconf import MDNS_TARGET_IP
+from homeassistant.components.network import MDNS_TARGET_IP, async_get_source_ip
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/lock/test_device_action.py b/tests/components/lock/test_device_action.py
index 7619cc61fcf7a0..f87fa4cc178780 100644
--- a/tests/components/lock/test_device_action.py
+++ b/tests/components/lock/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Lock device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.mark.parametrize(
@@ -44,7 +48,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -62,7 +66,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in basic_action_types
@@ -72,7 +76,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in expected_action_types
@@ -80,7 +84,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -106,7 +110,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -121,7 +125,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["lock", "unlock"]
@@ -129,11 +133,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for lock actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -144,7 +150,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "lock",
                     },
                 },
@@ -153,7 +159,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "unlock",
                     },
                 },
@@ -162,7 +168,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "open",
                     },
                 },
@@ -192,3 +198,49 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(lock_calls) == 1
     assert len(unlock_calls) == 1
     assert len(open_calls) == 1
+
+    assert lock_calls[0].domain == DOMAIN
+    assert lock_calls[0].service == "lock"
+    assert lock_calls[0].data == {"entity_id": entry.entity_id}
+    assert unlock_calls[0].domain == DOMAIN
+    assert unlock_calls[0].service == "unlock"
+    assert unlock_calls[0].data == {"entity_id": entry.entity_id}
+    assert open_calls[0].domain == DOMAIN
+    assert open_calls[0].service == "open"
+    assert open_calls[0].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for lock actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_lock"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.id,
+                        "type": "lock",
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+
+    lock_calls = async_mock_service(hass, "lock", "lock")
+
+    hass.bus.async_fire("test_event_lock")
+    await hass.async_block_till_done()
+    assert len(lock_calls) == 1
+
+    assert lock_calls[0].domain == DOMAIN
+    assert lock_calls[0].service == "lock"
+    assert lock_calls[0].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/lock/test_device_condition.py b/tests/components/lock/test_device_condition.py
index 4da8efecb56159..43513930f2ee06 100644
--- a/tests/components/lock/test_device_condition.py
+++ b/tests/components/lock/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Lock device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -19,11 +20,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -44,7 +48,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -53,7 +57,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in [
@@ -67,7 +71,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -93,7 +97,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -107,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in [
@@ -121,12 +125,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("lock.entity", STATE_LOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
 
     assert await async_setup_component(
         hass,
@@ -140,7 +148,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_locked",
                         }
                     ],
@@ -158,7 +166,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_unlocked",
                         }
                     ],
@@ -176,7 +184,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_unlocking",
                         }
                     ],
@@ -194,7 +202,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_locking",
                         }
                     ],
@@ -212,7 +220,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "lock.entity",
+                            "entity_id": entry.id,
                             "type": "is_jammed",
                         }
                     ],
@@ -232,27 +240,68 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_locked - event - test_event1"
 
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_unlocked - event - test_event2"
 
-    hass.states.async_set("lock.entity", STATE_UNLOCKING)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKING)
     hass.bus.async_fire("test_event3")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_unlocking - event - test_event3"
 
-    hass.states.async_set("lock.entity", STATE_LOCKING)
+    hass.states.async_set(entry.entity_id, STATE_LOCKING)
     hass.bus.async_fire("test_event4")
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_locking - event - test_event4"
 
-    hass.states.async_set("lock.entity", STATE_JAMMED)
+    hass.states.async_set(entry.entity_id, STATE_JAMMED)
     hass.bus.async_fire("test_event5")
     await hass.async_block_till_done()
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_jammed - event - test_event5"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_locked",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_locked - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_locked - event - test_event1"
diff --git a/tests/components/lock/test_device_trigger.py b/tests/components/lock/test_device_trigger.py
index 19191883a54d0c..107e0924440820 100644
--- a/tests/components/lock/test_device_trigger.py
+++ b/tests/components/lock/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -22,13 +23,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -49,7 +53,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -58,7 +62,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["locked", "unlocked", "unlocking", "locking", "jammed"]
@@ -66,7 +70,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -92,7 +96,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -106,7 +110,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["locked", "unlocked", "unlocking", "locking", "jammed"]
@@ -114,7 +118,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -148,9 +152,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a lock."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 5
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
 
     assert await async_setup_component(
         hass,
@@ -162,7 +202,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "locked",
                     },
                     "action": {
@@ -181,7 +221,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "lock.entity",
+                        "entity_id": entry.id,
                         "type": "unlocked",
                     },
                     "action": {
@@ -200,26 +240,77 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("lock.entity", STATE_LOCKED)
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "locked - device - {} - unlocked - locked - None".format("lock.entity")
+    assert (
+        calls[0].data["some"]
+        == f"locked - device - {entry.entity_id} - unlocked - locked - None"
+    )
 
     # Fake that the entity is turning off.
-    hass.states.async_set("lock.entity", STATE_UNLOCKED)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "unlocked - device - {} - locked - unlocked - None".format("lock.entity")
+    assert (
+        calls[1].data["some"]
+        == f"unlocked - device - {entry.entity_id} - locked - unlocked - None"
+    )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "locked",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "locked - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}} - {{ trigger.for }}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"locked - device - {entry.entity_id} - unlocked - locked - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_UNLOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKED)
 
     assert await async_setup_component(
         hass,
@@ -231,7 +322,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "locked",
                         "for": {"seconds": 5},
                     },
@@ -256,7 +347,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "unlocking",
                         "for": {"seconds": 5},
                     },
@@ -281,7 +372,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "jammed",
                         "for": {"seconds": 5},
                     },
@@ -306,7 +397,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "locking",
                         "for": {"seconds": 5},
                     },
@@ -330,10 +421,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_UNLOCKED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_LOCKED)
+    hass.states.async_set(entry.entity_id, STATE_LOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -342,10 +432,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - unlocked - locked - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - unlocked - locked - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_UNLOCKING)
+    hass.states.async_set(entry.entity_id, STATE_UNLOCKING)
     await hass.async_block_till_done()
     assert len(calls) == 1
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=16))
@@ -354,10 +444,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[1].data["some"]
-        == f"turn_on device - {entity_id} - locked - unlocking - 0:00:05"
+        == f"turn_on device - {entry.entity_id} - locked - unlocking - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_JAMMED)
+    hass.states.async_set(entry.entity_id, STATE_JAMMED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=21))
@@ -366,10 +456,10 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[2].data["some"]
-        == f"turn_off device - {entity_id} - unlocking - jammed - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - unlocking - jammed - 0:00:05"
     )
 
-    hass.states.async_set(entity_id, STATE_LOCKING)
+    hass.states.async_set(entry.entity_id, STATE_LOCKING)
     await hass.async_block_till_done()
     assert len(calls) == 3
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=27))
@@ -378,5 +468,5 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[3].data["some"]
-        == f"turn_on device - {entity_id} - jammed - locking - 0:00:05"
+        == f"turn_on device - {entry.entity_id} - jammed - locking - 0:00:05"
     )
diff --git a/tests/components/logbook/conftest.py b/tests/components/logbook/conftest.py
index 5b98d7240becaf..8795ba3c018ad3 100644
--- a/tests/components/logbook/conftest.py
+++ b/tests/components/logbook/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for script tests."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/logbook/test_init.py b/tests/components/logbook/test_init.py
index c961d40574d5ff..2a93e6e1d4c265 100644
--- a/tests/components/logbook/test_init.py
+++ b/tests/components/logbook/test_init.py
@@ -2639,7 +2639,7 @@ class MockLogbookPlatform:
 
         @ha.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
diff --git a/tests/components/logbook/test_websocket_api.py b/tests/components/logbook/test_websocket_api.py
index 9e991795083efe..c68cbedc44a3d2 100644
--- a/tests/components/logbook/test_websocket_api.py
+++ b/tests/components/logbook/test_websocket_api.py
@@ -68,7 +68,7 @@ class MockLogbookPlatform:
 
         @core.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
@@ -91,7 +91,7 @@ class MockLogbookPlatform:
 
         @core.callback
         def async_describe_events(
-            hass: HomeAssistant,
+            hass: HomeAssistant,  # noqa: N805
             async_describe_event: Callable[
                 [str, str, Callable[[Event], dict[str, str]]], None
             ],
diff --git a/tests/components/logentries/test_init.py b/tests/components/logentries/test_init.py
index 0101356e3edb3e..98b171c813f931 100644
--- a/tests/components/logentries/test_init.py
+++ b/tests/components/logentries/test_init.py
@@ -1,10 +1,10 @@
 """The tests for the Logentries component."""
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import ANY, call, patch
 
 import pytest
 
 import homeassistant.components.logentries as logentries
-from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -12,19 +12,23 @@
 async def test_setup_config_full(hass: HomeAssistant) -> None:
     """Test setup with all data."""
     config = {"logentries": {"token": "secret"}}
-    hass.bus.listen = MagicMock()
     assert await async_setup_component(hass, logentries.DOMAIN, config)
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
+
+    with patch("homeassistant.components.logentries.requests.post") as mock_post:
+        hass.states.async_set("fake.entity", STATE_ON)
+        await hass.async_block_till_done()
+        assert len(mock_post.mock_calls) == 1
 
 
 async def test_setup_config_defaults(hass: HomeAssistant) -> None:
     """Test setup with defaults."""
     config = {"logentries": {"token": "token"}}
-    hass.bus.listen = MagicMock()
     assert await async_setup_component(hass, logentries.DOMAIN, config)
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
+
+    with patch("homeassistant.components.logentries.requests.post") as mock_post:
+        hass.states.async_set("fake.entity", STATE_ON)
+        await hass.async_block_till_done()
+        assert len(mock_post.mock_calls) == 1
 
 
 @pytest.fixture
@@ -47,28 +51,24 @@ async def test_event_listener(hass: HomeAssistant, mock_dump, mock_requests) ->
     mock_post = mock_requests.post
     mock_requests.exceptions.RequestException = Exception
     config = {"logentries": {"token": "token"}}
-    hass.bus.listen = MagicMock()
     assert await async_setup_component(hass, logentries.DOMAIN, config)
-    handler_method = hass.bus.listen.call_args_list[0][0][1]
 
     valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0, "foo": "foo"}
     for in_, out in valid.items():
-        state = MagicMock(state=in_, domain="fake", object_id="entity", attributes={})
-        event = MagicMock(data={"new_state": state}, time_fired=12345)
-        body = [
-            {
-                "domain": "fake",
-                "entity_id": "entity",
-                "attributes": {},
-                "time": "12345",
-                "value": out,
-            }
-        ]
         payload = {
             "host": "https://webhook.logentries.com/noformat/logs/token",
-            "event": body,
+            "event": [
+                {
+                    "domain": "fake",
+                    "entity_id": "entity",
+                    "attributes": {},
+                    "time": ANY,
+                    "value": out,
+                }
+            ],
         }
-        handler_method(event)
+        hass.states.async_set("fake.entity", in_)
+        await hass.async_block_till_done()
         assert mock_post.call_count == 1
         assert mock_post.call_args == call(payload["host"], data=payload, timeout=10)
         mock_post.reset_mock()
diff --git a/tests/components/loqed/__init__.py b/tests/components/loqed/__init__.py
new file mode 100644
index 00000000000000..c40c0f7c8f5df2
--- /dev/null
+++ b/tests/components/loqed/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Loqed integration."""
diff --git a/tests/components/loqed/conftest.py b/tests/components/loqed/conftest.py
new file mode 100644
index 00000000000000..be57237afdc784
--- /dev/null
+++ b/tests/components/loqed/conftest.py
@@ -0,0 +1,73 @@
+"""Contains fixtures for Loqed tests."""
+
+from collections.abc import AsyncGenerator
+import json
+from typing import Any
+from unittest.mock import AsyncMock, Mock, patch
+
+from loqedAPI import loqed
+import pytest
+
+from homeassistant.components.loqed import DOMAIN
+from homeassistant.const import CONF_API_TOKEN, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry, load_fixture
+
+
+@pytest.fixture(name="config_entry")
+def config_entry_fixture() -> MockConfigEntry:
+    """Mock config entry."""
+
+    config = load_fixture("loqed/integration_config.json")
+    json_config = json.loads(config)
+    return MockConfigEntry(
+        version=1,
+        domain=DOMAIN,
+        data={
+            "id": "Foo",
+            "bridge_ip": json_config["bridge_ip"],
+            "bridge_mdns_hostname": json_config["bridge_mdns_hostname"],
+            "bridge_key": json_config["bridge_key"],
+            "lock_key_local_id": int(json_config["lock_key_local_id"]),
+            "lock_key_key": json_config["lock_key_key"],
+            CONF_WEBHOOK_ID: "Webhook_id",
+            CONF_API_TOKEN: "Token",
+            CONF_NAME: "Home",
+        },
+    )
+
+
+@pytest.fixture(name="lock")
+def lock_fixture() -> loqed.Lock:
+    """Set up a mock implementation of a Lock."""
+    webhooks_fixture = json.loads(load_fixture("loqed/get_all_webhooks.json"))
+
+    mock_lock = Mock(spec=loqed.Lock, id="Foo", last_key_id=2)
+    mock_lock.name = "LOQED smart lock"
+    mock_lock.getWebhooks = AsyncMock(return_value=webhooks_fixture)
+    mock_lock.bolt_state = "locked"
+    mock_lock.battery_percentage = 90
+    return mock_lock
+
+
+@pytest.fixture(name="integration")
+async def integration_fixture(
+    hass: HomeAssistant, config_entry: MockConfigEntry, lock: loqed.Lock
+) -> AsyncGenerator[MockConfigEntry, None]:
+    """Set up the loqed integration with a config entry."""
+    config: dict[str, Any] = {DOMAIN: {CONF_API_TOKEN: ""}}
+    config_entry.add_to_hass(hass)
+
+    lock_status = json.loads(load_fixture("loqed/status_ok.json"))
+
+    with patch("loqedAPI.loqed.LoqedAPI.async_get_lock", return_value=lock), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_status
+    ), patch(
+        "homeassistant.components.webhook.async_generate_url",
+        return_value="http://hook_id",
+    ):
+        await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+        yield config_entry
diff --git a/tests/components/loqed/fixtures/battery_update.json b/tests/components/loqed/fixtures/battery_update.json
new file mode 100644
index 00000000000000..be62d7f14f83e7
--- /dev/null
+++ b/tests/components/loqed/fixtures/battery_update.json
@@ -0,0 +1,6 @@
+{
+  "battery_type": "NICKEL_METAL_HYDRIDE",
+  "battery_percentage": 88,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**"
+}
diff --git a/tests/components/loqed/fixtures/get_all_locks.json b/tests/components/loqed/fixtures/get_all_locks.json
new file mode 100644
index 00000000000000..bd8489c5c87033
--- /dev/null
+++ b/tests/components/loqed/fixtures/get_all_locks.json
@@ -0,0 +1,26 @@
+{
+  "data": [
+    {
+      "id": "Foo",
+      "name": "MyLock",
+      "battery_percentage": 64,
+      "battery_type": "nickel_metal_hydride",
+      "bolt_state": "day_lock",
+      "party_mode": false,
+      "guest_access_mode": false,
+      "twist_assist": false,
+      "touch_to_connect": true,
+      "lock_direction": "clockwise",
+      "mortise_lock_type": "cylinder_operated_no_handle_on_the_outside",
+      "supported_lock_states": ["open", "day_lock", "night_lock"],
+      "online": true,
+      "bridge_ip": "192.168.12.34",
+      "bridge_hostname": "LOQED-aabbccddeeff.local",
+      "local_id": 1,
+      "key_secret": "SGFsbG8gd2VyZWxk",
+      "backend_key": "aGVsbG8gd29ybGQ=",
+      "bridge_webhook_count": 1,
+      "bridge_key": "Ym9uam91ciBtb25kZQ=="
+    }
+  ]
+}
diff --git a/tests/components/loqed/fixtures/get_all_webhooks.json b/tests/components/loqed/fixtures/get_all_webhooks.json
new file mode 100644
index 00000000000000..cf53fcf56a9241
--- /dev/null
+++ b/tests/components/loqed/fixtures/get_all_webhooks.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": 1,
+    "url": "http://hook_id",
+    "trigger_state_changed_open": 1,
+    "trigger_state_changed_latch": 1,
+    "trigger_state_changed_night_lock": 1,
+    "trigger_state_changed_unknown": 1,
+    "trigger_state_goto_open": 1,
+    "trigger_state_goto_latch": 1,
+    "trigger_state_goto_night_lock": 1,
+    "trigger_battery": 1,
+    "trigger_online_status": 1
+  }
+]
diff --git a/tests/components/loqed/fixtures/integration_config.json b/tests/components/loqed/fixtures/integration_config.json
new file mode 100644
index 00000000000000..c4d9f87162c3d3
--- /dev/null
+++ b/tests/components/loqed/fixtures/integration_config.json
@@ -0,0 +1,9 @@
+{
+  "lock_id": "**REDACTED**",
+  "lock_key_local_id": 1,
+  "lock_key_key": "SGFsbG8gd2VyZWxk",
+  "backend_key": "aGVsbG8gd29ybGQ=",
+  "bridge_key": "Ym9uam91ciBtb25kZQ==",
+  "bridge_ip": "192.168.12.34",
+  "bridge_mdns_hostname": "LOQED-aabbccddeeff.local"
+}
diff --git a/tests/components/loqed/fixtures/lock_going_to_daylock.json b/tests/components/loqed/fixtures/lock_going_to_daylock.json
new file mode 100644
index 00000000000000..a07ba43d25c030
--- /dev/null
+++ b/tests/components/loqed/fixtures/lock_going_to_daylock.json
@@ -0,0 +1,8 @@
+{
+  "go_to_state": "DAY_LOCK",
+  "go_to_state_numeric": 2,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "GO_TO_STATE_TWIST_ASSIST_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/lock_going_to_nightlock.json b/tests/components/loqed/fixtures/lock_going_to_nightlock.json
new file mode 100644
index 00000000000000..8f7ce2ec025510
--- /dev/null
+++ b/tests/components/loqed/fixtures/lock_going_to_nightlock.json
@@ -0,0 +1,8 @@
+{
+  "go_to_state": "NIGHT_LOCK",
+  "go_to_state_numeric": 3,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "GO_TO_STATE_TWIST_ASSIST_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/nightlock_reached.json b/tests/components/loqed/fixtures/nightlock_reached.json
new file mode 100644
index 00000000000000..f8ce0d45cae979
--- /dev/null
+++ b/tests/components/loqed/fixtures/nightlock_reached.json
@@ -0,0 +1,8 @@
+{
+  "requested_state": "NIGHT_LOCK",
+  "requested_state_numeric": 3,
+  "mac_wifi": "**REDACTED**",
+  "mac_ble": "**REDACTED**",
+  "event_type": "STATE_CHANGED_LATCH",
+  "key_local_id": 255
+}
diff --git a/tests/components/loqed/fixtures/status_ok.json b/tests/components/loqed/fixtures/status_ok.json
new file mode 100644
index 00000000000000..4e5362507e654e
--- /dev/null
+++ b/tests/components/loqed/fixtures/status_ok.json
@@ -0,0 +1,16 @@
+{
+  "battery_percentage": 78,
+  "battery_type": "NICKEL_METAL_HYDRIDE",
+  "battery_type_numeric": 1,
+  "battery_voltage": 10.37,
+  "bolt_state": "day_lock",
+  "bolt_state_numeric": 2,
+  "bridge_mac_wifi": "***REDACTED***",
+  "bridge_mac_ble": "***REDACTED***",
+  "lock_online": 1,
+  "webhooks_number": 1,
+  "ip_address": "192.168.42.12",
+  "up_timestamp": 1653041994,
+  "wifi_strength": 73,
+  "ble_strength": 20
+}
diff --git a/tests/components/loqed/test_config_flow.py b/tests/components/loqed/test_config_flow.py
new file mode 100644
index 00000000000000..c9c577e7199995
--- /dev/null
+++ b/tests/components/loqed/test_config_flow.py
@@ -0,0 +1,220 @@
+"""Test the Loqed config flow."""
+import json
+from unittest.mock import Mock, patch
+
+import aiohttp
+from loqedAPI import loqed
+
+from homeassistant import config_entries
+from homeassistant.components import zeroconf
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.const import CONF_API_TOKEN, CONF_NAME, CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import load_fixture
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+zeroconf_data = zeroconf.ZeroconfServiceInfo(
+    host="192.168.12.34",
+    addresses=["127.0.0.1"],
+    hostname="LOQED-ffeeddccbbaa.local",
+    name="mock_name",
+    port=9123,
+    properties={},
+    type="mock_type",
+)
+
+
+async def test_create_entry_zeroconf(hass: HomeAssistant) -> None:
+    """Test we get can create a lock via zeroconf."""
+    lock_result = json.loads(load_fixture("loqed/status_ok.json"))
+
+    with patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details",
+        return_value=lock_result,
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_ZEROCONF},
+            data=zeroconf_data,
+        )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    mock_lock = Mock(spec=loqed.Lock, id="Foo")
+    webhook_id = "Webhook_ID"
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock",
+        return_value=mock_lock,
+    ), patch(
+        "homeassistant.components.loqed.async_setup_entry",
+        return_value=True,
+    ), patch(
+        "homeassistant.components.webhook.async_generate_id", return_value=webhook_id
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                CONF_API_TOKEN: "eyadiuyfasiuasf",
+            },
+        )
+        await hass.async_block_till_done()
+    found_lock = all_locks_response["data"][0]
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "LOQED Touch Smart Lock"
+    assert result2["data"] == {
+        "id": "Foo",
+        "lock_key_key": found_lock["key_secret"],
+        "bridge_key": found_lock["bridge_key"],
+        "lock_key_local_id": found_lock["local_id"],
+        "bridge_mdns_hostname": found_lock["bridge_hostname"],
+        "bridge_ip": found_lock["bridge_ip"],
+        "name": found_lock["name"],
+        CONF_WEBHOOK_ID: webhook_id,
+        CONF_API_TOKEN: "eyadiuyfasiuasf",
+    }
+    mock_lock.getWebhooks.assert_awaited()
+
+
+async def test_create_entry_user(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we can create a lock via manual entry."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    lock_result = json.loads(load_fixture("loqed/status_ok.json"))
+    mock_lock = Mock(spec=loqed.Lock, id="Foo")
+    webhook_id = "Webhook_ID"
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+    found_lock = all_locks_response["data"][0]
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock",
+        return_value=mock_lock,
+    ), patch(
+        "homeassistant.components.loqed.async_setup_entry",
+        return_value=True,
+    ), patch(
+        "homeassistant.components.webhook.async_generate_id", return_value=webhook_id
+    ), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_result
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "LOQED Touch Smart Lock"
+    assert result2["data"] == {
+        "id": "Foo",
+        "lock_key_key": found_lock["key_secret"],
+        "bridge_key": found_lock["bridge_key"],
+        "lock_key_local_id": found_lock["local_id"],
+        "bridge_mdns_hostname": found_lock["bridge_hostname"],
+        "bridge_ip": found_lock["bridge_ip"],
+        "name": found_lock["name"],
+        CONF_WEBHOOK_ID: webhook_id,
+        CONF_API_TOKEN: "eyadiuyfasiuasf",
+    }
+    mock_lock.getWebhooks.assert_awaited()
+
+
+async def test_cannot_connect(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        side_effect=aiohttp.ClientError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_invalid_auth_when_lock_not_found(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle a situation where the user enters an invalid lock name."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock2"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "invalid_auth"}
+
+
+async def test_cannot_connect_when_lock_not_reachable(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we handle a situation where the user enters an invalid lock name."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_USER},
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] is None
+
+    all_locks_response = json.loads(load_fixture("loqed/get_all_locks.json"))
+
+    with patch(
+        "loqedAPI.cloud_loqed.LoqedCloudAPI.async_get_locks",
+        return_value=all_locks_response,
+    ), patch("loqedAPI.loqed.LoqedAPI.async_get_lock", side_effect=aiohttp.ClientError):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_API_TOKEN: "eyadiuyfasiuasf", CONF_NAME: "MyLock"},
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
diff --git a/tests/components/loqed/test_init.py b/tests/components/loqed/test_init.py
new file mode 100644
index 00000000000000..960ad9def6b97e
--- /dev/null
+++ b/tests/components/loqed/test_init.py
@@ -0,0 +1,78 @@
+"""Tests the init part of the Loqed integration."""
+
+import json
+from typing import Any
+from unittest.mock import AsyncMock, patch
+
+from loqedAPI import loqed
+
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_WEBHOOK_ID
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry, load_fixture
+
+
+async def test_webhook_accepts_valid_message(
+    hass: HomeAssistant,
+    hass_client_no_auth,
+    integration: MockConfigEntry,
+    lock: loqed.Lock,
+):
+    """Test webhook called with valid message."""
+    await async_setup_component(hass, "http", {"http": {}})
+    client = await hass_client_no_auth()
+    processed_message = json.loads(load_fixture("loqed/lock_going_to_nightlock.json"))
+    lock.receiveWebhook = AsyncMock(return_value=processed_message)
+
+    message = load_fixture("loqed/battery_update.json")
+    timestamp = 1653304609
+    await client.post(
+        f"/api/webhook/{integration.data[CONF_WEBHOOK_ID]}",
+        data=message,
+        headers={"timestamp": str(timestamp), "hash": "incorrect hash"},
+    )
+    lock.receiveWebhook.assert_called()
+
+
+async def test_setup_webhook_in_bridge(
+    hass: HomeAssistant, config_entry: MockConfigEntry, lock: loqed.Lock
+):
+    """Test webhook setup in loqed bridge."""
+    config: dict[str, Any] = {DOMAIN: {}}
+    config_entry.add_to_hass(hass)
+
+    lock_status = json.loads(load_fixture("loqed/status_ok.json"))
+    webhooks_fixture = json.loads(load_fixture("loqed/get_all_webhooks.json"))
+    lock.getWebhooks = AsyncMock(side_effect=[[], webhooks_fixture])
+
+    with patch("loqedAPI.loqed.LoqedAPI.async_get_lock", return_value=lock), patch(
+        "loqedAPI.loqed.LoqedAPI.async_get_lock_details", return_value=lock_status
+    ), patch(
+        "homeassistant.components.webhook.async_generate_url",
+        return_value="http://hook_id",
+    ):
+        await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    lock.registerWebhook.assert_called_with("http://hook_id")
+
+
+async def test_unload_entry(hass, integration: MockConfigEntry, lock: loqed.Lock):
+    """Test successful unload of entry."""
+
+    assert await hass.config_entries.async_unload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    lock.deleteWebhook.assert_called_with(1)
+    assert integration.state is ConfigEntryState.NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_unload_entry_fails(hass, integration: MockConfigEntry, lock: loqed.Lock):
+    """Test unsuccessful unload of entry."""
+    lock.deleteWebhook = AsyncMock(side_effect=Exception)
+
+    assert not await hass.config_entries.async_unload(integration.entry_id)
diff --git a/tests/components/loqed/test_lock.py b/tests/components/loqed/test_lock.py
new file mode 100644
index 00000000000000..59e70212f92b22
--- /dev/null
+++ b/tests/components/loqed/test_lock.py
@@ -0,0 +1,87 @@
+"""Tests the lock platform of the Loqed integration."""
+from loqedAPI import loqed
+
+from homeassistant.components.loqed import LoqedDataCoordinator
+from homeassistant.components.loqed.const import DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_LOCK,
+    SERVICE_OPEN,
+    SERVICE_UNLOCK,
+    STATE_LOCKED,
+    STATE_UNLOCKED,
+)
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_lock_entity(
+    hass: HomeAssistant,
+    integration: MockConfigEntry,
+) -> None:
+    """Test the lock entity."""
+    entity_id = "lock.home"
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_UNLOCKED
+
+
+async def test_lock_responds_to_bolt_state_updates(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock responding to updates."""
+    coordinator: LoqedDataCoordinator = hass.data[DOMAIN][integration.entry_id]
+    lock.bolt_state = "night_lock"
+    coordinator.async_update_listeners()
+
+    entity_id = "lock.home"
+
+    state = hass.states.get(entity_id)
+
+    assert state
+    assert state.state == STATE_LOCKED
+
+
+async def test_lock_transition_to_unlocked(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to unlocked state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_UNLOCK, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.unlock.assert_called()
+
+
+async def test_lock_transition_to_locked(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to locked state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_LOCK, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.lock.assert_called()
+
+
+async def test_lock_transition_to_open(
+    hass: HomeAssistant, integration: MockConfigEntry, lock: loqed.Lock
+) -> None:
+    """Tests the lock transitions to open state."""
+
+    entity_id = "lock.home"
+
+    await hass.services.async_call(
+        "lock", SERVICE_OPEN, {ATTR_ENTITY_ID: entity_id}, blocking=True
+    )
+    await hass.async_block_till_done()
+    lock.open.assert_called()
diff --git a/tests/components/lutron_caseta/test_device_trigger.py b/tests/components/lutron_caseta/test_device_trigger.py
index 325cb79e1a84ee..3fafbb8a57f053 100644
--- a/tests/components/lutron_caseta/test_device_trigger.py
+++ b/tests/components/lutron_caseta/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -39,7 +40,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -165,7 +165,7 @@ async def test_get_triggers(hass: HomeAssistant) -> None:
         hass, DeviceAutomationType.TRIGGER, device_id
     )
 
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_invalid_device_id(
diff --git a/tests/components/marytts/test_tts.py b/tests/components/marytts/test_tts.py
index 72cc65fbd0a7b3..4282b86ec2e212 100644
--- a/tests/components/marytts/test_tts.py
+++ b/tests/components/marytts/test_tts.py
@@ -1,6 +1,4 @@
 """The tests for the MaryTTS speech platform."""
-import os
-import shutil
 from unittest.mock import patch
 
 import pytest
@@ -27,12 +25,9 @@ async def get_media_source_url(hass, media_content_id):
 
 
 @pytest.fixture(autouse=True)
-def cleanup_cache(hass):
-    """Prevent TTS writing."""
-    yield
-    default_tts = hass.config.path(tts.DEFAULT_CACHE_DIR)
-    if os.path.isdir(default_tts):
-        shutil.rmtree(default_tts)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
 
 
 async def test_setup_component(hass: HomeAssistant) -> None:
diff --git a/tests/components/matter/common.py b/tests/components/matter/common.py
index 7582b9c415d981..a09351540543b5 100644
--- a/tests/components/matter/common.py
+++ b/tests/components/matter/common.py
@@ -71,6 +71,6 @@ async def trigger_subscription_callback(
     data: Any = None,
 ) -> None:
     """Trigger a subscription callback."""
-    callback = client.subscribe.call_args.kwargs["callback"]
+    callback = client.subscribe_events.call_args.kwargs["callback"]
     callback(event, data)
     await hass.async_block_till_done()
diff --git a/tests/components/matter/conftest.py b/tests/components/matter/conftest.py
index e4af252fccb55d..6a14148585a23e 100644
--- a/tests/components/matter/conftest.py
+++ b/tests/components/matter/conftest.py
@@ -5,12 +5,15 @@
 from collections.abc import AsyncGenerator, Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
+from matter_server.client.models.node import MatterNode
 from matter_server.common.const import SCHEMA_VERSION
 from matter_server.common.models import ServerInfoMessage
 import pytest
 
 from homeassistant.core import HomeAssistant
 
+from .common import setup_integration_with_node_fixture
+
 from tests.common import MockConfigEntry
 
 MOCK_FABRIC_ID = 12341234
@@ -210,3 +213,21 @@ def update_addon_fixture() -> Generator[AsyncMock, None, None]:
         "homeassistant.components.hassio.addon_manager.async_update_addon"
     ) as update_addon:
         yield update_addon
+
+
+@pytest.fixture(name="door_lock")
+async def door_lock_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a door lock node."""
+    return await setup_integration_with_node_fixture(hass, "door-lock", matter_client)
+
+
+@pytest.fixture(name="eve_contact_sensor_node")
+async def eve_contact_sensor_node_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a contact sensor node."""
+    return await setup_integration_with_node_fixture(
+        hass, "eve-contact-sensor", matter_client
+    )
diff --git a/tests/components/matter/fixtures/config_entry_diagnostics.json b/tests/components/matter/fixtures/config_entry_diagnostics.json
index 95ef0b6a8500fd..53477792e4303b 100644
--- a/tests/components/matter/fixtures/config_entry_diagnostics.json
+++ b/tests/components/matter/fixtures/config_entry_diagnostics.json
@@ -669,7 +669,9 @@
         "1/1030/65529": [],
         "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
       },
-      "available": true
+      "available": true,
+      "is_bridge": false,
+      "attribute_subscriptions": []
     }
   ],
   "events": []
diff --git a/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json b/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
index 794980a8fd418f..3c5b82ad5b898a 100644
--- a/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
+++ b/tests/components/matter/fixtures/config_entry_diagnostics_redacted.json
@@ -482,7 +482,9 @@
           "1/1030/65529": [],
           "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
         },
-        "available": true
+        "available": true,
+        "is_bridge": false,
+        "attribute_subscriptions": []
       }
     ],
     "events": []
diff --git a/tests/components/matter/fixtures/nodes/color-temperature-light.json b/tests/components/matter/fixtures/nodes/color-temperature-light.json
index 2155f20fe3a321..7552fa833fb35a 100644
--- a/tests/components/matter/fixtures/nodes/color-temperature-light.json
+++ b/tests/components/matter/fixtures/nodes/color-temperature-light.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -202,7 +202,7 @@
     ],
     "1/29/0": [
       {
-        "type": 268,
+        "deviceType": 268,
         "revision": 1
       }
     ],
@@ -313,5 +313,6 @@
     "1/4/65529": [0, 5, 2, 4, 3, 1],
     "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/contact-sensor.json b/tests/components/matter/fixtures/nodes/contact-sensor.json
deleted file mode 100644
index fa90ecff1d51b5..00000000000000
--- a/tests/components/matter/fixtures/nodes/contact-sensor.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "node_id": 1,
-  "date_commissioned": "2022-11-29T21:23:48.485051",
-  "last_interview": "2022-11-29T21:23:48.485057",
-  "interview_version": 2,
-  "attributes": {
-    "0/29/0": [
-      {
-        "type": 22,
-        "revision": 1
-      }
-    ],
-    "0/29/1": [
-      4, 29, 31, 40, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 59, 60, 62, 63,
-      64, 65
-    ],
-    "0/29/2": [41],
-    "0/29/3": [1],
-    "0/29/65532": 0,
-    "0/29/65533": 1,
-    "0/29/65528": [],
-    "0/29/65529": [],
-    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
-    "0/40/0": 1,
-    "0/40/1": "Nabu Casa",
-    "0/40/2": 65521,
-    "0/40/3": "Mock ContactSensor",
-    "0/40/4": 32768,
-    "0/40/5": "Mock Contact sensor",
-    "0/40/6": "XX",
-    "0/40/7": 0,
-    "0/40/8": "v1.0",
-    "0/40/9": 1,
-    "0/40/10": "v1.0",
-    "0/40/11": "20221206",
-    "0/40/12": "",
-    "0/40/13": "",
-    "0/40/14": "",
-    "0/40/15": "TEST_SN",
-    "0/40/16": false,
-    "0/40/17": true,
-    "0/40/18": "mock-contact-sensor",
-    "0/40/19": {
-      "caseSessionsPerFabric": 3,
-      "subscriptionsPerFabric": 3
-    },
-    "0/40/65532": 0,
-    "0/40/65533": 1,
-    "0/40/65528": [],
-    "0/40/65529": [],
-    "0/40/65531": [
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-      65528, 65529, 65531, 65532, 65533
-    ],
-    "1/3/0": 0,
-    "1/3/1": 2,
-    "1/3/65532": 0,
-    "1/3/65533": 4,
-    "1/3/65528": [],
-    "1/3/65529": [0, 64],
-    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
-    "1/29/0": [
-      {
-        "type": 21,
-        "revision": 1
-      }
-    ],
-    "1/29/1": [
-      3, 4, 5, 6, 7, 8, 15, 29, 30, 37, 47, 59, 64, 65, 69, 80, 257, 258, 259,
-      512, 513, 514, 516, 768, 1024, 1026, 1027, 1028, 1029, 1030, 1283, 1284,
-      1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 2820,
-      4294048773
-    ],
-    "1/29/2": [],
-    "1/29/3": [],
-    "1/29/65532": 0,
-    "1/29/65533": 1,
-    "1/29/65528": [],
-    "1/29/65529": [],
-    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
-    "1/69/0": true,
-    "1/69/65532": 0,
-    "1/69/65533": 1,
-    "1/69/65528": [],
-    "1/69/65529": [],
-    "1/69/65531": [0, 65528, 65529, 65531, 65532, 65533]
-  },
-  "available": true
-}
diff --git a/tests/components/matter/fixtures/nodes/device_diagnostics.json b/tests/components/matter/fixtures/nodes/device_diagnostics.json
index 2950a61622ce43..4b834cd90903de 100644
--- a/tests/components/matter/fixtures/nodes/device_diagnostics.json
+++ b/tests/components/matter/fixtures/nodes/device_diagnostics.json
@@ -12,7 +12,7 @@
     "0/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -414,7 +414,7 @@
     ],
     "1/29/0": [
       {
-        "type": 257,
+        "deviceType": 257,
         "revision": 1
       }
     ],
@@ -467,5 +467,7 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "is_bridge": false,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/dimmable-light.json b/tests/components/matter/fixtures/nodes/dimmable-light.json
index f295e3bf1545ca..e14c922857c9cf 100644
--- a/tests/components/matter/fixtures/nodes/dimmable-light.json
+++ b/tests/components/matter/fixtures/nodes/dimmable-light.json
@@ -12,7 +12,7 @@
     "0/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -354,7 +354,7 @@
     ],
     "1/29/0": [
       {
-        "type": 257,
+        "deviceType": 257,
         "revision": 1
       }
     ],
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/door-lock.json b/tests/components/matter/fixtures/nodes/door-lock.json
index f7a9749325fe1a..1477d78aa67eba 100644
--- a/tests/components/matter/fixtures/nodes/door-lock.json
+++ b/tests/components/matter/fixtures/nodes/door-lock.json
@@ -7,7 +7,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -443,7 +443,7 @@
     ],
     "1/29/0": [
       {
-        "type": 10,
+        "deviceType": 10,
         "revision": 1
       }
     ],
@@ -505,5 +505,6 @@
       0, 1, 2, 3, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 33, 35, 36,
       37, 38, 41, 43, 48, 49, 51, 65528, 65529, 65530, 65531, 65532, 65533
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/eve-contact-sensor.json b/tests/components/matter/fixtures/nodes/eve-contact-sensor.json
new file mode 100644
index 00000000000000..b0eacfb621c17c
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/eve-contact-sensor.json
@@ -0,0 +1,343 @@
+{
+  "node_id": 1,
+  "date_commissioned": "2023-07-02T14:06:45.190550",
+  "last_interview": "2023-07-02T14:06:45.190553",
+  "interview_version": 4,
+  "available": true,
+  "is_bridge": false,
+  "attributes": {
+    "0/53/65532": 15,
+    "0/53/11": 26,
+    "0/53/3": 4895,
+    "0/53/47": 0,
+    "0/53/8": [
+      {
+        "extAddress": 12872547289273451492,
+        "rloc16": 1024,
+        "routerId": 1,
+        "nextHop": 0,
+        "pathCost": 0,
+        "LQIIn": 3,
+        "LQIOut": 3,
+        "age": 142,
+        "allocated": true,
+        "linkEstablished": true
+      }
+    ],
+    "0/53/29": 1556,
+    "0/53/9": 2040160480,
+    "0/53/15": 1,
+    "0/53/40": 519,
+    "0/53/7": [
+      {
+        "extAddress": 12872547289273451492,
+        "age": 654,
+        "rloc16": 1024,
+        "linkFrameCounter": 738,
+        "mleFrameCounter": 418,
+        "lqi": 3,
+        "averageRssi": -50,
+        "lastRssi": -51,
+        "frameErrorRate": 5,
+        "messageErrorRate": 0,
+        "rxOnWhenIdle": true,
+        "fullThreadDevice": true,
+        "fullNetworkData": true,
+        "isChild": false
+      }
+    ],
+    "0/53/33": 66,
+    "0/53/18": 1,
+    "0/53/45": 0,
+    "0/53/21": 0,
+    "0/53/36": 0,
+    "0/53/44": 0,
+    "0/53/50": 0,
+    "0/53/60": "AB//wA==",
+    "0/53/10": 68,
+    "0/53/53": 0,
+    "0/53/65528": [],
+    "0/53/4": 5980345540157460411,
+    "0/53/19": 1,
+    "0/53/62": [0, 0, 0, 0],
+    "0/53/54": 2,
+    "0/53/49": 0,
+    "0/53/23": 2597,
+    "0/53/20": 0,
+    "0/53/28": 1059,
+    "0/53/24": 17,
+    "0/53/22": 2614,
+    "0/53/17": 0,
+    "0/53/32": 0,
+    "0/53/14": 1,
+    "0/53/26": 2597,
+    "0/53/37": 0,
+    "0/53/65529": [0],
+    "0/53/34": 1,
+    "0/53/2": "MyHome1425454932",
+    "0/53/6": 0,
+    "0/53/43": 0,
+    "0/53/25": 2597,
+    "0/53/30": 0,
+    "0/53/41": 1,
+    "0/53/55": 4,
+    "0/53/42": 520,
+    "0/53/52": 0,
+    "0/53/61": {
+      "activeTimestampPresent": true,
+      "pendingTimestampPresent": false,
+      "masterKeyPresent": true,
+      "networkNamePresent": true,
+      "extendedPanIdPresent": true,
+      "meshLocalPrefixPresent": true,
+      "delayPresent": false,
+      "panIdPresent": true,
+      "channelPresent": true,
+      "pskcPresent": true,
+      "securityPolicyPresent": true,
+      "channelMaskPresent": true
+    },
+    "0/53/48": 3,
+    "0/53/39": 529,
+    "0/53/35": 0,
+    "0/53/38": 0,
+    "0/53/31": 0,
+    "0/53/51": 0,
+    "0/53/65533": 1,
+    "0/53/59": {
+      "rotationTime": 672,
+      "flags": 8335
+    },
+    "0/53/46": 0,
+    "0/53/5": "QP1S/nSVYwAA",
+    "0/53/13": 1,
+    "0/53/27": 17,
+    "0/53/1": 2,
+    "0/53/0": 25,
+    "0/53/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+      39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 59,
+      60, 61, 62, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/53/12": 121,
+    "0/53/16": 0,
+    "0/42/0": [
+      {
+        "providerNodeID": 1773685588,
+        "endpoint": 0,
+        "fabricIndex": 1
+      }
+    ],
+    "0/42/65528": [],
+    "0/42/65533": 1,
+    "0/42/1": true,
+    "0/42/2": 1,
+    "0/42/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/42/3": null,
+    "0/42/65532": 0,
+    "0/42/65529": [0],
+    "0/48/65532": 0,
+    "0/48/65528": [1, 3, 5],
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/4": true,
+    "0/48/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/48/2": 0,
+    "0/48/0": 0,
+    "0/48/3": 0,
+    "0/48/65529": [0, 2, 4],
+    "0/48/65533": 1,
+    "0/31/4": 3,
+    "0/31/65529": [],
+    "0/31/3": 3,
+    "0/31/65533": 1,
+    "0/31/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/31/1": [],
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 2
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 3
+      }
+    ],
+    "0/31/65532": 0,
+    "0/31/65528": [],
+    "0/31/2": 4,
+    "0/49/2": 10,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65533": 1,
+    "0/49/1": [
+      {
+        "networkID": "Uv50lWMtT7s=",
+        "connected": true
+      }
+    ],
+    "0/49/3": 20,
+    "0/49/7": null,
+    "0/49/0": 1,
+    "0/49/6": null,
+    "0/49/65529": [0, 3, 4, 6, 8],
+    "0/49/5": 0,
+    "0/49/4": true,
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/49/65532": 2,
+    "0/63/0": [],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/63/65528": [2, 5],
+    "0/63/1": [],
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/2": 3,
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/29/65529": [],
+    "0/29/65532": 0,
+    "0/29/3": [1],
+    "0/29/2": [41],
+    "0/29/65533": 1,
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 42, 46, 48, 49, 51, 53, 60, 62, 63],
+    "0/29/65528": [],
+    "0/51/65531": [0, 1, 2, 3, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "ieee802154",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "YtmXHFJ/dhk=",
+        "IPv4Addresses": [],
+        "IPv6Addresses": [
+          "/RG+U41GAABynlpPU50e5g==",
+          "/oAAAAAAAABg2ZccUn92GQ==",
+          "/VL+dJVjAAB1cwmi02rvTA=="
+        ],
+        "type": 4
+      }
+    ],
+    "0/51/65529": [0],
+    "0/51/7": [],
+    "0/51/3": 0,
+    "0/51/65533": 1,
+    "0/51/2": 653,
+    "0/51/6": [],
+    "0/51/1": 1,
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65528": [],
+    "0/51/5": [],
+    "0/40/9": 6650,
+    "0/40/65529": [],
+    "0/40/4": 77,
+    "0/40/1": "Eve Systems",
+    "0/40/5": "",
+    "0/40/15": "QV26L1A16199",
+    "0/40/8": "1.1",
+    "0/40/6": "**REDACTED**",
+    "0/40/3": "Eve Door",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/2": 4874,
+    "0/40/65532": 0,
+    "0/40/65528": [],
+    "0/40/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 18, 19, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "0/40/7": 1,
+    "0/40/10": "3.2.1",
+    "0/40/0": 1,
+    "0/40/65533": 1,
+    "0/40/18": "4D97F6015F8E39C1",
+    "0/46/65529": [],
+    "0/46/0": [1],
+    "0/46/65528": [],
+    "0/46/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "0/46/65532": 0,
+    "0/46/65533": 1,
+    "0/60/65532": 0,
+    "0/60/0": 0,
+    "0/60/65528": [],
+    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/60/2": null,
+    "0/60/65529": [0, 1, 2],
+    "0/60/1": null,
+    "0/60/65533": 1,
+    "1/69/65529": [],
+    "1/69/65528": [],
+    "1/69/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/69/65533": 1,
+    "1/69/65532": 0,
+    "1/69/0": false,
+    "1/29/65529": [],
+    "1/29/1": [3, 29, 47, 69, 319486977],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/29/65533": 1,
+    "1/29/0": [
+      {
+        "deviceType": 21,
+        "revision": 1
+      }
+    ],
+    "1/29/65528": [],
+    "1/29/65532": 0,
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/47/65531": [
+      0, 1, 2, 11, 12, 14, 15, 16, 18, 19, 25, 65528, 65529, 65531, 65532, 65533
+    ],
+    "1/47/15": false,
+    "1/47/25": 1,
+    "1/47/2": "Battery",
+    "1/47/18": [],
+    "1/47/1": 0,
+    "1/47/14": 0,
+    "1/47/65533": 1,
+    "1/47/12": 200,
+    "1/47/19": "",
+    "1/47/11": 3558,
+    "1/47/65528": [],
+    "1/47/65529": [],
+    "1/47/0": 1,
+    "1/47/16": 2,
+    "1/47/65532": 10,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/1": 2,
+    "1/3/0": 0,
+    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "1/3/65532": 0,
+    "1/3/65533": 4
+  },
+  "attribute_subscriptions": [
+    [1, 69, 0],
+    [1, 47, 12]
+  ]
+}
diff --git a/tests/components/matter/fixtures/nodes/extended-color-light.json b/tests/components/matter/fixtures/nodes/extended-color-light.json
index ac2a840d041171..f4d83239b6d8eb 100644
--- a/tests/components/matter/fixtures/nodes/extended-color-light.json
+++ b/tests/components/matter/fixtures/nodes/extended-color-light.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -202,7 +202,7 @@
     ],
     "1/29/0": [
       {
-        "type": 269,
+        "deviceType": 269,
         "revision": 1
       }
     ],
@@ -313,5 +313,6 @@
     "1/4/65529": [0, 5, 2, 4, 3, 1],
     "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/flow-sensor.json b/tests/components/matter/fixtures/nodes/flow-sensor.json
index 3bbeb51151a8ec..e1fc2a3658505f 100644
--- a/tests/components/matter/fixtures/nodes/flow-sensor.json
+++ b/tests/components/matter/fixtures/nodes/flow-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -56,7 +56,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 774,
+        "deviceType": 774,
         "revision": 1
       }
     ],
@@ -78,5 +78,6 @@
     "1/1028/65529": [],
     "1/1028/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/humidity-sensor.json b/tests/components/matter/fixtures/nodes/humidity-sensor.json
index 92153e6151661e..a1940fc1857b4d 100644
--- a/tests/components/matter/fixtures/nodes/humidity-sensor.json
+++ b/tests/components/matter/fixtures/nodes/humidity-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -56,7 +56,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 775,
+        "deviceType": 775,
         "revision": 1
       }
     ],
@@ -77,5 +77,6 @@
     "1/1029/65529": [],
     "1/1029/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/light-sensor.json b/tests/components/matter/fixtures/nodes/light-sensor.json
index 5ea56033a78634..93583c342920a8 100644
--- a/tests/components/matter/fixtures/nodes/light-sensor.json
+++ b/tests/components/matter/fixtures/nodes/light-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -56,7 +56,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 262,
+        "deviceType": 262,
         "revision": 1
       }
     ],
@@ -85,5 +85,6 @@
     "1/1024/65529": [],
     "1/1024/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/occupancy-sensor.json b/tests/components/matter/fixtures/nodes/occupancy-sensor.json
index a541fdf4e776ad..d8f2580c2b03fe 100644
--- a/tests/components/matter/fixtures/nodes/occupancy-sensor.json
+++ b/tests/components/matter/fixtures/nodes/occupancy-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -61,7 +61,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 263,
+        "deviceType": 263,
         "revision": 1
       }
     ],
@@ -93,5 +93,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json b/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
index f037ba80bc0fc3..43ba486bc29130 100644
--- a/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
+++ b/tests/components/matter/fixtures/nodes/on-off-plugin-unit.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -118,7 +118,7 @@
     ],
     "1/29/0": [
       {
-        "type": 266,
+        "deviceType": 266,
         "revision": 1
       }
     ],
@@ -136,5 +136,6 @@
     "1/29/65529": [],
     "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json b/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json
new file mode 100644
index 00000000000000..f29361da1281ef
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/onoff-light-alt-name.json
@@ -0,0 +1,412 @@
+{
+  "node_id": 1,
+  "date_commissioned": "2022-11-29T21:23:48.485051",
+  "last_interview": "2022-11-29T21:23:48.485057",
+  "interview_version": 2,
+  "attributes": {
+    "0/4/0": 128,
+    "0/4/65532": 1,
+    "0/4/65533": 4,
+    "0/4/65528": [0, 1, 2, 3],
+    "0/4/65529": [0, 1, 2, 3, 4, 5],
+    "0/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "0/29/0": [
+      {
+        "type": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [
+      4, 29, 31, 40, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 59, 60, 62, 63,
+      64, 65
+    ],
+    "0/29/2": [41],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65533": 1,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/31/0": [
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 1
+      }
+    ],
+    "0/31/1": [],
+    "0/31/2": 4,
+    "0/31/3": 3,
+    "0/31/4": 3,
+    "0/31/65532": 0,
+    "0/31/65533": 1,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Light",
+    "0/40/4": 32768,
+    "0/40/5": "Mock OnOff Light               \u0000",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock-onoff-light",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65532": 0,
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+      65528, 65529, 65531, 65532, 65533
+    ],
+    "0/42/0": [],
+    "0/42/1": true,
+    "0/42/2": 0,
+    "0/42/3": 0,
+    "0/42/65532": 0,
+    "0/42/65533": 1,
+    "0/42/65528": [],
+    "0/42/65529": [0],
+    "0/42/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/43/0": "en-US",
+    "0/43/1": [
+      "en-US",
+      "de-DE",
+      "fr-FR",
+      "en-GB",
+      "es-ES",
+      "zh-CN",
+      "it-IT",
+      "ja-JP"
+    ],
+    "0/43/65532": 0,
+    "0/43/65533": 1,
+    "0/43/65528": [],
+    "0/43/65529": [],
+    "0/43/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "0/44/0": 0,
+    "0/44/1": 0,
+    "0/44/2": [0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 7],
+    "0/44/65532": 0,
+    "0/44/65533": 1,
+    "0/44/65528": [],
+    "0/44/65529": [],
+    "0/44/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/48/0": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/4": true,
+    "0/48/65532": 0,
+    "0/48/65533": 1,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/50/65532": 0,
+    "0/50/65533": 1,
+    "0/50/65528": [1],
+    "0/50/65529": [0],
+    "0/50/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "",
+        "IPv4Addresses": [""],
+        "IPv6Addresses": [],
+        "type": 1
+      }
+    ],
+    "0/51/1": 6,
+    "0/51/2": 31279,
+    "0/51/3": 8,
+    "0/51/4": 1,
+    "0/51/5": [],
+    "0/51/6": [],
+    "0/51/7": [],
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/52/0": [],
+    "0/52/1": 166480,
+    "0/52/2": 86512,
+    "0/52/3": 157052,
+    "0/52/65532": 0,
+    "0/52/65533": 1,
+    "0/52/65528": [],
+    "0/52/65529": [],
+    "0/52/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/53/65532": 15,
+    "0/53/65533": 1,
+    "0/53/65528": [],
+    "0/53/65529": [0],
+    "0/53/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+      39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+      57, 58, 59, 60, 61, 62, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/54/0": "",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -61,
+    "0/54/5": null,
+    "0/54/6": null,
+    "0/54/7": null,
+    "0/54/8": null,
+    "0/54/9": null,
+    "0/54/10": null,
+    "0/54/11": null,
+    "0/54/12": null,
+    "0/54/65532": 3,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [0],
+    "0/54/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "0/55/0": null,
+    "0/55/1": null,
+    "0/55/2": 0,
+    "0/55/3": 0,
+    "0/55/4": 0,
+    "0/55/5": 0,
+    "0/55/6": 0,
+    "0/55/7": null,
+    "0/55/8": 0,
+    "0/55/65532": 3,
+    "0/55/65533": 1,
+    "0/55/65528": [],
+    "0/55/65529": [0],
+    "0/55/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/59/65532": 0,
+    "0/59/65533": 1,
+    "0/59/65528": [],
+    "0/59/65529": [],
+    "0/59/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65532": 0,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": "",
+        "fabricIndex": 1
+      }
+    ],
+    "0/62/1": [
+      {
+        "rootPublicKey": "",
+        "vendorId": 65521,
+        "fabricId": 1,
+        "nodeId": 1,
+        "label": "",
+        "fabricIndex": 1
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 1,
+    "0/62/4": [""],
+    "0/62/5": 1,
+    "0/62/65532": 0,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [0, 1, 2, 3, 4, 5, 65528, 65529, 65531, 65532, 65533],
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 3,
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "0/64/65532": 0,
+    "0/64/65533": 1,
+    "0/64/65528": [],
+    "0/64/65529": [],
+    "0/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "0/65/0": [],
+    "0/65/65532": 0,
+    "0/65/65533": 1,
+    "0/65/65528": [],
+    "0/65/65529": [],
+    "0/65/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/65528": [],
+    "1/3/65529": [0, 64],
+    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "1/4/0": 128,
+    "1/4/65532": 1,
+    "1/4/65533": 4,
+    "1/4/65528": [0, 1, 2, 3],
+    "1/4/65529": [0, 1, 2, 3, 4, 5],
+    "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/6/0": true,
+    "1/6/16384": true,
+    "1/6/16385": 0,
+    "1/6/16386": 0,
+    "1/6/16387": null,
+    "1/6/65532": 1,
+    "1/6/65533": 4,
+    "1/6/65528": [],
+    "1/6/65529": [0, 1, 2, 64, 65, 66],
+    "1/6/65531": [
+      0, 16384, 16385, 16386, 16387, 65528, 65529, 65531, 65532, 65533
+    ],
+    "1/8/0": 52,
+    "1/8/1": 0,
+    "1/8/2": 1,
+    "1/8/3": 254,
+    "1/8/4": 0,
+    "1/8/5": 0,
+    "1/8/6": 0,
+    "1/8/15": 0,
+    "1/8/16": 0,
+    "1/8/17": null,
+    "1/8/18": 0,
+    "1/8/19": 0,
+    "1/8/20": 50,
+    "1/8/16384": null,
+    "1/8/65532": 3,
+    "1/8/65533": 5,
+    "1/8/65528": [],
+    "1/8/65529": [0, 1, 2, 3, 4, 5, 6, 7],
+    "1/8/65531": [
+      0, 1, 2, 3, 4, 5, 6, 15, 16, 17, 18, 19, 20, 16384, 65528, 65529, 65531,
+      65532, 65533
+    ],
+    "1/29/0": [
+      {
+        "type": 257,
+        "revision": 1
+      }
+    ],
+    "1/29/1": [3, 4, 6, 8, 29, 768, 1030],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65533": 1,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/768/0": 0,
+    "1/768/1": 0,
+    "1/768/2": 0,
+    "1/768/3": 24939,
+    "1/768/4": 24701,
+    "1/768/7": 0,
+    "1/768/8": 2,
+    "1/768/15": 0,
+    "1/768/16": 0,
+    "1/768/16384": 0,
+    "1/768/16385": 2,
+    "1/768/16386": 0,
+    "1/768/16387": 0,
+    "1/768/16388": 25,
+    "1/768/16389": 8960,
+    "1/768/16390": 0,
+    "1/768/16394": 31,
+    "1/768/16395": 0,
+    "1/768/16396": 65279,
+    "1/768/16397": 0,
+    "1/768/16400": 0,
+    "1/768/65532": 31,
+    "1/768/65533": 5,
+    "1/768/65528": [],
+    "1/768/65529": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 64, 65, 66, 67, 68, 71, 75, 76
+    ],
+    "1/768/65531": [
+      0, 1, 2, 3, 4, 7, 8, 15, 16, 16384, 16385, 16386, 16387, 16388, 16389,
+      16390, 16394, 16395, 16396, 16397, 16400, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "1/1030/0": 0,
+    "1/1030/1": 0,
+    "1/1030/2": 1,
+    "1/1030/65532": 0,
+    "1/1030/65533": 3,
+    "1/1030/65528": [],
+    "1/1030/65529": [],
+    "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
+  },
+  "available": true,
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/fixtures/nodes/onoff-light-no-name.json b/tests/components/matter/fixtures/nodes/onoff-light-no-name.json
new file mode 100644
index 00000000000000..8a1134409a9ab4
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/onoff-light-no-name.json
@@ -0,0 +1,412 @@
+{
+  "node_id": 1,
+  "date_commissioned": "2022-11-29T21:23:48.485051",
+  "last_interview": "2022-11-29T21:23:48.485057",
+  "interview_version": 2,
+  "attributes": {
+    "0/4/0": 128,
+    "0/4/65532": 1,
+    "0/4/65533": 4,
+    "0/4/65528": [0, 1, 2, 3],
+    "0/4/65529": [0, 1, 2, 3, 4, 5],
+    "0/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "0/29/0": [
+      {
+        "type": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [
+      4, 29, 31, 40, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 59, 60, 62, 63,
+      64, 65
+    ],
+    "0/29/2": [41],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65533": 1,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/31/0": [
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 1
+      }
+    ],
+    "0/31/1": [],
+    "0/31/2": 4,
+    "0/31/3": 3,
+    "0/31/4": 3,
+    "0/31/65532": 0,
+    "0/31/65533": 1,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Light",
+    "0/40/4": 32768,
+    "0/40/5": null,
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock-onoff-light",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65532": 0,
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+      65528, 65529, 65531, 65532, 65533
+    ],
+    "0/42/0": [],
+    "0/42/1": true,
+    "0/42/2": 0,
+    "0/42/3": 0,
+    "0/42/65532": 0,
+    "0/42/65533": 1,
+    "0/42/65528": [],
+    "0/42/65529": [0],
+    "0/42/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/43/0": "en-US",
+    "0/43/1": [
+      "en-US",
+      "de-DE",
+      "fr-FR",
+      "en-GB",
+      "es-ES",
+      "zh-CN",
+      "it-IT",
+      "ja-JP"
+    ],
+    "0/43/65532": 0,
+    "0/43/65533": 1,
+    "0/43/65528": [],
+    "0/43/65529": [],
+    "0/43/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "0/44/0": 0,
+    "0/44/1": 0,
+    "0/44/2": [0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 7],
+    "0/44/65532": 0,
+    "0/44/65533": 1,
+    "0/44/65528": [],
+    "0/44/65529": [],
+    "0/44/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/48/0": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/4": true,
+    "0/48/65532": 0,
+    "0/48/65533": 1,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/50/65532": 0,
+    "0/50/65533": 1,
+    "0/50/65528": [1],
+    "0/50/65529": [0],
+    "0/50/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "",
+        "IPv4Addresses": [""],
+        "IPv6Addresses": [],
+        "type": 1
+      }
+    ],
+    "0/51/1": 6,
+    "0/51/2": 31279,
+    "0/51/3": 8,
+    "0/51/4": 1,
+    "0/51/5": [],
+    "0/51/6": [],
+    "0/51/7": [],
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/52/0": [],
+    "0/52/1": 166480,
+    "0/52/2": 86512,
+    "0/52/3": 157052,
+    "0/52/65532": 0,
+    "0/52/65533": 1,
+    "0/52/65528": [],
+    "0/52/65529": [],
+    "0/52/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/53/65532": 15,
+    "0/53/65533": 1,
+    "0/53/65528": [],
+    "0/53/65529": [0],
+    "0/53/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+      39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+      57, 58, 59, 60, 61, 62, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/54/0": "",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -61,
+    "0/54/5": null,
+    "0/54/6": null,
+    "0/54/7": null,
+    "0/54/8": null,
+    "0/54/9": null,
+    "0/54/10": null,
+    "0/54/11": null,
+    "0/54/12": null,
+    "0/54/65532": 3,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [0],
+    "0/54/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "0/55/0": null,
+    "0/55/1": null,
+    "0/55/2": 0,
+    "0/55/3": 0,
+    "0/55/4": 0,
+    "0/55/5": 0,
+    "0/55/6": 0,
+    "0/55/7": null,
+    "0/55/8": 0,
+    "0/55/65532": 3,
+    "0/55/65533": 1,
+    "0/55/65528": [],
+    "0/55/65529": [0],
+    "0/55/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/59/65532": 0,
+    "0/59/65533": 1,
+    "0/59/65528": [],
+    "0/59/65529": [],
+    "0/59/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65532": 0,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": "",
+        "fabricIndex": 1
+      }
+    ],
+    "0/62/1": [
+      {
+        "rootPublicKey": "",
+        "vendorId": 65521,
+        "fabricId": 1,
+        "nodeId": 1,
+        "label": "",
+        "fabricIndex": 1
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 1,
+    "0/62/4": [""],
+    "0/62/5": 1,
+    "0/62/65532": 0,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [0, 1, 2, 3, 4, 5, 65528, 65529, 65531, 65532, 65533],
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 3,
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "0/64/65532": 0,
+    "0/64/65533": 1,
+    "0/64/65528": [],
+    "0/64/65529": [],
+    "0/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "0/65/0": [],
+    "0/65/65532": 0,
+    "0/65/65533": 1,
+    "0/65/65528": [],
+    "0/65/65529": [],
+    "0/65/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/65528": [],
+    "1/3/65529": [0, 64],
+    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "1/4/0": 128,
+    "1/4/65532": 1,
+    "1/4/65533": 4,
+    "1/4/65528": [0, 1, 2, 3],
+    "1/4/65529": [0, 1, 2, 3, 4, 5],
+    "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/6/0": true,
+    "1/6/16384": true,
+    "1/6/16385": 0,
+    "1/6/16386": 0,
+    "1/6/16387": null,
+    "1/6/65532": 1,
+    "1/6/65533": 4,
+    "1/6/65528": [],
+    "1/6/65529": [0, 1, 2, 64, 65, 66],
+    "1/6/65531": [
+      0, 16384, 16385, 16386, 16387, 65528, 65529, 65531, 65532, 65533
+    ],
+    "1/8/0": 52,
+    "1/8/1": 0,
+    "1/8/2": 1,
+    "1/8/3": 254,
+    "1/8/4": 0,
+    "1/8/5": 0,
+    "1/8/6": 0,
+    "1/8/15": 0,
+    "1/8/16": 0,
+    "1/8/17": null,
+    "1/8/18": 0,
+    "1/8/19": 0,
+    "1/8/20": 50,
+    "1/8/16384": null,
+    "1/8/65532": 3,
+    "1/8/65533": 5,
+    "1/8/65528": [],
+    "1/8/65529": [0, 1, 2, 3, 4, 5, 6, 7],
+    "1/8/65531": [
+      0, 1, 2, 3, 4, 5, 6, 15, 16, 17, 18, 19, 20, 16384, 65528, 65529, 65531,
+      65532, 65533
+    ],
+    "1/29/0": [
+      {
+        "type": 257,
+        "revision": 1
+      }
+    ],
+    "1/29/1": [3, 4, 6, 8, 29, 768, 1030],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65533": 1,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/768/0": 0,
+    "1/768/1": 0,
+    "1/768/2": 0,
+    "1/768/3": 24939,
+    "1/768/4": 24701,
+    "1/768/7": 0,
+    "1/768/8": 2,
+    "1/768/15": 0,
+    "1/768/16": 0,
+    "1/768/16384": 0,
+    "1/768/16385": 2,
+    "1/768/16386": 0,
+    "1/768/16387": 0,
+    "1/768/16388": 25,
+    "1/768/16389": 8960,
+    "1/768/16390": 0,
+    "1/768/16394": 31,
+    "1/768/16395": 0,
+    "1/768/16396": 65279,
+    "1/768/16397": 0,
+    "1/768/16400": 0,
+    "1/768/65532": 31,
+    "1/768/65533": 5,
+    "1/768/65528": [],
+    "1/768/65529": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 64, 65, 66, 67, 68, 71, 75, 76
+    ],
+    "1/768/65531": [
+      0, 1, 2, 3, 4, 7, 8, 15, 16, 16384, 16385, 16386, 16387, 16388, 16389,
+      16390, 16394, 16395, 16396, 16397, 16400, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "1/1030/0": 0,
+    "1/1030/1": 0,
+    "1/1030/2": 1,
+    "1/1030/65532": 0,
+    "1/1030/65533": 3,
+    "1/1030/65528": [],
+    "1/1030/65529": [],
+    "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
+  },
+  "available": true,
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/fixtures/nodes/onoff-light.json b/tests/components/matter/fixtures/nodes/onoff-light.json
index fa6ed7afeffb08..65ef0be5c8e949 100644
--- a/tests/components/matter/fixtures/nodes/onoff-light.json
+++ b/tests/components/matter/fixtures/nodes/onoff-light.json
@@ -12,7 +12,7 @@
     "0/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -354,7 +354,7 @@
     ],
     "1/29/0": [
       {
-        "type": 257,
+        "deviceType": 257,
         "revision": 1
       }
     ],
@@ -407,5 +407,6 @@
     "1/1030/65529": [],
     "1/1030/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/pressure-sensor.json b/tests/components/matter/fixtures/nodes/pressure-sensor.json
index 7be49b650b5e2c..a47cda28056f10 100644
--- a/tests/components/matter/fixtures/nodes/pressure-sensor.json
+++ b/tests/components/matter/fixtures/nodes/pressure-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -56,7 +56,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 773,
+        "deviceType": 773,
         "revision": 1
       }
     ],
@@ -77,5 +77,6 @@
     "1/1027/65529": [],
     "1/1027/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/temperature-sensor.json b/tests/components/matter/fixtures/nodes/temperature-sensor.json
index dd23fbda2cc604..c7d372ac2d74cd 100644
--- a/tests/components/matter/fixtures/nodes/temperature-sensor.json
+++ b/tests/components/matter/fixtures/nodes/temperature-sensor.json
@@ -6,7 +6,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -61,7 +61,7 @@
     "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 770,
+        "deviceType": 770,
         "revision": 1
       }
     ],
@@ -83,5 +83,6 @@
     "1/1026/65529": [],
     "1/1026/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
   },
-  "available": true
+  "available": true,
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/thermostat.json b/tests/components/matter/fixtures/nodes/thermostat.json
new file mode 100644
index 00000000000000..85ac42e5429153
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/thermostat.json
@@ -0,0 +1,370 @@
+{
+  "node_id": 4,
+  "date_commissioned": "2023-06-28T16:26:35.525058",
+  "last_interview": "2023-06-28T16:26:35.525060",
+  "interview_version": 4,
+  "available": true,
+  "is_bridge": false,
+  "attributes": {
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 42, 48, 49, 50, 51, 54, 60, 62, 63, 64],
+    "0/29/2": [41],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65533": 1,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 2
+      }
+    ],
+    "0/31/1": [],
+    "0/31/2": 4,
+    "0/31/3": 3,
+    "0/31/4": 3,
+    "0/31/65532": 0,
+    "0/31/65533": 1,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/40/0": 1,
+    "0/40/1": "LONGAN-LINK",
+    "0/40/2": 4895,
+    "0/40/3": "Longan link HVAC",
+    "0/40/4": 8192,
+    "0/40/5": "",
+    "0/40/6": "XX",
+    "0/40/7": 1,
+    "0/40/8": "1.0",
+    "0/40/9": 2,
+    "0/40/10": "v2.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/14": "",
+    "0/40/15": "5a1fd2d040f23cf66e3a9d2a88e11f78",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "3D06D025F9E026A0",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65532": 0,
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 18, 19, 65528,
+      65529, 65531, 65532, 65533
+    ],
+    "0/42/0": [],
+    "0/42/1": true,
+    "0/42/2": 1,
+    "0/42/3": null,
+    "0/42/65532": 0,
+    "0/42/65533": 1,
+    "0/42/65528": [],
+    "0/42/65529": [0],
+    "0/42/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/48/0": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/4": true,
+    "0/48/65532": 0,
+    "0/48/65533": 1,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "TE9OR0FOLUlPVA==",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "TE9OR0FOLUlPVA==",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/50/65532": 0,
+    "0/50/65533": 1,
+    "0/50/65528": [1],
+    "0/50/65529": [0],
+    "0/50/65531": [65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "3FR1X7qs",
+        "IPv4Addresses": ["wKgI7g=="],
+        "IPv6Addresses": [
+          "/oAAAAAAAADeVHX//l+6rA==",
+          "JA4DsgZ9jUDeVHX//l+6rA==",
+          "/UgvJAe/AADeVHX//l+6rA=="
+        ],
+        "type": 1
+      }
+    ],
+    "0/51/1": 4,
+    "0/51/2": 30,
+    "0/51/3": 0,
+    "0/51/4": 0,
+    "0/51/5": [],
+    "0/51/6": [],
+    "0/51/7": [],
+    "0/51/8": true,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 65528, 65529, 65531, 65532, 65533
+    ],
+    "0/54/0": "aHckDXAk",
+    "0/54/1": 0,
+    "0/54/2": 3,
+    "0/54/3": 1,
+    "0/54/4": -61,
+    "0/54/5": null,
+    "0/54/6": null,
+    "0/54/7": null,
+    "0/54/8": null,
+    "0/54/9": null,
+    "0/54/10": null,
+    "0/54/11": null,
+    "0/54/12": null,
+    "0/54/65532": 3,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [0],
+    "0/54/65531": [
+      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 65528, 65529, 65531, 65532,
+      65533
+    ],
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65532": 0,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [0, 1, 2, 65528, 65529, 65531, 65532, 65533],
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVASQRBBgkBwEkCAEwCUEETaqdhs6MRkbh8fdh4EEImZaziiE6anaVp6Mu3P/zIJUB0fHUMxydKRTAC8bIn7vUhBCM47OYlYTkX0zFhoKYrzcKNQEoARgkAgE2AwQCBAEYMAQUrouBLuksQTkLrFhNVAbTHkNvMSEwBRTPlgMACvPdpqPOzuvR0OfPgfUcxBgwC0AcUInETXp/2gIFGDQF2+u+9WtYtvIfo6C3MhoOIV1SrRBZWYxY3CVjPGK7edTibQrVA4GccZKnHhNSBjxktrPiGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEE+rI5XQyifTZbZRK1Z2DOuXdQkmdUkWklTv+G1x4ZfbSupbUDo4l7i/iFdyu//uJThAw1GPEkWe6i98IFKCOQpzcKNQEpARgkAmAwBBTPlgMACvPdpqPOzuvR0OfPgfUcxDAFFJQo6UEBWTLtZVYFZwRBgn+qstpTGDALQK3jYiaxwnYJMwTBQlcVNrGxPtuVTZrp5foZtQCp/JEX2ZWqVxKypilx0ES/CfMHZ0Lllv9QsLs8xV/HNLidllkY",
+        "fabricIndex": 2
+      }
+    ],
+    "0/62/1": [
+      {
+        "rootPublicKey": "BAP9BJt5aQ9N98ClPTdNxpMZ1/Vh8r9usw6C8Ygi79AImsJq4UjAaYad0UI9Lh0OmRA9sWE2aSPbHjf409i/970=",
+        "vendorID": 4996,
+        "fabricID": 1,
+        "nodeID": 1425709672,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJXfyipMp+Jx4pkoTnvYoAYODis4xJktKdQXu8MSpBLIwII58BD0KkIG9NmuHcp0xUQKzqlfyB/bkAanevO73ZI=",
+        "vendorID": 65521,
+        "fabricID": 1,
+        "nodeID": 4,
+        "label": "",
+        "fabricIndex": 2
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 2,
+    "0/62/4": [
+      "FTABAQAkAgE3AycULlZRw4lgwKgkFQEYJgT1e7grJgV1r5ktNwYnFC5WUcOJYMCoJBUBGCQHASQIATAJQQQD/QSbeWkPTffApT03TcaTGdf1YfK/brMOgvGIIu/QCJrCauFIwGmGndFCPS4dDpkQPbFhNmkj2x43+NPYv/e9Nwo1ASkBGCQCYDAEFCqZHzimE2c+jPoEuJoM1rQaAPFRMAUUKpkfOKYTZz6M+gS4mgzWtBoA8VEYMAtANu49PfywV8aJmtxNYZa7SJXGlK1EciiF6vhZsoqdDCwx1VQX8FdyVunw0H3ljzbvucU6o8aY6HwBsPJKCQVHzhg=",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEld/KKkyn4nHimShOe9igBg4OKzjEmS0p1Be7wxKkEsjAgjnwEPQqQgb02a4dynTFRArOqV/IH9uQBqd687vdkjcKNQEpARgkAmAwBBSUKOlBAVky7WVWBWcEQYJ/qrLaUzAFFJQo6UEBWTLtZVYFZwRBgn+qstpTGDALQCNU8W3im+pmCBR5A4e15ByjPq2msE05NI9eeFI6BO0p/whhaBSGtjI7Tb1onNNu9AH6AQoji8XDDa7Nj/1w9KoY"
+    ],
+    "0/62/5": 2,
+    "0/62/65532": 0,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [0, 1, 2, 3, 4, 5, 65528, 65529, 65531, 65532, 65533],
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 3,
+    "0/63/3": 3,
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "0/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "0/64/65532": 0,
+    "0/64/65533": 1,
+    "0/64/65528": [],
+    "0/64/65529": [],
+    "0/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/3/0": 0,
+    "1/3/1": 4,
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
+    "1/4/0": 128,
+    "1/4/65532": 1,
+    "1/4/65533": 4,
+    "1/4/65528": [0, 1, 2, 3],
+    "1/4/65529": [0, 1, 2, 3, 4, 5],
+    "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/6/0": true,
+    "1/6/65532": 0,
+    "1/6/65533": 4,
+    "1/6/65528": [],
+    "1/6/65529": [0, 1, 2],
+    "1/6/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/29/0": [
+      {
+        "deviceType": 769,
+        "revision": 1
+      }
+    ],
+    "1/29/1": [3, 4, 6, 29, 30, 64, 513, 514, 516],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65533": 1,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/30/0": [],
+    "1/30/65532": 0,
+    "1/30/65533": 1,
+    "1/30/65528": [],
+    "1/30/65529": [],
+    "1/30/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/64/0": [
+      {
+        "label": "room",
+        "value": "bedroom 2"
+      },
+      {
+        "label": "orientation",
+        "value": "North"
+      },
+      {
+        "label": "floor",
+        "value": "2"
+      },
+      {
+        "label": "direction",
+        "value": "up"
+      }
+    ],
+    "1/64/65532": 0,
+    "1/64/65533": 1,
+    "1/64/65528": [],
+    "1/64/65529": [],
+    "1/64/65531": [0, 65528, 65529, 65531, 65532, 65533],
+    "1/513/0": 2830,
+    "1/513/3": null,
+    "1/513/4": null,
+    "1/513/5": null,
+    "1/513/6": null,
+    "1/513/9": 0,
+    "1/513/17": null,
+    "1/513/18": null,
+    "1/513/21": 1600,
+    "1/513/22": 3000,
+    "1/513/23": 1600,
+    "1/513/24": 3000,
+    "1/513/25": 5,
+    "1/513/27": 4,
+    "1/513/28": 3,
+    "1/513/30": 0,
+    "1/513/65532": 35,
+    "1/513/65533": 5,
+    "1/513/65528": [],
+    "1/513/65529": [0],
+    "1/513/65531": [
+      0, 3, 4, 5, 6, 9, 17, 18, 21, 22, 23, 24, 25, 27, 28, 30, 65528, 65529,
+      65531, 65532, 65533
+    ],
+    "1/514/0": 0,
+    "1/514/1": 2,
+    "1/514/2": 0,
+    "1/514/3": 0,
+    "1/514/65532": 0,
+    "1/514/65533": 1,
+    "1/514/65528": [],
+    "1/514/65529": [],
+    "1/514/65531": [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533],
+    "1/516/0": 0,
+    "1/516/1": 0,
+    "1/516/65532": 0,
+    "1/516/65533": 1,
+    "1/516/65528": [],
+    "1/516/65529": [],
+    "1/516/65531": [0, 1, 65528, 65529, 65531, 65532, 65533]
+  },
+  "attribute_subscriptions": [
+    [1, 513, 17],
+    [1, 6, 0],
+    [1, 513, 0],
+    [1, 513, 28],
+    [1, 513, 65532],
+    [1, 513, 18],
+    [1, 513, 30],
+    [1, 513, 27]
+  ]
+}
diff --git a/tests/components/matter/fixtures/nodes/window-covering_full.json b/tests/components/matter/fixtures/nodes/window-covering_full.json
new file mode 100644
index 00000000000000..feb75409526f69
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/window-covering_full.json
@@ -0,0 +1,269 @@
+{
+  "node_id": 50,
+  "date_commissioned": "2023-04-27T18:47:08.437119",
+  "last_interview": "2023-04-27T18:47:08.437131",
+  "interview_version": 3,
+  "available": true,
+  "attributes": {
+    "0/29/65533": 1,
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 48, 49, 51, 60, 62, 63, 54],
+    "0/29/2": [],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "0/31/65533": 1,
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 2
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 3
+      }
+    ],
+    "0/31/2": 4,
+    "0/31/4": 4,
+    "0/31/3": 3,
+    "0/31/65532": 0,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [65528, 65529, 65531, 65533, 0, 2, 4, 3, 65532],
+    "0/40/65532": 0,
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Covering",
+    "0/40/4": 32768,
+    "0/40/5": "Mock Full Window Covering",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock-full-window-covering",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      65528, 65529, 65531, 65532, 0, 6, 1, 2, 3, 4, 7, 8, 9, 10, 19, 65533, 5
+    ],
+    "0/48/65532": 0,
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/4": true,
+    "0/48/65533": 1,
+    "0/48/0": 0,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [65528, 65529, 65531, 65532, 2, 3, 1, 4, 65533, 0],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "MTI2MDk5",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "MTI2MDk5",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "JG8olrDo",
+        "IPv4Addresses": ["wKgBFw=="],
+        "IPv6Addresses": ["/oAAAAAAAAAmbyj//paw6A=="],
+        "type": 1
+      }
+    ],
+    "0/51/1": 1,
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [0, 1, 8, 65528, 65529, 65531, 65532, 65533],
+    "0/60/65532": 0,
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 65533],
+    "0/62/65532": 0,
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 2
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVAiQRMhgkBwEkCAEwCUEE+5TLtucQZ8l7Y5r8nKhYB0mia0RMn+RJa5AtRIPb2R9ixMcQXfQBANdHPCwsfTGWyjBYzPXG1yDUTUz+Z1J9aTcKNQEoARgkAgE2AwQCBAEYMAQUh/lTccn18xJ1JqA9VRHdr2+IhscwBRTPeGj+EyBBTsdlJC4zNSP/tIcpFhgwC0AoRjZKvJRkg+Cz77N6+IIQBt0i1Oco92N/XzoDWtgUVIOW5qvPcUUI/tiYAEDdefy2/6XpjU1Y7ecN3vgoTdNUGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEEL6dfjjyZxKHsFjZvYUOhWsOCI/2ucOxcCZGFaJwG0vXhL5/aDhR/AF907lF93LR1Huvp3NJsB0oxqsNnbEz8jjcKNQEpARgkAmAwBBTPeGj+EyBBTsdlJC4zNSP/tIcpFjAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQIHEwwdIaYHnFzpYngW9g+7Cn3gl0qKnetK5gWUVVTdVtpx6dYBblvPnOU+5K3Ow85llzcRxU1yXgPAM77s7t8gY",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 3,
+    "0/62/1": [
+      {
+        "rootPublicKey": "BFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U=",
+        "vendorId": 24582,
+        "fabricId": 7331465149450221740,
+        "nodeId": 3429688654,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJyJ1DODbJ+HellxuG3J/EstNpyw/i5h1x5qjNLQjwnPZoEaLLMZ8KKN7/rxQy3JUIkfuQydJz7JXeF80mES8q8=",
+        "vendorId": 4362,
+        "fabricId": 8516517930550670493,
+        "nodeId": 1443093566726981311,
+        "label": "",
+        "fabricIndex": 2
+      },
+      {
+        "rootPublicKey": "BFOpRqEk+HJ6n/NtUtaWTQVVwstz9QRDK2xvRP6qKZKX3Rk05Zie5Ux9PdjgE1K5zE9NIP2jHHcVJjRBVZxNFz0=",
+        "vendorId": 4939,
+        "fabricId": 2,
+        "nodeId": 50,
+        "label": "",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/4": [
+      "FTABAQEkAgE3AyyEAlVTLAcGR29vZ2xlLAELTWF0dGVyIFJvb3QnFAEAAAD+////GCYEf9JDKSYFf5Rb5TcGLIQCVVMsBwZHb29nbGUsAQtNYXR0ZXIgUm9vdCcUAQAAAP7///8YJAcBJAgBMAlBBFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U3CjUBKQEkAgEYJAJgMAQUcsIB91cZE7NIygDKe0X0d0ZoyX4wBRRywgH3VxkTs0jKAMp7RfR3RmjJfhgwC0BlFksWat/xjBVhCozpG9cD6cH2d7cRzhM1BRUt8NoVERZ1rFWRzueGhRzdnv2tKWZ0vryyo6Mgm83nswnbVSxvGA==",
+      "FTABEQDNbArxrUcyIYFkHqJLbo/WJAIBNwMnFHQ/DS4Kfg0eGCYEt4c/KyYFx+imNDcGJxR0Pw0uCn4NHhgkBwEkCAEwCUEEnInUM4Nsn4d6WXG4bcn8Sy02nLD+LmHXHmqM0tCPCc9mgRossxnwoo3v+vFDLclQiR+5DJ0nPsld4XzSYRLyrzcKNQEpARgwBBRmfAEklIwuWsdBmLyvfEmBToSQbyQCYTAFFGZ8ASSUjC5ax0GYvK98SYFOhJBvGDALQG4YnkZOq0UG+s4+HLs3eTnu91x/TgO5aeFb7sRom4xWTHn+rS7KISVXeWs6W3FRJsJdyZSYNgdwv5/cRFPC5q8Y",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEU6lGoST4cnqf821S1pZNBVXCy3P1BEMrbG9E/qopkpfdGTTlmJ7lTH092OATUrnMT00g/aMcdxUmNEFVnE0XPTcKNQEpARgkAmAwBBQvAa/SApcgS93u6aNxvkFzRrAaGDAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQJjFHQ5JVpar4vSHdn0lTZreXN7Ye9N3BfZWW+BJXbTs9yOH/oON1B1OLipahkwhWRj7A26vEfRHQ9g3Bh2Zt/kY"
+    ],
+    "0/62/5": 3,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [65528, 65529, 65531, 65532, 0, 2, 3, 1, 4, 5, 65533],
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 4,
+    "0/63/3": 3,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3],
+    "0/54/65532": 0,
+    "0/54/0": "YI0m7T6v",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -88,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [],
+    "0/54/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 3, 4, 65533],
+    "1/29/65533": 1,
+    "1/29/0": [
+      {
+        "deviceType": 514,
+        "revision": 2
+      }
+    ],
+    "1/29/1": [29, 3, 258],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/65531": [65528, 65529, 65531, 65532, 65533, 0, 1],
+    "1/258/65532": 31,
+    "1/258/65533": 5,
+    "1/258/0": 6,
+    "1/258/1": 90,
+    "1/258/2": 90,
+    "1/258/3": 0,
+    "1/258/4": 0,
+    "1/258/5": 0,
+    "1/258/7": 1,
+    "1/258/8": 0,
+    "1/258/9": 0,
+    "1/258/10": 0,
+    "1/258/11": 0,
+    "1/258/12": 0,
+    "1/258/13": 255,
+    "1/258/14": 0,
+    "1/258/15": 0,
+    "1/258/16": 0,
+    "1/258/17": 0,
+    "1/258/18": 0,
+    "1/258/19": 0,
+    "1/258/23": 0,
+    "1/258/26": 0,
+    "1/258/6": 0,
+    "1/258/65528": [],
+    "1/258/65529": [0, 1, 2, 4, 5, 7, 8],
+    "1/258/65531": [
+      65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12,
+      13, 14, 15, 16, 17, 18, 19, 23, 26, 6
+    ]
+  },
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/fixtures/nodes/window-covering_lift.json b/tests/components/matter/fixtures/nodes/window-covering_lift.json
new file mode 100644
index 00000000000000..afc2a2f734f6f4
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/window-covering_lift.json
@@ -0,0 +1,250 @@
+{
+  "node_id": 50,
+  "date_commissioned": "2023-04-27T18:47:08.437119",
+  "last_interview": "2023-04-27T18:47:08.437131",
+  "interview_version": 3,
+  "available": true,
+  "attributes": {
+    "0/29/65533": 1,
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 48, 49, 51, 60, 62, 63, 54],
+    "0/29/2": [],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "0/31/65533": 1,
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 2
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 3
+      }
+    ],
+    "0/31/2": 4,
+    "0/31/4": 4,
+    "0/31/3": 3,
+    "0/31/65532": 0,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [65528, 65529, 65531, 65533, 0, 2, 4, 3, 65532],
+    "0/40/65532": 0,
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Covering",
+    "0/40/4": 32768,
+    "0/40/5": "Mock Lift Window Covering",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock-lift-window-covering",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      65528, 65529, 65531, 65532, 0, 6, 1, 2, 3, 4, 7, 8, 9, 10, 19, 65533, 5
+    ],
+    "0/48/65532": 0,
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/4": true,
+    "0/48/65533": 1,
+    "0/48/0": 0,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [65528, 65529, 65531, 65532, 2, 3, 1, 4, 65533, 0],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "MTI2MDk5",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "MTI2MDk5",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "JG8olrDo",
+        "IPv4Addresses": ["wKgBFw=="],
+        "IPv6Addresses": ["/oAAAAAAAAAmbyj//paw6A=="],
+        "type": 1
+      }
+    ],
+    "0/51/1": 1,
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [0, 1, 8, 65528, 65529, 65531, 65532, 65533],
+    "0/60/65532": 0,
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 65533],
+    "0/62/65532": 0,
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 2
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVAiQRMhgkBwEkCAEwCUEE+5TLtucQZ8l7Y5r8nKhYB0mia0RMn+RJa5AtRIPb2R9ixMcQXfQBANdHPCwsfTGWyjBYzPXG1yDUTUz+Z1J9aTcKNQEoARgkAgE2AwQCBAEYMAQUh/lTccn18xJ1JqA9VRHdr2+IhscwBRTPeGj+EyBBTsdlJC4zNSP/tIcpFhgwC0AoRjZKvJRkg+Cz77N6+IIQBt0i1Oco92N/XzoDWtgUVIOW5qvPcUUI/tiYAEDdefy2/6XpjU1Y7ecN3vgoTdNUGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEEL6dfjjyZxKHsFjZvYUOhWsOCI/2ucOxcCZGFaJwG0vXhL5/aDhR/AF907lF93LR1Huvp3NJsB0oxqsNnbEz8jjcKNQEpARgkAmAwBBTPeGj+EyBBTsdlJC4zNSP/tIcpFjAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQIHEwwdIaYHnFzpYngW9g+7Cn3gl0qKnetK5gWUVVTdVtpx6dYBblvPnOU+5K3Ow85llzcRxU1yXgPAM77s7t8gY",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 3,
+    "0/62/1": [
+      {
+        "rootPublicKey": "BFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U=",
+        "vendorId": 24582,
+        "fabricId": 7331465149450221740,
+        "nodeId": 3429688654,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJyJ1DODbJ+HellxuG3J/EstNpyw/i5h1x5qjNLQjwnPZoEaLLMZ8KKN7/rxQy3JUIkfuQydJz7JXeF80mES8q8=",
+        "vendorId": 4362,
+        "fabricId": 8516517930550670493,
+        "nodeId": 1443093566726981311,
+        "label": "",
+        "fabricIndex": 2
+      },
+      {
+        "rootPublicKey": "BFOpRqEk+HJ6n/NtUtaWTQVVwstz9QRDK2xvRP6qKZKX3Rk05Zie5Ux9PdjgE1K5zE9NIP2jHHcVJjRBVZxNFz0=",
+        "vendorId": 4939,
+        "fabricId": 2,
+        "nodeId": 50,
+        "label": "",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/4": [
+      "FTABAQEkAgE3AyyEAlVTLAcGR29vZ2xlLAELTWF0dGVyIFJvb3QnFAEAAAD+////GCYEf9JDKSYFf5Rb5TcGLIQCVVMsBwZHb29nbGUsAQtNYXR0ZXIgUm9vdCcUAQAAAP7///8YJAcBJAgBMAlBBFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U3CjUBKQEkAgEYJAJgMAQUcsIB91cZE7NIygDKe0X0d0ZoyX4wBRRywgH3VxkTs0jKAMp7RfR3RmjJfhgwC0BlFksWat/xjBVhCozpG9cD6cH2d7cRzhM1BRUt8NoVERZ1rFWRzueGhRzdnv2tKWZ0vryyo6Mgm83nswnbVSxvGA==",
+      "FTABEQDNbArxrUcyIYFkHqJLbo/WJAIBNwMnFHQ/DS4Kfg0eGCYEt4c/KyYFx+imNDcGJxR0Pw0uCn4NHhgkBwEkCAEwCUEEnInUM4Nsn4d6WXG4bcn8Sy02nLD+LmHXHmqM0tCPCc9mgRossxnwoo3v+vFDLclQiR+5DJ0nPsld4XzSYRLyrzcKNQEpARgwBBRmfAEklIwuWsdBmLyvfEmBToSQbyQCYTAFFGZ8ASSUjC5ax0GYvK98SYFOhJBvGDALQG4YnkZOq0UG+s4+HLs3eTnu91x/TgO5aeFb7sRom4xWTHn+rS7KISVXeWs6W3FRJsJdyZSYNgdwv5/cRFPC5q8Y",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEU6lGoST4cnqf821S1pZNBVXCy3P1BEMrbG9E/qopkpfdGTTlmJ7lTH092OATUrnMT00g/aMcdxUmNEFVnE0XPTcKNQEpARgkAmAwBBQvAa/SApcgS93u6aNxvkFzRrAaGDAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQJjFHQ5JVpar4vSHdn0lTZreXN7Ye9N3BfZWW+BJXbTs9yOH/oON1B1OLipahkwhWRj7A26vEfRHQ9g3Bh2Zt/kY"
+    ],
+    "0/62/5": 3,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [65528, 65529, 65531, 65532, 0, 2, 3, 1, 4, 5, 65533],
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 4,
+    "0/63/3": 3,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3],
+    "0/54/65532": 0,
+    "0/54/0": "YI0m7T6v",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -88,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [],
+    "0/54/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 3, 4, 65533],
+    "1/29/65533": 1,
+    "1/29/0": [
+      {
+        "deviceType": 514,
+        "revision": 2
+      }
+    ],
+    "1/29/1": [29, 3, 258],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/65531": [65528, 65529, 65531, 65532, 65533, 0, 1],
+    "1/258/65532": 1,
+    "1/258/65533": 5,
+    "1/258/0": 5,
+    "1/258/5": 0,
+    "1/258/7": 1,
+    "1/258/10": 0,
+    "1/258/13": 255,
+    "1/258/23": 0,
+    "1/258/65528": [],
+    "1/258/65529": [0, 1, 2, 5],
+    "1/258/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 5, 7, 10, 13, 23]
+  },
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/fixtures/nodes/window-covering.json b/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
similarity index 99%
rename from tests/components/matter/fixtures/nodes/window-covering.json
rename to tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
index 5ab0d497278961..8d3335bbd6c456 100644
--- a/tests/components/matter/fixtures/nodes/window-covering.json
+++ b/tests/components/matter/fixtures/nodes/window-covering_pa-lift.json
@@ -7,7 +7,7 @@
   "attributes": {
     "0/29/0": [
       {
-        "type": 22,
+        "deviceType": 22,
         "revision": 1
       }
     ],
@@ -281,7 +281,7 @@
     "1/4/65531": [0, 65528, 65529, 65531, 65532, 65533],
     "1/29/0": [
       {
-        "type": 514,
+        "deviceType": 514,
         "revision": 1
       }
     ],
@@ -349,5 +349,6 @@
       0, 1, 3, 5, 7, 8, 10, 11, 13, 14, 16, 17, 23, 65528, 65529, 65531, 65532,
       65533
     ]
-  }
+  },
+  "attribute_subscriptions": []
 }
diff --git a/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json b/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json
new file mode 100644
index 00000000000000..44347dbd964541
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/window-covering_pa-tilt.json
@@ -0,0 +1,255 @@
+{
+  "node_id": 50,
+  "date_commissioned": "2023-04-27T18:47:08.437119",
+  "last_interview": "2023-04-27T18:47:08.437131",
+  "interview_version": 3,
+  "available": true,
+  "attributes": {
+    "0/29/65533": 1,
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 48, 49, 51, 60, 62, 63, 54],
+    "0/29/2": [],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "0/31/65533": 1,
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 2
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 3
+      }
+    ],
+    "0/31/2": 4,
+    "0/31/4": 4,
+    "0/31/3": 3,
+    "0/31/65532": 0,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [65528, 65529, 65531, 65533, 0, 2, 4, 3, 65532],
+    "0/40/65532": 0,
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Covering",
+    "0/40/4": 32768,
+    "0/40/5": "Mock PA Tilt Window Covering",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock_pa_tilt_window_covering",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      65528, 65529, 65531, 65532, 0, 6, 1, 2, 3, 4, 7, 8, 9, 10, 19, 65533, 5
+    ],
+    "0/48/65532": 0,
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/4": true,
+    "0/48/65533": 1,
+    "0/48/0": 0,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [65528, 65529, 65531, 65532, 2, 3, 1, 4, 65533, 0],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "MTI2MDk5",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "MTI2MDk5",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "JG8olrDo",
+        "IPv4Addresses": ["wKgBFw=="],
+        "IPv6Addresses": ["/oAAAAAAAAAmbyj//paw6A=="],
+        "type": 1
+      }
+    ],
+    "0/51/1": 1,
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [0, 1, 8, 65528, 65529, 65531, 65532, 65533],
+    "0/60/65532": 0,
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 65533],
+    "0/62/65532": 0,
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 2
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVAiQRMhgkBwEkCAEwCUEE+5TLtucQZ8l7Y5r8nKhYB0mia0RMn+RJa5AtRIPb2R9ixMcQXfQBANdHPCwsfTGWyjBYzPXG1yDUTUz+Z1J9aTcKNQEoARgkAgE2AwQCBAEYMAQUh/lTccn18xJ1JqA9VRHdr2+IhscwBRTPeGj+EyBBTsdlJC4zNSP/tIcpFhgwC0AoRjZKvJRkg+Cz77N6+IIQBt0i1Oco92N/XzoDWtgUVIOW5qvPcUUI/tiYAEDdefy2/6XpjU1Y7ecN3vgoTdNUGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEEL6dfjjyZxKHsFjZvYUOhWsOCI/2ucOxcCZGFaJwG0vXhL5/aDhR/AF907lF93LR1Huvp3NJsB0oxqsNnbEz8jjcKNQEpARgkAmAwBBTPeGj+EyBBTsdlJC4zNSP/tIcpFjAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQIHEwwdIaYHnFzpYngW9g+7Cn3gl0qKnetK5gWUVVTdVtpx6dYBblvPnOU+5K3Ow85llzcRxU1yXgPAM77s7t8gY",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 3,
+    "0/62/1": [
+      {
+        "rootPublicKey": "BFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U=",
+        "vendorId": 24582,
+        "fabricId": 7331465149450221740,
+        "nodeId": 3429688654,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJyJ1DODbJ+HellxuG3J/EstNpyw/i5h1x5qjNLQjwnPZoEaLLMZ8KKN7/rxQy3JUIkfuQydJz7JXeF80mES8q8=",
+        "vendorId": 4362,
+        "fabricId": 8516517930550670493,
+        "nodeId": 1443093566726981311,
+        "label": "",
+        "fabricIndex": 2
+      },
+      {
+        "rootPublicKey": "BFOpRqEk+HJ6n/NtUtaWTQVVwstz9QRDK2xvRP6qKZKX3Rk05Zie5Ux9PdjgE1K5zE9NIP2jHHcVJjRBVZxNFz0=",
+        "vendorId": 4939,
+        "fabricId": 2,
+        "nodeId": 50,
+        "label": "",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/4": [
+      "FTABAQEkAgE3AyyEAlVTLAcGR29vZ2xlLAELTWF0dGVyIFJvb3QnFAEAAAD+////GCYEf9JDKSYFf5Rb5TcGLIQCVVMsBwZHb29nbGUsAQtNYXR0ZXIgUm9vdCcUAQAAAP7///8YJAcBJAgBMAlBBFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U3CjUBKQEkAgEYJAJgMAQUcsIB91cZE7NIygDKe0X0d0ZoyX4wBRRywgH3VxkTs0jKAMp7RfR3RmjJfhgwC0BlFksWat/xjBVhCozpG9cD6cH2d7cRzhM1BRUt8NoVERZ1rFWRzueGhRzdnv2tKWZ0vryyo6Mgm83nswnbVSxvGA==",
+      "FTABEQDNbArxrUcyIYFkHqJLbo/WJAIBNwMnFHQ/DS4Kfg0eGCYEt4c/KyYFx+imNDcGJxR0Pw0uCn4NHhgkBwEkCAEwCUEEnInUM4Nsn4d6WXG4bcn8Sy02nLD+LmHXHmqM0tCPCc9mgRossxnwoo3v+vFDLclQiR+5DJ0nPsld4XzSYRLyrzcKNQEpARgwBBRmfAEklIwuWsdBmLyvfEmBToSQbyQCYTAFFGZ8ASSUjC5ax0GYvK98SYFOhJBvGDALQG4YnkZOq0UG+s4+HLs3eTnu91x/TgO5aeFb7sRom4xWTHn+rS7KISVXeWs6W3FRJsJdyZSYNgdwv5/cRFPC5q8Y",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEU6lGoST4cnqf821S1pZNBVXCy3P1BEMrbG9E/qopkpfdGTTlmJ7lTH092OATUrnMT00g/aMcdxUmNEFVnE0XPTcKNQEpARgkAmAwBBQvAa/SApcgS93u6aNxvkFzRrAaGDAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQJjFHQ5JVpar4vSHdn0lTZreXN7Ye9N3BfZWW+BJXbTs9yOH/oON1B1OLipahkwhWRj7A26vEfRHQ9g3Bh2Zt/kY"
+    ],
+    "0/62/5": 3,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [65528, 65529, 65531, 65532, 0, 2, 3, 1, 4, 5, 65533],
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 4,
+    "0/63/3": 3,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3],
+    "0/54/65532": 0,
+    "0/54/0": "YI0m7T6v",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -88,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [],
+    "0/54/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 3, 4, 65533],
+    "1/29/65533": 1,
+    "1/29/0": [
+      {
+        "deviceType": 514,
+        "revision": 2
+      }
+    ],
+    "1/29/1": [29, 3, 258],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/65531": [65528, 65529, 65531, 65532, 65533, 0, 1],
+    "1/258/65532": 18,
+    "1/258/65533": 5,
+    "1/258/0": 7,
+    "1/258/7": 1,
+    "1/258/9": 0,
+    "1/258/10": 0,
+    "1/258/12": 0,
+    "1/258/13": 255,
+    "1/258/15": 0,
+    "1/258/23": 0,
+    "1/258/6": 0,
+    "1/258/65528": [],
+    "1/258/65529": [0, 1, 2, 8],
+    "1/258/65531": [
+      65528, 65529, 65531, 65532, 65533, 0, 7, 9, 10, 12, 13, 15, 23, 6
+    ]
+  },
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/fixtures/nodes/window-covering_tilt.json b/tests/components/matter/fixtures/nodes/window-covering_tilt.json
new file mode 100644
index 00000000000000..a33e0f24c3f33a
--- /dev/null
+++ b/tests/components/matter/fixtures/nodes/window-covering_tilt.json
@@ -0,0 +1,250 @@
+{
+  "node_id": 50,
+  "date_commissioned": "2023-04-27T18:47:08.437119",
+  "last_interview": "2023-04-27T18:47:08.437131",
+  "interview_version": 3,
+  "available": true,
+  "attributes": {
+    "0/29/65533": 1,
+    "0/29/0": [
+      {
+        "deviceType": 22,
+        "revision": 1
+      }
+    ],
+    "0/29/1": [29, 31, 40, 48, 49, 51, 60, 62, 63, 54],
+    "0/29/2": [],
+    "0/29/3": [1],
+    "0/29/65532": 0,
+    "0/29/65528": [],
+    "0/29/65529": [],
+    "0/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "0/31/65533": 1,
+    "0/31/0": [
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 1
+      },
+      {
+        "privilege": 0,
+        "authMode": 0,
+        "subjects": null,
+        "targets": null,
+        "fabricIndex": 2
+      },
+      {
+        "privilege": 5,
+        "authMode": 2,
+        "subjects": [112233],
+        "targets": null,
+        "fabricIndex": 3
+      }
+    ],
+    "0/31/2": 4,
+    "0/31/4": 4,
+    "0/31/3": 3,
+    "0/31/65532": 0,
+    "0/31/65528": [],
+    "0/31/65529": [],
+    "0/31/65531": [65528, 65529, 65531, 65533, 0, 2, 4, 3, 65532],
+    "0/40/65532": 0,
+    "0/40/0": 1,
+    "0/40/1": "Nabu Casa",
+    "0/40/2": 65521,
+    "0/40/3": "Mock Covering",
+    "0/40/4": 32768,
+    "0/40/5": "Mock Tilt Window Covering",
+    "0/40/6": "XX",
+    "0/40/7": 0,
+    "0/40/8": "v1.0",
+    "0/40/9": 1,
+    "0/40/10": "v1.0",
+    "0/40/11": "20200101",
+    "0/40/12": "",
+    "0/40/13": "",
+    "0/40/14": "",
+    "0/40/15": "12345678",
+    "0/40/16": false,
+    "0/40/17": true,
+    "0/40/18": "mock-tilt-window-covering",
+    "0/40/19": {
+      "caseSessionsPerFabric": 3,
+      "subscriptionsPerFabric": 3
+    },
+    "0/40/65533": 1,
+    "0/40/65528": [],
+    "0/40/65529": [],
+    "0/40/65531": [
+      65528, 65529, 65531, 65532, 0, 6, 1, 2, 3, 4, 7, 8, 9, 10, 19, 65533, 5
+    ],
+    "0/48/65532": 0,
+    "0/48/2": 0,
+    "0/48/3": 0,
+    "0/48/1": {
+      "failSafeExpiryLengthSeconds": 60,
+      "maxCumulativeFailsafeSeconds": 900
+    },
+    "0/48/4": true,
+    "0/48/65533": 1,
+    "0/48/0": 0,
+    "0/48/65528": [1, 3, 5],
+    "0/48/65529": [0, 2, 4],
+    "0/48/65531": [65528, 65529, 65531, 65532, 2, 3, 1, 4, 65533, 0],
+    "0/49/0": 1,
+    "0/49/1": [
+      {
+        "networkID": "MTI2MDk5",
+        "connected": true
+      }
+    ],
+    "0/49/2": 10,
+    "0/49/3": 30,
+    "0/49/4": true,
+    "0/49/5": 0,
+    "0/49/6": "MTI2MDk5",
+    "0/49/7": null,
+    "0/49/65532": 1,
+    "0/49/65533": 1,
+    "0/49/65528": [1, 5, 7],
+    "0/49/65529": [0, 2, 4, 6, 8],
+    "0/49/65531": [0, 1, 2, 3, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533],
+    "0/51/0": [
+      {
+        "name": "WIFI_STA_DEF",
+        "isOperational": true,
+        "offPremiseServicesReachableIPv4": null,
+        "offPremiseServicesReachableIPv6": null,
+        "hardwareAddress": "JG8olrDo",
+        "IPv4Addresses": ["wKgBFw=="],
+        "IPv6Addresses": ["/oAAAAAAAAAmbyj//paw6A=="],
+        "type": 1
+      }
+    ],
+    "0/51/1": 1,
+    "0/51/8": false,
+    "0/51/65532": 0,
+    "0/51/65533": 1,
+    "0/51/65528": [],
+    "0/51/65529": [0],
+    "0/51/65531": [0, 1, 8, 65528, 65529, 65531, 65532, 65533],
+    "0/60/65532": 0,
+    "0/60/0": 0,
+    "0/60/1": null,
+    "0/60/2": null,
+    "0/60/65533": 1,
+    "0/60/65528": [],
+    "0/60/65529": [0, 1, 2],
+    "0/60/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 65533],
+    "0/62/65532": 0,
+    "0/62/0": [
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 1
+      },
+      {
+        "noc": "",
+        "icac": null,
+        "fabricIndex": 2
+      },
+      {
+        "noc": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVAiQRMhgkBwEkCAEwCUEE+5TLtucQZ8l7Y5r8nKhYB0mia0RMn+RJa5AtRIPb2R9ixMcQXfQBANdHPCwsfTGWyjBYzPXG1yDUTUz+Z1J9aTcKNQEoARgkAgE2AwQCBAEYMAQUh/lTccn18xJ1JqA9VRHdr2+IhscwBRTPeGj+EyBBTsdlJC4zNSP/tIcpFhgwC0AoRjZKvJRkg+Cz77N6+IIQBt0i1Oco92N/XzoDWtgUVIOW5qvPcUUI/tiYAEDdefy2/6XpjU1Y7ecN3vgoTdNUGA==",
+        "icac": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEEL6dfjjyZxKHsFjZvYUOhWsOCI/2ucOxcCZGFaJwG0vXhL5/aDhR/AF907lF93LR1Huvp3NJsB0oxqsNnbEz8jjcKNQEpARgkAmAwBBTPeGj+EyBBTsdlJC4zNSP/tIcpFjAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQIHEwwdIaYHnFzpYngW9g+7Cn3gl0qKnetK5gWUVVTdVtpx6dYBblvPnOU+5K3Ow85llzcRxU1yXgPAM77s7t8gY",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/2": 5,
+    "0/62/3": 3,
+    "0/62/1": [
+      {
+        "rootPublicKey": "BFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U=",
+        "vendorId": 24582,
+        "fabricId": 7331465149450221740,
+        "nodeId": 3429688654,
+        "label": "",
+        "fabricIndex": 1
+      },
+      {
+        "rootPublicKey": "BJyJ1DODbJ+HellxuG3J/EstNpyw/i5h1x5qjNLQjwnPZoEaLLMZ8KKN7/rxQy3JUIkfuQydJz7JXeF80mES8q8=",
+        "vendorId": 4362,
+        "fabricId": 8516517930550670493,
+        "nodeId": 1443093566726981311,
+        "label": "",
+        "fabricIndex": 2
+      },
+      {
+        "rootPublicKey": "BFOpRqEk+HJ6n/NtUtaWTQVVwstz9QRDK2xvRP6qKZKX3Rk05Zie5Ux9PdjgE1K5zE9NIP2jHHcVJjRBVZxNFz0=",
+        "vendorId": 4939,
+        "fabricId": 2,
+        "nodeId": 50,
+        "label": "",
+        "fabricIndex": 3
+      }
+    ],
+    "0/62/4": [
+      "FTABAQEkAgE3AyyEAlVTLAcGR29vZ2xlLAELTWF0dGVyIFJvb3QnFAEAAAD+////GCYEf9JDKSYFf5Rb5TcGLIQCVVMsBwZHb29nbGUsAQtNYXR0ZXIgUm9vdCcUAQAAAP7///8YJAcBJAgBMAlBBFs332VJwg3I1yKmuKy2YKinZM57r2xsIk9+6ENJaErX2An/ZQAz0VJ9zx+6rGqcOti0HtrJCfe1x2D9VCyJI3U3CjUBKQEkAgEYJAJgMAQUcsIB91cZE7NIygDKe0X0d0ZoyX4wBRRywgH3VxkTs0jKAMp7RfR3RmjJfhgwC0BlFksWat/xjBVhCozpG9cD6cH2d7cRzhM1BRUt8NoVERZ1rFWRzueGhRzdnv2tKWZ0vryyo6Mgm83nswnbVSxvGA==",
+      "FTABEQDNbArxrUcyIYFkHqJLbo/WJAIBNwMnFHQ/DS4Kfg0eGCYEt4c/KyYFx+imNDcGJxR0Pw0uCn4NHhgkBwEkCAEwCUEEnInUM4Nsn4d6WXG4bcn8Sy02nLD+LmHXHmqM0tCPCc9mgRossxnwoo3v+vFDLclQiR+5DJ0nPsld4XzSYRLyrzcKNQEpARgwBBRmfAEklIwuWsdBmLyvfEmBToSQbyQCYTAFFGZ8ASSUjC5ax0GYvK98SYFOhJBvGDALQG4YnkZOq0UG+s4+HLs3eTnu91x/TgO5aeFb7sRom4xWTHn+rS7KISVXeWs6W3FRJsJdyZSYNgdwv5/cRFPC5q8Y",
+      "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEU6lGoST4cnqf821S1pZNBVXCy3P1BEMrbG9E/qopkpfdGTTlmJ7lTH092OATUrnMT00g/aMcdxUmNEFVnE0XPTcKNQEpARgkAmAwBBQvAa/SApcgS93u6aNxvkFzRrAaGDAFFC8Br9IClyBL3e7po3G+QXNGsBoYGDALQJjFHQ5JVpar4vSHdn0lTZreXN7Ye9N3BfZWW+BJXbTs9yOH/oON1B1OLipahkwhWRj7A26vEfRHQ9g3Bh2Zt/kY"
+    ],
+    "0/62/5": 3,
+    "0/62/65533": 1,
+    "0/62/65528": [1, 3, 5, 8],
+    "0/62/65529": [0, 2, 4, 6, 7, 9, 10, 11],
+    "0/62/65531": [65528, 65529, 65531, 65532, 0, 2, 3, 1, 4, 5, 65533],
+    "0/63/65532": 0,
+    "0/63/65533": 1,
+    "0/63/0": [],
+    "0/63/1": [],
+    "0/63/2": 4,
+    "0/63/3": 3,
+    "0/63/65528": [2, 5],
+    "0/63/65529": [0, 1, 3, 4],
+    "0/63/65531": [65528, 65529, 65531, 65532, 65533, 0, 1, 2, 3],
+    "0/54/65532": 0,
+    "0/54/0": "YI0m7T6v",
+    "0/54/1": 4,
+    "0/54/2": 3,
+    "0/54/3": 6,
+    "0/54/4": -88,
+    "0/54/65533": 1,
+    "0/54/65528": [],
+    "0/54/65529": [],
+    "0/54/65531": [65528, 65529, 65531, 65532, 0, 1, 2, 3, 4, 65533],
+    "1/29/65533": 1,
+    "1/29/0": [
+      {
+        "deviceType": 514,
+        "revision": 2
+      }
+    ],
+    "1/29/1": [29, 3, 258],
+    "1/29/2": [],
+    "1/29/3": [],
+    "1/29/65532": 0,
+    "1/29/65528": [],
+    "1/29/65529": [],
+    "1/29/65531": [65528, 65529, 65531, 65533, 0, 1, 2, 3, 65532],
+    "1/3/65532": 0,
+    "1/3/65533": 4,
+    "1/3/0": 0,
+    "1/3/1": 0,
+    "1/3/65528": [],
+    "1/3/65529": [0],
+    "1/3/65531": [65528, 65529, 65531, 65532, 65533, 0, 1],
+    "1/258/65532": 2,
+    "1/258/65533": 5,
+    "1/258/0": 7,
+    "1/258/6": 0,
+    "1/258/7": 1,
+    "1/258/10": 0,
+    "1/258/13": 255,
+    "1/258/23": 0,
+    "1/258/65528": [],
+    "1/258/65529": [0, 1, 2, 8],
+    "1/258/65531": [65528, 65529, 65531, 65532, 65533, 0, 7, 10, 13, 23, 6]
+  },
+  "attribute_subscriptions": []
+}
diff --git a/tests/components/matter/test_adapter.py b/tests/components/matter/test_adapter.py
index 8eadb76894e42c..62ed847bf28f8b 100644
--- a/tests/components/matter/test_adapter.py
+++ b/tests/components/matter/test_adapter.py
@@ -8,6 +8,7 @@
 from matter_server.common.models import EventType, MatterNodeData
 import pytest
 
+from homeassistant.components.matter.adapter import get_clean_name
 from homeassistant.components.matter.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -17,14 +18,24 @@
 
 # This tests needs to be adjusted to remove lingering tasks
 @pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("node_fixture", "name"),
+    [
+        ("onoff-light", "Mock OnOff Light"),
+        ("onoff-light-alt-name", "Mock OnOff Light"),
+        ("onoff-light-no-name", "Mock Light"),
+    ],
+)
 async def test_device_registry_single_node_device(
     hass: HomeAssistant,
     matter_client: MagicMock,
+    node_fixture: str,
+    name: str,
 ) -> None:
     """Test bridge devices are set up correctly with via_device."""
     await setup_integration_with_node_fixture(
         hass,
-        "onoff-light",
+        node_fixture,
         matter_client,
     )
 
@@ -37,7 +48,7 @@ async def test_device_registry_single_node_device(
     # test serial id present as additional identifier
     assert (DOMAIN, "serial_12345678") in entry.identifiers
 
-    assert entry.name == "Mock OnOff Light"
+    assert entry.name == name
     assert entry.manufacturer == "Nabu Casa"
     assert entry.model == "Mock Light"
     assert entry.hw_version == "v1.0"
@@ -125,10 +136,10 @@ async def test_node_added_subscription(
     integration: MagicMock,
 ) -> None:
     """Test subscription to new devices work."""
-    assert matter_client.subscribe.call_count == 1
-    assert matter_client.subscribe.call_args[0][1] == EventType.NODE_ADDED
+    assert matter_client.subscribe_events.call_count == 4
+    assert matter_client.subscribe_events.call_args[0][1] == EventType.NODE_ADDED
 
-    node_added_callback = matter_client.subscribe.call_args[0][0]
+    node_added_callback = matter_client.subscribe_events.call_args[0][0]
     node_data = load_and_parse_node_fixture("onoff-light")
     node = MatterNode(
         dataclass_from_dict(
@@ -145,3 +156,17 @@ async def test_node_added_subscription(
 
     entity_state = hass.states.get("light.mock_onoff_light")
     assert entity_state
+
+
+async def test_get_clean_name_() -> None:
+    """Test get_clean_name helper.
+
+    Test device names that are assigned to `null`
+    or have a trailing null char with spaces.
+    """
+    assert get_clean_name(None) is None
+    assert get_clean_name("\x00") is None
+    assert get_clean_name("   \x00") is None
+    assert get_clean_name("") is None
+    assert get_clean_name("Mock device") == "Mock device"
+    assert get_clean_name("Mock device                    \x00") == "Mock device"
diff --git a/tests/components/matter/test_binary_sensor.py b/tests/components/matter/test_binary_sensor.py
index 743619ddde9aae..4dbb3b27b9c6ef 100644
--- a/tests/components/matter/test_binary_sensor.py
+++ b/tests/components/matter/test_binary_sensor.py
@@ -1,10 +1,16 @@
 """Test Matter binary sensors."""
-from unittest.mock import MagicMock
+from collections.abc import Generator
+from unittest.mock import MagicMock, patch
 
 from matter_server.client.models.node import MatterNode
 import pytest
 
+from homeassistant.components.matter.binary_sensor import (
+    DISCOVERY_SCHEMAS as BINARY_SENSOR_SCHEMAS,
+)
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from .common import (
     set_node_attribute,
@@ -13,14 +19,16 @@
 )
 
 
-@pytest.fixture(name="contact_sensor_node")
-async def contact_sensor_node_fixture(
-    hass: HomeAssistant, matter_client: MagicMock
-) -> MatterNode:
-    """Fixture for a contact sensor node."""
-    return await setup_integration_with_node_fixture(
-        hass, "contact-sensor", matter_client
-    )
+@pytest.fixture(autouse=True)
+def binary_sensor_platform() -> Generator[None, None, None]:
+    """Load only the binary sensor platform."""
+    with patch(
+        "homeassistant.components.matter.discovery.DISCOVERY_SCHEMAS",
+        new={
+            Platform.BINARY_SENSOR: BINARY_SENSOR_SCHEMAS,
+        },
+    ):
+        yield
 
 
 # This tests needs to be adjusted to remove lingering tasks
@@ -28,21 +36,22 @@ async def contact_sensor_node_fixture(
 async def test_contact_sensor(
     hass: HomeAssistant,
     matter_client: MagicMock,
-    contact_sensor_node: MatterNode,
+    eve_contact_sensor_node: MatterNode,
 ) -> None:
     """Test contact sensor."""
-    state = hass.states.get("binary_sensor.mock_contact_sensor_contact")
+    entity_id = "binary_sensor.eve_door_door"
+    state = hass.states.get(entity_id)
     assert state
-    assert state.state == "off"
+    assert state.state == "on"
 
-    set_node_attribute(contact_sensor_node, 1, 69, 0, False)
+    set_node_attribute(eve_contact_sensor_node, 1, 69, 0, True)
     await trigger_subscription_callback(
-        hass, matter_client, data=(contact_sensor_node.node_id, "1/69/0", False)
+        hass, matter_client, data=(eve_contact_sensor_node.node_id, "1/69/0", True)
     )
 
-    state = hass.states.get("binary_sensor.mock_contact_sensor_contact")
+    state = hass.states.get(entity_id)
     assert state
-    assert state.state == "on"
+    assert state.state == "off"
 
 
 @pytest.fixture(name="occupancy_sensor_node")
@@ -75,3 +84,32 @@ async def test_occupancy_sensor(
     state = hass.states.get("binary_sensor.mock_occupancy_sensor_occupancy")
     assert state
     assert state.state == "off"
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_battery_sensor(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    door_lock: MatterNode,
+) -> None:
+    """Test battery sensor."""
+    entity_id = "binary_sensor.mock_door_lock_battery"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "off"
+
+    set_node_attribute(door_lock, 1, 47, 14, 1)
+    await trigger_subscription_callback(
+        hass, matter_client, data=(door_lock.node_id, "1/47/14", 1)
+    )
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "on"
+
+    entity_registry = er.async_get(hass)
+    entry = entity_registry.async_get(entity_id)
+
+    assert entry
+    assert entry.entity_category == EntityCategory.DIAGNOSTIC
diff --git a/tests/components/matter/test_climate.py b/tests/components/matter/test_climate.py
new file mode 100644
index 00000000000000..ec8453b5c560a1
--- /dev/null
+++ b/tests/components/matter/test_climate.py
@@ -0,0 +1,399 @@
+"""Test Matter locks."""
+from unittest.mock import MagicMock, call
+
+from chip.clusters import Objects as clusters
+from matter_server.client.models.node import MatterNode
+from matter_server.common.helpers.util import create_attribute_path_from_attribute
+import pytest
+
+from homeassistant.components.climate import (
+    HVAC_MODE_COOL,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_HEAT_COOL,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.components.climate.const import (
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_OFF,
+)
+from homeassistant.core import HomeAssistant
+
+from .common import (
+    set_node_attribute,
+    setup_integration_with_node_fixture,
+    trigger_subscription_callback,
+)
+
+
+@pytest.fixture(name="thermostat")
+async def thermostat_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a thermostat node."""
+    return await setup_integration_with_node_fixture(hass, "thermostat", matter_client)
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_thermostat(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    thermostat: MatterNode,
+) -> None:
+    """Test thermostat."""
+    # test default temp range
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["min_temp"] == 7
+    assert state.attributes["max_temp"] == 35
+
+    # test set temperature when target temp is None
+    assert state.attributes["temperature"] is None
+    assert state.state == HVAC_MODE_COOL
+    with pytest.raises(
+        ValueError, match="Current target_temperature should not be None"
+    ):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "temperature": 22.5,
+            },
+            blocking=True,
+        )
+    with pytest.raises(ValueError, match="Temperature must be provided"):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "target_temp_low": 18,
+                "target_temp_high": 26,
+            },
+            blocking=True,
+        )
+
+    # change system mode to heat_cool
+    set_node_attribute(thermostat, 1, 513, 28, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    with pytest.raises(
+        ValueError,
+        match="current target_temperature_low and target_temperature_high should not be None",
+    ):
+        state = hass.states.get("climate.longan_link_hvac")
+        assert state
+        assert state.state == HVAC_MODE_HEAT_COOL
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "target_temp_low": 18,
+                "target_temp_high": 26,
+            },
+            blocking=True,
+        )
+
+    # initial state
+    set_node_attribute(thermostat, 1, 513, 3, 1600)
+    set_node_attribute(thermostat, 1, 513, 4, 3000)
+    set_node_attribute(thermostat, 1, 513, 5, 1600)
+    set_node_attribute(thermostat, 1, 513, 6, 3000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["min_temp"] == 16
+    assert state.attributes["max_temp"] == 30
+    assert state.attributes["hvac_modes"] == [
+        HVACMode.OFF,
+        HVACMode.HEAT,
+        HVACMode.COOL,
+        HVACMode.HEAT_COOL,
+    ]
+
+    # test system mode update from device
+    set_node_attribute(thermostat, 1, 513, 28, 0)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_OFF
+
+    set_node_attribute(thermostat, 1, 513, 28, 7)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_FAN_ONLY
+
+    set_node_attribute(thermostat, 1, 513, 28, 8)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_DRY
+
+    # test running state update from device
+    set_node_attribute(thermostat, 1, 513, 41, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.HEATING
+
+    set_node_attribute(thermostat, 1, 513, 41, 8)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.HEATING
+
+    set_node_attribute(thermostat, 1, 513, 41, 2)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.COOLING
+
+    set_node_attribute(thermostat, 1, 513, 41, 16)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.COOLING
+
+    set_node_attribute(thermostat, 1, 513, 41, 4)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 32)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 64)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.FAN
+
+    set_node_attribute(thermostat, 1, 513, 41, 66)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["hvac_action"] == HVACAction.OFF
+
+    # change system mode to heat
+    set_node_attribute(thermostat, 1, 513, 28, 4)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_HEAT
+
+    # change occupied heating setpoint to 20
+    set_node_attribute(thermostat, 1, 513, 18, 2000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["temperature"] == 20
+
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 25,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kHeat,
+            50,
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+
+    # change system mode to cool
+    set_node_attribute(thermostat, 1, 513, 28, 3)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_COOL
+
+    # change occupied cooling setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 17, 1800)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["temperature"] == 18
+
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 16,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, -20
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+
+    # change system mode to heat_cool
+    set_node_attribute(thermostat, 1, 513, 28, 1)
+    await trigger_subscription_callback(hass, matter_client)
+    with pytest.raises(
+        ValueError, match="temperature_low and temperature_high must be provided"
+    ):
+        await hass.services.async_call(
+            "climate",
+            "set_temperature",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "temperature": 18,
+            },
+            blocking=True,
+        )
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.state == HVAC_MODE_HEAT_COOL
+
+    # change occupied cooling setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 17, 2500)
+    await trigger_subscription_callback(hass, matter_client)
+    # change occupied heating setpoint to 18
+    set_node_attribute(thermostat, 1, 513, 18, 1700)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get("climate.longan_link_hvac")
+    assert state
+    assert state.attributes["target_temp_low"] == 17
+    assert state.attributes["target_temp_high"] == 25
+
+    # change target_temp_low to 18
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "target_temp_low": 18,
+            "target_temp_high": 25,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kHeat, 10
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+    set_node_attribute(thermostat, 1, 513, 18, 1800)
+    await trigger_subscription_callback(hass, matter_client)
+
+    # change target_temp_high to 26
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "target_temp_low": 18,
+            "target_temp_high": 26,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, 10
+        ),
+    )
+    matter_client.send_device_command.reset_mock()
+    set_node_attribute(thermostat, 1, 513, 17, 2600)
+    await trigger_subscription_callback(hass, matter_client)
+
+    await hass.services.async_call(
+        "climate",
+        "set_hvac_mode",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "hvac_mode": HVAC_MODE_HEAT,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.write_attribute.call_count == 1
+    assert matter_client.write_attribute.call_args == call(
+        node_id=thermostat.node_id,
+        attribute_path=create_attribute_path_from_attribute(
+            endpoint_id=1,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        ),
+        value=4,
+    )
+    matter_client.send_device_command.reset_mock()
+
+    with pytest.raises(ValueError, match="Unsupported hvac mode dry in Matter"):
+        await hass.services.async_call(
+            "climate",
+            "set_hvac_mode",
+            {
+                "entity_id": "climate.longan_link_hvac",
+                "hvac_mode": HVACMode.DRY,
+            },
+            blocking=True,
+        )
+
+    # change target_temp and hvac_mode in the same call
+    matter_client.send_device_command.reset_mock()
+    matter_client.write_attribute.reset_mock()
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        {
+            "entity_id": "climate.longan_link_hvac",
+            "temperature": 22,
+            "hvac_mode": HVACMode.COOL,
+        },
+        blocking=True,
+    )
+    assert matter_client.write_attribute.call_count == 1
+    assert matter_client.write_attribute.call_args == call(
+        node_id=thermostat.node_id,
+        attribute_path=create_attribute_path_from_attribute(
+            endpoint_id=1,
+            attribute=clusters.Thermostat.Attributes.SystemMode,
+        ),
+        value=3,
+    )
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=thermostat.node_id,
+        endpoint_id=1,
+        command=clusters.Thermostat.Commands.SetpointRaiseLower(
+            clusters.Thermostat.Enums.SetpointAdjustMode.kCool, -40
+        ),
+    )
diff --git a/tests/components/matter/test_cover.py b/tests/components/matter/test_cover.py
index 15ce8ceea8b0fa..d409983307ffff 100644
--- a/tests/components/matter/test_cover.py
+++ b/tests/components/matter/test_cover.py
@@ -1,8 +1,8 @@
 """Test Matter covers."""
+from math import floor
 from unittest.mock import MagicMock, call
 
 from chip.clusters import Objects as clusters
-from matter_server.client.models.node import MatterNode
 import pytest
 
 from homeassistant.components.cover import (
@@ -10,6 +10,7 @@
     STATE_CLOSING,
     STATE_OPEN,
     STATE_OPENING,
+    CoverEntityFeature,
 )
 from homeassistant.core import HomeAssistant
 
@@ -20,29 +21,37 @@
 )
 
 
-@pytest.fixture(name="window_covering")
-async def window_covering_fixture(
-    hass: HomeAssistant, matter_client: MagicMock
-) -> MatterNode:
-    """Fixture for a window covering node."""
-    return await setup_integration_with_node_fixture(
-        hass, "window-covering", matter_client
-    )
-
-
 # This tests needs to be adjusted to remove lingering tasks
 @pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_lift", "cover.mock_lift_window_covering"),
+        ("window-covering_pa-lift", "cover.longan_link_wncv_da01"),
+        ("window-covering_tilt", "cover.mock_tilt_window_covering"),
+        ("window-covering_pa-tilt", "cover.mock_pa_tilt_window_covering"),
+        ("window-covering_full", "cover.mock_full_window_covering"),
+    ],
+)
 async def test_cover(
     hass: HomeAssistant,
     matter_client: MagicMock,
-    window_covering: MatterNode,
+    fixture: str,
+    entity_id: str,
 ) -> None:
-    """Test window covering."""
+    """Test window covering commands that always are implemented."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
     await hass.services.async_call(
         "cover",
         "close_cover",
         {
-            "entity_id": "cover.longan_link_wncv_da01",
+            "entity_id": entity_id,
         },
         blocking=True,
     )
@@ -59,7 +68,7 @@ async def test_cover(
         "cover",
         "stop_cover",
         {
-            "entity_id": "cover.longan_link_wncv_da01",
+            "entity_id": entity_id,
         },
         blocking=True,
     )
@@ -76,7 +85,7 @@ async def test_cover(
         "cover",
         "open_cover",
         {
-            "entity_id": "cover.longan_link_wncv_da01",
+            "entity_id": entity_id,
         },
         blocking=True,
     )
@@ -89,11 +98,36 @@ async def test_cover(
     )
     matter_client.send_device_command.reset_mock()
 
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_lift", "cover.mock_lift_window_covering"),
+        ("window-covering_pa-lift", "cover.longan_link_wncv_da01"),
+        ("window-covering_full", "cover.mock_full_window_covering"),
+    ],
+)
+async def test_cover_lift(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with lift and position aware lift features."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
     await hass.services.async_call(
         "cover",
         "set_cover_position",
         {
-            "entity_id": "cover.longan_link_wncv_da01",
+            "entity_id": entity_id,
             "position": 50,
         },
         blocking=True,
@@ -107,35 +141,359 @@ async def test_cover(
     )
     matter_client.send_device_command.reset_mock()
 
-    set_node_attribute(window_covering, 1, 258, 8, 30)
-    set_node_attribute(window_covering, 1, 258, 10, 2)
+    set_node_attribute(window_covering, 1, 258, 10, 0b001010)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("cover.longan_link_wncv_da01")
+    state = hass.states.get(entity_id)
     assert state
     assert state.state == STATE_CLOSING
 
-    set_node_attribute(window_covering, 1, 258, 8, 0)
-    set_node_attribute(window_covering, 1, 258, 10, 0)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000101)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("cover.longan_link_wncv_da01")
+    state = hass.states.get(entity_id)
     assert state
-    assert state.state == STATE_OPEN
+    assert state.state == STATE_OPENING
+
 
-    set_node_attribute(window_covering, 1, 258, 8, 50)
-    set_node_attribute(window_covering, 1, 258, 10, 1)
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_lift", "cover.mock_lift_window_covering"),
+    ],
+)
+async def test_cover_lift_only(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with lift feature and without position aware lift feature."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
+    set_node_attribute(window_covering, 1, 258, 14, None)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("cover.longan_link_wncv_da01")
+    state = hass.states.get(entity_id)
     assert state
-    assert state.state == STATE_OPENING
+    assert state.state == "unknown"
 
-    set_node_attribute(window_covering, 1, 258, 8, 100)
-    set_node_attribute(window_covering, 1, 258, 10, 0)
+    set_node_attribute(window_covering, 1, 258, 65529, [0, 1, 2])
     await trigger_subscription_callback(hass, matter_client)
 
-    state = hass.states.get("cover.longan_link_wncv_da01")
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] & CoverEntityFeature.SET_POSITION == 0
+
+    set_node_attribute(window_covering, 1, 258, 65529, [0, 1, 2, 5])
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes["supported_features"] & CoverEntityFeature.SET_POSITION != 0
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_pa-lift", "cover.longan_link_wncv_da01"),
+    ],
+)
+async def test_cover_position_aware_lift(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with position aware lift features."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
+    state = hass.states.get(entity_id)
+    assert state
+    mask = (
+        CoverEntityFeature.OPEN
+        | CoverEntityFeature.CLOSE
+        | CoverEntityFeature.STOP
+        | CoverEntityFeature.SET_POSITION
+    )
+    assert state.attributes["supported_features"] & mask == mask
+
+    for position in (0, 9999):
+        set_node_attribute(window_covering, 1, 258, 14, position)
+        set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+        await trigger_subscription_callback(hass, matter_client)
+
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.attributes["current_position"] == 100 - floor(position / 100)
+        assert state.state == STATE_OPEN
+
+    set_node_attribute(window_covering, 1, 258, 14, 10000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
     assert state
     assert state.attributes["current_position"] == 0
     assert state.state == STATE_CLOSED
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_tilt", "cover.mock_tilt_window_covering"),
+        ("window-covering_pa-tilt", "cover.mock_pa_tilt_window_covering"),
+        ("window-covering_full", "cover.mock_full_window_covering"),
+    ],
+)
+async def test_cover_tilt(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with tilt and position aware tilt features."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
+    await hass.services.async_call(
+        "cover",
+        "set_cover_tilt_position",
+        {
+            "entity_id": entity_id,
+            "tilt_position": 50,
+        },
+        blocking=True,
+    )
+
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=window_covering.node_id,
+        endpoint_id=1,
+        command=clusters.WindowCovering.Commands.GoToTiltPercentage(5000),
+    )
+    matter_client.send_device_command.reset_mock()
+
+    await trigger_subscription_callback(hass, matter_client)
+
+    set_node_attribute(window_covering, 1, 258, 10, 0b100010)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_CLOSING
+
+    set_node_attribute(window_covering, 1, 258, 10, 0b010001)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OPENING
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_tilt", "cover.mock_tilt_window_covering"),
+    ],
+)
+async def test_cover_tilt_only(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with tilt feature and without position aware tilt feature."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
+    set_node_attribute(window_covering, 1, 258, 65529, [0, 1, 2])
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert (
+        state.attributes["supported_features"] & CoverEntityFeature.SET_TILT_POSITION
+        == 0
+    )
+
+    set_node_attribute(window_covering, 1, 258, 65529, [0, 1, 2, 8])
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert (
+        state.attributes["supported_features"] & CoverEntityFeature.SET_TILT_POSITION
+        != 0
+    )
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize(
+    ("fixture", "entity_id"),
+    [
+        ("window-covering_pa-tilt", "cover.mock_pa_tilt_window_covering"),
+    ],
+)
+async def test_cover_position_aware_tilt(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    fixture: str,
+    entity_id: str,
+) -> None:
+    """Test window covering devices with position aware tilt feature."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        fixture,
+        matter_client,
+    )
+
+    state = hass.states.get(entity_id)
+    assert state
+    mask = (
+        CoverEntityFeature.OPEN
+        | CoverEntityFeature.CLOSE
+        | CoverEntityFeature.STOP
+        | CoverEntityFeature.SET_TILT_POSITION
+    )
+    assert state.attributes["supported_features"] & mask == mask
+
+    for tilt_position in (0, 9999, 10000):
+        set_node_attribute(window_covering, 1, 258, 15, tilt_position)
+        set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+        await trigger_subscription_callback(hass, matter_client)
+
+        state = hass.states.get(entity_id)
+        assert state
+        assert state.attributes["current_tilt_position"] == 100 - floor(
+            tilt_position / 100
+        )
+
+
+async def test_cover_full_features(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+) -> None:
+    """Test window covering devices with all the features."""
+
+    window_covering = await setup_integration_with_node_fixture(
+        hass,
+        "window-covering_full",
+        matter_client,
+    )
+    entity_id = "cover.mock_full_window_covering"
+
+    state = hass.states.get(entity_id)
+    assert state
+    mask = (
+        CoverEntityFeature.OPEN
+        | CoverEntityFeature.CLOSE
+        | CoverEntityFeature.STOP
+        | CoverEntityFeature.SET_POSITION
+        | CoverEntityFeature.SET_TILT_POSITION
+    )
+    assert state.attributes["supported_features"] & mask == mask
+
+    set_node_attribute(window_covering, 1, 258, 14, 10000)
+    set_node_attribute(window_covering, 1, 258, 15, 10000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_CLOSED
+
+    set_node_attribute(window_covering, 1, 258, 14, 5000)
+    set_node_attribute(window_covering, 1, 258, 15, 10000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OPEN
+
+    set_node_attribute(window_covering, 1, 258, 14, 10000)
+    set_node_attribute(window_covering, 1, 258, 15, 5000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_CLOSED
+
+    set_node_attribute(window_covering, 1, 258, 14, 5000)
+    set_node_attribute(window_covering, 1, 258, 15, 5000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OPEN
+
+    set_node_attribute(window_covering, 1, 258, 14, 5000)
+    set_node_attribute(window_covering, 1, 258, 15, None)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OPEN
+
+    set_node_attribute(window_covering, 1, 258, 14, None)
+    set_node_attribute(window_covering, 1, 258, 15, 5000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "unknown"
+
+    set_node_attribute(window_covering, 1, 258, 14, 10000)
+    set_node_attribute(window_covering, 1, 258, 15, None)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_CLOSED
+
+    set_node_attribute(window_covering, 1, 258, 14, None)
+    set_node_attribute(window_covering, 1, 258, 15, 10000)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "unknown"
+
+    set_node_attribute(window_covering, 1, 258, 14, None)
+    set_node_attribute(window_covering, 1, 258, 15, None)
+    set_node_attribute(window_covering, 1, 258, 10, 0b000000)
+    await trigger_subscription_callback(hass, matter_client)
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "unknown"
diff --git a/tests/components/matter/test_door_lock.py b/tests/components/matter/test_door_lock.py
index 072658044d83b9..3eba65dc8ab2ba 100644
--- a/tests/components/matter/test_door_lock.py
+++ b/tests/components/matter/test_door_lock.py
@@ -11,24 +11,15 @@
     STATE_UNLOCKED,
     STATE_UNLOCKING,
 )
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.const import ATTR_CODE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 
 from .common import (
     set_node_attribute,
-    setup_integration_with_node_fixture,
     trigger_subscription_callback,
 )
 
 
-@pytest.fixture(name="door_lock")
-async def door_lock_fixture(
-    hass: HomeAssistant, matter_client: MagicMock
-) -> MatterNode:
-    """Fixture for a door lock node."""
-    return await setup_integration_with_node_fixture(hass, "door-lock", matter_client)
-
-
 # This tests needs to be adjusted to remove lingering tasks
 @pytest.mark.parametrize("expected_lingering_tasks", [True])
 async def test_lock(
@@ -104,3 +95,46 @@ async def test_lock(
     state = hass.states.get("lock.mock_door_lock")
     assert state
     assert state.state == STATE_UNKNOWN
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_lock_requires_pin(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    door_lock: MatterNode,
+) -> None:
+    """Test door lock with PINCode."""
+
+    code = "1234567"
+
+    # set RequirePINforRemoteOperation
+    set_node_attribute(door_lock, 1, 257, 51, True)
+    # set door state to unlocked
+    set_node_attribute(door_lock, 1, 257, 0, 2)
+
+    with pytest.raises(ValueError):
+        # Lock door using invalid code format
+        await trigger_subscription_callback(hass, matter_client)
+        await hass.services.async_call(
+            "lock",
+            "lock",
+            {"entity_id": "lock.mock_door_lock", ATTR_CODE: "1234"},
+            blocking=True,
+        )
+
+    # Lock door using valid code
+    await trigger_subscription_callback(hass, matter_client)
+    await hass.services.async_call(
+        "lock",
+        "lock",
+        {"entity_id": "lock.mock_door_lock", ATTR_CODE: code},
+        blocking=True,
+    )
+    assert matter_client.send_device_command.call_count == 1
+    assert matter_client.send_device_command.call_args == call(
+        node_id=door_lock.node_id,
+        endpoint_id=1,
+        command=clusters.DoorLock.Commands.LockDoor(code.encode()),
+        timed_request_timeout_ms=1000,
+    )
diff --git a/tests/components/matter/test_init.py b/tests/components/matter/test_init.py
index 58d0d0d445bcdc..bbe77b76af58ca 100644
--- a/tests/components/matter/test_init.py
+++ b/tests/components/matter/test_init.py
@@ -168,7 +168,7 @@ async def start_listening(listen_ready: asyncio.Event) -> None:
         matter_client.connect.side_effect = MatterError("Boom")
         raise error
 
-    async def get_nodes() -> list[MagicMock]:
+    def get_nodes() -> list[MagicMock]:
         """Mock the client get_nodes method."""
         listen_block.set()
         return []
diff --git a/tests/components/matter/test_light.py b/tests/components/matter/test_light.py
index ef8541120086dd..78ffa477b33e70 100644
--- a/tests/components/matter/test_light.py
+++ b/tests/components/matter/test_light.py
@@ -188,7 +188,7 @@ async def test_color_temperature_light(
         "turn_on",
         {
             "entity_id": entity_id,
-            "color_temp": 3000,
+            "color_temp": 300,
         },
         blocking=True,
     )
@@ -200,7 +200,7 @@ async def test_color_temperature_light(
                 node_id=light_node.node_id,
                 endpoint_id=1,
                 command=clusters.ColorControl.Commands.MoveToColorTemperature(
-                    colorTemperature=3003,
+                    colorTemperatureMireds=300,
                     transitionTime=0,
                 ),
             ),
diff --git a/tests/components/matter/test_sensor.py b/tests/components/matter/test_sensor.py
index a2e97e188f63f1..2650f2b1a6ff36 100644
--- a/tests/components/matter/test_sensor.py
+++ b/tests/components/matter/test_sensor.py
@@ -4,7 +4,9 @@
 from matter_server.client.models.node import MatterNode
 import pytest
 
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from .common import (
     set_node_attribute,
@@ -179,3 +181,30 @@ async def test_temperature_sensor(
     state = hass.states.get("sensor.mock_temperature_sensor_temperature")
     assert state
     assert state.state == "25.0"
+
+
+# This tests needs to be adjusted to remove lingering tasks
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+async def test_battery_sensor(
+    hass: HomeAssistant,
+    matter_client: MagicMock,
+    eve_contact_sensor_node: MatterNode,
+) -> None:
+    """Test battery sensor."""
+    entity_id = "sensor.eve_door_battery"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "100"
+
+    set_node_attribute(eve_contact_sensor_node, 1, 47, 12, 100)
+    await trigger_subscription_callback(hass, matter_client)
+
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "50"
+
+    entity_registry = er.async_get(hass)
+    entry = entity_registry.async_get(entity_id)
+
+    assert entry
+    assert entry.entity_category == EntityCategory.DIAGNOSTIC
diff --git a/tests/components/mazda/test_button.py b/tests/components/mazda/test_button.py
index 535ddcc963b62f..ba80c10b38d81d 100644
--- a/tests/components/mazda/test_button.py
+++ b/tests/components/mazda/test_button.py
@@ -65,40 +65,6 @@ async def test_button_setup_electric_vehicle(hass: HomeAssistant) -> None:
 
     entity_registry = er.async_get(hass)
 
-    entry = entity_registry.async_get("button.my_mazda3_start_engine")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_start_engine"
-    state = hass.states.get("button.my_mazda3_start_engine")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Start engine"
-    assert state.attributes.get(ATTR_ICON) == "mdi:engine"
-
-    entry = entity_registry.async_get("button.my_mazda3_stop_engine")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_stop_engine"
-    state = hass.states.get("button.my_mazda3_stop_engine")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Stop engine"
-    assert state.attributes.get(ATTR_ICON) == "mdi:engine-off"
-
-    entry = entity_registry.async_get("button.my_mazda3_turn_on_hazard_lights")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_turn_on_hazard_lights"
-    state = hass.states.get("button.my_mazda3_turn_on_hazard_lights")
-    assert state
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Turn on hazard lights"
-    assert state.attributes.get(ATTR_ICON) == "mdi:hazard-lights"
-
-    entry = entity_registry.async_get("button.my_mazda3_turn_off_hazard_lights")
-    assert entry
-    assert entry.unique_id == "JM000000000000000_turn_off_hazard_lights"
-    state = hass.states.get("button.my_mazda3_turn_off_hazard_lights")
-    assert state
-    assert (
-        state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Turn off hazard lights"
-    )
-    assert state.attributes.get(ATTR_ICON) == "mdi:hazard-lights"
-
     entry = entity_registry.async_get("button.my_mazda3_refresh_status")
     assert entry
     assert entry.unique_id == "JM000000000000000_refresh_vehicle_status"
@@ -109,20 +75,45 @@ async def test_button_setup_electric_vehicle(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.parametrize(
-    ("entity_id_suffix", "api_method_name"),
+    ("electric_vehicle", "entity_id_suffix"),
+    [
+        (True, "start_engine"),
+        (True, "stop_engine"),
+        (True, "turn_on_hazard_lights"),
+        (True, "turn_off_hazard_lights"),
+        (False, "refresh_status"),
+    ],
+)
+async def test_button_not_created(
+    hass: HomeAssistant, electric_vehicle, entity_id_suffix
+) -> None:
+    """Test that button entities are not created when they should not be."""
+    await init_integration(hass, electric_vehicle=electric_vehicle)
+
+    entity_registry = er.async_get(hass)
+
+    entity_id = f"button.my_mazda3_{entity_id_suffix}"
+    entry = entity_registry.async_get(entity_id)
+    assert entry is None
+    state = hass.states.get(entity_id)
+    assert state is None
+
+
+@pytest.mark.parametrize(
+    ("electric_vehicle", "entity_id_suffix", "api_method_name"),
     [
-        ("start_engine", "start_engine"),
-        ("stop_engine", "stop_engine"),
-        ("turn_on_hazard_lights", "turn_on_hazard_lights"),
-        ("turn_off_hazard_lights", "turn_off_hazard_lights"),
-        ("refresh_status", "refresh_vehicle_status"),
+        (False, "start_engine", "start_engine"),
+        (False, "stop_engine", "stop_engine"),
+        (False, "turn_on_hazard_lights", "turn_on_hazard_lights"),
+        (False, "turn_off_hazard_lights", "turn_off_hazard_lights"),
+        (True, "refresh_status", "refresh_vehicle_status"),
     ],
 )
 async def test_button_press(
-    hass: HomeAssistant, entity_id_suffix, api_method_name
+    hass: HomeAssistant, electric_vehicle, entity_id_suffix, api_method_name
 ) -> None:
     """Test pressing the button entities."""
-    client_mock = await init_integration(hass, electric_vehicle=True)
+    client_mock = await init_integration(hass, electric_vehicle=electric_vehicle)
 
     await hass.services.async_call(
         BUTTON_DOMAIN,
diff --git a/tests/components/media_player/test_device_condition.py b/tests/components/media_player/test_device_condition.py
index d2e2c3db289092..b89993dec65beb 100644
--- a/tests/components/media_player/test_device_condition.py
+++ b/tests/components/media_player/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Media player device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -20,11 +21,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -45,7 +49,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -54,7 +58,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in [
@@ -69,7 +73,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -95,7 +99,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -109,7 +113,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in [
@@ -124,12 +128,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("media_player.entity", STATE_ON)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -143,7 +151,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -161,7 +169,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -179,7 +187,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_idle",
                         }
                     ],
@@ -197,7 +205,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_paused",
                         }
                     ],
@@ -215,7 +223,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_playing",
                         }
                     ],
@@ -233,7 +241,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "media_player.entity",
+                            "entity_id": entry.id,
                             "type": "is_buffering",
                         }
                     ],
@@ -257,7 +265,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on - event - test_event1"
 
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -268,7 +276,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 2
     assert calls[1].data["some"] == "is_off - event - test_event2"
 
-    hass.states.async_set("media_player.entity", STATE_IDLE)
+    hass.states.async_set(entry.entity_id, STATE_IDLE)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -279,7 +287,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_idle - event - test_event3"
 
-    hass.states.async_set("media_player.entity", STATE_PAUSED)
+    hass.states.async_set(entry.entity_id, STATE_PAUSED)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -290,7 +298,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 4
     assert calls[3].data["some"] == "is_paused - event - test_event4"
 
-    hass.states.async_set("media_player.entity", STATE_PLAYING)
+    hass.states.async_set(entry.entity_id, STATE_PLAYING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -301,7 +309,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 5
     assert calls[4].data["some"] == "is_playing - event - test_event5"
 
-    hass.states.async_set("media_player.entity", STATE_BUFFERING)
+    hass.states.async_set(entry.entity_id, STATE_BUFFERING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     hass.bus.async_fire("test_event3")
@@ -311,3 +319,43 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert calls[5].data["some"] == "is_buffering - event - test_event6"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on - event - test_event1"
diff --git a/tests/components/media_player/test_device_trigger.py b/tests/components/media_player/test_device_trigger.py
index cb25439955b91b..42608eacb097f4 100644
--- a/tests/components/media_player/test_device_trigger.py
+++ b/tests/components/media_player/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -23,13 +24,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -50,7 +54,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
 
@@ -69,7 +73,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in trigger_types
@@ -77,7 +81,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -103,7 +107,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -111,29 +115,30 @@ async def test_get_triggers_hidden_auxiliary(
         entity_category=entity_category,
         hidden_by=hidden_by,
     )
+    trigger_types = {
+        "buffering",
+        "changed_states",
+        "idle",
+        "paused",
+        "playing",
+        "turned_off",
+        "turned_on",
+    }
     expected_triggers = [
         {
             "platform": "device",
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
-        for trigger in [
-            "buffering",
-            "changed_states",
-            "idle",
-            "paused",
-            "playing",
-            "turned_off",
-            "turned_on",
-        ]
+        for trigger in trigger_types
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -167,9 +172,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a media player."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 7
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test triggers firing."""
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     data_template = (
         "{label} - {{{{ trigger.platform}}}} - "
@@ -196,7 +237,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "media_player.entity",
+                        "entity_id": entry.id,
                         "type": trigger,
                     },
                     "action": {
@@ -210,64 +251,115 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is turning on.
-    hass.states.async_set("media_player.entity", STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        "turned_on - device - media_player.entity - off - on - None",
-        "changed_states - device - media_player.entity - off - on - None",
+        "turned_on - device - media_player.test_5678 - off - on - None",
+        "changed_states - device - media_player.test_5678 - off - on - None",
     }
 
     # Fake that the entity is turning off.
-    hass.states.async_set("media_player.entity", STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        "turned_off - device - media_player.entity - on - off - None",
-        "changed_states - device - media_player.entity - on - off - None",
+        "turned_off - device - media_player.test_5678 - on - off - None",
+        "changed_states - device - media_player.test_5678 - on - off - None",
     }
 
     # Fake that the entity becomes idle.
-    hass.states.async_set("media_player.entity", STATE_IDLE)
+    hass.states.async_set(entry.entity_id, STATE_IDLE)
     await hass.async_block_till_done()
     assert len(calls) == 6
     assert {calls[4].data["some"], calls[5].data["some"]} == {
-        "idle - device - media_player.entity - off - idle - None",
-        "changed_states - device - media_player.entity - off - idle - None",
+        "idle - device - media_player.test_5678 - off - idle - None",
+        "changed_states - device - media_player.test_5678 - off - idle - None",
     }
 
     # Fake that the entity starts playing.
-    hass.states.async_set("media_player.entity", STATE_PLAYING)
+    hass.states.async_set(entry.entity_id, STATE_PLAYING)
     await hass.async_block_till_done()
     assert len(calls) == 8
     assert {calls[6].data["some"], calls[7].data["some"]} == {
-        "playing - device - media_player.entity - idle - playing - None",
-        "changed_states - device - media_player.entity - idle - playing - None",
+        "playing - device - media_player.test_5678 - idle - playing - None",
+        "changed_states - device - media_player.test_5678 - idle - playing - None",
     }
 
     # Fake that the entity is paused.
-    hass.states.async_set("media_player.entity", STATE_PAUSED)
+    hass.states.async_set(entry.entity_id, STATE_PAUSED)
     await hass.async_block_till_done()
     assert len(calls) == 10
     assert {calls[8].data["some"], calls[9].data["some"]} == {
-        "paused - device - media_player.entity - playing - paused - None",
-        "changed_states - device - media_player.entity - playing - paused - None",
+        "paused - device - media_player.test_5678 - playing - paused - None",
+        "changed_states - device - media_player.test_5678 - playing - paused - None",
     }
 
     # Fake that the entity is buffering.
-    hass.states.async_set("media_player.entity", STATE_BUFFERING)
+    hass.states.async_set(entry.entity_id, STATE_BUFFERING)
     await hass.async_block_till_done()
     assert len(calls) == 12
     assert {calls[10].data["some"], calls[11].data["some"]} == {
-        "buffering - device - media_player.entity - paused - buffering - None",
-        "changed_states - device - media_player.entity - paused - buffering - None",
+        "buffering - device - media_player.test_5678 - paused - buffering - None",
+        "changed_states - device - media_player.test_5678 - paused - buffering - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+
+    data_template = (
+        "{label} - {{{{ trigger.platform}}}} - "
+        "{{{{ trigger.entity_id}}}} - {{{{ trigger.from_state.state}}}} - "
+        "{{{{ trigger.to_state.state}}}} - {{{{ trigger.for }}}}"
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_on",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": data_template.format(label="turned_on")
+                        },
+                    },
+                }
+            ]
+        },
+    )
+
+    # Fake that the entity is turning on.
+    hass.states.async_set(entry.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == "turned_on - device - media_player.test_5678 - off - on - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_OFF)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
 
     assert await async_setup_component(
         hass,
@@ -279,7 +371,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                         "for": {"seconds": 5},
                     },
@@ -303,10 +395,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_OFF
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -314,5 +405,6 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     assert len(calls) == 1
     await hass.async_block_till_done()
     assert (
-        calls[0].data["some"] == f"turn_off device - {entity_id} - off - on - 0:00:05"
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - off - on - 0:00:05"
     )
diff --git a/tests/components/media_player/test_recorder.py b/tests/components/media_player/test_recorder.py
index 98922d7d0a4231..a04c7e85119d54 100644
--- a/tests/components/media_player/test_recorder.py
+++ b/tests/components/media_player/test_recorder.py
@@ -2,6 +2,9 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import media_player
 from homeassistant.components.media_player import (
@@ -13,7 +16,7 @@
 )
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -22,6 +25,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def media_player_only() -> None:
+    """Enable only the media_player platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.MEDIA_PLAYER],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test media_player registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/media_source/test_init.py b/tests/components/media_source/test_init.py
index ec374e6a6e1ffb..4e512608abf549 100644
--- a/tests/components/media_source/test_init.py
+++ b/tests/components/media_source/test_init.py
@@ -95,7 +95,7 @@ async def not_shown_browse(self):
     media = await media_source.async_browse_media(hass, const.URI_SCHEME)
     assert isinstance(media, media_source.models.BrowseMediaSource)
     assert len(media.children) == 1
-    assert media.children[0].title == "Local Media"
+    assert media.children[0].title == "My media"
 
 
 async def test_async_resolve_media(hass: HomeAssistant) -> None:
diff --git a/tests/components/melnor/conftest.py b/tests/components/melnor/conftest.py
index 790301171cd485..ab51bf44a579d1 100644
--- a/tests/components/melnor/conftest.py
+++ b/tests/components/melnor/conftest.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from collections.abc import Generator
+from datetime import datetime, time, timedelta, timezone
 from unittest.mock import AsyncMock, patch
 
 from melnor_bluetooth.device import Device
@@ -57,13 +58,78 @@ def mock_bluetooth(enable_bluetooth):
     """Auto mock bluetooth."""
 
 
-class MockedValve:
+class MockFrequency:
+    """Mocked class for a Frequency."""
+
+    _duration: int
+    _interval: int
+    _is_watering: bool
+    _start_time: time
+    _next_run_time: datetime
+
+    def __init__(self) -> None:
+        """Initialize a mocked frequency."""
+        self._duration = 0
+        self._interval = 0
+        self._is_watering = False
+        self._start_time = time(12, 0)
+        self._next_run_time = datetime(2021, 1, 1, 12, 0, tzinfo=timezone.utc)
+
+    @property
+    def duration_minutes(self) -> int:
+        """Return the duration in minutes."""
+        return self._duration
+
+    @duration_minutes.setter
+    def duration_minutes(self, duration: int) -> None:
+        """Set the duration in minutes."""
+        self._duration = duration
+
+    @property
+    def interval_hours(self) -> int:
+        """Return the interval in hours."""
+        return self._interval
+
+    @interval_hours.setter
+    def interval_hours(self, interval: int) -> None:
+        """Set the interval in hours."""
+        self._interval = interval
+
+    @property
+    def start_time(self) -> time:
+        """Return the start time."""
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time: time) -> None:
+        """Set the start time."""
+        self._start_time = start_time
+
+    @property
+    def is_watering(self) -> bool:
+        """Return true if the frequency is currently watering."""
+        return self._is_watering
+
+    @property
+    def next_run_time(self) -> datetime:
+        """Return the next run time."""
+        return self._next_run_time
+
+    @property
+    def schedule_end_time(self) -> datetime:
+        """Return the schedule end time."""
+        return self._next_run_time + timedelta(minutes=self._duration)
+
+
+class MockValve:
     """Mocked class for a Valve."""
 
     _id: int
     _is_watering: bool
     _manual_watering_minutes: int
     _end_time: int
+    _frequency: MockFrequency
+    _schedule_enabled: bool
 
     def __init__(self, identifier: int) -> None:
         """Initialize a mocked valve."""
@@ -71,35 +137,69 @@ def __init__(self, identifier: int) -> None:
         self._id = identifier
         self._is_watering = False
         self._manual_watering_minutes = 0
+        self._schedule_enabled = False
+
+        self._frequency = MockFrequency()
 
     @property
     def id(self) -> int:
         """Return the valve id."""
         return self._id
 
+    @property
+    def frequency(self):
+        """Return the frequency."""
+        return self._frequency
+
     @property
     def is_watering(self):
         """Return true if the valve is currently watering."""
         return self._is_watering
 
-    async def set_is_watering(self, is_watering: bool):
-        """Set the valve to manual watering."""
-        self._is_watering = is_watering
-
     @property
     def manual_watering_minutes(self):
         """Return the number of minutes the valve is set to manual watering."""
         return self._manual_watering_minutes
 
-    async def set_manual_watering_minutes(self, minutes: int):
-        """Set the valve to manual watering."""
-        self._manual_watering_minutes = minutes
+    @property
+    def next_cycle(self):
+        """Return the end time of the current watering cycle."""
+        return self._frequency.next_run_time
+
+    @property
+    def schedule_enabled(self) -> bool:
+        """Return true if the schedule is enabled."""
+        return self._schedule_enabled
 
     @property
     def watering_end_time(self) -> int:
         """Return the end time of the current watering cycle."""
         return self._end_time
 
+    async def set_is_watering(self, is_watering: bool):
+        """Set the valve to manual watering."""
+        self._is_watering = is_watering
+
+    async def set_manual_watering_minutes(self, minutes: int):
+        """Set the valve to manual watering."""
+        self._manual_watering_minutes = minutes
+
+    async def set_frequency_interval_hours(self, interval: int):
+        """Set the frequency interval in hours."""
+        self._frequency.interval_hours = interval
+
+    async def set_frequency_duration_minutes(self, duration: int):
+        """Set the frequency duration in minutes."""
+        self._frequency.duration_minutes = duration
+
+    async def set_frequency_enabled(self, enabled: bool):
+        """Set the frequency schedule enabled."""
+        self._schedule_enabled = enabled
+
+    async def set_frequency_start_time(self, value: time):
+        """Set the frequency schedule enabled."""
+        self._frequency.start_time = value
+
 
 def mock_config_entry(hass: HomeAssistant):
     """Return a mock config entry."""
@@ -131,10 +231,10 @@ def mock_melnor_device():
         device.name = "test_melnor"
         device.rssi = -50
 
-        device.zone1 = MockedValve(0)
-        device.zone2 = MockedValve(1)
-        device.zone3 = MockedValve(2)
-        device.zone4 = MockedValve(3)
+        device.zone1 = MockValve(0)
+        device.zone2 = MockValve(1)
+        device.zone3 = MockValve(2)
+        device.zone4 = MockValve(3)
 
         device.__getitem__.side_effect = lambda key: getattr(device, key)
 
diff --git a/tests/components/melnor/test_number.py b/tests/components/melnor/test_number.py
index e7d6780aa4c91c..a8d358c2ac2347 100644
--- a/tests/components/melnor/test_number.py
+++ b/tests/components/melnor/test_number.py
@@ -12,7 +12,7 @@
 
 
 async def test_manual_watering_minutes(hass: HomeAssistant) -> None:
-    """Test the manual watering switch."""
+    """Test the manual watering duration number."""
 
     entry = mock_config_entry(hass)
 
@@ -22,8 +22,9 @@ async def test_manual_watering_minutes(hass: HomeAssistant) -> None:
         assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-        number = hass.states.get("number.zone_1_manual_minutes")
+        number = hass.states.get("number.zone_1_manual_duration")
 
+        assert number is not None
         assert number.state == "0"
         assert number.attributes["max"] == 360
         assert number.attributes["min"] == 1
@@ -35,11 +36,84 @@ async def test_manual_watering_minutes(hass: HomeAssistant) -> None:
         await hass.services.async_call(
             "number",
             "set_value",
-            {"entity_id": "number.zone_1_manual_minutes", "value": 10},
+            {"entity_id": "number.zone_1_manual_duration", "value": 10},
             blocking=True,
         )
 
-        number = hass.states.get("number.zone_1_manual_minutes")
+        number = hass.states.get("number.zone_1_manual_duration")
 
+        assert number is not None
         assert number.state == "10"
         assert device.zone1.manual_watering_minutes == 10
+
+
+async def test_frequency_interval_hours(hass: HomeAssistant) -> None:
+    """Test the interval hours number."""
+
+    entry = mock_config_entry(hass)
+
+    with patch_async_ble_device_from_address(), patch_melnor_device() as device_patch, patch_async_register_callback():
+        device = device_patch.return_value
+
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        number = hass.states.get("number.zone_1_schedule_interval")
+
+        assert number is not None
+        assert number.state == "0"
+        assert number.attributes["max"] == 168
+        assert number.attributes["min"] == 1
+        assert number.attributes["step"] == 1.0
+        assert number.attributes["icon"] == "mdi:calendar-refresh-outline"
+
+        assert device.zone1.frequency.interval_hours == 0
+
+        await hass.services.async_call(
+            "number",
+            "set_value",
+            {"entity_id": "number.zone_1_schedule_interval", "value": 10},
+            blocking=True,
+        )
+
+        number = hass.states.get("number.zone_1_schedule_interval")
+
+        assert number is not None
+        assert number.state == "10"
+        assert device.zone1.frequency.interval_hours == 10
+
+
+async def test_frequency_duration_minutes(hass: HomeAssistant) -> None:
+    """Test the duration minutes number."""
+
+    entry = mock_config_entry(hass)
+
+    with patch_async_ble_device_from_address(), patch_melnor_device() as device_patch, patch_async_register_callback():
+        device = device_patch.return_value
+
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        number = hass.states.get("number.zone_1_schedule_duration")
+
+        assert number is not None
+        assert number.state == "0"
+        assert number.attributes["max"] == 360
+        assert number.attributes["min"] == 1
+        assert number.attributes["step"] == 1.0
+        assert number.attributes["icon"] == "mdi:timer-outline"
+
+        assert device.zone1.frequency.duration_minutes == 0
+
+        await hass.services.async_call(
+            "number",
+            "set_value",
+            {"entity_id": "number.zone_1_schedule_duration", "value": 10},
+            blocking=True,
+        )
+
+        number = hass.states.get("number.zone_1_schedule_duration")
+
+        assert number is not None
+        assert number.state == "10"
+        assert device.zone1.frequency.duration_minutes == 10
diff --git a/tests/components/melnor/test_sensor.py b/tests/components/melnor/test_sensor.py
index b525ec67b17f2f..291115fae9d6d1 100644
--- a/tests/components/melnor/test_sensor.py
+++ b/tests/components/melnor/test_sensor.py
@@ -30,6 +30,8 @@ async def test_battery_sensor(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         battery_sensor = hass.states.get("sensor.test_melnor_battery")
+
+        assert battery_sensor is not None
         assert battery_sensor.state == "80"
         assert battery_sensor.attributes["unit_of_measurement"] == PERCENTAGE
         assert battery_sensor.attributes["device_class"] == SensorDeviceClass.BATTERY
@@ -58,6 +60,8 @@ async def test_minutes_remaining_sensor(hass: HomeAssistant) -> None:
 
         # Valve is off, report 0
         minutes_sensor = hass.states.get("sensor.zone_1_manual_cycle_end")
+
+        assert minutes_sensor is not None
         assert minutes_sensor.state == "unknown"
         assert minutes_sensor.attributes["device_class"] == SensorDeviceClass.TIMESTAMP
 
@@ -69,9 +73,50 @@ async def test_minutes_remaining_sensor(hass: HomeAssistant) -> None:
 
         # Valve is on, report 10
         minutes_remaining_sensor = hass.states.get("sensor.zone_1_manual_cycle_end")
+
+        assert minutes_remaining_sensor is not None
         assert minutes_remaining_sensor.state == end_time.isoformat(timespec="seconds")
 
 
+async def test_schedule_next_cycle_sensor(hass: HomeAssistant) -> None:
+    """Test the frequency next_cycle sensor."""
+
+    now = dt_util.utcnow()
+
+    entry = mock_config_entry(hass)
+    device = mock_melnor_device()
+
+    next_cycle = now + dt_util.dt.timedelta(minutes=10)
+
+    # we control this mock
+    device.zone1.frequency._next_run_time = next_cycle
+
+    with freeze_time(now), patch_async_ble_device_from_address(), patch_melnor_device(
+        device
+    ), patch_async_register_callback():
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        # Valve is off, report 0
+        minutes_sensor = hass.states.get("sensor.zone_1_next_cycle")
+
+        assert minutes_sensor is not None
+        assert minutes_sensor.state == "unknown"
+        assert minutes_sensor.attributes["device_class"] == SensorDeviceClass.TIMESTAMP
+
+        # Turn valve on
+        device.zone1._schedule_enabled = True
+
+        async_fire_time_changed(hass, now + dt_util.dt.timedelta(seconds=10))
+        await hass.async_block_till_done()
+
+        # Valve is on, report 10
+        next_cycle_sensor = hass.states.get("sensor.zone_1_next_cycle")
+
+        assert next_cycle_sensor is not None
+        assert next_cycle_sensor.state == next_cycle.isoformat(timespec="seconds")
+
+
 async def test_rssi_sensor(
     hass: HomeAssistant, entity_registry: er.EntityRegistry
 ) -> None:
@@ -104,6 +149,7 @@ async def test_rssi_sensor(
 
         rssi = hass.states.get(entity_id)
 
+        assert rssi is not None
         assert (
             rssi.attributes["unit_of_measurement"] == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
         )
diff --git a/tests/components/melnor/test_switch.py b/tests/components/melnor/test_switch.py
index 08a36182480035..fdd5e8ad33e59e 100644
--- a/tests/components/melnor/test_switch.py
+++ b/tests/components/melnor/test_switch.py
@@ -23,6 +23,8 @@ async def test_manual_watering_switch_metadata(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         switch = hass.states.get("switch.zone_1")
+
+        assert switch is not None
         assert switch.attributes["device_class"] == SwitchDeviceClass.SWITCH
         assert switch.attributes["icon"] == "mdi:sprinkler"
 
@@ -39,6 +41,8 @@ async def test_manual_watering_switch_on_off(hass: HomeAssistant) -> None:
         await hass.async_block_till_done()
 
         switch = hass.states.get("switch.zone_1")
+
+        assert switch is not None
         assert switch.state is STATE_OFF
 
         await hass.services.async_call(
@@ -49,6 +53,8 @@ async def test_manual_watering_switch_on_off(hass: HomeAssistant) -> None:
         )
 
         switch = hass.states.get("switch.zone_1")
+
+        assert switch is not None
         assert switch.state is STATE_ON
         assert device.zone1.is_watering is True
 
@@ -60,5 +66,38 @@ async def test_manual_watering_switch_on_off(hass: HomeAssistant) -> None:
         )
 
         switch = hass.states.get("switch.zone_1")
+
+        assert switch is not None
         assert switch.state is STATE_OFF
         assert device.zone1.is_watering is False
+
+
+async def test_schedule_enabled_switch_on_off(hass: HomeAssistant) -> None:
+    """Test the schedule enabled switch."""
+
+    entry = mock_config_entry(hass)
+
+    with patch_async_ble_device_from_address(), patch_melnor_device() as device_patch, patch_async_register_callback():
+        device = device_patch.return_value
+
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        switch = hass.states.get("switch.zone_1_schedule")
+
+        assert switch is not None
+        assert switch.state is STATE_OFF
+        assert device.zone1.schedule_enabled is False
+
+        await hass.services.async_call(
+            "switch",
+            "turn_on",
+            {"entity_id": "switch.zone_1_schedule"},
+            blocking=True,
+        )
+
+        switch = hass.states.get("switch.zone_1_schedule")
+
+        assert switch is not None
+        assert switch.state is STATE_ON
+        assert device.zone1.schedule_enabled is True
diff --git a/tests/components/melnor/test_time.py b/tests/components/melnor/test_time.py
new file mode 100644
index 00000000000000..682f518d40be81
--- /dev/null
+++ b/tests/components/melnor/test_time.py
@@ -0,0 +1,50 @@
+"""Test the Melnor time platform."""
+from __future__ import annotations
+
+from datetime import time
+
+from homeassistant.core import HomeAssistant
+import homeassistant.util.dt as dt_util
+
+from .conftest import (
+    mock_config_entry,
+    patch_async_ble_device_from_address,
+    patch_async_register_callback,
+    patch_melnor_device,
+)
+
+from tests.common import async_fire_time_changed
+
+
+async def test_schedule_start_time(hass: HomeAssistant) -> None:
+    """Test the frequency schedule start time."""
+
+    now = dt_util.now()
+
+    entry = mock_config_entry(hass)
+
+    with patch_async_ble_device_from_address(), patch_melnor_device() as device_patch, patch_async_register_callback():
+        device = device_patch.return_value
+
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        time_entity = hass.states.get("time.zone_1_schedule_start_time")
+
+        assert time_entity is not None
+        assert time_entity.state == device.zone1.frequency.start_time.isoformat()
+
+        await hass.services.async_call(
+            "time",
+            "set_value",
+            {"entity_id": "time.zone_1_schedule_start_time", "time": time(1, 0)},
+            blocking=True,
+        )
+
+        async_fire_time_changed(hass, now + dt_util.dt.timedelta(seconds=10))
+        await hass.async_block_till_done()
+
+        time_entity = hass.states.get("time.zone_1_schedule_start_time")
+
+        assert time_entity is not None
+        assert time_entity.state == time(1, 0).isoformat()
diff --git a/tests/components/microsoft/__init__.py b/tests/components/microsoft/__init__.py
new file mode 100644
index 00000000000000..10e98be7c01db0
--- /dev/null
+++ b/tests/components/microsoft/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Microsoft text-to-speech component."""
diff --git a/tests/components/microsoft/test_tts.py b/tests/components/microsoft/test_tts.py
new file mode 100644
index 00000000000000..9684d1aa7d5acc
--- /dev/null
+++ b/tests/components/microsoft/test_tts.py
@@ -0,0 +1,318 @@
+"""Tests for Microsoft text-to-speech."""
+from unittest.mock import patch
+
+from pycsspeechtts import pycsspeechtts
+import pytest
+
+from homeassistant.components import media_source, tts
+from homeassistant.components.media_player import (
+    ATTR_MEDIA_CONTENT_ID,
+    DOMAIN as DOMAIN_MP,
+    SERVICE_PLAY_MEDIA,
+)
+from homeassistant.components.microsoft.tts import SUPPORTED_LANGUAGES
+from homeassistant.config import async_process_ha_core_config
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError, ServiceNotFound
+from homeassistant.setup import async_setup_component
+
+from tests.common import async_mock_service
+
+
+async def get_media_source_url(hass: HomeAssistant, media_content_id):
+    """Get the media source url."""
+    if media_source.DOMAIN not in hass.config.components:
+        assert await async_setup_component(hass, media_source.DOMAIN, {})
+
+    resolved = await media_source.async_resolve_media(hass, media_content_id, None)
+    return resolved.url
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
+
+
+@pytest.fixture
+async def calls(hass: HomeAssistant):
+    """Mock media player calls."""
+    return async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
+
+
+@pytest.fixture(autouse=True)
+async def setup_internal_url(hass: HomeAssistant):
+    """Set up internal url."""
+    await async_process_ha_core_config(
+        hass, {"internal_url": "http://example.local:8123"}
+    )
+
+
+@pytest.fixture
+def mock_tts():
+    """Mock tts."""
+    with patch(
+        "homeassistant.components.microsoft.tts.pycsspeechtts.TTSTranslator"
+    ) as mock_tts:
+        mock_tts.return_value.speak.return_value = b""
+        yield mock_tts
+
+
+async def test_service_say(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say."""
+
+    await async_setup_component(
+        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "microsoft", "api_key": ""}}
+    )
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    url = await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
+    assert url.endswith(".mp3")
+
+    assert mock_tts.mock_calls[1][2] == {
+        "language": "en-us",
+        "gender": "Female",
+        "voiceType": "JennyNeural",
+        "output": "audio-24khz-96kbitrate-mono-mp3",
+        "rate": "0%",
+        "volume": "0%",
+        "pitch": "default",
+        "contour": "",
+        "text": "There is a person at the front door.",
+    }
+
+
+async def test_service_say_en_gb_config(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say with en-gb code in the config."""
+
+    await async_setup_component(
+        hass,
+        tts.DOMAIN,
+        {
+            tts.DOMAIN: {
+                "platform": "microsoft",
+                "api_key": "",
+                "language": "en-gb",
+                "type": "AbbiNeural",
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
+    assert mock_tts.mock_calls[1][2] == {
+        "language": "en-gb",
+        "gender": "Female",
+        "voiceType": "AbbiNeural",
+        "output": "audio-24khz-96kbitrate-mono-mp3",
+        "rate": "0%",
+        "volume": "0%",
+        "pitch": "default",
+        "contour": "",
+        "text": "There is a person at the front door.",
+    }
+
+
+async def test_service_say_en_gb_service(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say with en-gb code in the service."""
+
+    await async_setup_component(
+        hass,
+        tts.DOMAIN,
+        {tts.DOMAIN: {"platform": "microsoft", "api_key": ""}},
+    )
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+            tts.ATTR_LANGUAGE: "en-gb",
+            tts.ATTR_OPTIONS: {"type": "AbbiNeural"},
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
+    assert mock_tts.mock_calls[1][2] == {
+        "language": "en-gb",
+        "gender": "Female",
+        "voiceType": "AbbiNeural",
+        "output": "audio-24khz-96kbitrate-mono-mp3",
+        "rate": "0%",
+        "volume": "0%",
+        "pitch": "default",
+        "contour": "",
+        "text": "There is a person at the front door.",
+    }
+
+
+async def test_service_say_fa_ir_config(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say with fa-ir code in the config."""
+
+    await async_setup_component(
+        hass,
+        tts.DOMAIN,
+        {
+            tts.DOMAIN: {
+                "platform": "microsoft",
+                "api_key": "",
+                "language": "fa-ir",
+                "type": "DilaraNeural",
+            }
+        },
+    )
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
+    assert mock_tts.mock_calls[1][2] == {
+        "language": "fa-ir",
+        "gender": "Female",
+        "voiceType": "DilaraNeural",
+        "output": "audio-24khz-96kbitrate-mono-mp3",
+        "rate": "0%",
+        "volume": "0%",
+        "pitch": "default",
+        "contour": "",
+        "text": "There is a person at the front door.",
+    }
+
+
+async def test_service_say_fa_ir_service(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say with fa-ir code in the service."""
+
+    config = {
+        tts.DOMAIN: {
+            "platform": "microsoft",
+            "api_key": "",
+            "service_name": "microsoft_say",
+        }
+    }
+
+    await async_setup_component(hass, tts.DOMAIN, config)
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+            tts.ATTR_LANGUAGE: "fa-ir",
+            tts.ATTR_OPTIONS: {"type": "DilaraNeural"},
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
+    assert mock_tts.mock_calls[1][2] == {
+        "language": "fa-ir",
+        "gender": "Female",
+        "voiceType": "DilaraNeural",
+        "output": "audio-24khz-96kbitrate-mono-mp3",
+        "rate": "0%",
+        "volume": "0%",
+        "pitch": "default",
+        "contour": "",
+        "text": "There is a person at the front door.",
+    }
+
+
+def test_supported_languages() -> None:
+    """Test list of supported languages."""
+    for lang in ["en-us", "fa-ir", "en-gb"]:
+        assert lang in SUPPORTED_LANGUAGES
+    assert "en-US" not in SUPPORTED_LANGUAGES
+    for lang in [
+        "en",
+        "en-uk",
+        "english",
+        "english (united states)",
+        "jennyneural",
+        "en-us-jennyneural",
+    ]:
+        assert lang not in {s.lower() for s in SUPPORTED_LANGUAGES}
+    assert len(SUPPORTED_LANGUAGES) > 100
+
+
+async def test_invalid_language(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test setup component with invalid language."""
+    await async_setup_component(
+        hass,
+        tts.DOMAIN,
+        {tts.DOMAIN: {"platform": "microsoft", "api_key": "", "language": "en"}},
+    )
+
+    with pytest.raises(ServiceNotFound):
+        await hass.services.async_call(
+            tts.DOMAIN,
+            "microsoft_say",
+            {
+                "entity_id": "media_player.something",
+                tts.ATTR_MESSAGE: "There is a person at the front door.",
+            },
+            blocking=True,
+        )
+
+    assert len(calls) == 0
+    assert len(mock_tts.mock_calls) == 0
+
+
+async def test_service_say_error(hass: HomeAssistant, mock_tts, calls) -> None:
+    """Test service call say with http error."""
+    mock_tts.return_value.speak.side_effect = pycsspeechtts.requests.HTTPError
+    await async_setup_component(
+        hass, tts.DOMAIN, {tts.DOMAIN: {"platform": "microsoft", "api_key": ""}}
+    )
+
+    await hass.services.async_call(
+        tts.DOMAIN,
+        "microsoft_say",
+        {
+            "entity_id": "media_player.something",
+            tts.ATTR_MESSAGE: "There is a person at the front door.",
+        },
+        blocking=True,
+    )
+
+    assert len(calls) == 1
+    with pytest.raises(HomeAssistantError):
+        await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
+    assert len(mock_tts.mock_calls) == 2
diff --git a/tests/components/mill/test_init.py b/tests/components/mill/test_init.py
index c37c28c7b96c9e..2c17a2d755031b 100644
--- a/tests/components/mill/test_init.py
+++ b/tests/components/mill/test_init.py
@@ -23,7 +23,7 @@ async def test_setup_with_cloud_config(hass: HomeAssistant) -> None:
     with patch(
         "mill.Mill.fetch_heater_and_sensor_data", return_value={}
     ) as mock_fetch, patch("mill.Mill.connect", return_value=True) as mock_connect:
-        assert await async_setup_component(hass, "mill", entry)
+        assert await async_setup_component(hass, "mill", {})
     assert len(mock_fetch.mock_calls) == 1
     assert len(mock_connect.mock_calls) == 1
 
@@ -40,7 +40,7 @@ async def test_setup_with_cloud_config_fails(hass: HomeAssistant) -> None:
     )
     entry.add_to_hass(hass)
     with patch("mill.Mill.connect", return_value=False):
-        assert await async_setup_component(hass, "mill", entry)
+        assert await async_setup_component(hass, "mill", {})
     assert entry.state is ConfigEntryState.SETUP_RETRY
 
 
@@ -57,7 +57,7 @@ async def test_setup_with_old_cloud_config(hass: HomeAssistant) -> None:
     with patch("mill.Mill.fetch_heater_and_sensor_data", return_value={}), patch(
         "mill.Mill.connect", return_value=True
     ) as mock_connect:
-        assert await async_setup_component(hass, "mill", entry)
+        assert await async_setup_component(hass, "mill", {})
 
     assert len(mock_connect.mock_calls) == 1
 
@@ -90,7 +90,7 @@ async def test_setup_with_local_config(hass: HomeAssistant) -> None:
             "status": "ok",
         },
     ) as mock_connect:
-        assert await async_setup_component(hass, "mill", entry)
+        assert await async_setup_component(hass, "mill", {})
 
     assert len(mock_fetch.mock_calls) == 1
     assert len(mock_connect.mock_calls) == 1
@@ -115,7 +115,7 @@ async def test_unload_entry(hass: HomeAssistant) -> None:
     ), patch(
         "mill.Mill.connect", return_value=True
     ):
-        assert await async_setup_component(hass, "mill", entry)
+        assert await async_setup_component(hass, "mill", {})
 
         assert await hass.config_entries.async_unload(entry.entry_id)
 
diff --git a/tests/components/moat/__init__.py b/tests/components/moat/__init__.py
index 358d338993f8e5..e0af0229cba24a 100644
--- a/tests/components/moat/__init__.py
+++ b/tests/components/moat/__init__.py
@@ -19,7 +19,7 @@
     service_data={
         "00005000-0000-1000-8000-00805f9b34fb": b"\xdfy\xe3\xa6\x12\xb3\xf5\x0b",
         "00001000-0000-1000-8000-00805f9b34fb": (
-            b"\xdfy\xe3\xa6\x12\xb3\x11S\xdbb\xfcbpq" b"\xf5\x0b\xff\xff"
+            b"\xdfy\xe3\xa6\x12\xb3\x11S\xdbb\xfcbpq\xf5\x0b\xff\xff"
         ),
     },
     service_uuids=[
diff --git a/tests/components/mobile_app/test_notify.py b/tests/components/mobile_app/test_notify.py
index 5ce010eee408ab..23e2530c70aa6b 100644
--- a/tests/components/mobile_app/test_notify.py
+++ b/tests/components/mobile_app/test_notify.py
@@ -143,7 +143,7 @@ async def test_notify_works(
 ) -> None:
     """Test notify works."""
     assert hass.services.has_service("notify", "mobile_app_test") is True
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -191,7 +191,7 @@ async def test_notify_ws_works(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -212,7 +212,7 @@ async def test_notify_ws_works(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 2"}, blocking=True
     )
 
@@ -271,7 +271,7 @@ async def test_notify_ws_confirming_works(
     assert sub_result["success"]
 
     # Sent a message that will be delivered locally
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world"}, blocking=True
     )
 
@@ -359,23 +359,24 @@ async def test_notify_ws_not_confirming(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 1"}, blocking=True
     )
 
     with patch(
         "homeassistant.components.mobile_app.push_notification.PUSH_CONFIRM_TIMEOUT", 0
     ):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "notify", "mobile_app_test", {"message": "Hello world 2"}, blocking=True
         )
         await hass.async_block_till_done()
+        await hass.async_block_till_done()
 
     # When we fail, all unconfirmed ones and failed one are sent via cloud
     assert len(aioclient_mock.mock_calls) == 2
 
     # All future ones also go via cloud
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify", "mobile_app_test", {"message": "Hello world 3"}, blocking=True
     )
 
@@ -389,7 +390,7 @@ async def test_local_push_only(
 ) -> None:
     """Test a local only push registration."""
     with pytest.raises(HomeAssistantError) as e_info:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             "notify",
             "mobile_app_websocket_push_name",
             {"message": "Not connected"},
@@ -411,7 +412,7 @@ async def test_local_push_only(
     sub_result = await client.receive_json()
     assert sub_result["success"]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         "notify",
         "mobile_app_websocket_push_name",
         {"message": "Hello world 1"},
diff --git a/tests/components/mobile_app/test_webhook.py b/tests/components/mobile_app/test_webhook.py
index 02c9ace7cd4760..ce1dc19319aa78 100644
--- a/tests/components/mobile_app/test_webhook.py
+++ b/tests/components/mobile_app/test_webhook.py
@@ -1026,15 +1026,19 @@ async def test_webhook_handle_conversation_process(
     """Test that we can converse."""
     webhook_client.server.app.router._frozen = False
 
-    resp = await webhook_client.post(
-        "/api/webhook/{}".format(create_registrations[1]["webhook_id"]),
-        json={
-            "type": "conversation_process",
-            "data": {
-                "text": "Turn the kitchen light off",
+    with patch(
+        "homeassistant.components.conversation.AgentManager.async_get_agent",
+        return_value=mock_agent,
+    ):
+        resp = await webhook_client.post(
+            "/api/webhook/{}".format(create_registrations[1]["webhook_id"]),
+            json={
+                "type": "conversation_process",
+                "data": {
+                    "text": "Turn the kitchen light off",
+                },
             },
-        },
-    )
+        )
 
     assert resp.status == HTTPStatus.OK
     json = await resp.json()
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index 7a069234045866..2daf722bb0573a 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -705,7 +705,6 @@ async def test_pymodbus_connect_fail(
     ExceptionMessage = "test connect exception"
     mock_pymodbus.connect.side_effect = ModbusException(ExceptionMessage)
     assert await async_setup_component(hass, DOMAIN, config) is True
-    assert ExceptionMessage in caplog.text
 
 
 async def test_delay(
diff --git a/tests/components/moon/test_sensor.py b/tests/components/moon/test_sensor.py
index 164e5ddace5137..922febed3bfa19 100644
--- a/tests/components/moon/test_sensor.py
+++ b/tests/components/moon/test_sensor.py
@@ -60,14 +60,14 @@ async def test_moon_day(
     assert state.attributes[ATTR_FRIENDLY_NAME] == "Moon Phase"
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.ENUM
     assert state.attributes[ATTR_OPTIONS] == [
+        STATE_NEW_MOON,
+        STATE_WAXING_CRESCENT,
         STATE_FIRST_QUARTER,
+        STATE_WAXING_GIBBOUS,
         STATE_FULL_MOON,
+        STATE_WANING_GIBBOUS,
         STATE_LAST_QUARTER,
-        STATE_NEW_MOON,
         STATE_WANING_CRESCENT,
-        STATE_WANING_GIBBOUS,
-        STATE_WAXING_CRESCENT,
-        STATE_WAXING_GIBBOUS,
     ]
 
     entity_registry = er.async_get(hass)
diff --git a/tests/components/motioneye/test_camera.py b/tests/components/motioneye/test_camera.py
index 8cc64b8ff00638..6972bee35d019b 100644
--- a/tests/components/motioneye/test_camera.py
+++ b/tests/components/motioneye/test_camera.py
@@ -358,7 +358,7 @@ async def test_camera_option_stream_url_template(
         },
         options={
             CONF_STREAM_URL_TEMPLATE: (
-                f"http://127.0.0.1:{stream_server.port}/" "{{ name }}/{{ id }}"
+                f"http://127.0.0.1:{stream_server.port}/{{{{ name }}}}/{{{{ id }}}}"
             )
         },
     )
diff --git a/tests/components/mqtt/conftest.py b/tests/components/mqtt/conftest.py
index 9fe04c459fe690..ebe86c1f1dfb7d 100644
--- a/tests/components/mqtt/conftest.py
+++ b/tests/components/mqtt/conftest.py
@@ -2,7 +2,6 @@
 
 import pytest
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.components.light.conftest import mock_light_profiles  # noqa: F401
 
 
diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
index a30a15d5098739..ee32b7131c4a1a 100644
--- a/tests/components/mqtt/test_alarm_control_panel.py
+++ b/tests/components/mqtt/test_alarm_control_panel.py
@@ -64,7 +64,6 @@
     help_test_unload_config_entry_with_platform,
     help_test_update_with_json_attrs_bad_json,
     help_test_update_with_json_attrs_not_dict,
-    help_test_validate_platform_config,
 )
 
 from tests.common import async_fire_mqtt_message
@@ -131,7 +130,7 @@ def alarm_control_panel_platform_only():
 
 
 @pytest.mark.parametrize(
-    ("config", "valid"),
+    ("hass_config", "valid"),
     [
         (
             {
@@ -170,10 +169,14 @@ def alarm_control_panel_platform_only():
     ],
 )
 async def test_fail_setup_without_state_or_command_topic(
-    hass: HomeAssistant, config, valid
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator, valid
 ) -> None:
     """Test for failing setup with no state or command topic."""
-    assert help_test_validate_platform_config(hass, config) == valid
+    if valid:
+        await mqtt_mock_entry()
+        return
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
 
 
 @pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index c98de3628b8d98..921f46703c2f27 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -984,8 +984,8 @@ async def test_discovery_broken(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test handling of bad discovery message."""
-    data1 = '{ "name": "Beer",' '  "off_delay": -1 }'
-    data2 = '{ "name": "Milk",' '  "state_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "off_delay": -1 }'
+    data2 = '{ "name": "Milk",  "state_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass,
         mqtt_mock_entry,
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index 384f03a317c14c..4a6d1bf64d4f5d 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -27,8 +27,11 @@
     HVACAction,
     HVACMode,
 )
-from homeassistant.components.mqtt.climate import MQTT_CLIMATE_ATTRIBUTES_BLOCKED
-from homeassistant.const import ATTR_TEMPERATURE, Platform
+from homeassistant.components.mqtt.climate import (
+    DEFAULT_INITIAL_TEMPERATURE,
+    MQTT_CLIMATE_ATTRIBUTES_BLOCKED,
+)
+from homeassistant.const import ATTR_TEMPERATURE, Platform, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 
 from .test_common import (
@@ -352,9 +355,6 @@ async def test_set_operation_optimistic(
     assert state.state == "heat"
 
 
-# CONF_POWER_COMMAND_TOPIC, CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE are deprecated,
-# support for CONF_POWER_STATE_TOPIC and CONF_POWER_STATE_TEMPLATE was already removed or never added
-# support was deprecated with release 2023.2 and will be removed with release 2023.8
 @pytest.mark.parametrize(
     "hass_config",
     [
@@ -374,17 +374,134 @@ async def test_set_operation_with_power_command(
     await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "cool"
-    mqtt_mock.async_publish.assert_has_calls(
-        [call("power-command", "ON", 0, False), call("mode-topic", "cool", 0, False)]
-    )
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "cool", 0, False)])
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "off"
-    mqtt_mock.async_publish.assert_has_calls(
-        [call("power-command", "OFF", 0, False), call("mode-topic", "off", 0, False)]
-    )
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "off", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    # the hvac_mode is not updated optimistically as this is not supported
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "ON", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "OFF", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            climate.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"power_command_topic": "power-command", "optimistic": True},),
+        )
+    ],
+)
+async def test_turn_on_and_off_optimistic_with_power_command(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting of turn on/off with power command enabled."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "cool", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    # the hvac_mode is not updated optimistically as this is not supported
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "ON", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    # the hvac_mode is updated optimistically
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+    mqtt_mock.async_publish.assert_has_calls([call("power-command", "OFF", 0, False)])
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("hass_config", "climate_on", "climate_off"),
+    [
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["heat", "cool"]},)
+            ),
+            "heat",
+            None,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["off", "dry"]},)
+            ),
+            None,
+            "off",
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN, DEFAULT_CONFIG, ({"modes": ["off", "cool"]},)
+            ),
+            "cool",
+            "off",
+        ),
+    ],
+)
+async def test_turn_on_and_off_without_power_command(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    climate_on: str | None,
+    climate_off: str | None,
+) -> None:
+    """Test setting of turn on/off with power command enabled."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert climate_on is None or state.state == climate_on
+    if climate_on:
+        mqtt_mock.async_publish.assert_has_calls(
+            [call("mode-topic", climate_on, 0, False)]
+        )
+    else:
+        mqtt_mock.async_publish.assert_has_calls([])
+
+    await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "cool"
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert climate_off is None or state.state == climate_off
+    if climate_off:
+        assert state.state == "off"
+        mqtt_mock.async_publish.assert_has_calls([call("mode-topic", "off", 0, False)])
+    else:
+        assert state.state == "cool"
+        mqtt_mock.async_publish.assert_has_calls([])
     mqtt_mock.async_publish.reset_mock()
 
 
@@ -963,7 +1080,7 @@ async def test_handle_action_received(
     hvac_action = state.attributes.get(ATTR_HVAC_ACTION)
     assert hvac_action is None
     # Redefine actions according to https://developers.home-assistant.io/docs/core/entity/climate/#hvac-action
-    actions = ["off", "heating", "cooling", "drying", "idle", "fan"]
+    actions = ["off", "preheating", "heating", "cooling", "drying", "idle", "fan"]
     assert all(elem in actions for elem in HVACAction)
     for action in actions:
         async_fire_mqtt_message(hass, "action", action)
@@ -1330,6 +1447,9 @@ async def test_get_target_temperature_low_high_with_templates(
                     # By default, just unquote the JSON-strings
                     "value_template": "{{ value_json }}",
                     "action_template": "{{ value_json }}",
+                    "current_humidity_template": "{{ value_json }}",
+                    "current_temperature_template": "{{ value_json }}",
+                    "temperature_state_template": "{{ value_json }}",
                     # Rendering to a bool for aux heat
                     "aux_state_template": "{{ value == 'switchmeon' }}",
                     # Rendering preset_mode
@@ -1474,6 +1594,7 @@ async def test_get_with_templates(
                 climate.DOMAIN: {
                     "name": "test",
                     "mode_command_topic": "mode-topic",
+                    "power_command_topic": "power-topic",
                     "target_humidity_command_topic": "humidity-topic",
                     "temperature_command_topic": "temperature-topic",
                     "temperature_low_command_topic": "temperature-low-topic",
@@ -1493,6 +1614,7 @@ async def test_get_with_templates(
                     ],
                     # Create simple templates
                     "fan_mode_command_template": "fan_mode: {{ value }}",
+                    "power_command_template": "power: {{ value }}",
                     "preset_mode_command_template": "preset_mode: {{ value }}",
                     "mode_command_template": "mode: {{ value }}",
                     "swing_mode_command_template": "swing_mode: {{ value }}",
@@ -1534,13 +1656,38 @@ async def test_set_and_templates(
 
     # Mode
     await common.async_set_hvac_mode(hass, "cool", ENTITY_CLIMATE)
-    mqtt_mock.async_publish.assert_called_once_with(
-        "mode-topic", "mode: cool", 0, False
-    )
+    mqtt_mock.async_publish.assert_any_call("mode-topic", "mode: cool", 0, False)
+    assert mqtt_mock.async_publish.call_count == 1
     mqtt_mock.async_publish.reset_mock()
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == "cool"
 
+    await common.async_set_hvac_mode(hass, "off", ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("mode-topic", "mode: off", 0, False)
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    # Power
+    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("power-topic", "power: ON", 0, False)
+    # Only power command is sent
+    # the mode is not updated when power_command_topic is set
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
+    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    mqtt_mock.async_publish.assert_any_call("power-topic", "power: OFF", 0, False)
+    # Only power command is sent
+    # the mode is not updated when power_command_topic is set
+    assert mqtt_mock.async_publish.call_count == 1
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.state == "off"
+
     # Swing Mode
     await common.async_set_swing_mode(hass, "on", ENTITY_CLIMATE)
     mqtt_mock.async_publish.assert_called_once_with(
@@ -1690,12 +1837,97 @@ async def test_temperature_unit(
     """Test that setting temperature unit converts temperature values."""
     await mqtt_mock_entry()
 
+    state = hass.states.get(ENTITY_CLIMATE)
+    assert state.attributes.get("temperature") == DEFAULT_INITIAL_TEMPERATURE
+    assert state.attributes.get("min_temp") == DEFAULT_MIN_TEMP
+    assert state.attributes.get("max_temp") == DEFAULT_MAX_TEMP
+
     async_fire_mqtt_message(hass, "current_temperature", "77")
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("current_temperature") == 25
 
 
+@pytest.mark.parametrize(
+    ("hass_config", "temperature_unit", "initial", "min", "max", "current"),
+    [
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.CELSIUS,
+            DEFAULT_INITIAL_TEMPERATURE,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MAX_TEMP,
+            25,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.KELVIN,
+            294,
+            280,
+            308,
+            298,
+        ),
+        (
+            help_custom_config(
+                climate.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.FAHRENHEIT,
+            70,
+            45,
+            95,
+            77,
+        ),
+    ],
+)
+async def test_alt_temperature_unit(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    temperature_unit: UnitOfTemperature,
+    initial: float,
+    min: float,
+    max: float,
+    current: float,
+) -> None:
+    """Test deriving the systems temperature unit."""
+    with patch.object(hass.config.units, "temperature_unit", temperature_unit):
+        await mqtt_mock_entry()
+
+        state = hass.states.get(ENTITY_CLIMATE)
+        assert state.attributes.get("temperature") == initial
+        assert state.attributes.get("min_temp") == min
+        assert state.attributes.get("max_temp") == max
+
+        async_fire_mqtt_message(hass, "current_temperature", "77")
+
+        state = hass.states.get(ENTITY_CLIMATE)
+        assert state.attributes.get("current_temperature") == current
+
+
 async def test_setting_attribute_via_mqtt_json_message(
     hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
 ) -> None:
@@ -2050,10 +2282,17 @@ async def test_precision_whole(
         (
             climate.SERVICE_TURN_ON,
             "power_command_topic",
-            None,
+            {},
             "ON",
             None,
         ),
+        (
+            climate.SERVICE_TURN_OFF,
+            "power_command_topic",
+            {},
+            "OFF",
+            None,
+        ),
         (
             climate.SERVICE_SET_HVAC_MODE,
             "mode_command_topic",
diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/test_common.py
index f9df3450c8d5c3..cd1cc7280c60ac 100644
--- a/tests/components/mqtt/test_common.py
+++ b/tests/components/mqtt/test_common.py
@@ -9,17 +9,14 @@
 from unittest.mock import ANY, MagicMock, patch
 
 import pytest
-import voluptuous as vol
 import yaml
 
 from homeassistant import config as module_hass_config
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import debug_info
-from homeassistant.components.mqtt.config_integration import PLATFORM_CONFIG_SCHEMA_BASE
 from homeassistant.components.mqtt.const import MQTT_DISCONNECTED
 from homeassistant.components.mqtt.mixins import MQTT_ATTRIBUTES_BLOCKED
 from homeassistant.components.mqtt.models import PublishPayloadType
-from homeassistant.config import async_log_exception
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -30,7 +27,6 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.generated.mqtt import MQTT
 from homeassistant.helpers import (
-    config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
@@ -38,7 +34,7 @@
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from tests.common import MockConfigEntry, async_fire_mqtt_message
-from tests.typing import MqttMockHAClient, MqttMockHAClientGenerator, MqttMockPahoClient
+from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
 
 DEFAULT_CONFIG_DEVICE_INFO_ID = {
     "identifiers": ["helloworld"],
@@ -70,8 +66,6 @@
 _AttributesType = list[tuple[str, Any]]
 _StateDataType = list[tuple[_MqttMessageType, str | None, _AttributesType | None]]
 
-MQTT_YAML_SCHEMA = vol.Schema({mqtt.DOMAIN: PLATFORM_CONFIG_SCHEMA_BASE})
-
 
 def help_all_subscribe_calls(mqtt_client_mock: MqttMockPahoClient) -> list[Any]:
     """Test of a call."""
@@ -82,53 +76,6 @@ def help_all_subscribe_calls(mqtt_client_mock: MqttMockPahoClient) -> list[Any]:
     return all_calls
 
 
-def help_test_validate_platform_config(
-    hass: HomeAssistant, config: ConfigType
-) -> ConfigType | None:
-    """Test the schema validation."""
-    try:
-        # validate the schema
-        MQTT_YAML_SCHEMA(config)
-        return True
-    except vol.Error as exc:
-        # log schema exceptions
-        async_log_exception(exc, mqtt.DOMAIN, config, hass)
-        return False
-
-
-async def help_setup_component(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator | None,
-    domain: str,
-    config: ConfigType,
-    use_discovery: bool = False,
-) -> MqttMockHAClient | None:
-    """Help to set up the MQTT component."""
-    # `async_setup_component` will call `async_setup` and
-    # after that it will also start the entry `async_start_entry`
-    # when `async_setup` removed mqtt_mock_entry_with_no_config should be awaited.
-
-    if use_discovery:
-        comp_config = cv.ensure_list(config[mqtt.DOMAIN][domain])
-        item = 0
-        assert mqtt_mock_entry is not None
-        mqtt_mock = await mqtt_mock_entry()
-        for comp in comp_config:
-            item += 1
-            topic = f"homeassistant/{domain}/item_{item}/config"
-            async_fire_mqtt_message(hass, topic, json.dumps(comp))
-        await hass.async_block_till_done()
-    else:
-        entry = MockConfigEntry(
-            domain=mqtt.DOMAIN, data={mqtt.CONF_BROKER: "test-broker"}
-        )
-        entry.add_to_hass(hass)
-        with patch("homeassistant.config.load_yaml_config_file", return_value=config):
-            await entry.async_setup(hass)
-        mqtt_mock = None
-    return mqtt_mock
-
-
 def help_custom_config(
     mqtt_entity_domain: str,
     mqtt_base_config: ConfigType,
@@ -189,7 +136,7 @@ async def help_test_availability_without_topic(
 
 async def help_test_default_availability_payload(
     hass: HomeAssistant,
-    mqtt_mock_entry_with_no_config: MqttMockHAClientGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
     domain: str,
     config: ConfigType,
     no_assumed_state: bool = False,
@@ -204,7 +151,8 @@ async def help_test_default_availability_payload(
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
 
-    await help_setup_component(hass, mqtt_mock_entry_with_no_config, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -252,7 +200,8 @@ async def help_test_default_availability_list_payload(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -313,7 +262,8 @@ async def help_test_default_availability_list_payload_all(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -375,7 +325,8 @@ async def help_test_default_availability_list_payload_any(
         {"topic": "availability-topic1"},
         {"topic": "availability-topic2"},
     ]
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -428,10 +379,14 @@ async def help_test_default_availability_list_single(
         {"topic": "availability-topic1"},
     ]
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
-    help_test_validate_platform_config(hass, config)
+
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={mqtt.CONF_BROKER: "test-broker"})
+    entry.add_to_hass(hass)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await entry.async_setup(hass)
 
     assert (
-        "Invalid config for [mqtt]: two or more values in the same group of exclusion 'availability'"
+        "two or more values in the same group of exclusion 'availability'"
         in caplog.text
     )
 
@@ -454,7 +409,8 @@ async def help_test_custom_availability_payload(
     config[mqtt.DOMAIN][domain]["availability_topic"] = "availability-topic"
     config[mqtt.DOMAIN][domain]["payload_available"] = "good"
     config[mqtt.DOMAIN][domain]["payload_not_available"] = "nogood"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     state = hass.states.get(f"{domain}.test")
     assert state and state.state == STATE_UNAVAILABLE
@@ -574,7 +530,8 @@ async def help_test_setting_attribute_via_mqtt_json_message(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", '{ "val": "100" }')
     state = hass.states.get(f"{domain}.test")
@@ -631,7 +588,8 @@ async def help_test_setting_attribute_with_template(
     config[mqtt.DOMAIN][domain][
         "json_attributes_template"
     ] = "{{ value_json['Timer1'] | tojson }}"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(
         hass, "attr-topic", json.dumps({"Timer1": {"Arm": 0, "Time": "22:18"}})
@@ -657,7 +615,8 @@ async def help_test_update_with_json_attrs_not_dict(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", '[ "list", "of", "things"]')
     state = hass.states.get(f"{domain}.test")
@@ -680,7 +639,8 @@ async def help_test_update_with_json_attrs_bad_json(
     # Add JSON attributes settings to config
     config = copy.deepcopy(config)
     config[mqtt.DOMAIN][domain]["json_attributes_topic"] = "attr-topic"
-    await help_setup_component(hass, mqtt_mock_entry, domain, config)
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        await mqtt_mock_entry()
 
     async_fire_mqtt_message(hass, "attr-topic", "This is not JSON")
 
@@ -1177,9 +1137,8 @@ async def help_test_entity_id_update_subscriptions(
     assert len(topics) > 0
     entity_registry = er.async_get(hass)
 
-    mqtt_mock = await help_setup_component(
-        hass, mqtt_mock_entry, domain, config, use_discovery=True
-    )
+    with patch("homeassistant.config.load_yaml_config_file", return_value=config):
+        mqtt_mock = await mqtt_mock_entry()
     assert mqtt_mock is not None
 
     state = hass.states.get(f"{domain}.test")
diff --git a/tests/components/mqtt/test_device_trigger.py b/tests/components/mqtt/test_device_trigger.py
index bcfd55488bc381..9f3b7565332c41 100644
--- a/tests/components/mqtt/test_device_trigger.py
+++ b/tests/components/mqtt/test_device_trigger.py
@@ -3,6 +3,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,15 +18,18 @@
 from .test_common import help_test_unload_config_entry
 
 from tests.common import (
-    assert_lists_same,
     async_fire_mqtt_message,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import MqttMockHAClient, MqttMockHAClientGenerator, WebSocketGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Track calls to a mock service."""
@@ -75,7 +79,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_unknown_triggers(
@@ -122,7 +126,7 @@ async def test_get_unknown_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 async def test_get_non_existing_triggers(
@@ -145,7 +149,7 @@ async def test_get_non_existing_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 @pytest.mark.no_fail_on_log_exception
@@ -196,7 +200,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_update_remove_triggers(
@@ -249,7 +253,7 @@ async def test_update_remove_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers1)
+    assert triggers == unordered(expected_triggers1)
 
     # Update trigger
     async_fire_mqtt_message(hass, "homeassistant/device_automation/bla/config", data2)
@@ -258,7 +262,7 @@ async def test_update_remove_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers2)
+    assert triggers == unordered(expected_triggers2)
 
     # Remove trigger
     async_fire_mqtt_message(hass, "homeassistant/device_automation/bla/config", "")
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 8d3c43744fcf51..f35af9fb0378ea 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -1115,7 +1115,6 @@ async def test_discovery_expansion_2(
 
 
 @patch("homeassistant.components.mqtt.PLATFORMS", [Platform.SWITCH])
-@pytest.mark.no_fail_on_log_exception
 async def test_discovery_expansion_3(
     hass: HomeAssistant,
     mqtt_mock_entry: MqttMockHAClientGenerator,
@@ -1146,10 +1145,7 @@ async def test_discovery_expansion_3(
     assert hass.states.get("switch.DiscoveryExpansionTest1") is None
     # Make sure the malformed availability data does not trip up discovery by asserting
     # there are schema valdiation errors in the log
-    assert (
-        "voluptuous.error.MultipleInvalid: expected a dictionary @ data['availability'][0]"
-        in caplog.text
-    )
+    assert "expected a dictionary @ data['availability'][0]" in caplog.text
 
 
 async def test_discovery_expansion_without_encoding_and_value_template_1(
diff --git a/tests/components/mqtt/test_fan.py b/tests/components/mqtt/test_fan.py
index c274c18bec095d..c4181a3f885b22 100644
--- a/tests/components/mqtt/test_fan.py
+++ b/tests/components/mqtt/test_fan.py
@@ -97,10 +97,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['fan'][0]['command_topic']"
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/mqtt/test_humidifier.py b/tests/components/mqtt/test_humidifier.py
index 90b2e6d5ba6fda..1c386b28703bca 100644
--- a/tests/components/mqtt/test_humidifier.py
+++ b/tests/components/mqtt/test_humidifier.py
@@ -8,12 +8,15 @@
 
 from homeassistant.components import humidifier, mqtt
 from homeassistant.components.humidifier import (
+    ATTR_CURRENT_HUMIDITY,
     ATTR_HUMIDITY,
     ATTR_MODE,
     DOMAIN,
     SERVICE_SET_HUMIDITY,
     SERVICE_SET_MODE,
+    HumidifierAction,
 )
+from homeassistant.components.mqtt.const import CONF_CURRENT_HUMIDITY_TOPIC
 from homeassistant.components.mqtt.humidifier import (
     CONF_MODE_COMMAND_TOPIC,
     CONF_MODE_STATE_TOPIC,
@@ -139,10 +142,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['humidifier'][0]['command_topic']. Got None"
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -152,8 +152,10 @@ async def test_fail_setup_if_no_command_topic(
             mqtt.DOMAIN: {
                 humidifier.DOMAIN: {
                     "name": "test",
+                    "action_topic": "action-topic",
                     "state_topic": "state-topic",
                     "command_topic": "command-topic",
+                    "current_humidity_topic": "current-humidity-topic",
                     "payload_off": "StAtE_OfF",
                     "payload_on": "StAtE_On",
                     "target_humidity_state_topic": "humidity-state-topic",
@@ -186,14 +188,17 @@ async def test_controlling_state_via_topic(
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
     assert not state.attributes.get(ATTR_ASSUMED_STATE)
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "state-topic", "StAtE_On")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_ON
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "state-topic", "StAtE_OfF")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_OFF
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
 
     async_fire_mqtt_message(hass, "humidity-state-topic", "0")
     state = hass.states.get("humidifier.test")
@@ -223,6 +228,26 @@ async def test_controlling_state_via_topic(
     assert "not a valid mode" in caplog.text
     caplog.clear()
 
+    async_fire_mqtt_message(hass, "current-humidity-topic", "48")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "101")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "-1.6")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 48
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "43.6")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 44
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", "invalid")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 44
+
     async_fire_mqtt_message(hass, "mode-state-topic", "auto")
     state = hass.states.get("humidifier.test")
     assert state.attributes.get(humidifier.ATTR_MODE) == "auto"
@@ -250,6 +275,34 @@ async def test_controlling_state_via_topic(
     async_fire_mqtt_message(hass, "state-topic", "None")
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
+
+    # Turn un the humidifier
+    async_fire_mqtt_message(hass, "state-topic", "StAtE_On")
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_ON
+    assert not state.attributes.get(humidifier.ATTR_ACTION)
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.DRYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.DRYING
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.HUMIDIFYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", HumidifierAction.HUMIDIFYING.value)
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", "invalid_action")
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "state-topic", "StAtE_OfF")
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_OFF
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.OFF
 
 
 @pytest.mark.parametrize(
@@ -259,8 +312,10 @@ async def test_controlling_state_via_topic(
             mqtt.DOMAIN: {
                 humidifier.DOMAIN: {
                     "name": "test",
+                    "action_topic": "action-topic",
                     "state_topic": "state-topic",
                     "command_topic": "command-topic",
+                    "current_humidity_topic": "current-humidity-topic",
                     "target_humidity_state_topic": "humidity-state-topic",
                     "target_humidity_command_topic": "humidity-command-topic",
                     "mode_state_topic": "mode-state-topic",
@@ -270,6 +325,8 @@ async def test_controlling_state_via_topic(
                         "eco",
                         "baby",
                     ],
+                    "current_humidity_template": "{{ value_json.val }}",
+                    "action_template": "{{ value_json.val }}",
                     "state_value_template": "{{ value_json.val }}",
                     "target_humidity_state_template": "{{ value_json.val }}",
                     "mode_state_template": "{{ value_json.val }}",
@@ -315,6 +372,22 @@ async def test_controlling_state_via_topic_and_json_message(
     assert state.attributes.get(humidifier.ATTR_HUMIDITY) is None
     caplog.clear()
 
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": 1}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 1
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": 100}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) == 100
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"val": "None"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) is None
+
+    async_fire_mqtt_message(hass, "current-humidity-topic", '{"otherval": 100}')
+    assert state.attributes.get(humidifier.ATTR_CURRENT_HUMIDITY) is None
+    caplog.clear()
+
     async_fire_mqtt_message(hass, "mode-state-topic", '{"val": "low"}')
     assert "not a valid mode" in caplog.text
     caplog.clear()
@@ -343,6 +416,35 @@ async def test_controlling_state_via_topic_and_json_message(
     state = hass.states.get("humidifier.test")
     assert state.state == STATE_UNKNOWN
 
+    # Make sure the humidifier is ON
+    async_fire_mqtt_message(hass, "state-topic", '{"val":"ON"}')
+    state = hass.states.get("humidifier.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "drying"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.DRYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "humidifying"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": null}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"otherval": "idle"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.HUMIDIFYING
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "idle"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.IDLE
+
+    async_fire_mqtt_message(hass, "action-topic", '{"val": "off"}')
+    state = hass.states.get("humidifier.test")
+    assert state.attributes.get(humidifier.ATTR_ACTION) == HumidifierAction.OFF
+
 
 @pytest.mark.parametrize(
     "hass_config",
@@ -749,6 +851,7 @@ async def test_sending_mqtt_commands_and_explicit_optimistic(
         ("state_topic", "ON", None, "on"),
         (CONF_MODE_STATE_TOPIC, "auto", ATTR_MODE, "auto"),
         (CONF_TARGET_HUMIDITY_STATE_TOPIC, "45", ATTR_HUMIDITY, 45),
+        (CONF_CURRENT_HUMIDITY_TOPIC, "39", ATTR_CURRENT_HUMIDITY, 39),
     ],
 )
 async def test_encoding_subscribable_topics(
diff --git a/tests/components/mqtt/test_image.py b/tests/components/mqtt/test_image.py
new file mode 100644
index 00000000000000..d5789880f73e39
--- /dev/null
+++ b/tests/components/mqtt/test_image.py
@@ -0,0 +1,812 @@
+"""The tests for mqtt image component."""
+from base64 import b64encode
+from contextlib import suppress
+from http import HTTPStatus
+import json
+import ssl
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+import respx
+
+from homeassistant.components import image, mqtt
+from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN, Platform
+from homeassistant.core import HomeAssistant
+
+from .test_common import (
+    help_test_availability_when_connection_lost,
+    help_test_availability_without_topic,
+    help_test_custom_availability_payload,
+    help_test_default_availability_payload,
+    help_test_discovery_broken,
+    help_test_discovery_removal,
+    help_test_discovery_update,
+    help_test_discovery_update_attr,
+    help_test_discovery_update_unchanged,
+    help_test_entity_debug_info_message,
+    help_test_entity_device_info_remove,
+    help_test_entity_device_info_update,
+    help_test_entity_device_info_with_connection,
+    help_test_entity_device_info_with_identifier,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+    help_test_reloadable,
+    help_test_setting_attribute_via_mqtt_json_message,
+    help_test_setting_attribute_with_template,
+    help_test_unique_id,
+    help_test_unload_config_entry_with_platform,
+    help_test_update_with_json_attrs_bad_json,
+    help_test_update_with_json_attrs_not_dict,
+)
+
+from tests.common import async_fire_mqtt_message
+from tests.typing import (
+    ClientSessionGenerator,
+    MqttMockHAClientGenerator,
+    MqttMockPahoClient,
+)
+
+DEFAULT_CONFIG = {
+    mqtt.DOMAIN: {image.DOMAIN: {"name": "test", "image_topic": "test_topic"}}
+}
+
+
+@pytest.fixture(autouse=True)
+def image_platform_only():
+    """Only setup the image platform to speed up tests."""
+    with patch("homeassistant.components.mqtt.PLATFORMS", [Platform.IMAGE]):
+        yield
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [{mqtt.DOMAIN: {image.DOMAIN: {"image_topic": "test/image", "name": "Test"}}}],
+)
+async def test_run_image_setup(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test that it fetches the given payload."""
+    topic = "test/image"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"grass")
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                image.DOMAIN: {
+                    "image_topic": "test/image",
+                    "name": "Test",
+                    "image_encoding": "b64",
+                    "content_type": "image/png",
+                }
+            }
+        }
+    ],
+)
+async def test_run_image_b64_encoded(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that it fetches the given encoded payload."""
+    topic = "test/image"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    # Fire incorrect encoded message (utf-8 encoded string)
+    async_fire_mqtt_message(hass, topic, "grass")
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+    assert "Error processing image data received at topic test/image" in caplog.text
+
+    # Fire correctly encoded message (b64 encoded payload)
+    async_fire_mqtt_message(hass, topic, b64encode(b"grass"))
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.read()
+    assert body == b"grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "image_topic": "test/image",
+                    "name": "Test",
+                    "encoding": "utf-8",
+                    "image_encoding": "b64",
+                    "availability": {"topic": "test/image_availability"},
+                }
+            }
+        }
+    ],
+)
+async def test_image_b64_encoded_with_availability(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test availability works if b64 encoding is turned on."""
+    topic = "test/image"
+    topic_availability = "test/image_availability"
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+    # Make sure we are available
+    async_fire_mqtt_message(hass, topic_availability, "online")
+
+    state = hass.states.get("image.test")
+    assert state is not None
+    assert state.state == STATE_UNKNOWN
+
+    url = hass.states.get("image.test").attributes["entity_picture"]
+
+    async_fire_mqtt_message(hass, topic, b64encode(b"grass"))
+
+    client = await hass_client_no_auth()
+    resp = await client.get(url)
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "grass"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                }
+            }
+        }
+    ],
+)
+async def test_image_from_url(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    # Test first with invalid URL
+    async_fire_mqtt_message(hass, topic, b"/tmp/test.png")
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    assert "Invalid image URL" in caplog.text
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 1
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    # Check the image is not refetched
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 1
+
+    # Check the image is refetched when receiving a new message on the URL topic
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+    assert respx.get("http://localhost/test.png").call_count == 2
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                    "url_template": "{{ value_json.val }}",
+                }
+            }
+        }
+    ],
+)
+async def test_image_from_url_with_template(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type="image/png", content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, '{"val": "http://localhost/test.png"}')
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK
+    body = await resp.text()
+    assert body == "milk"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                }
+            }
+        }
+    ],
+)
+@pytest.mark.parametrize(
+    ("content_type", "setup_ok"),
+    [
+        ("image/jpg", True),
+        ("image", True),
+        ("image/png", True),
+        ("text/javascript", False),
+    ],
+)
+async def test_image_from_url_content_type(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    content_type: str,
+    setup_ok: bool,
+) -> None:
+    """Test setup with URL."""
+    respx.get("http://localhost/test.png").respond(
+        status_code=HTTPStatus.OK, content_type=content_type, content=b"milk"
+    )
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    # Test first with invalid URL
+    async_fire_mqtt_message(hass, topic, b"/tmp/test.png")
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00"
+
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.OK if setup_ok else HTTPStatus.SERVICE_UNAVAILABLE
+    if setup_ok:
+        body = await resp.text()
+        assert body == "milk"
+
+    state = hass.states.get("image.test")
+    assert state.state == "2023-04-01T00:00:00+00:00" if setup_ok else STATE_UNKNOWN
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "image": {
+                    "url_topic": "test/image",
+                    "name": "Test",
+                    "encoding": "utf-8",
+                }
+            }
+        }
+    ],
+)
+@pytest.mark.parametrize(
+    "side_effect",
+    [
+        httpx.RequestError("server offline", request=MagicMock()),
+        httpx.TimeoutException,
+        ssl.SSLError,
+    ],
+)
+async def test_image_from_url_fails(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    side_effect: Exception,
+) -> None:
+    """Test setup with minimum configuration."""
+    respx.get("http://localhost/test.png").mock(side_effect=side_effect)
+    topic = "test/image"
+
+    await mqtt_mock_entry()
+
+    state = hass.states.get("image.test")
+    assert state.state == STATE_UNKNOWN
+    access_token = state.attributes["access_token"]
+    assert state.attributes == {
+        "access_token": access_token,
+        "entity_picture": f"/api/image_proxy/image.test?token={access_token}",
+        "friendly_name": "Test",
+    }
+
+    async_fire_mqtt_message(hass, topic, b"http://localhost/test.png")
+
+    await hass.async_block_till_done()
+
+    state = hass.states.get("image.test")
+
+    # The image failed to load, the the last image update is registered
+    # but _last_image was set to `None`
+    assert state.state == "2023-04-01T00:00:00+00:00"
+    client = await hass_client_no_auth()
+    resp = await client.get(state.attributes["entity_picture"])
+    assert resp.status == HTTPStatus.INTERNAL_SERVER_ERROR
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+@pytest.mark.parametrize(
+    ("hass_config", "error_msg"),
+    [
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "url_topic": "test/image",
+                        "content_type": "image/jpg",
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "Option `content_type` can not be used together with `url_topic`",
+        ),
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "url_topic": "test/image",
+                        "image_topic": "test/image-data-topic",
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "two or more values in the same group of exclusion 'image_topic'",
+        ),
+        (
+            {
+                mqtt.DOMAIN: {
+                    "image": {
+                        "name": "Test",
+                        "encoding": "utf-8",
+                    }
+                }
+            },
+            "Invalid config for [mqtt]: Expected one of [`image_topic`, `url_topic`], got none",
+        ),
+    ],
+)
+async def test_image_config_fails(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    error_msg: str,
+) -> None:
+    """Test setup with minimum configuration."""
+    with suppress(AssertionError):
+        await mqtt_mock_entry()
+    assert error_msg in caplog.text
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_when_connection_lost(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability after MQTT disconnection."""
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_mock_entry, image.DOMAIN
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_without_topic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability without defined availability topic."""
+    await help_test_availability_without_topic(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_default_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by default payload with defined topic."""
+    await help_test_default_availability_payload(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_custom_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by custom payload with defined topic."""
+    await help_test_custom_availability_payload(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_via_mqtt_json_message(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_attribute_with_template(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_with_template(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_update_with_json_attrs_not_dict(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_not_dict(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_update_with_json_attrs_bad_json(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_bad_json(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_discovery_update_attr(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered MQTTAttributes."""
+    await help_test_discovery_update_attr(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                image.DOMAIN: [
+                    {
+                        "name": "Test 1",
+                        "image_topic": "test-topic",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                    {
+                        "name": "Test 2",
+                        "image_topic": "test-topic",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                ]
+            }
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test unique id option only creates one image per unique_id."""
+    await help_test_unique_id(hass, mqtt_mock_entry, image.DOMAIN)
+
+
+async def test_discovery_removal_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test removal of discovered image."""
+    data = json.dumps(DEFAULT_CONFIG[mqtt.DOMAIN][image.DOMAIN])
+    await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, image.DOMAIN, data)
+
+
+async def test_discovery_update_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered image."""
+    config1 = {"name": "Beer", "image_topic": "test_topic"}
+    config2 = {"name": "Milk", "image_topic": "test_topic"}
+
+    await help_test_discovery_update(
+        hass, mqtt_mock_entry, caplog, image.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_image(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered image."""
+    data1 = '{ "name": "Beer", "image_topic": "test_topic"}'
+    with patch(
+        "homeassistant.components.mqtt.image.MqttImage.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass,
+            mqtt_mock_entry,
+            caplog,
+            image.DOMAIN,
+            data1,
+            discovery_update,
+        )
+
+
+@pytest.mark.no_fail_on_log_exception
+async def test_discovery_broken(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test handling of bad discovery message."""
+    data1 = '{ "name": "Beer" }'
+    data2 = '{ "name": "Milk", "image_topic": "test_topic"}'
+
+    await help_test_discovery_broken(
+        hass, mqtt_mock_entry, caplog, image.DOMAIN, data1, data2
+    )
+
+
+async def test_entity_device_info_with_connection(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT image device registry integration."""
+    await help_test_entity_device_info_with_connection(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_with_identifier(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT image device registry integration."""
+    await help_test_entity_device_info_with_identifier(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry update."""
+    await help_test_entity_device_info_update(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_remove(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry remove."""
+    await help_test_entity_device_info_remove(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_id_update_subscriptions(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    await help_test_entity_id_update_subscriptions(
+        hass,
+        mqtt_mock_entry,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+        ["test_topic"],
+    )
+
+
+async def test_entity_id_update_discovery_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT discovery update when entity_id is updated."""
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock_entry, image.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_debug_info_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT debug info."""
+    await help_test_entity_debug_info_message(
+        hass,
+        mqtt_mock_entry,
+        image.DOMAIN,
+        DEFAULT_CONFIG,
+        None,
+        state_topic="test_topic",
+        state_payload=b"ON",
+    )
+
+
+async def test_reloadable(
+    hass: HomeAssistant,
+    mqtt_client_mock: MqttMockPahoClient,
+) -> None:
+    """Test reloading the MQTT platform."""
+    domain = image.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_reloadable(hass, mqtt_client_mock, domain, config)
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_manual_entity_from_yaml(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setup manual configured MQTT entity."""
+    await mqtt_mock_entry()
+    platform = image.DOMAIN
+    assert hass.states.get(f"{platform}.test")
+
+
+async def test_unload_entry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test unloading the config entry."""
+    domain = image.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_unload_config_entry_with_platform(
+        hass, mqtt_mock_entry, domain, config
+    )
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index fa8d2e42dda4cb..eee1d00613732e 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -1,7 +1,6 @@
 """The tests for the MQTT component."""
 import asyncio
 from collections.abc import Generator
-import copy
 from datetime import datetime, timedelta
 from functools import partial
 import json
@@ -23,6 +22,8 @@
     EVENT_HOMEASSISTANT_STARTED,
     EVENT_HOMEASSISTANT_STOP,
     SERVICE_RELOAD,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
     Platform,
     UnitOfTemperature,
 )
@@ -36,7 +37,7 @@
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
-from .test_common import help_all_subscribe_calls, help_test_validate_platform_config
+from .test_common import help_all_subscribe_calls
 
 from tests.common import (
     MockConfigEntry,
@@ -2065,50 +2066,52 @@ def _callback(args) -> None:
     assert callbacks[0].payload == "test-payload"
 
 
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                "light": {
+                    "platform": "mqtt",
+                    "name": "test",
+                    "command_topic": "test-topic",
+                }
+            }
+        }
+    ],
+)
 @patch("homeassistant.components.mqtt.PLATFORMS", [])
 async def test_setup_manual_mqtt_with_platform_key(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test set up a manual MQTT item with a platform key."""
-    config = {
-        mqtt.DOMAIN: {
-            "light": {
-                "platform": "mqtt",
-                "name": "test",
-                "command_topic": "test-topic",
-            }
-        }
-    }
-    help_test_validate_platform_config(hass, config)
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
     assert (
         "Invalid config for [mqtt]: [platform] is an invalid option for [mqtt]"
         in caplog.text
     )
 
 
+@pytest.mark.parametrize("hass_config", [{mqtt.DOMAIN: {"light": {"name": "test"}}}])
+@pytest.mark.xfail(reason="Invalid config for [mqtt]: required key not provided")
 @patch("homeassistant.components.mqtt.PLATFORMS", [])
 async def test_setup_manual_mqtt_with_invalid_config(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test set up a manual MQTT item with an invalid config."""
-    config = {mqtt.DOMAIN: {"light": {"name": "test"}}}
-    help_test_validate_platform_config(hass, config)
+    with pytest.raises(AssertionError):
+        await mqtt_mock_entry()
     assert (
         "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']."
         " Got None. (See ?, line ?)" in caplog.text
     )
 
 
-@patch("homeassistant.components.mqtt.PLATFORMS", [])
-async def test_setup_manual_mqtt_empty_platform(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test set up a manual MQTT platform without items."""
-    config: ConfigType = {mqtt.DOMAIN: {"light": []}}
-    help_test_validate_platform_config(hass, config)
-    assert "voluptuous.error.MultipleInvalid" not in caplog.text
-
-
 @patch("homeassistant.components.mqtt.PLATFORMS", [])
 @pytest.mark.parametrize(
     ("mqtt_config_entry_data", "protocol"),
@@ -3468,31 +3471,6 @@ async def async_mqtt_connected_async(status: bool) -> None:
     assert mqtt_connected_calls_async[1] is False
 
 
-# Test existence of removed YAML configuration under the platform key
-# This warning and test is to be removed from HA core 2023.6
-async def test_one_deprecation_warning_per_platform(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test a deprecation warning is is logged once per platform."""
-    platform = "light"
-    config = {"platform": "mqtt", "command_topic": "test-topic"}
-    config1 = copy.deepcopy(config)
-    config1["name"] = "test1"
-    config2 = copy.deepcopy(config)
-    config2["name"] = "test2"
-    await async_setup_component(hass, platform, {platform: [config1, config2]})
-    count = 0
-    for record in caplog.records:
-        if record.levelname == "ERROR" and (
-            f"Manually configured MQTT {platform}(s) found under platform key '{platform}'"
-            in record.message
-        ):
-            count += 1
-    assert count == 1
-
-
 @patch("homeassistant.components.mqtt.PLATFORMS", [Platform.LIGHT])
 async def test_unload_config_entry(
     hass: HomeAssistant,
@@ -3737,3 +3715,155 @@ def _check_entities() -> int:
     )
     await hass.async_block_till_done()
     assert _check_entities() == 2
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            "mqtt": {
+                "sensor": [
+                    {
+                        "name": "test_manual1",
+                        "unique_id": "test_manual_unique_id123",
+                        "state_topic": "test-topic_manual1",
+                    },
+                    {
+                        "name": "test_manual3",
+                        "unique_id": "test_manual_unique_id789",
+                        "state_topic": "test-topic_manual3",
+                    },
+                ]
+            }
+        }
+    ],
+)
+async def test_reload_config_entry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test manual entities reloaded and set up correctly."""
+    await mqtt_mock_entry()
+
+    # set up item through discovery
+    config_discovery = {
+        "name": "test_discovery",
+        "unique_id": "test_discovery_unique456",
+        "state_topic": "test-topic_discovery",
+    }
+    async_fire_mqtt_message(
+        hass, "homeassistant/sensor/bla/config", json.dumps(config_discovery)
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    assert hass.states.get("sensor.test_discovery") is not None
+
+    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
+
+    def _check_entities() -> int:
+        entities: list[Entity] = []
+        mqtt_platforms = async_get_platforms(hass, mqtt.DOMAIN)
+        for mqtt_platform in mqtt_platforms:
+            assert mqtt_platform.config_entry is entry
+            entities += (entity for entity in mqtt_platform.entities.values())
+
+        return len(entities)
+
+    # assert on initial set up manual items
+
+    async_fire_mqtt_message(hass, "test-topic_manual1", "manual1_intial")
+    async_fire_mqtt_message(hass, "test-topic_manual3", "manual3_intial")
+
+    assert (state := hass.states.get("sensor.test_manual1")) is not None
+    assert state.attributes["friendly_name"] == "test_manual1"
+    assert state.state == "manual1_intial"
+    assert (state := hass.states.get("sensor.test_manual3")) is not None
+    assert state.attributes["friendly_name"] == "test_manual3"
+    assert state.state == "manual3_intial"
+    assert _check_entities() == 3
+
+    # Reload the entry with a new configuration.yaml
+    # Mock configuration.yaml was updated
+    # The first item was updated, a new item was added, an item was removed
+    hass_config_new = {
+        "mqtt": {
+            "sensor": [
+                {
+                    "name": "test_manual1_updated",
+                    "unique_id": "test_manual_unique_id123",
+                    "state_topic": "test-topic_manual1_updated",
+                },
+                {
+                    "name": "test_manual2_new",
+                    "unique_id": "test_manual_unique_id456",
+                    "state_topic": "test-topic_manual2",
+                },
+            ]
+        }
+    }
+    with patch(
+        "homeassistant.config.load_yaml_config_file", return_value=hass_config_new
+    ):
+        assert await hass.config_entries.async_reload(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+        await hass.async_block_till_done()
+
+    assert (state := hass.states.get("sensor.test_manual1")) is not None
+    assert state.attributes["friendly_name"] == "test_manual1_updated"
+    assert state.state == STATE_UNKNOWN
+    assert (state := hass.states.get("sensor.test_manual2_new")) is not None
+    assert state.attributes["friendly_name"] == "test_manual2_new"
+    assert state.state is STATE_UNKNOWN
+    # State of test_manual3 is still loaded but is unavailable
+    assert (state := hass.states.get("sensor.test_manual3")) is not None
+    assert state.state is STATE_UNAVAILABLE
+    assert (state := hass.states.get("sensor.test_discovery")) is not None
+    assert state.state is STATE_UNAVAILABLE
+    # The entity is not loaded anymore
+    assert _check_entities() == 2
+
+    async_fire_mqtt_message(hass, "test-topic_manual1_updated", "manual1_update")
+    async_fire_mqtt_message(hass, "test-topic_manual2", "manual2_update")
+    async_fire_mqtt_message(hass, "test-topic_manual3", "manual3_update")
+
+    assert (state := hass.states.get("sensor.test_manual1")) is not None
+    assert state.state == "manual1_update"
+    assert (state := hass.states.get("sensor.test_manual2_new")) is not None
+    assert state.state == "manual2_update"
+    assert (state := hass.states.get("sensor.test_manual3")) is not None
+    assert state.state is STATE_UNAVAILABLE
+
+    # Reload manual configured items and assert again
+    with patch(
+        "homeassistant.config.load_yaml_config_file", return_value=hass_config_new
+    ):
+        await hass.services.async_call(
+            "mqtt",
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    assert (state := hass.states.get("sensor.test_manual1")) is not None
+    assert state.attributes["friendly_name"] == "test_manual1_updated"
+    assert state.state == STATE_UNKNOWN
+    assert (state := hass.states.get("sensor.test_manual2_new")) is not None
+    assert state.attributes["friendly_name"] == "test_manual2_new"
+    assert state.state == STATE_UNKNOWN
+    assert (state := hass.states.get("sensor.test_manual3")) is not None
+    assert state.state == STATE_UNAVAILABLE
+    assert _check_entities() == 2
+
+    async_fire_mqtt_message(
+        hass, "test-topic_manual1_updated", "manual1_update_after_reload"
+    )
+    async_fire_mqtt_message(hass, "test-topic_manual2", "manual2_update_after_reload")
+    async_fire_mqtt_message(hass, "test-topic_manual3", "manual3_update_after_reload")
+
+    assert (state := hass.states.get("sensor.test_manual1")) is not None
+    assert state.state == "manual1_update_after_reload"
+    assert (state := hass.states.get("sensor.test_manual2_new")) is not None
+    assert state.state == "manual2_update_after_reload"
+    assert (state := hass.states.get("sensor.test_manual3")) is not None
+    assert state.state is STATE_UNAVAILABLE
diff --git a/tests/components/mqtt/test_legacy_vacuum.py b/tests/components/mqtt/test_legacy_vacuum.py
index bf10a692b7c68d..0297f4216c4d63 100644
--- a/tests/components/mqtt/test_legacy_vacuum.py
+++ b/tests/components/mqtt/test_legacy_vacuum.py
@@ -769,8 +769,8 @@ async def test_discovery_broken(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test handling of bad discovery message."""
-    data1 = '{ "name": "Beer",' '  "command_topic": "test_topic#" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "command_topic": "test_topic#" }'
+    data2 = '{ "name": "Milk",  "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, vacuum.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_light.py b/tests/components/mqtt/test_light.py
index 22330d65c2a172..ee4f170e8e675d 100644
--- a/tests/components/mqtt/test_light.py
+++ b/tests/components/mqtt/test_light.py
@@ -253,10 +253,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if command fails with command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']. Got None."
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
@@ -2419,9 +2416,7 @@ async def test_discovery_ignores_extra_keys(
     """Test discovery ignores extra keys that are not blocked."""
     await mqtt_mock_entry()
     # inserted `platform` key should be ignored
-    data = (
-        '{ "name": "Beer",' '  "platform": "mqtt",' '  "command_topic": "test_topic"}'
-    )
+    data = '{ "name": "Beer",  "platform": "mqtt",  "command_topic": "test_topic"}'
     async_fire_mqtt_message(hass, "homeassistant/light/bla/config", data)
     await hass.async_block_till_done()
     state = hass.states.get("light.beer")
diff --git a/tests/components/mqtt/test_light_json.py b/tests/components/mqtt/test_light_json.py
index 6c653045aa282b..5a7bedd91e65ad 100644
--- a/tests/components/mqtt/test_light_json.py
+++ b/tests/components/mqtt/test_light_json.py
@@ -198,10 +198,7 @@ async def test_fail_setup_if_no_command_topic(
     """Test if setup fails with no command topic."""
     with pytest.raises(AssertionError):
         await mqtt_mock_entry()
-    assert (
-        "Invalid config for [mqtt]: required key not provided @ data['mqtt']['light'][0]['command_topic']. Got None."
-        in caplog.text
-    )
+    assert "Invalid config for [mqtt]: required key not provided" in caplog.text
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/mqtt/test_light_template.py b/tests/components/mqtt/test_light_template.py
index ba8414e252ab49..4727caca2ccb04 100644
--- a/tests/components/mqtt/test_light_template.py
+++ b/tests/components/mqtt/test_light_template.py
@@ -161,9 +161,9 @@ async def test_setup_fails(
                     "command_topic": "test_light_rgb/set",
                     "command_on_template": "on",
                     "command_off_template": "off",
-                    "red_template": '{{ value.split(",")[4].' 'split("-")[0] }}',
-                    "green_template": '{{ value.split(",")[4].' 'split("-")[1] }}',
-                    "blue_template": '{{ value.split(",")[4].' 'split("-")[2] }}',
+                    "red_template": '{{ value.split(",")[4].split("-")[0] }}',
+                    "green_template": '{{ value.split(",")[4].split("-")[1] }}',
+                    "blue_template": '{{ value.split(",")[4].split("-")[2] }}',
                 }
             }
         }
@@ -416,9 +416,9 @@ async def test_state_brightness_color_effect_temp_change_via_topic(
                     "optimistic": True,
                     "state_template": '{{ value.split(",")[0] }}',
                     "color_temp_template": '{{ value.split(",")[2] }}',
-                    "red_template": '{{ value.split(",")[3].' 'split("-")[0] }}',
-                    "green_template": '{{ value.split(",")[3].' 'split("-")[1] }}',
-                    "blue_template": '{{ value.split(",")[3].' 'split("-")[2] }}',
+                    "red_template": '{{ value.split(",")[3].split("-")[0] }}',
+                    "green_template": '{{ value.split(",")[3].split("-")[1] }}',
+                    "blue_template": '{{ value.split(",")[3].split("-")[2] }}',
                     "effect_template": '{{ value.split(",")[4] }}',
                     "qos": 2,
                 }
diff --git a/tests/components/mqtt/test_lock.py b/tests/components/mqtt/test_lock.py
index 3c878a85f9e1d9..2b77a573bad8c2 100644
--- a/tests/components/mqtt/test_lock.py
+++ b/tests/components/mqtt/test_lock.py
@@ -796,7 +796,7 @@ async def test_discovery_removal_lock(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test removal of discovered lock."""
-    data = '{ "name": "test",' '  "command_topic": "test_topic" }'
+    data = '{ "name": "test", "command_topic": "test_topic" }'
     await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, lock.DOMAIN, data)
 
 
@@ -855,7 +855,7 @@ async def test_discovery_broken(
 ) -> None:
     """Test handling of bad discovery message."""
     data1 = '{ "name": "Beer" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data2 = '{ "name": "Milk", "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, lock.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_number.py b/tests/components/mqtt/test_number.py
index f12f5eca8b6400..f882209139ce52 100644
--- a/tests/components/mqtt/test_number.py
+++ b/tests/components/mqtt/test_number.py
@@ -189,6 +189,14 @@ async def test_value_template(
     state = hass.states.get("number.test_number")
     assert state.state == "10"
 
+    # Assert an empty value from a template is ignored
+    async_fire_mqtt_message(hass, topic, '{"other_val":12}')
+
+    await hass.async_block_till_done()
+
+    state = hass.states.get("number.test_number")
+    assert state.state == "10"
+
     async_fire_mqtt_message(hass, topic, '{"val":20.5}')
 
     await hass.async_block_till_done()
diff --git a/tests/components/mqtt/test_scene.py b/tests/components/mqtt/test_scene.py
index 9c4b5b53be9ecc..4da60d44bb758d 100644
--- a/tests/components/mqtt/test_scene.py
+++ b/tests/components/mqtt/test_scene.py
@@ -180,7 +180,7 @@ async def test_discovery_removal_scene(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test removal of discovered scene."""
-    data = '{ "name": "test",' '  "command_topic": "test_topic" }'
+    data = '{ "name": "test",  "command_topic": "test_topic" }'
     await help_test_discovery_removal(hass, mqtt_mock_entry, caplog, scene.DOMAIN, data)
 
 
@@ -213,7 +213,7 @@ async def test_discovery_update_unchanged_scene(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test update of discovered scene."""
-    data1 = '{ "name": "Beer",' '  "command_topic": "test_topic" }'
+    data1 = '{ "name": "Beer",  "command_topic": "test_topic" }'
     with patch(
         "homeassistant.components.mqtt.scene.MqttScene.discovery_update"
     ) as discovery_update:
@@ -235,7 +235,7 @@ async def test_discovery_broken(
 ) -> None:
     """Test handling of bad discovery message."""
     data1 = '{ "name": "Beer" }'
-    data2 = '{ "name": "Milk",' '  "command_topic": "test_topic" }'
+    data2 = '{ "name": "Milk",  "command_topic": "test_topic" }'
     await help_test_discovery_broken(
         hass, mqtt_mock_entry, caplog, scene.DOMAIN, data1, data2
     )
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 64499f11140dd9..8f2aa754bacf31 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -480,117 +480,44 @@ async def test_setting_sensor_value_via_mqtt_json_message_and_default_current_st
                     "state_class": "total",
                     "state_topic": "test-topic",
                     "unit_of_measurement": "fav unit",
-                    "last_reset_topic": "last-reset-topic",
+                    "last_reset_value_template": "{{ value_json.last_reset }}",
+                    "value_template": "{{ value_json.state }}",
                 }
             }
         }
     ],
 )
-async def test_setting_sensor_last_reset_via_mqtt_message(
-    hass: HomeAssistant,
-    mqtt_mock_entry: MqttMockHAClientGenerator,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the setting of the last_reset property via MQTT."""
-    await mqtt_mock_entry()
-
-    async_fire_mqtt_message(hass, "last-reset-topic", "2020-01-02 08:11:00")
-    state = hass.states.get("sensor.test")
-    assert state.attributes.get("last_reset") == "2020-01-02T08:11:00"
-    assert "'last_reset_topic' must be same as 'state_topic'" in caplog.text
-    assert (
-        "'last_reset_value_template' must be set if 'last_reset_topic' is set"
-        in caplog.text
-    )
-
-
 @pytest.mark.parametrize(
-    "hass_config",
+    ("message", "last_reset", "state"),
     [
-        {
-            mqtt.DOMAIN: {
-                sensor.DOMAIN: {
-                    "name": "test",
-                    "state_class": "total",
-                    "state_topic": "test-topic",
-                    "unit_of_measurement": "fav unit",
-                    "last_reset_topic": "last-reset-topic",
-                }
-            }
-        }
+        (
+            '{ "last_reset": "2020-01-02 08:11:00" }',
+            "2020-01-02T08:11:00",
+            STATE_UNKNOWN,
+        ),
+        (
+            '{ "last_reset": "2020-01-02 08:11:03", "state": 10.0 }',
+            "2020-01-02T08:11:03",
+            "10.0",
+        ),
+        ('{ "last_reset": null, "state": 10.1 }', None, "10.1"),
+        ('{ "last_reset": "", "state": 10.1 }', None, "10.1"),
     ],
 )
-@pytest.mark.parametrize("datestring", ["2020-21-02 08:11:00", "Hello there!"])
-async def test_setting_sensor_bad_last_reset_via_mqtt_message(
+async def test_setting_sensor_last_reset_via_mqtt_json_message(
     hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    datestring,
     mqtt_mock_entry: MqttMockHAClientGenerator,
-) -> None:
-    """Test the setting of the last_reset property via MQTT."""
-    await mqtt_mock_entry()
-
-    async_fire_mqtt_message(hass, "last-reset-topic", datestring)
-    state = hass.states.get("sensor.test")
-    assert state.attributes.get("last_reset") is None
-    assert "Invalid last_reset message" in caplog.text
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                sensor.DOMAIN: {
-                    "name": "test",
-                    "state_class": "total",
-                    "state_topic": "test-topic",
-                    "unit_of_measurement": "fav unit",
-                    "last_reset_topic": "last-reset-topic",
-                }
-            }
-        }
-    ],
-)
-async def test_setting_sensor_empty_last_reset_via_mqtt_message(
-    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
-) -> None:
-    """Test the setting of the last_reset property via MQTT."""
-    await mqtt_mock_entry()
-
-    async_fire_mqtt_message(hass, "last-reset-topic", "")
-    state = hass.states.get("sensor.test")
-    assert state.attributes.get("last_reset") is None
-
-
-@pytest.mark.parametrize(
-    "hass_config",
-    [
-        {
-            mqtt.DOMAIN: {
-                sensor.DOMAIN: {
-                    "name": "test",
-                    "state_class": "total",
-                    "state_topic": "test-topic",
-                    "unit_of_measurement": "fav unit",
-                    "last_reset_topic": "last-reset-topic",
-                    "last_reset_value_template": "{{ value_json.last_reset }}",
-                }
-            }
-        }
-    ],
-)
-async def test_setting_sensor_last_reset_via_mqtt_json_message(
-    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+    message: str,
+    last_reset: str,
+    state: str,
 ) -> None:
     """Test the setting of the value via MQTT with JSON payload."""
     await mqtt_mock_entry()
 
-    async_fire_mqtt_message(
-        hass, "last-reset-topic", '{ "last_reset": "2020-01-02 08:11:00" }'
-    )
-    state = hass.states.get("sensor.test")
-    assert state.attributes.get("last_reset") == "2020-01-02T08:11:00"
+    async_fire_mqtt_message(hass, "test-topic", message)
+    sensor_state = hass.states.get("sensor.test")
+    assert sensor_state.attributes.get("last_reset") == last_reset
+    assert sensor_state.state == state
 
 
 @pytest.mark.parametrize(
@@ -608,19 +535,6 @@ async def test_setting_sensor_last_reset_via_mqtt_json_message(
                 },
             }
         },
-        {
-            mqtt.DOMAIN: {
-                sensor.DOMAIN: {
-                    "name": "test",
-                    "state_class": "total",
-                    "state_topic": "test-topic",
-                    "unit_of_measurement": "kWh",
-                    "value_template": "{{ value_json.value | float / 60000 }}",
-                    "last_reset_value_template": "{{ utcnow().fromtimestamp(value_json.time / 1000, tz=utcnow().tzinfo) }}",
-                    "last_reset_topic": "test-topic",
-                },
-            }
-        },
     ],
 )
 async def test_setting_sensor_last_reset_via_mqtt_json_message_2(
@@ -640,11 +554,6 @@ async def test_setting_sensor_last_reset_via_mqtt_json_message_2(
     state = hass.states.get("sensor.test")
     assert float(state.state) == pytest.approx(0.015796176944444445)
     assert state.attributes.get("last_reset") == "2021-08-19T15:05:00+00:00"
-    assert "'last_reset_topic' must be same as 'state_topic'" not in caplog.text
-    assert (
-        "'last_reset_value_template' must be set if 'last_reset_topic' is set"
-        not in caplog.text
-    )
 
 
 @pytest.mark.parametrize(
@@ -783,10 +692,7 @@ async def test_default_availability_list_single(
 ) -> None:
     """Test availability list and availability_topic are mutually exclusive."""
     await help_test_default_availability_list_single(
-        hass,
-        caplog,
-        sensor.DOMAIN,
-        DEFAULT_CONFIG,
+        hass, caplog, sensor.DOMAIN, DEFAULT_CONFIG
     )
 
 
diff --git a/tests/components/mqtt/test_state_vacuum.py b/tests/components/mqtt/test_state_vacuum.py
index 203f5d55b95258..dd15399f67088b 100644
--- a/tests/components/mqtt/test_state_vacuum.py
+++ b/tests/components/mqtt/test_state_vacuum.py
@@ -112,7 +112,7 @@ async def test_default_supported_features(
     entity = hass.states.get("vacuum.mqtttest")
     entity_features = entity.attributes.get(mqttvacuum.CONF_SUPPORTED_FEATURES, 0)
     assert sorted(services_to_strings(entity_features, SERVICE_TO_STRING)) == sorted(
-        ["start", "stop", "return_home", "battery", "status", "clean_spot"]
+        ["start", "stop", "return_home", "battery", "clean_spot"]
     )
 
 
diff --git a/tests/components/mqtt/test_trigger.py b/tests/components/mqtt/test_trigger.py
index 83868c3387ccf1..97ded1f2294792 100644
--- a/tests/components/mqtt/test_trigger.py
+++ b/tests/components/mqtt/test_trigger.py
@@ -9,7 +9,11 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import async_fire_mqtt_message, async_mock_service, mock_component
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/mqtt/test_water_heater.py b/tests/components/mqtt/test_water_heater.py
new file mode 100644
index 00000000000000..942a2ec87d4e9f
--- /dev/null
+++ b/tests/components/mqtt/test_water_heater.py
@@ -0,0 +1,1109 @@
+"""The tests for the mqtt water heater component."""
+import copy
+import json
+from typing import Any
+from unittest.mock import call, patch
+
+import pytest
+import voluptuous as vol
+
+from homeassistant.components import mqtt, water_heater
+from homeassistant.components.mqtt.water_heater import (
+    MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED,
+)
+from homeassistant.components.water_heater import (
+    ATTR_CURRENT_TEMPERATURE,
+    ATTR_OPERATION_MODE,
+    DEFAULT_MAX_TEMP,
+    DEFAULT_MIN_TEMP,
+    STATE_ECO,
+    STATE_ELECTRIC,
+    STATE_GAS,
+    STATE_HEAT_PUMP,
+    STATE_HIGH_DEMAND,
+    STATE_PERFORMANCE,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, Platform, UnitOfTemperature
+from homeassistant.core import HomeAssistant
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .test_common import (
+    help_custom_config,
+    help_test_availability_when_connection_lost,
+    help_test_availability_without_topic,
+    help_test_custom_availability_payload,
+    help_test_default_availability_payload,
+    help_test_discovery_broken,
+    help_test_discovery_removal,
+    help_test_discovery_update,
+    help_test_discovery_update_attr,
+    help_test_discovery_update_unchanged,
+    help_test_encoding_subscribable_topics,
+    help_test_entity_debug_info_message,
+    help_test_entity_device_info_remove,
+    help_test_entity_device_info_update,
+    help_test_entity_device_info_with_connection,
+    help_test_entity_device_info_with_identifier,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+    help_test_publishing_with_custom_encoding,
+    help_test_reloadable,
+    help_test_setting_attribute_via_mqtt_json_message,
+    help_test_setting_attribute_with_template,
+    help_test_setting_blocked_attribute_via_mqtt_json_message,
+    help_test_unique_id,
+    help_test_unload_config_entry_with_platform,
+    help_test_update_with_json_attrs_bad_json,
+    help_test_update_with_json_attrs_not_dict,
+)
+
+from tests.common import async_fire_mqtt_message
+from tests.components.water_heater import common
+from tests.typing import MqttMockHAClientGenerator, MqttMockPahoClient
+
+ENTITY_WATER_HEATER = "water_heater.test"
+
+
+_DEFAULT_MIN_TEMP_CELSIUS = round(
+    TemperatureConverter.convert(
+        DEFAULT_MIN_TEMP,
+        UnitOfTemperature.FAHRENHEIT,
+        UnitOfTemperature.CELSIUS,
+    ),
+    1,
+)
+_DEFAULT_MAX_TEMP_CELSIUS = round(
+    TemperatureConverter.convert(
+        DEFAULT_MAX_TEMP,
+        UnitOfTemperature.FAHRENHEIT,
+        UnitOfTemperature.CELSIUS,
+    ),
+    1,
+)
+
+
+DEFAULT_CONFIG = {
+    mqtt.DOMAIN: {
+        water_heater.DOMAIN: {
+            "name": "test",
+            "mode_command_topic": "mode-topic",
+            "temperature_command_topic": "temperature-topic",
+        }
+    }
+}
+
+
+@pytest.fixture(autouse=True)
+def water_heater_platform_only():
+    """Only setup the water heater platform to speed up tests."""
+    with patch("homeassistant.components.mqtt.PLATFORMS", [Platform.WATER_HEATER]):
+        yield
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_params(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the initial parameters."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.state == "off"
+    # default water heater min/max temp in celsius
+    assert state.attributes.get("min_temp") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("max_temp") == _DEFAULT_MAX_TEMP_CELSIUS
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_supported_features(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the supported_features."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    support = (
+        WaterHeaterEntityFeature.TARGET_TEMPERATURE
+        | WaterHeaterEntityFeature.OPERATION_MODE
+    )
+
+    assert state.attributes.get("supported_features") == support
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_get_operation_modes(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that the operation list returns the correct modes."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert [
+        STATE_ECO,
+        STATE_ELECTRIC,
+        STATE_GAS,
+        STATE_HEAT_PUMP,
+        STATE_HIGH_DEMAND,
+        STATE_PERFORMANCE,
+        STATE_OFF,
+    ] == state.attributes.get("operation_list")
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_operation_mode_bad_attr_and_state(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test setting operation mode without required attribute."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+    with pytest.raises(vol.Invalid) as excinfo:
+        await common.async_set_operation_mode(hass, None, ENTITY_WATER_HEATER)
+    assert "string value is None for dictionary value @ data['operation_mode']" in str(
+        excinfo.value
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_operation(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting of new operation mode."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+    await common.async_set_operation_mode(hass, "eco", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+    mqtt_mock.async_publish.assert_called_once_with("mode-topic", "eco", 0, False)
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"mode_state_topic": "mode-state"},),
+        )
+    ],
+)
+async def test_set_operation_pessimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting operation mode in pessimistic mode."""
+    await hass.async_block_till_done()
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "unknown"
+
+    await common.async_set_operation_mode(hass, "eco", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "unknown"
+
+    async_fire_mqtt_message(hass, "mode-state", "eco")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+    async_fire_mqtt_message(hass, "mode-state", "bogus mode")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            (
+                {
+                    "mode_state_topic": "mode-state",
+                    "optimistic": True,
+                },
+            ),
+        )
+    ],
+)
+async def test_set_operation_optimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting operation mode in optimistic mode."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "off"
+
+    await common.async_set_operation_mode(hass, "electric", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "electric"
+
+    async_fire_mqtt_message(hass, "mode-state", "performance")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+
+    async_fire_mqtt_message(hass, "mode-state", "bogus mode")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_set_target_temperature(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "performance"
+    mqtt_mock.async_publish.assert_called_once_with(
+        "mode-topic", "performance", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_temperature(
+        hass, temperature=50, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 50
+    mqtt_mock.async_publish.assert_called_once_with(
+        "temperature-topic", "50.0", 0, False
+    )
+
+    # also test directly supplying the operation mode to set_temperature
+    mqtt_mock.async_publish.reset_mock()
+    await common.async_set_temperature(
+        hass, temperature=47, operation_mode="eco", entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+    assert state.attributes.get("temperature") == 47
+    mqtt_mock.async_publish.assert_has_calls(
+        [
+            call("mode-topic", "eco", 0, False),
+            call("temperature-topic", "47.0", 0, False),
+        ]
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"temperature_state_topic": "temperature-state"},),
+        )
+    ],
+)
+async def test_set_target_temperature_pessimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    await common.async_set_temperature(
+        hass, temperature=60, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+
+    async_fire_mqtt_message(hass, "temperature-state", "1701")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1701
+
+    async_fire_mqtt_message(hass, "temperature-state", "not a number")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1701
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"temperature_state_topic": "temperature-state", "optimistic": True},),
+        )
+    ],
+)
+async def test_set_target_temperature_optimistic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setting the target temperature optimistic."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    await common.async_set_operation_mode(hass, "performance", ENTITY_WATER_HEATER)
+    await common.async_set_temperature(
+        hass, temperature=55, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 55
+
+    async_fire_mqtt_message(hass, "temperature-state", "49")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 49
+
+    async_fire_mqtt_message(hass, "temperature-state", "not a number")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 49
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            ({"current_temperature_topic": "current_temperature"},),
+        )
+    ],
+)
+async def test_receive_mqtt_temperature(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test getting the current temperature via MQTT."""
+    await mqtt_mock_entry()
+
+    async_fire_mqtt_message(hass, "current_temperature", "53")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 53
+
+    async_fire_mqtt_message(hass, "current_temperature", "")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert (
+        "Invalid empty payload for attribute _attr_current_temperature, ignoring update"
+        in caplog.text
+    )
+    assert state.attributes.get("current_temperature") == 53
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_when_connection_lost(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability after MQTT disconnection."""
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_mock_entry, water_heater.DOMAIN
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_availability_without_topic(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability without defined availability topic."""
+    await help_test_availability_without_topic(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_default_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by default payload with defined topic."""
+    await help_test_default_availability_payload(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_custom_availability_payload(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test availability by custom payload with defined topic."""
+    await help_test_custom_availability_payload(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: {
+                    "name": "test",
+                    "mode_command_topic": "mode-topic",
+                    "temperature_command_topic": "temperature-topic",
+                    # By default, just unquote the JSON-strings
+                    "value_template": "{{ value_json }}",
+                    "mode_state_template": "{{ value_json.attribute }}",
+                    "temperature_state_template": "{{ value_json }}",
+                    "current_temperature_template": "{{ value_json}}",
+                    "mode_state_topic": "mode-state",
+                    "temperature_state_topic": "temperature-state",
+                    "current_temperature_topic": "current-temperature",
+                }
+            }
+        }
+    ],
+)
+async def test_get_with_templates(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test getting various attributes with templates."""
+    await mqtt_mock_entry()
+
+    # Operation Mode
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    async_fire_mqtt_message(hass, "mode-state", '{"attribute": "eco"}')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "eco"
+
+    # Temperature - with valid value
+    assert state.attributes.get("temperature") is None
+    async_fire_mqtt_message(hass, "temperature-state", '"1031"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 1031
+
+    # Temperature - with invalid value
+    async_fire_mqtt_message(hass, "temperature-state", '"-INVALID-"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    # make sure, the invalid value gets logged...
+    assert "Could not parse temperature_state_template from -INVALID-" in caplog.text
+    # ... but the actual value stays unchanged.
+    assert state.attributes.get("temperature") == 1031
+
+    # Temperature - with JSON null value
+    async_fire_mqtt_message(hass, "temperature-state", "null")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") is None
+
+    # Current temperature
+    async_fire_mqtt_message(hass, "current-temperature", '"74656"')
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 74656
+    # Test resetting the current temperature using a JSON null value
+    async_fire_mqtt_message(hass, "current-temperature", "null")
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") is None
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: {
+                    "name": "test",
+                    "mode_command_topic": "mode-topic",
+                    "temperature_command_topic": "temperature-topic",
+                    # Create simple templates
+                    "mode_command_template": "mode: {{ value }}",
+                    "temperature_command_template": "temp: {{ value }}",
+                }
+            }
+        }
+    ],
+)
+async def test_set_and_templates(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test setting various attributes with templates."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    # Mode
+    await common.async_set_operation_mode(hass, "heat_pump", ENTITY_WATER_HEATER)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "mode-topic", "mode: heat_pump", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.state == "heat_pump"
+
+    # Temperature
+    await common.async_set_temperature(
+        hass, temperature=107, entity_id=ENTITY_WATER_HEATER
+    )
+    mqtt_mock.async_publish.assert_called_once_with(
+        "temperature-topic", "temp: 107.0", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 107
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"min_temp": 70},))],
+)
+async def test_min_temp_custom(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test a custom min temp."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    min_temp = state.attributes.get("min_temp")
+
+    assert isinstance(min_temp, float)
+    assert state.attributes.get("min_temp") == 70
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"max_temp": 220},))],
+)
+async def test_max_temp_custom(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test a custom max temp."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    max_temp = state.attributes.get("max_temp")
+
+    assert isinstance(max_temp, float)
+    assert max_temp == 220
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        help_custom_config(
+            water_heater.DOMAIN,
+            DEFAULT_CONFIG,
+            (
+                {
+                    "temperature_unit": "F",
+                    "current_temperature_topic": "current_temperature",
+                },
+            ),
+        )
+    ],
+)
+async def test_temperature_unit(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting temperature unit converts temperature values."""
+    await mqtt_mock_entry()
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("min_temp") == _DEFAULT_MIN_TEMP_CELSIUS
+    assert state.attributes.get("max_temp") == _DEFAULT_MAX_TEMP_CELSIUS
+
+    async_fire_mqtt_message(hass, "current_temperature", "127")
+
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("current_temperature") == 52.8
+
+
+@pytest.mark.parametrize(
+    ("hass_config", "temperature_unit", "initial", "min_temp", "max_temp", "current"),
+    [
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.CELSIUS,
+            _DEFAULT_MIN_TEMP_CELSIUS,
+            _DEFAULT_MIN_TEMP_CELSIUS,
+            _DEFAULT_MAX_TEMP_CELSIUS,
+            48.9,
+        ),
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.KELVIN,
+            316,
+            316,
+            333,
+            322,
+        ),
+        (
+            help_custom_config(
+                water_heater.DOMAIN,
+                DEFAULT_CONFIG,
+                (
+                    {
+                        "temperature_unit": "F",
+                        "current_temperature_topic": "current_temperature",
+                    },
+                ),
+            ),
+            UnitOfTemperature.FAHRENHEIT,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MIN_TEMP,
+            DEFAULT_MAX_TEMP,
+            120,
+        ),
+    ],
+)
+async def test_alt_temperature_unit(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    temperature_unit: UnitOfTemperature,
+    initial: float,
+    min_temp: float,
+    max_temp: float,
+    current: float,
+) -> None:
+    """Test deriving the systems temperature unit."""
+    with patch.object(hass.config.units, "temperature_unit", temperature_unit):
+        await mqtt_mock_entry()
+
+        state = hass.states.get(ENTITY_WATER_HEATER)
+        assert state.attributes.get("temperature") == initial
+        assert state.attributes.get("min_temp") == min_temp
+        assert state.attributes.get("max_temp") == max_temp
+
+        async_fire_mqtt_message(hass, "current_temperature", "120")
+
+        state = hass.states.get(ENTITY_WATER_HEATER)
+        assert state.attributes.get("current_temperature") == current
+
+
+async def test_setting_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_via_mqtt_json_message(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_setting_blocked_attribute_via_mqtt_json_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_blocked_attribute_via_mqtt_json_message(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+        MQTT_WATER_HEATER_ATTRIBUTES_BLOCKED,
+    )
+
+
+async def test_setting_attribute_with_template(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_attribute_with_template(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_update_with_json_attrs_not_dict(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_not_dict(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_update_with_json_attrs_bad_json(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test attributes get extracted from a JSON result."""
+    await help_test_update_with_json_attrs_bad_json(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+async def test_discovery_update_attr(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered MQTTAttributes."""
+    await help_test_discovery_update_attr(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        water_heater.DOMAIN,
+        DEFAULT_CONFIG,
+    )
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [
+        {
+            mqtt.DOMAIN: {
+                water_heater.DOMAIN: [
+                    {
+                        "name": "Test 1",
+                        "mode_state_topic": "test_topic1/state",
+                        "mode_command_topic": "test_topic1/command",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                    {
+                        "name": "Test 2",
+                        "mode_state_topic": "test_topic2/state",
+                        "mode_command_topic": "test_topic2/command",
+                        "unique_id": "TOTALLY_UNIQUE",
+                    },
+                ]
+            }
+        }
+    ],
+)
+async def test_unique_id(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test unique id option only creates one water heater per unique_id."""
+    await help_test_unique_id(hass, mqtt_mock_entry, water_heater.DOMAIN)
+
+
+@pytest.mark.parametrize(
+    ("topic", "value", "attribute", "attribute_value"),
+    [
+        ("current_temperature_topic", "22.1", ATTR_CURRENT_TEMPERATURE, 22.1),
+        ("mode_state_topic", "eco", ATTR_OPERATION_MODE, None),
+        ("temperature_state_topic", "19.9", ATTR_TEMPERATURE, 19.9),
+    ],
+)
+async def test_encoding_subscribable_topics(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    topic: str,
+    value: str,
+    attribute: str | None,
+    attribute_value: Any,
+) -> None:
+    """Test handling of incoming encoded payload."""
+    config = copy.deepcopy(DEFAULT_CONFIG[mqtt.DOMAIN][water_heater.DOMAIN])
+    await help_test_encoding_subscribable_topics(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        topic,
+        value,
+        attribute,
+        attribute_value,
+    )
+
+
+async def test_discovery_removal_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test removal of discovered water heater."""
+    data = json.dumps(DEFAULT_CONFIG[mqtt.DOMAIN][water_heater.DOMAIN])
+    await help_test_discovery_removal(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, data
+    )
+
+
+async def test_discovery_update_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered water heater."""
+    config1 = {"name": "Beer"}
+    config2 = {"name": "Milk"}
+    await help_test_discovery_update(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_water_heater(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test update of discovered water heater."""
+    data1 = '{ "name": "Beer" }'
+    with patch(
+        "homeassistant.components.mqtt.water_heater.MqttWaterHeater.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass,
+            mqtt_mock_entry,
+            caplog,
+            water_heater.DOMAIN,
+            data1,
+            discovery_update,
+        )
+
+
+@pytest.mark.no_fail_on_log_exception
+async def test_discovery_broken(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test handling of bad discovery message."""
+    data1 = '{ "name": "Beer", "mode_command_topic": "test_topic#" }'
+    data2 = '{ "name": "Milk", "mode_command_topic": "test_topic" }'
+    await help_test_discovery_broken(
+        hass, mqtt_mock_entry, caplog, water_heater.DOMAIN, data1, data2
+    )
+
+
+async def test_entity_device_info_with_connection(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT water heater device registry integration."""
+    await help_test_entity_device_info_with_connection(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_with_identifier(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT water heater device registry integration."""
+    await help_test_entity_device_info_with_identifier(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry update."""
+    await help_test_entity_device_info_update(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_device_info_remove(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test device registry remove."""
+    await help_test_entity_device_info_remove(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_id_update_subscriptions(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = {
+        mqtt.DOMAIN: {
+            water_heater.DOMAIN: {
+                "name": "test",
+                "mode_state_topic": "test-topic",
+                "availability_topic": "avty-topic",
+            }
+        }
+    }
+    await help_test_entity_id_update_subscriptions(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        ["test-topic", "avty-topic"],
+    )
+
+
+async def test_entity_id_update_discovery_update(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT discovery update when entity_id is updated."""
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock_entry, water_heater.DOMAIN, DEFAULT_CONFIG
+    )
+
+
+async def test_entity_debug_info_message(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test MQTT debug info."""
+    config = {
+        mqtt.DOMAIN: {
+            water_heater.DOMAIN: {
+                "name": "test",
+                "mode_command_topic": "command-topic",
+                "mode_state_topic": "test-topic",
+            }
+        }
+    }
+    await help_test_entity_debug_info_message(
+        hass,
+        mqtt_mock_entry,
+        water_heater.DOMAIN,
+        config,
+        water_heater.SERVICE_SET_OPERATION_MODE,
+        command_topic="command-topic",
+        command_payload="eco",
+        state_topic="test-topic",
+        service_parameters={"operation_mode": "eco"},
+    )
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_precision_default(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to tenths works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 23.7
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"precision": 0.5},))],
+)
+async def test_precision_halves(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to halves works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 23.5
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    "hass_config",
+    [help_custom_config(water_heater.DOMAIN, DEFAULT_CONFIG, ({"precision": 1.0},))],
+)
+async def test_precision_whole(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test that setting precision to whole works as intended."""
+    mqtt_mock = await mqtt_mock_entry()
+
+    await common.async_set_temperature(
+        hass, temperature=23.67, entity_id=ENTITY_WATER_HEATER
+    )
+    state = hass.states.get(ENTITY_WATER_HEATER)
+    assert state.attributes.get("temperature") == 24.0
+    mqtt_mock.async_publish.reset_mock()
+
+
+@pytest.mark.parametrize(
+    ("service", "topic", "parameters", "payload", "template"),
+    [
+        (
+            water_heater.SERVICE_SET_OPERATION_MODE,
+            "mode_command_topic",
+            {"operation_mode": "electric"},
+            "electric",
+            "mode_command_template",
+        ),
+        (
+            water_heater.SERVICE_SET_TEMPERATURE,
+            "temperature_command_topic",
+            {"temperature": "20.1"},
+            20.1,
+            "temperature_command_template",
+        ),
+    ],
+)
+async def test_publishing_with_custom_encoding(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+    caplog: pytest.LogCaptureFixture,
+    service: str,
+    topic: str,
+    parameters: dict[str, Any],
+    payload: str,
+    template: str | None,
+) -> None:
+    """Test publishing MQTT payload with different encoding."""
+    domain = water_heater.DOMAIN
+    config = copy.deepcopy(DEFAULT_CONFIG)
+
+    await help_test_publishing_with_custom_encoding(
+        hass,
+        mqtt_mock_entry,
+        caplog,
+        domain,
+        config,
+        service,
+        topic,
+        parameters,
+        payload,
+        template,
+    )
+
+
+async def test_reloadable(
+    hass: HomeAssistant,
+    mqtt_client_mock: MqttMockPahoClient,
+) -> None:
+    """Test reloading the MQTT platform."""
+    domain = water_heater.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_reloadable(hass, mqtt_client_mock, domain, config)
+
+
+@pytest.mark.parametrize("hass_config", [DEFAULT_CONFIG])
+async def test_setup_manual_entity_from_yaml(
+    hass: HomeAssistant, mqtt_mock_entry: MqttMockHAClientGenerator
+) -> None:
+    """Test setup manual configured MQTT entity."""
+    await mqtt_mock_entry()
+    platform = water_heater.DOMAIN
+    assert hass.states.get(f"{platform}.test")
+
+
+async def test_unload_entry(
+    hass: HomeAssistant,
+    mqtt_mock_entry: MqttMockHAClientGenerator,
+) -> None:
+    """Test unloading the config entry."""
+    domain = water_heater.DOMAIN
+    config = DEFAULT_CONFIG
+    await help_test_unload_config_entry_with_platform(
+        hass, mqtt_mock_entry, domain, config
+    )
diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py
index a61ea692bf2e3d..5eabb2202aa2a0 100644
--- a/tests/components/mqtt_eventstream/test_init.py
+++ b/tests/components/mqtt_eventstream/test_init.py
@@ -49,7 +49,7 @@ async def test_setup_no_mqtt(
 async def test_setup_with_pub(hass: HomeAssistant, mqtt_mock: MqttMockHAClient) -> None:
     """Test the setup with subscription."""
     # Should start off with no listeners for all events
-    assert hass.bus.async_listeners().get("*") is None
+    assert not hass.bus.async_listeners().get("*")
 
     assert await add_eventstream(hass, pub_topic="bar")
     await hass.async_block_till_done()
diff --git a/tests/components/mqtt_room/test_sensor.py b/tests/components/mqtt_room/test_sensor.py
index 1d6b2980ab2720..72540f49ca793e 100644
--- a/tests/components/mqtt_room/test_sensor.py
+++ b/tests/components/mqtt_room/test_sensor.py
@@ -17,7 +17,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_mqtt_message
 from tests.typing import MqttMockHAClient
@@ -110,7 +110,7 @@ async def test_room_update(hass: HomeAssistant, mqtt_mock: MqttMockHAClient) ->
     await assert_state(hass, LIVING_ROOM)
     await assert_distance(hass, 1)
 
-    time = dt.utcnow() + datetime.timedelta(seconds=7)
+    time = dt_util.utcnow() + datetime.timedelta(seconds=7)
     with patch("homeassistant.helpers.condition.dt_util.utcnow", return_value=time):
         await send_message(hass, BEDROOM_TOPIC, FAR_MESSAGE)
         await assert_state(hass, BEDROOM)
diff --git a/tests/components/mystrom/__init__.py b/tests/components/mystrom/__init__.py
new file mode 100644
index 00000000000000..8b3e2f8535f2d6
--- /dev/null
+++ b/tests/components/mystrom/__init__.py
@@ -0,0 +1,172 @@
+"""Tests for the myStrom integration."""
+from typing import Any, Optional
+
+
+def get_default_device_response(device_type: int) -> dict[str, Any]:
+    """Return default device response."""
+    return {
+        "version": "2.59.32",
+        "mac": "6001940376EB",
+        "type": device_type,
+        "ssid": "personal",
+        "ip": "192.168.0.23",
+        "mask": "255.255.255.0",
+        "gw": "192.168.0.1",
+        "dns": "192.168.0.1",
+        "static": False,
+        "connected": True,
+        "signal": 94,
+    }
+
+
+def get_default_bulb_state() -> dict[str, Any]:
+    """Get default bulb state."""
+    return {
+        "type": "rgblamp",
+        "battery": False,
+        "reachable": True,
+        "meshroot": True,
+        "on": False,
+        "color": "46;18;100",
+        "mode": "hsv",
+        "ramp": 10,
+        "power": 0.45,
+        "fw_version": "2.58.0",
+    }
+
+
+def get_default_switch_state() -> dict[str, Any]:
+    """Get default switch state."""
+    return {
+        "power": 1.69,
+        "Ws": 0.81,
+        "relay": True,
+        "temperature": 24.87,
+        "version": "2.59.32",
+        "mac": "6001940376EB",
+        "ssid": "personal",
+        "ip": "192.168.0.23",
+        "mask": "255.255.255.0",
+        "gw": "192.168.0.1",
+        "dns": "192.168.0.1",
+        "static": False,
+        "connected": True,
+        "signal": 94,
+    }
+
+
+class MyStromDeviceMock:
+    """Base device mock."""
+
+    def __init__(self, state: dict[str, Any]) -> None:
+        """Initialize device mock."""
+        self._requested_state = False
+        self._state = state
+
+    async def get_state(self) -> None:
+        """Set if state is requested."""
+        self._requested_state = True
+
+
+class MyStromBulbMock(MyStromDeviceMock):
+    """MyStrom Bulb mock."""
+
+    def __init__(self, mac: str, state: dict[str, Any]) -> None:
+        """Initialize bulb mock."""
+        super().__init__(state)
+        self.mac = mac
+
+    @property
+    def firmware(self) -> Optional[str]:
+        """Return current firmware."""
+        if not self._requested_state:
+            return None
+        return self._state["fw_version"]
+
+    @property
+    def consumption(self) -> Optional[float]:
+        """Return current firmware."""
+        if not self._requested_state:
+            return None
+        return self._state["power"]
+
+    @property
+    def color(self) -> Optional[str]:
+        """Return current color settings."""
+        if not self._requested_state:
+            return None
+        return self._state["color"]
+
+    @property
+    def mode(self) -> Optional[str]:
+        """Return current mode."""
+        if not self._requested_state:
+            return None
+        return self._state["mode"]
+
+    @property
+    def transition_time(self) -> Optional[int]:
+        """Return current transition time (ramp)."""
+        if not self._requested_state:
+            return None
+        return self._state["ramp"]
+
+    @property
+    def bulb_type(self) -> Optional[str]:
+        """Return the type of the bulb."""
+        if not self._requested_state:
+            return None
+        return self._state["type"]
+
+    @property
+    def state(self) -> Optional[bool]:
+        """Return the current state of the bulb."""
+        if not self._requested_state:
+            return None
+        return self._state["on"]
+
+
+class MyStromSwitchMock(MyStromDeviceMock):
+    """MyStrom Switch mock."""
+
+    @property
+    def relay(self) -> Optional[bool]:
+        """Return the relay state."""
+        if not self._requested_state:
+            return None
+        return self._state["on"]
+
+    @property
+    def consumption(self) -> Optional[float]:
+        """Return the current power consumption in mWh."""
+        if not self._requested_state:
+            return None
+        return self._state["power"]
+
+    @property
+    def consumedWs(self) -> Optional[float]:
+        """The average of energy consumed per second since last report call."""
+        if not self._requested_state:
+            return None
+        return self._state["Ws"]
+
+    @property
+    def firmware(self) -> Optional[str]:
+        """Return the current firmware."""
+        if not self._requested_state:
+            return None
+        return self._state["version"]
+
+    @property
+    def mac(self) -> Optional[str]:
+        """Return the MAC address."""
+        if not self._requested_state:
+            return None
+        return self._state["mac"]
+
+    @property
+    def temperature(self) -> Optional[float]:
+        """Return the current temperature in celsius."""
+        if not self._requested_state:
+            return None
+        return self._state["temperature"]
diff --git a/tests/components/mystrom/conftest.py b/tests/components/mystrom/conftest.py
new file mode 100644
index 00000000000000..04b8fc221edf81
--- /dev/null
+++ b/tests/components/mystrom/conftest.py
@@ -0,0 +1,37 @@
+"""Provide common mystrom fixtures and mocks."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+DEVICE_NAME = "myStrom Device"
+DEVICE_MAC = "6001940376EB"
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.mystrom.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create and add a config entry."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=DEVICE_MAC,
+        data={CONF_HOST: "1.1.1.1"},
+        title=DEVICE_NAME,
+    )
+    config_entry.add_to_hass(hass)
+    return config_entry
diff --git a/tests/components/mystrom/test_config_flow.py b/tests/components/mystrom/test_config_flow.py
new file mode 100644
index 00000000000000..97823681b8e4ac
--- /dev/null
+++ b/tests/components/mystrom/test_config_flow.py
@@ -0,0 +1,133 @@
+"""Test the myStrom config flow."""
+from unittest.mock import AsyncMock, patch
+
+from pymystrom.exceptions import MyStromConnectionError
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .conftest import DEVICE_MAC
+
+from tests.common import MockConfigEntry
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
+
+
+async def test_form_combined(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 101, "mac": DEVICE_MAC}),
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "myStrom Device"
+    assert result2["data"] == {"host": "1.1.1.1"}
+
+
+async def test_form_duplicates(
+    hass: HomeAssistant, mock_setup_entry: AsyncMock, config_entry: MockConfigEntry
+) -> None:
+    """Test abort on duplicate."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    with patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ) as mock_session:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.ABORT
+    assert result2["reason"] == "already_configured"
+
+    mock_session.assert_called_once()
+
+
+async def test_step_import(hass: HomeAssistant) -> None:
+    """Test the import step."""
+    conf = {
+        CONF_HOST: "1.1.1.1",
+    }
+    with patch("pymystrom.switch.MyStromSwitch.get_state"), patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=conf
+        )
+        await hass.async_block_till_done()
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "myStrom Device"
+    assert result["data"] == {
+        CONF_HOST: "1.1.1.1",
+    }
+
+
+async def test_wong_answer_from_device(hass: HomeAssistant) -> None:
+    """Test handling of wrong answers from the device."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=MyStromConnectionError(),
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["step_id"] == "user"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+    with patch(
+        "pymystrom.get_device_info",
+        return_value={"type": 101, "mac": DEVICE_MAC},
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "myStrom Device"
+    assert result2["data"] == {"host": "1.1.1.1"}
diff --git a/tests/components/mystrom/test_init.py b/tests/components/mystrom/test_init.py
new file mode 100644
index 00000000000000..281d7af9947988
--- /dev/null
+++ b/tests/components/mystrom/test_init.py
@@ -0,0 +1,154 @@
+"""Test the myStrom init."""
+from unittest.mock import AsyncMock, PropertyMock, patch
+
+from pymystrom.exceptions import MyStromConnectionError
+import pytest
+
+from homeassistant.components.mystrom.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import (
+    MyStromBulbMock,
+    MyStromSwitchMock,
+    get_default_bulb_state,
+    get_default_device_response,
+    get_default_switch_state,
+)
+from .conftest import DEVICE_MAC
+
+from tests.common import MockConfigEntry
+
+
+async def init_integration(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    device_type: int,
+) -> None:
+    """Inititialize integration for testing."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value=get_default_device_response(device_type)),
+    ), patch(
+        "homeassistant.components.mystrom._get_mystrom_bulb",
+        return_value=MyStromBulbMock("6001940376EB", get_default_bulb_state()),
+    ), patch(
+        "homeassistant.components.mystrom._get_mystrom_switch",
+        return_value=MyStromSwitchMock(get_default_switch_state()),
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+
+async def test_init_switch_and_unload(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a myStrom switch."""
+    await init_integration(hass, config_entry, 101)
+    state = hass.states.get("switch.mystrom_device")
+    assert state is not None
+    assert config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+    await hass.async_block_till_done()
+    assert config_entry.state is ConfigEntryState.NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+@pytest.mark.parametrize(
+    ("device_type", "platform", "entry_state", "entity_state_none"),
+    [
+        (101, "switch", ConfigEntryState.LOADED, False),
+        (102, "light", ConfigEntryState.LOADED, False),
+        (103, "button", ConfigEntryState.SETUP_ERROR, True),
+        (104, "button", ConfigEntryState.SETUP_ERROR, True),
+        (105, "light", ConfigEntryState.LOADED, False),
+        (106, "switch", ConfigEntryState.LOADED, False),
+        (107, "switch", ConfigEntryState.LOADED, False),
+        (110, "sensor", ConfigEntryState.SETUP_ERROR, True),
+        (113, "switch", ConfigEntryState.SETUP_ERROR, True),
+        (118, "button", ConfigEntryState.SETUP_ERROR, True),
+        (120, "switch", ConfigEntryState.SETUP_ERROR, True),
+    ],
+)
+async def test_init_bulb(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    device_type: int,
+    platform: str,
+    entry_state: ConfigEntryState,
+    entity_state_none: bool,
+) -> None:
+    """Test the initialization of a myStrom bulb."""
+    await init_integration(hass, config_entry, device_type)
+    state = hass.states.get(f"{platform}.mystrom_device")
+    assert (state is None) == entity_state_none
+    assert config_entry.state is entry_state
+
+
+async def test_init_of_unknown_bulb(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a unknown myStrom bulb."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 102, "mac": DEVICE_MAC}),
+    ), patch("pymystrom.bulb.MyStromBulb.get_state", return_value={}), patch(
+        "pymystrom.bulb.MyStromBulb.bulb_type", "new_type"
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.mac",
+        new_callable=PropertyMock,
+        return_value=DEVICE_MAC,
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_ERROR
+
+
+async def test_init_of_unknown_device(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test the initialization of a unsupported myStrom device."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value={"type": 103, "mac": DEVICE_MAC}),
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_ERROR
+
+
+async def test_init_cannot_connect_because_of_device_info(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test error handling for failing get_device_info."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=MyStromConnectionError(),
+    ), patch("pymystrom.switch.MyStromSwitch.get_state", return_value={}), patch(
+        "pymystrom.bulb.MyStromBulb.get_state", return_value={}
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+
+
+async def test_init_cannot_connect_because_of_get_state(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
+    """Test error handling for failing get_state."""
+    with patch(
+        "pymystrom.get_device_info",
+        side_effect=AsyncMock(return_value=get_default_device_response(101)),
+    ), patch(
+        "pymystrom.switch.MyStromSwitch.get_state", side_effect=MyStromConnectionError()
+    ), patch(
+        "pymystrom.bulb.MyStromBulb.get_state", side_effect=MyStromConnectionError()
+    ):
+        await hass.config_entries.async_setup(config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
diff --git a/tests/components/nest/test_api.py b/tests/components/nest/test_api.py
index 422f1fe626961e..91975f3559f113 100644
--- a/tests/components/nest/test_api.py
+++ b/tests/components/nest/test_api.py
@@ -14,7 +14,7 @@
 
 from homeassistant.components.nest.const import API_URL, OAUTH2_TOKEN, SDM_SCOPES
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import CLIENT_ID, CLIENT_SECRET, PROJECT_ID, PlatformSetup
 from .conftest import FAKE_REFRESH_TOKEN, FAKE_TOKEN
@@ -80,7 +80,7 @@ async def async_new_subscriber(
     creds = captured_creds
     assert creds.token == FAKE_TOKEN
     assert creds.refresh_token == FAKE_REFRESH_TOKEN
-    assert int(dt.as_timestamp(creds.expiry)) == int(token_expiration_time)
+    assert int(dt_util.as_timestamp(creds.expiry)) == int(token_expiration_time)
     assert creds.valid
     assert not creds.expired
     assert creds.token_uri == OAUTH2_TOKEN
@@ -157,7 +157,7 @@ async def async_new_subscriber(
     creds = captured_creds
     assert creds.token == FAKE_TOKEN
     assert creds.refresh_token == FAKE_REFRESH_TOKEN
-    assert int(dt.as_timestamp(creds.expiry)) == int(token_expiration_time)
+    assert int(dt_util.as_timestamp(creds.expiry)) == int(token_expiration_time)
     assert not creds.valid
     assert creds.expired
     assert creds.token_uri == OAUTH2_TOKEN
diff --git a/tests/components/nest/test_device_trigger.py b/tests/components/nest/test_device_trigger.py
index ea888d32fd6656..f659568c674312 100644
--- a/tests/components/nest/test_device_trigger.py
+++ b/tests/components/nest/test_device_trigger.py
@@ -1,6 +1,7 @@
 """The tests for Nest device triggers."""
 from google_nest_sdm.event import EventMessage
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@
 from .common import DEVICE_ID, CreateDevice, FakeSubscriber, PlatformSetup
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -124,7 +124,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_multiple_devices(
diff --git a/tests/components/netatmo/test_camera.py b/tests/components/netatmo/test_camera.py
index 8334946af07f16..8bfe7176f5df28 100644
--- a/tests/components/netatmo/test_camera.py
+++ b/tests/components/netatmo/test_camera.py
@@ -17,7 +17,7 @@
 from homeassistant.const import CONF_WEBHOOK_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import fake_post_request, selected_platforms, simulate_webhook
 
@@ -420,7 +420,7 @@ async def fake_post(*args, **kwargs):
 
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(seconds=60),
+            dt_util.utcnow() + timedelta(seconds=60),
         )
         await hass.async_block_till_done()
         assert fake_post_hits >= calls
diff --git a/tests/components/netatmo/test_device_trigger.py b/tests/components/netatmo/test_device_trigger.py
index 7d29ccb794a7db..c7cbaf4d131f64 100644
--- a/tests/components/netatmo/test_device_trigger.py
+++ b/tests/components/netatmo/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Netatmo device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -18,7 +19,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_capture_events,
     async_get_device_automations,
     async_mock_service,
@@ -56,7 +56,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
         model=device_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     expected_triggers = []
@@ -70,7 +70,7 @@ async def test_get_triggers(
                         "type": event_type,
                         "subtype": subtype,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "metadata": {"secondary": False},
                     }
                 )
@@ -81,7 +81,7 @@ async def test_get_triggers(
                     "domain": NETATMO_DOMAIN,
                     "type": event_type,
                     "device_id": device_entry.id,
-                    "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                    "entity_id": entity_entry.id,
                     "metadata": {"secondary": False},
                 }
             )
@@ -92,7 +92,7 @@ async def test_get_triggers(
         )
         if trigger["domain"] == NETATMO_DOMAIN
     ]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -130,7 +130,7 @@ async def test_if_fires_on_event(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=camera_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     events = async_capture_events(hass, "netatmo_event")
@@ -145,7 +145,90 @@ async def test_if_fires_on_event(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
+                        "type": event_type,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "{{trigger.event.data.type}} - {{trigger.platform}} - {{trigger.event.data.device_id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    device = device_registry.async_get_device(set(), {connection})
+    assert device is not None
+
+    # Fake that the entity is turning on.
+    hass.bus.async_fire(
+        event_type=NETATMO_EVENT,
+        event_data={
+            "type": event_type,
+            ATTR_DEVICE_ID: device.id,
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(events) == 1
+    assert len(calls) == 1
+    assert calls[0].data["some"] == f"{event_type} - device - {device.id}"
+
+
+@pytest.mark.parametrize(
+    ("platform", "camera_type", "event_type"),
+    [("camera", "Smart Outdoor Camera", trigger) for trigger in OUTDOOR_CAMERA_TRIGGERS]
+    + [("camera", "Smart Indoor Camera", trigger) for trigger in INDOOR_CAMERA_TRIGGERS]
+    + [
+        ("climate", "Smart Valve", trigger)
+        for trigger in CLIMATE_TRIGGERS
+        if trigger not in SUBTYPES
+    ]
+    + [
+        ("climate", "Smart Thermostat", trigger)
+        for trigger in CLIMATE_TRIGGERS
+        if trigger not in SUBTYPES
+    ],
+)
+async def test_if_fires_on_event_legacy(
+    hass: HomeAssistant,
+    calls,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    platform,
+    camera_type,
+    event_type,
+) -> None:
+    """Test for event triggers firing."""
+    mac_address = "12:34:56:AB:CD:EF"
+    connection = (dr.CONNECTION_NETWORK_MAC, mac_address)
+    config_entry = MockConfigEntry(domain=NETATMO_DOMAIN, data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={connection},
+        identifiers={(NETATMO_DOMAIN, mac_address)},
+        model=camera_type,
+    )
+    entity_entry = entity_registry.async_get_or_create(
+        platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
+    )
+    events = async_capture_events(hass, "netatmo_event")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": NETATMO_DOMAIN,
+                        "device_id": device_entry.id,
+                        "entity_id": entity_entry.entity_id,
                         "type": event_type,
                     },
                     "action": {
@@ -212,7 +295,7 @@ async def test_if_fires_on_event_with_subtype(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=camera_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
     events = async_capture_events(hass, "netatmo_event")
@@ -227,7 +310,7 @@ async def test_if_fires_on_event_with_subtype(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "type": event_type,
                         "subtype": sub_type,
                     },
@@ -288,7 +371,7 @@ async def test_if_invalid_device(
         identifiers={(NETATMO_DOMAIN, mac_address)},
         model=device_type,
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         platform, NETATMO_DOMAIN, "5678", device_id=device_entry.id
     )
 
@@ -302,7 +385,7 @@ async def test_if_invalid_device(
                         "platform": "device",
                         "domain": NETATMO_DOMAIN,
                         "device_id": device_entry.id,
-                        "entity_id": f"{platform}.{NETATMO_DOMAIN}_5678",
+                        "entity_id": entity_entry.id,
                         "type": event_type,
                     },
                     "action": {
diff --git a/tests/components/netatmo/test_init.py b/tests/components/netatmo/test_init.py
index 2af9aece9e3376..f4d24e87b91325 100644
--- a/tests/components/netatmo/test_init.py
+++ b/tests/components/netatmo/test_init.py
@@ -12,7 +12,7 @@
 from homeassistant.const import CONF_WEBHOOK_ID
 from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import (
     FAKE_WEBHOOK_ACTIVATION,
@@ -21,7 +21,11 @@
     simulate_webhook,
 )
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from tests.common import (
+    MockConfigEntry,
+    async_fire_time_changed,
+    async_get_persistent_notifications,
+)
 from tests.components.cloud import mock_cloud
 
 # Fake webhook thermostat mode change to "Max"
@@ -335,7 +339,7 @@ async def test_setup_component_with_delay(hass: HomeAssistant, config_entry) ->
 
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(seconds=60),
+            dt_util.utcnow() + timedelta(seconds=60),
         )
         await hass.async_block_till_done()
 
@@ -391,7 +395,10 @@ async def test_setup_component_invalid_token_scope(hass: HomeAssistant) -> None:
 
     assert config_entry.state is config_entries.ConfigEntryState.SETUP_ERROR
     assert hass.config_entries.async_entries(DOMAIN)
-    assert len(hass.states.async_all()) > 0
+
+    notifications = async_get_persistent_notifications(hass)
+
+    assert len(notifications) > 0
 
     for config_entry in hass.config_entries.async_entries("netatmo"):
         await hass.config_entries.async_remove(config_entry.entry_id)
@@ -437,7 +444,8 @@ async def fake_ensure_valid_token(*args, **kwargs):
 
     assert config_entry.state is config_entries.ConfigEntryState.SETUP_ERROR
     assert hass.config_entries.async_entries(DOMAIN)
-    assert len(hass.states.async_all()) > 0
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) > 0
 
     for config_entry in hass.config_entries.async_entries("netatmo"):
         await hass.config_entries.async_remove(config_entry.entry_id)
diff --git a/tests/components/network/test_init.py b/tests/components/network/test_init.py
index a54e649115b5ca..880caecc138659 100644
--- a/tests/components/network/test_init.py
+++ b/tests/components/network/test_init.py
@@ -712,3 +712,120 @@ async def test_async_get_source_ip_no_ip_loopback(
         await hass.async_block_till_done()
 
         assert await network.async_get_source_ip(hass) == "127.0.0.1"
+
+
+_ADAPTERS_WITH_MANUAL_CONFIG = [
+    {
+        "auto": True,
+        "index": 1,
+        "default": False,
+        "enabled": True,
+        "ipv4": [],
+        "ipv6": [
+            {
+                "address": "2001:db8::",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 1,
+            },
+            {
+                "address": "fe80::1234:5678:9abc:def0",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 1,
+            },
+        ],
+        "name": "eth0",
+    },
+    {
+        "auto": True,
+        "index": 2,
+        "default": False,
+        "enabled": True,
+        "ipv4": [{"address": "192.168.1.5", "network_prefix": 23}],
+        "ipv6": [],
+        "name": "eth1",
+    },
+    {
+        "auto": True,
+        "index": 3,
+        "default": False,
+        "enabled": True,
+        "ipv4": [{"address": "172.16.1.5", "network_prefix": 23}],
+        "ipv6": [
+            {
+                "address": "fe80::dead:beef:dead:beef",
+                "network_prefix": 64,
+                "flowinfo": 1,
+                "scope_id": 3,
+            }
+        ],
+        "name": "eth2",
+    },
+    {
+        "auto": False,
+        "index": 4,
+        "default": False,
+        "enabled": False,
+        "ipv4": [{"address": "169.254.3.2", "network_prefix": 16}],
+        "ipv6": [],
+        "name": "vtun0",
+    },
+]
+
+
+async def test_async_get_announce_addresses(hass: HomeAssistant) -> None:
+    """Test addresses for mDNS/etc announcement."""
+    first_ip = "172.16.1.5"
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=first_ip,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+    assert actual[0] == first_ip and actual == [
+        first_ip,
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "192.168.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
+
+    first_ip = "192.168.1.5"
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=first_ip,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+
+    assert actual[0] == first_ip and actual == [
+        first_ip,
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "172.16.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
+
+
+async def test_async_get_announce_addresses_no_source_ip(hass: HomeAssistant) -> None:
+    """Test addresses for mDNS/etc announcement without source ip."""
+    with patch(
+        "homeassistant.components.network.async_get_source_ip",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.network.async_get_adapters",
+        return_value=_ADAPTERS_WITH_MANUAL_CONFIG,
+    ):
+        actual = await network.async_get_announce_addresses(hass)
+    assert actual == [
+        "2001:db8::",
+        "fe80::1234:5678:9abc:def0",
+        "192.168.1.5",
+        "172.16.1.5",
+        "fe80::dead:beef:dead:beef",
+    ]
diff --git a/tests/components/nexia/test_init.py b/tests/components/nexia/test_init.py
index dd147c4cb21201..5409181f00eca4 100644
--- a/tests/components/nexia/test_init.py
+++ b/tests/components/nexia/test_init.py
@@ -1,5 +1,8 @@
 """The init tests for the nexia platform."""
+import aiohttp
+
 from homeassistant.components.nexia.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import EntityRegistry
@@ -10,6 +13,12 @@
 from tests.typing import WebSocketGenerator
 
 
+async def test_setup_retry_client_os_error(hass: HomeAssistant) -> None:
+    """Verify we retry setup on aiohttp.ClientOSError."""
+    config_entry = await async_init_integration(hass, exception=aiohttp.ClientOSError)
+    assert config_entry.state == ConfigEntryState.SETUP_RETRY
+
+
 async def remove_device(ws_client, device_id, config_entry_id):
     """Remove config entry from a device."""
     await ws_client.send_json(
diff --git a/tests/components/nexia/util.py b/tests/components/nexia/util.py
index d564ccc351cf2c..318a317fae4f75 100644
--- a/tests/components/nexia/util.py
+++ b/tests/components/nexia/util.py
@@ -15,6 +15,7 @@
 async def async_init_integration(
     hass: HomeAssistant,
     skip_setup: bool = False,
+    exception: Exception | None = None,
 ) -> MockConfigEntry:
     """Set up the nexia integration in Home Assistant."""
 
@@ -25,9 +26,18 @@ async def async_init_integration(
         "nexia.home.load_or_create_uuid", return_value=uuid.uuid4()
     ):
         nexia = NexiaHome(mock_session)
-        mock_session.post(
-            nexia.API_MOBILE_SESSION_URL, text=load_fixture(session_fixture)
-        )
+        if exception:
+
+            async def _raise_exception(*args, **kwargs):
+                raise exception
+
+            mock_session.post(
+                nexia.API_MOBILE_SESSION_URL, side_effect=_raise_exception
+            )
+        else:
+            mock_session.post(
+                nexia.API_MOBILE_SESSION_URL, text=load_fixture(session_fixture)
+            )
         mock_session.get(
             nexia.API_MOBILE_HOUSES_URL.format(house_id=123456),
             text=load_fixture(house_fixture),
diff --git a/tests/components/nextcloud/test_config_flow.py b/tests/components/nextcloud/test_config_flow.py
index ba465c5f8a7281..94c037586219e7 100644
--- a/tests/components/nextcloud/test_config_flow.py
+++ b/tests/components/nextcloud/test_config_flow.py
@@ -4,14 +4,13 @@
 from nextcloudmonitor import (
     NextcloudMonitorAuthorizationError,
     NextcloudMonitorConnectionError,
-    NextcloudMonitorError,
     NextcloudMonitorRequestError,
 )
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components.nextcloud import DOMAIN
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH, SOURCE_USER
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
 from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
@@ -131,67 +130,6 @@ async def test_user_already_configured(
     assert result["reason"] == "already_configured"
 
 
-async def test_import(
-    hass: HomeAssistant, mock_nextcloud_monitor: Mock, snapshot: SnapshotAssertion
-) -> None:
-    """Test that the import step works."""
-    with patch(
-        "homeassistant.components.nextcloud.config_flow.NextcloudMonitor",
-        return_value=mock_nextcloud_monitor,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=VALID_CONFIG,
-        )
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "nc_url"
-    assert result["data"] == snapshot
-
-
-async def test_import_already_configured(
-    hass: HomeAssistant, mock_nextcloud_monitor: Mock
-) -> None:
-    """Test that import step is aborted when duplicates are added."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="nc_url",
-        unique_id="nc_url",
-        data=VALID_CONFIG,
-    )
-    entry.add_to_hass(hass)
-
-    with patch(
-        "homeassistant.components.nextcloud.config_flow.NextcloudMonitor",
-        return_value=mock_nextcloud_monitor,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=VALID_CONFIG,
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_import_connection_error(hass: HomeAssistant) -> None:
-    """Test that import step is aborted on connection error."""
-    with patch(
-        "homeassistant.components.nextcloud.config_flow.NextcloudMonitor",
-        side_effect=NextcloudMonitorError,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=VALID_CONFIG,
-        )
-        await hass.async_block_till_done()
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "connection_error_during_import"
-
-
 async def test_reauth(
     hass: HomeAssistant, mock_nextcloud_monitor: Mock, snapshot: SnapshotAssertion
 ) -> None:
diff --git a/tests/components/nextdns/test_switch.py b/tests/components/nextdns/test_switch.py
index ed0ea4e86202a1..33a3f8049028e0 100644
--- a/tests/components/nextdns/test_switch.py
+++ b/tests/components/nextdns/test_switch.py
@@ -637,7 +637,7 @@ async def test_switch_on(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.nextdns.NextDns.set_setting", return_value=True
     ) as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_ON,
             {ATTR_ENTITY_ID: "switch.fake_profile_block_page"},
@@ -663,7 +663,7 @@ async def test_switch_off(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.nextdns.NextDns.set_setting", return_value=True
     ) as mock_switch_on:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             SWITCH_DOMAIN,
             SERVICE_TURN_OFF,
             {ATTR_ENTITY_ID: "switch.fake_profile_web3"},
diff --git a/tests/components/nina/test_config_flow.py b/tests/components/nina/test_config_flow.py
index e09bdfc739be38..194f0298dd500f 100644
--- a/tests/components/nina/test_config_flow.py
+++ b/tests/components/nina/test_config_flow.py
@@ -10,7 +10,7 @@
 
 from homeassistant import data_entry_flow
 from homeassistant.components.nina.const import (
-    CONF_FILTER_CORONA,
+    CONF_HEADLINE_FILTER,
     CONF_MESSAGE_SLOTS,
     CONF_REGIONS,
     CONST_REGION_A_TO_D,
@@ -37,7 +37,7 @@
     CONST_REGION_M_TO_Q: ["071380000000_0", "071380000000_1"],
     CONST_REGION_R_TO_U: ["072320000000_0", "072320000000_1"],
     CONST_REGION_V_TO_Z: ["081270000000_0", "081270000000_1"],
-    CONF_FILTER_CORONA: True,
+    CONF_HEADLINE_FILTER: ".*corona.*",
 }
 
 DUMMY_RESPONSE_REGIONS: dict[str, Any] = json.loads(
@@ -113,7 +113,7 @@ async def test_step_user_no_selection(hass: HomeAssistant) -> None:
         wraps=mocked_request_function,
     ):
         result: dict[str, Any] = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data={}
+            DOMAIN, context={"source": SOURCE_USER}, data={CONF_HEADLINE_FILTER: ""}
         )
 
         assert result["type"] == data_entry_flow.FlowResultType.FORM
@@ -145,7 +145,7 @@ async def test_options_flow_init(hass: HomeAssistant) -> None:
         domain=DOMAIN,
         title="NINA",
         data={
-            CONF_FILTER_CORONA: deepcopy(DUMMY_DATA[CONF_FILTER_CORONA]),
+            CONF_HEADLINE_FILTER: deepcopy(DUMMY_DATA[CONF_HEADLINE_FILTER]),
             CONF_MESSAGE_SLOTS: deepcopy(DUMMY_DATA[CONF_MESSAGE_SLOTS]),
             CONST_REGION_A_TO_D: deepcopy(DUMMY_DATA[CONST_REGION_A_TO_D]),
             CONF_REGIONS: {"095760000000": "Aach"},
@@ -183,7 +183,7 @@ async def test_options_flow_init(hass: HomeAssistant) -> None:
         assert result["data"] is None
 
         assert dict(config_entry.data) == {
-            CONF_FILTER_CORONA: deepcopy(DUMMY_DATA[CONF_FILTER_CORONA]),
+            CONF_HEADLINE_FILTER: deepcopy(DUMMY_DATA[CONF_HEADLINE_FILTER]),
             CONF_MESSAGE_SLOTS: deepcopy(DUMMY_DATA[CONF_MESSAGE_SLOTS]),
             CONST_REGION_A_TO_D: ["072350000000_1"],
             CONST_REGION_E_TO_H: [],
@@ -229,6 +229,7 @@ async def test_options_flow_with_no_selection(hass: HomeAssistant) -> None:
                 CONST_REGION_M_TO_Q: [],
                 CONST_REGION_R_TO_U: [],
                 CONST_REGION_V_TO_Z: [],
+                CONF_HEADLINE_FILTER: "",
             },
         )
 
diff --git a/tests/components/nina/test_init.py b/tests/components/nina/test_init.py
index d75e35473cade6..826b8e422edacf 100644
--- a/tests/components/nina/test_init.py
+++ b/tests/components/nina/test_init.py
@@ -15,7 +15,7 @@
 
 ENTRY_DATA: dict[str, Any] = {
     "slots": 5,
-    "corona_filter": True,
+    "headline_filter": ".*corona.*",
     "regions": {"083350000000": "Aach, Stadt"},
 }
 
@@ -37,6 +37,27 @@ async def init_integration(hass) -> MockConfigEntry:
         return entry
 
 
+async def test_config_migration(hass: HomeAssistant) -> None:
+    """Test the migration to a new configuration layout."""
+
+    old_entry_data: dict[str, Any] = {
+        "slots": 5,
+        "corona_filter": True,
+        "regions": {"083350000000": "Aach, Stadt"},
+    }
+
+    old_conf_entry: MockConfigEntry = MockConfigEntry(
+        domain=DOMAIN, title="NINA", data=old_entry_data
+    )
+
+    old_conf_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(old_conf_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert dict(old_conf_entry.data) == ENTRY_DATA
+
+
 async def test_config_entry_not_ready(hass: HomeAssistant) -> None:
     """Test the configuration entry."""
     entry: MockConfigEntry = await init_integration(hass)
diff --git a/tests/components/notify/test_init.py b/tests/components/notify/test_init.py
index dcdfb961d0dad4..9fb5b9e531a6f5 100644
--- a/tests/components/notify/test_init.py
+++ b/tests/components/notify/test_init.py
@@ -14,7 +14,7 @@
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockPlatform, mock_platform
+from tests.common import MockPlatform, async_get_persistent_notifications, mock_platform
 
 
 class MockNotifyPlatform(MockPlatform):
@@ -139,7 +139,8 @@ async def test_warn_template(
     )
     # We should only log it once
     assert caplog.text.count("Passing templates to notify service is deprecated") == 1
-    assert hass.states.get("persistent_notification.notification") is not None
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
 
 
 async def test_invalid_platform(
diff --git a/tests/components/notify/test_persistent_notification.py b/tests/components/notify/test_persistent_notification.py
index 32634e354e9cc1..580b2bdb614921 100644
--- a/tests/components/notify/test_persistent_notification.py
+++ b/tests/components/notify/test_persistent_notification.py
@@ -4,6 +4,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from tests.common import async_get_persistent_notifications
+
 
 async def test_async_send_message(hass: HomeAssistant) -> None:
     """Test sending a message to notify.persistent_notification service."""
@@ -17,9 +19,48 @@ async def test_async_send_message(hass: HomeAssistant) -> None:
     )
     await hass.async_block_till_done()
 
-    entity_ids = hass.states.async_entity_ids(pn.DOMAIN)
-    assert len(entity_ids) == 1
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
+    notification = notifications[list(notifications)[0]]
+
+    assert notification["message"] == "Hello"
+    assert notification["title"] == "Test notification"
+
+
+async def test_async_supports_notification_id(hass: HomeAssistant) -> None:
+    """Test that notify.persistent_notification supports notification_id."""
+    await async_setup_component(hass, pn.DOMAIN, {"core": {}})
+    await async_setup_component(hass, notify.DOMAIN, {})
+    await hass.async_block_till_done()
+
+    message = {
+        "message": "Hello",
+        "title": "Test notification",
+        "data": {"notification_id": "my_id"},
+    }
+    await hass.services.async_call(
+        notify.DOMAIN, notify.SERVICE_PERSISTENT_NOTIFICATION, message
+    )
+    await hass.async_block_till_done()
+
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
+
+    # Send second message with same ID
+
+    message = {
+        "message": "Goodbye",
+        "title": "Notification was updated",
+        "data": {"notification_id": "my_id"},
+    }
+    await hass.services.async_call(
+        notify.DOMAIN, notify.SERVICE_PERSISTENT_NOTIFICATION, message
+    )
+    await hass.async_block_till_done()
+
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
 
-    state = hass.states.get(entity_ids[0])
-    assert state.attributes.get("message") == "Hello"
-    assert state.attributes.get("title") == "Test notification"
+    notification = notifications[list(notifications)[0]]
+    assert notification["message"] == "Goodbye"
+    assert notification["title"] == "Notification was updated"
diff --git a/tests/components/number/test_device_action.py b/tests/components/number/test_device_action.py
index 987c14409484e0..1e0cfd5b391624 100644
--- a/tests/components/number/test_device_action.py
+++ b/tests/components/number/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Number device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 async def test_get_actions(
@@ -36,7 +40,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set("number.test_5678", 0.5, {"min_value": 0.0, "max_value": 1.0})
@@ -45,14 +49,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "number.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -78,7 +82,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -92,7 +96,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_value"]
@@ -100,7 +104,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_no_state(
@@ -115,7 +119,7 @@ async def test_get_action_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -123,19 +127,21 @@ async def test_get_action_no_state(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "number.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
-    hass.states.async_set("number.entity", 0.5, {"min_value": 0.0, "max_value": 1.0})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
 
     assert await async_setup_component(
         hass,
@@ -150,7 +156,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "number.entity",
+                        "entity_id": entry.id,
                         "type": "set_value",
                         "value": 0.3,
                     },
@@ -160,23 +166,96 @@ async def test_action(hass: HomeAssistant) -> None:
     )
 
     calls = async_mock_service(hass, DOMAIN, "set_value")
+    assert len(calls) == 0
 
+    hass.bus.async_fire("test_event_set_value")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+    assert calls[0].domain == DOMAIN
+    assert calls[0].service == "set_value"
+    assert calls[0].data == {"entity_id": entry.entity_id, "value": 0.3}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_value",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_value",
+                        "value": 0.3,
+                    },
+                },
+            ]
+        },
+    )
+
+    calls = async_mock_service(hass, DOMAIN, "set_value")
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event_set_value")
     await hass.async_block_till_done()
 
     assert len(calls) == 1
+    assert calls[0].domain == DOMAIN
+    assert calls[0].service == "set_value"
+    assert calls[0].data == {"entity_id": entry.entity_id, "value": 0.3}
+
+
+async def test_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id="abcdefgh"
+    )
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entry.id,
+            "type": "set_value",
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
 
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [{"name": "value", "required": True, "type": "float"}]
 
-async def test_capabilities(hass: HomeAssistant) -> None:
+
+async def test_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id="abcdefgh"
+    )
     capabilities = await device_action.async_get_action_capabilities(
         hass,
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": "number.entity",
+            "entity_id": entry.entity_id,
             "type": "set_value",
         },
     )
diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py
index 67a02968037db0..d9cf27c12aad63 100644
--- a/tests/components/number/test_init.py
+++ b/tests/components/number/test_init.py
@@ -1,4 +1,5 @@
 """The tests for the Number component."""
+from collections.abc import Generator
 from typing import Any
 from unittest.mock import MagicMock
 
@@ -14,6 +15,7 @@
     NumberDeviceClass,
     NumberEntity,
     NumberEntityDescription,
+    NumberMode,
 )
 from homeassistant.components.number.const import (
     DEVICE_CLASS_UNITS as NUMBER_DEVICE_CLASS_UNITS,
@@ -22,6 +24,7 @@
     DEVICE_CLASS_UNITS as SENSOR_DEVICE_CLASS_UNITS,
     SensorDeviceClass,
 )
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_UNIT_OF_MEASUREMENT,
@@ -30,11 +33,23 @@
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
-from tests.common import mock_restore_cache_with_extra_data
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    async_mock_restore_state_shutdown_restart,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+    mock_restore_cache_with_extra_data,
+)
+
+TEST_DOMAIN = "test"
 
 
 class MockDefaultNumberEntity(NumberEntity):
@@ -237,60 +252,6 @@ async def test_attributes(hass: HomeAssistant) -> None:
     assert number_4.value is None
 
 
-async def test_deprecation_warnings(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
-) -> None:
-    """Test overriding the deprecated attributes is possible and warnings are logged."""
-    number = MockDefaultNumberEntityDeprecated()
-    number.hass = hass
-    assert number.max_value == 100.0
-    assert number.min_value == 0.0
-    assert number.step == 1.0
-    assert number.unit_of_measurement is None
-    assert number.value == 0.5
-
-    number_2 = MockNumberEntityDeprecated()
-    number_2.hass = hass
-    assert number_2.max_value == 0.5
-    assert number_2.min_value == -0.5
-    assert number_2.step == 0.1
-    assert number_2.unit_of_measurement == "cats"
-    assert number_2.value == 0.5
-
-    number_3 = MockNumberEntityAttrDeprecated()
-    number_3.hass = hass
-    assert number_3.max_value == 1000.0
-    assert number_3.min_value == -1000.0
-    assert number_3.step == 100.0
-    assert number_3.unit_of_measurement == "dogs"
-    assert number_3.value == 500.0
-
-    number_4 = MockNumberEntityDescrDeprecated()
-    number_4.hass = hass
-    assert number_4.max_value == 10.0
-    assert number_4.min_value == -10.0
-    assert number_4.step == 2.0
-    assert number_4.unit_of_measurement == "rabbits"
-    assert number_4.value == 0.5
-
-    assert (
-        "tests.components.number.test_init::MockNumberEntityDeprecated is overriding "
-        " deprecated methods on an instance of NumberEntity"
-    )
-    assert (
-        "Entity None (<class 'tests.components.number.test_init.MockNumberEntityAttrDeprecated'>) "
-        "is using deprecated NumberEntity features" in caplog.text
-    )
-    assert (
-        "Entity None (<class 'tests.components.number.test_init.MockNumberEntityDescrDeprecated'>) "
-        "is using deprecated NumberEntity features" in caplog.text
-    )
-    assert (
-        "tests.components.number.test_init is setting deprecated attributes on an "
-        "instance of NumberEntityDescription" in caplog.text
-    )
-
-
 async def test_sync_set_value(hass: HomeAssistant) -> None:
     """Test if async set_value calls sync set_value."""
     number = MockDefaultNumberEntity()
@@ -340,104 +301,6 @@ async def test_set_value(hass: HomeAssistant, enable_custom_integrations: None)
     assert state.state == "60.0"
 
 
-async def test_deprecated_attributes(
-    hass: HomeAssistant, enable_custom_integrations: None
-) -> None:
-    """Test entity using deprecated attributes."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init(empty=True)
-    platform.ENTITIES.append(platform.LegacyMockNumberEntity())
-    entity = platform.ENTITIES[0]
-    entity._attr_name = "Test"
-    entity._attr_max_value = 25
-    entity._attr_min_value = -25
-    entity._attr_step = 2.5
-    entity._attr_value = 51.0
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "51.0"
-    assert state.attributes.get(ATTR_MAX) == 25.0
-    assert state.attributes.get(ATTR_MIN) == -25.0
-    assert state.attributes.get(ATTR_STEP) == 2.5
-
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_VALUE,
-        {ATTR_VALUE: 0.0, ATTR_ENTITY_ID: "number.test"},
-        blocking=True,
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-    # test ValueError trigger
-    with pytest.raises(ValueError):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_SET_VALUE,
-            {ATTR_VALUE: 110.0, ATTR_ENTITY_ID: "number.test"},
-            blocking=True,
-        )
-
-    await hass.async_block_till_done()
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-
-async def test_deprecated_methods(
-    hass: HomeAssistant, enable_custom_integrations: None
-) -> None:
-    """Test entity using deprecated methods."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init(empty=True)
-    platform.ENTITIES.append(
-        platform.LegacyMockNumberEntity(
-            name="Test",
-            max_value=25.0,
-            min_value=-25.0,
-            step=2.5,
-            value=51.0,
-        )
-    )
-
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "51.0"
-    assert state.attributes.get(ATTR_MAX) == 25.0
-    assert state.attributes.get(ATTR_MIN) == -25.0
-    assert state.attributes.get(ATTR_STEP) == 2.5
-
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_VALUE,
-        {ATTR_VALUE: 0.0, ATTR_ENTITY_ID: "number.test"},
-        blocking=True,
-    )
-    await hass.async_block_till_done()
-
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-    # test ValueError trigger
-    with pytest.raises(ValueError):
-        await hass.services.async_call(
-            DOMAIN,
-            SERVICE_SET_VALUE,
-            {ATTR_VALUE: 110.0, ATTR_ENTITY_ID: "number.test"},
-            blocking=True,
-        )
-
-    await hass.async_block_till_done()
-    state = hass.states.get("number.test")
-    assert state.state == "0.0"
-
-
 @pytest.mark.parametrize(
     (
         "unit_system",
@@ -635,7 +498,7 @@ async def test_restore_number_save_state(
     await hass.async_block_till_done()
 
     # Trigger saving state
-    await hass.async_stop()
+    await async_mock_restore_state_shutdown_restart(hass)
 
     assert len(hass_storage[RESTORE_STATE_KEY]["data"]) == 1
     state = hass_storage[RESTORE_STATE_KEY]["data"][0]["state"]
@@ -927,3 +790,120 @@ def test_device_classes_aligned() -> None:
             SENSOR_DEVICE_CLASS_UNITS[device_class]
             == NUMBER_DEVICE_CLASS_UNITS[device_class]
         )
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test number name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed sensor without device class -> no name
+    entity1 = NumberEntity()
+    entity1.entity_id = "number.test1"
+
+    # Unnamed sensor with device class but has_entity_name False -> no name
+    entity2 = NumberEntity()
+    entity2.entity_id = "number.test2"
+    entity2._attr_device_class = NumberDeviceClass.TEMPERATURE
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity3 = NumberEntity()
+    entity3.entity_id = "number.test3"
+    entity3._attr_device_class = NumberDeviceClass.TEMPERATURE
+    entity3._attr_has_entity_name = True
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity4 = NumberEntity()
+    entity4.entity_id = "number.test4"
+    entity4.entity_description = NumberEntityDescription(
+        "test",
+        NumberDeviceClass.TEMPERATURE,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test number platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{DOMAIN}",
+        MockPlatform(async_setup_entry=async_setup_entry_platform),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state
+    assert state.attributes == {
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity2.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity3.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "friendly_name": "Temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
+
+    state = hass.states.get(entity4.entity_id)
+    assert state
+    assert state.attributes == {
+        "device_class": "temperature",
+        "friendly_name": "Temperature",
+        "max": 100.0,
+        "min": 0.0,
+        "mode": NumberMode.AUTO,
+        "step": 1.0,
+    }
diff --git a/tests/components/number/test_recorder.py b/tests/components/number/test_recorder.py
index d996a67f93ba24..635354b1176001 100644
--- a/tests/components/number/test_recorder.py
+++ b/tests/components/number/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import number
 from homeassistant.components.number import ATTR_MAX, ATTR_MIN, ATTR_MODE, ATTR_STEP
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def number_only() -> None:
+    """Enable only the number platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.NUMBER],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test number registered attributes to be excluded."""
     assert await async_setup_component(hass, "homeassistant", {})
diff --git a/tests/components/nut/test_device_action.py b/tests/components/nut/test_device_action.py
index 0664b0de5c82d0..c15a2157343a96 100644
--- a/tests/components/nut/test_device_action.py
+++ b/tests/components/nut/test_device_action.py
@@ -3,6 +3,7 @@
 
 from pynut2.nut2 import PyNUTError
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation, device_automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,7 +15,7 @@
 
 from .util import async_init_integration
 
-from tests.common import assert_lists_same, async_get_device_automations
+from tests.common import async_get_device_automations
 
 
 async def test_get_all_actions_for_specified_user(
@@ -47,7 +48,7 @@ async def test_get_all_actions_for_specified_user(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_no_actions_for_anonymous_user(
diff --git a/tests/components/nws/const.py b/tests/components/nws/const.py
index 2048db2a2c3c5f..106b80998ac863 100644
--- a/tests/components/nws/const.py
+++ b/tests/components/nws/const.py
@@ -3,6 +3,8 @@
 from homeassistant.components.weather import (
     ATTR_CONDITION_LIGHTNING_RAINY,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_DEW_POINT,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TEMP,
     ATTR_FORECAST_TIME,
@@ -59,6 +61,9 @@
     "windGust": 20,
 }
 
+CLEAR_NIGHT_OBSERVATION = DEFAULT_OBSERVATION.copy()
+CLEAR_NIGHT_OBSERVATION["iconTime"] = "night"
+
 SENSOR_EXPECTED_OBSERVATION_METRIC = {
     "dewpoint": "5",
     "temperature": "10",
@@ -183,6 +188,9 @@
         "timestamp": "2019-08-12T23:53:00+00:00",
         "iconTime": "night",
         "iconWeather": (("lightning-rainy", 40), ("lightning-rainy", 90)),
+        "probabilityOfPrecipitation": 89,
+        "dewpoint": 4,
+        "relativeHumidity": 75,
     },
 ]
 
@@ -192,7 +200,9 @@
     ATTR_FORECAST_TEMP: 10,
     ATTR_FORECAST_WIND_SPEED: 10,
     ATTR_FORECAST_WIND_BEARING: 180,
-    ATTR_FORECAST_PRECIPITATION_PROBABILITY: 90,
+    ATTR_FORECAST_PRECIPITATION_PROBABILITY: 89,
+    ATTR_FORECAST_DEW_POINT: 4,
+    ATTR_FORECAST_HUMIDITY: 75,
 }
 
 EXPECTED_FORECAST_METRIC = {
@@ -211,7 +221,14 @@
         2,
     ),
     ATTR_FORECAST_WIND_BEARING: 180,
-    ATTR_FORECAST_PRECIPITATION_PROBABILITY: 90,
+    ATTR_FORECAST_PRECIPITATION_PROBABILITY: 89,
+    ATTR_FORECAST_DEW_POINT: round(
+        TemperatureConverter.convert(
+            4, UnitOfTemperature.FAHRENHEIT, UnitOfTemperature.CELSIUS
+        ),
+        1,
+    ),
+    ATTR_FORECAST_HUMIDITY: 75,
 }
 
 NONE_FORECAST = [{key: None for key in DEFAULT_FORECAST[0]}]
diff --git a/tests/components/nws/test_weather.py b/tests/components/nws/test_weather.py
index ce268796639f38..06d2c2006d84dd 100644
--- a/tests/components/nws/test_weather.py
+++ b/tests/components/nws/test_weather.py
@@ -7,6 +7,7 @@
 
 from homeassistant.components import nws
 from homeassistant.components.weather import (
+    ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_SUNNY,
     ATTR_FORECAST,
     DOMAIN as WEATHER_DOMAIN,
@@ -19,6 +20,7 @@
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
 from .const import (
+    CLEAR_NIGHT_OBSERVATION,
     EXPECTED_FORECAST_IMPERIAL,
     EXPECTED_FORECAST_METRIC,
     NONE_FORECAST,
@@ -97,6 +99,23 @@ async def test_imperial_metric(
         assert forecast[0].get(key) == value
 
 
+async def test_night_clear(hass: HomeAssistant, mock_simple_nws, no_sensor) -> None:
+    """Test with clear-night in observation."""
+    instance = mock_simple_nws.return_value
+    instance.observation = CLEAR_NIGHT_OBSERVATION
+
+    entry = MockConfigEntry(
+        domain=nws.DOMAIN,
+        data=NWS_CONFIG,
+    )
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("weather.abc_daynight")
+    assert state.state == ATTR_CONDITION_CLEAR_NIGHT
+
+
 async def test_none_values(hass: HomeAssistant, mock_simple_nws, no_sensor) -> None:
     """Test with none values in observation and forecast dicts."""
     instance = mock_simple_nws.return_value
diff --git a/tests/components/obihai/test_config_flow.py b/tests/components/obihai/test_config_flow.py
index 1743b81a0e9e0b..d9ca52424c2f6b 100644
--- a/tests/components/obihai/test_config_flow.py
+++ b/tests/components/obihai/test_config_flow.py
@@ -78,54 +78,6 @@ async def test_connect_failure(hass: HomeAssistant, mock_gaierror: Generator) ->
     assert result["errors"]["base"] == "cannot_connect"
 
 
-async def test_yaml_import(hass: HomeAssistant) -> None:
-    """Test we get the YAML imported."""
-
-    with patch(VALIDATE_AUTH_PATCH, return_value=MockPyObihai()):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data=USER_INPUT,
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert "errors" not in result
-
-
-async def test_yaml_import_auth_fail(hass: HomeAssistant) -> None:
-    """Test the YAML import fails."""
-
-    with patch(VALIDATE_AUTH_PATCH, return_value=False):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data=USER_INPUT,
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "invalid_auth"
-    assert "errors" not in result
-
-
-async def test_yaml_import_connect_fail(
-    hass: HomeAssistant, mock_gaierror: Generator
-) -> None:
-    """Test the YAML import fails with invalid host."""
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=USER_INPUT,
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "cannot_connect"
-    assert "errors" not in result
-
-
 async def test_dhcp_flow(hass: HomeAssistant) -> None:
     """Test that DHCP discovery works."""
 
diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py
index d609f118bdc5f3..bbe50f9a810705 100644
--- a/tests/components/onboarding/test_views.py
+++ b/tests/components/onboarding/test_views.py
@@ -453,6 +453,27 @@ async def test_onboarding_core_sets_up_met(
     assert len(hass.config_entries.async_entries("met")) == 1
 
 
+async def test_onboarding_core_sets_up_google_translate(
+    hass: HomeAssistant,
+    hass_storage: dict[str, Any],
+    hass_client: ClientSessionGenerator,
+    mock_default_integrations,
+) -> None:
+    """Test finishing the core step sets up google translate."""
+    mock_storage(hass_storage, {"done": [const.STEP_USER]})
+
+    assert await async_setup_component(hass, "onboarding", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client()
+    resp = await client.post("/api/onboarding/core_config")
+
+    assert resp.status == 200
+
+    await hass.async_block_till_done()
+    assert len(hass.config_entries.async_entries("google_translate")) == 1
+
+
 async def test_onboarding_core_sets_up_radio_browser(
     hass: HomeAssistant,
     hass_storage: dict[str, Any],
diff --git a/tests/components/onvif/test_config_flow.py b/tests/components/onvif/test_config_flow.py
index 981620e7ae0c8e..00fc77076e8408 100644
--- a/tests/components/onvif/test_config_flow.py
+++ b/tests/components/onvif/test_config_flow.py
@@ -32,6 +32,7 @@
         config_flow.CONF_HOST: HOST,
         config_flow.CONF_PORT: PORT,
         "MAC": MAC,
+        "HARDWARE": "IPC model",
     },
     {
         "EPR": "urn:uuid:987654321",
@@ -54,11 +55,18 @@
 
 
 def setup_mock_discovery(
-    mock_discovery, with_name=False, with_mac=False, two_devices=False
+    mock_discovery,
+    with_name=False,
+    with_mac=False,
+    two_devices=False,
+    with_hardware=True,
+    no_devices=False,
 ):
     """Prepare mock discovery result."""
     services = []
     for item in DISCOVERY:
+        if no_devices:
+            continue
         service = MagicMock()
         service.getXAddrs = MagicMock(
             return_value=[
@@ -79,9 +87,18 @@ def setup_mock_discovery(
                 return_value=f"onvif://www.onvif.org/mac/{item['MAC']}"
             )
             scopes.append(scope)
+        if with_hardware and "HARDWARE" in item:
+            scope = MagicMock()
+            scope.getValue = MagicMock(
+                return_value=f"onvif://www.onvif.org/hardware/{item['HARDWARE']}"
+            )
+            scopes.append(scope)
         service.getScopes = MagicMock(return_value=scopes)
         services.append(service)
-    mock_discovery.return_value = services
+
+    mock_ws_discovery = MagicMock()
+    mock_ws_discovery.searchServices = MagicMock(return_value=services)
+    mock_discovery.return_value = mock_ws_discovery
 
 
 async def test_flow_discovered_devices(hass: HomeAssistant) -> None:
@@ -97,7 +114,7 @@ async def test_flow_discovered_devices(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -111,10 +128,16 @@ async def test_flow_discovered_devices(hass: HomeAssistant) -> None:
 
         assert result["type"] == data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "device"
-        assert len(result["data_schema"].schema[config_flow.CONF_HOST].container) == 3
+        container = result["data_schema"].schema[config_flow.CONF_HOST].container
+        assert len(container) == 3
+        assert container == {
+            "Manually configure ONVIF device": "Manually configure ONVIF device",
+            "1.2.3.4": "urn:uuid:123456789 (1.2.3.4) [IPC model]",
+            "5.6.7.8": "urn:uuid:987654321 (5.6.7.8)",
+        }
 
         result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={config_flow.CONF_HOST: f"{URN} ({HOST})"}
+            result["flow_id"], user_input={config_flow.CONF_HOST: HOST}
         )
 
         assert result["type"] == data_entry_flow.FlowResultType.FORM
@@ -161,7 +184,7 @@ async def test_flow_discovered_devices_ignore_configured_manual_input(
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -200,12 +223,12 @@ async def test_flow_discovered_no_device(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
         setup_mock_onvif_camera(mock_onvif_camera)
-        mock_discovery.return_value = []
+        setup_mock_discovery(mock_discovery, no_devices=True)
         setup_mock_device(mock_device)
 
         result = await hass.config_entries.flow.async_configure(
@@ -242,7 +265,7 @@ async def test_flow_discovery_ignore_existing_and_abort(hass: HomeAssistant) ->
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -285,7 +308,7 @@ async def test_flow_manual_entry(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -342,7 +365,7 @@ async def test_flow_manual_entry_no_profiles(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -382,7 +405,7 @@ async def test_flow_manual_entry_no_mac(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -424,7 +447,7 @@ async def test_flow_manual_entry_fails(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -532,7 +555,7 @@ async def test_flow_manual_entry_wrong_password(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -809,7 +832,7 @@ async def test_flow_manual_entry_updates_existing_user_password(
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
@@ -860,7 +883,7 @@ async def test_flow_manual_entry_wrong_port(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
-        "homeassistant.components.onvif.config_flow.wsdiscovery"
+        "homeassistant.components.onvif.config_flow.WSDiscovery"
     ) as mock_discovery, patch(
         "homeassistant.components.onvif.ONVIFDevice"
     ) as mock_device:
diff --git a/tests/components/onvif/test_diagnostics.py b/tests/components/onvif/test_diagnostics.py
index eb7d058a755204..f87a5f0eff6458 100644
--- a/tests/components/onvif/test_diagnostics.py
+++ b/tests/components/onvif/test_diagnostics.py
@@ -82,12 +82,12 @@ async def test_diagnostics(
         },
         "events": {
             "pullpoint_manager_state": {
-                "__type": "<enum " "'PullPointManagerState'>",
-                "repr": "<PullPointManagerState.PAUSED: " "2>",
+                "__type": "<enum 'PullPointManagerState'>",
+                "repr": "<PullPointManagerState.PAUSED: 2>",
             },
             "webhook_manager_state": {
                 "__type": "<enum 'WebHookManagerState'>",
-                "repr": "<WebHookManagerState.STARTED: " "1>",
+                "repr": "<WebHookManagerState.STARTED: 1>",
             },
         },
     }
diff --git a/tests/components/openai_conversation/test_init.py b/tests/components/openai_conversation/test_init.py
index 4016ac03c97b8e..fe23bbac56c813 100644
--- a/tests/components/openai_conversation/test_init.py
+++ b/tests/components/openai_conversation/test_init.py
@@ -13,6 +13,7 @@
 
 async def test_default_prompt(
     hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
     mock_init_component,
     area_registry: ar.AreaRegistry,
     device_registry: dr.DeviceRegistry,
@@ -101,18 +102,24 @@ async def test_default_prompt(
             ]
         },
     ) as mock_create:
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
     assert mock_create.mock_calls[0][2]["messages"] == snapshot
 
 
-async def test_error_handling(hass: HomeAssistant, mock_init_component) -> None:
+async def test_error_handling(
+    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_init_component
+) -> None:
     """Test that the default prompt works."""
     with patch(
         "openai.ChatCompletion.acreate", side_effect=error.ServiceUnavailableError
     ):
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
@@ -133,7 +140,9 @@ async def test_template_error(
     ), patch("openai.ChatCompletion.acreate"):
         await hass.config_entries.async_setup(mock_config_entry.entry_id)
         await hass.async_block_till_done()
-        result = await conversation.async_converse(hass, "hello", None, Context())
+        result = await conversation.async_converse(
+            hass, "hello", None, Context(), agent_id=mock_config_entry.entry_id
+        )
 
     assert result.response.response_type == intent.IntentResponseType.ERROR, result
     assert result.response.error_code == "unknown", result
diff --git a/tests/components/openhome/__init__.py b/tests/components/openhome/__init__.py
new file mode 100644
index 00000000000000..39c7a3a4dcb16f
--- /dev/null
+++ b/tests/components/openhome/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Linn / OpenHome integration."""
diff --git a/tests/components/openhome/test_config_flow.py b/tests/components/openhome/test_config_flow.py
new file mode 100644
index 00000000000000..4cc5c58dda567d
--- /dev/null
+++ b/tests/components/openhome/test_config_flow.py
@@ -0,0 +1,116 @@
+"""Tests for the Openhome config flow module."""
+
+from homeassistant import data_entry_flow
+from homeassistant.components import ssdp
+from homeassistant.components.openhome.const import DOMAIN
+from homeassistant.components.ssdp import ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_UDN
+from homeassistant.config_entries import SOURCE_SSDP
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SOURCE
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+MOCK_UDN = "uuid:4c494e4e-1234-ab12-abcd-01234567819f"
+MOCK_FRIENDLY_NAME = "Test Client"
+MOCK_SSDP_LOCATION = "http://device:12345/description.xml"
+
+MOCK_DISCOVER = ssdp.SsdpServiceInfo(
+    ssdp_usn="usn",
+    ssdp_st="st",
+    ssdp_location=MOCK_SSDP_LOCATION,
+    upnp={ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME, ATTR_UPNP_UDN: MOCK_UDN},
+)
+
+
+async def test_ssdp(hass: HomeAssistant) -> None:
+    """Test a ssdp import flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "confirm"
+    assert result["description_placeholders"] == {CONF_NAME: MOCK_FRIENDLY_NAME}
+
+    result2 = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result2["title"] == MOCK_FRIENDLY_NAME
+    assert result2["data"] == {CONF_HOST: MOCK_SSDP_LOCATION}
+
+
+async def test_device_exists(hass: HomeAssistant) -> None:
+    """Test a ssdp import where device already exists."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: MOCK_SSDP_LOCATION},
+        title=MOCK_FRIENDLY_NAME,
+        unique_id=MOCK_UDN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+
+async def test_missing_udn(hass: HomeAssistant) -> None:
+    """Test a ssdp import where discovery is missing udn."""
+    broken_discovery = ssdp.SsdpServiceInfo(
+        ssdp_usn="usn",
+        ssdp_st="st",
+        ssdp_location=MOCK_SSDP_LOCATION,
+        upnp={
+            ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME,
+        },
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=broken_discovery,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "incomplete_discovery"
+
+
+async def test_missing_ssdp_location(hass: HomeAssistant) -> None:
+    """Test a ssdp import where discovery is missing udn."""
+    broken_discovery = ssdp.SsdpServiceInfo(
+        ssdp_usn="usn",
+        ssdp_st="st",
+        ssdp_location="",
+        upnp={ATTR_UPNP_FRIENDLY_NAME: MOCK_FRIENDLY_NAME, ATTR_UPNP_UDN: MOCK_UDN},
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=broken_discovery,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "incomplete_discovery"
+
+
+async def test_host_updated(hass: HomeAssistant) -> None:
+    """Test a ssdp import flow where host changes."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "old_host"},
+        title=MOCK_FRIENDLY_NAME,
+        unique_id=MOCK_UDN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_SSDP},
+        data=MOCK_DISCOVER,
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
+
+    assert entry.data[CONF_HOST] == MOCK_SSDP_LOCATION
diff --git a/tests/components/openhome/test_update.py b/tests/components/openhome/test_update.py
new file mode 100644
index 00000000000000..d975cc29af43d7
--- /dev/null
+++ b/tests/components/openhome/test_update.py
@@ -0,0 +1,172 @@
+"""Tests for the Openhome update platform."""
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+from homeassistant.components.openhome.const import DOMAIN
+from homeassistant.components.update import (
+    ATTR_INSTALLED_VERSION,
+    ATTR_LATEST_VERSION,
+    ATTR_RELEASE_SUMMARY,
+    ATTR_RELEASE_URL,
+    DOMAIN as PLATFORM_DOMAIN,
+    SERVICE_INSTALL,
+    UpdateDeviceClass,
+)
+from homeassistant.const import (
+    ATTR_DEVICE_CLASS,
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    STATE_ON,
+    STATE_UNKNOWN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from tests.common import MockConfigEntry
+
+LATEST_FIRMWARE_INSTALLED = {
+    "status": "on_latest",
+    "current_software": {"version": "4.100.502", "topic": "main", "channel": "release"},
+}
+
+FIRMWARE_UPDATE_AVAILABLE = {
+    "status": "update_available",
+    "current_software": {"version": "4.99.491", "topic": "main", "channel": "release"},
+    "update_info": {
+        "legal": {
+            "licenseurl": "http://products.linn.co.uk/VersionInfo/licenseV2.txt",
+            "privacyurl": "https://www.linn.co.uk/privacy",
+            "privacyuri": "https://products.linn.co.uk/VersionInfo/PrivacyV1.json",
+            "privacyversion": 1,
+        },
+        "releasenotesuri": "http://docs.linn.co.uk/wiki/index.php/ReleaseNotes",
+        "updates": [
+            {
+                "channel": "release",
+                "date": "07 Jun 2023 12:29:48",
+                "description": "Release build version 4.100.502 (07 Jun 2023 12:29:48)",
+                "exaktlink": "3",
+                "manifest": "https://cloud.linn.co.uk/update/components/836/4.100.502/manifest.json",
+                "topic": "main",
+                "variant": "836",
+                "version": "4.100.502",
+            }
+        ],
+        "exaktUpdates": [],
+    },
+}
+
+
+async def setup_integration(
+    hass: HomeAssistant,
+    software_status: dict,
+    update_firmware: AsyncMock,
+) -> None:
+    """Load an openhome platform with mocked device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "http://localhost"},
+    )
+    entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.openhome.PLATFORMS", [Platform.UPDATE]), patch(
+        "homeassistant.components.openhome.Device", MagicMock()
+    ) as mock_device:
+        mock_device.return_value.init = AsyncMock()
+        mock_device.return_value.uuid = MagicMock(return_value="uuid")
+        mock_device.return_value.manufacturer = MagicMock(return_value="manufacturer")
+        mock_device.return_value.model_name = MagicMock(return_value="model_name")
+        mock_device.return_value.friendly_name = MagicMock(return_value="friendly_name")
+        mock_device.return_value.software_status = AsyncMock(
+            return_value=software_status
+        )
+        mock_device.return_value.update_firmware = update_firmware
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+
+async def test_not_supported(hass: HomeAssistant):
+    """Ensure update entity works if service not supported."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, None, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] is None
+    assert state.attributes[ATTR_LATEST_VERSION] is None
+    assert state.attributes[ATTR_RELEASE_URL] is None
+    assert state.attributes[ATTR_RELEASE_SUMMARY] is None
+    update_firmware.assert_not_called()
+
+
+async def test_on_latest_firmware(hass: HomeAssistant):
+    """Test device on latest firmware."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, LATEST_FIRMWARE_INSTALLED, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "4.100.502"
+    assert state.attributes[ATTR_LATEST_VERSION] is None
+    assert state.attributes[ATTR_RELEASE_URL] is None
+    assert state.attributes[ATTR_RELEASE_SUMMARY] is None
+    update_firmware.assert_not_called()
+
+
+async def test_update_available(hass: HomeAssistant):
+    """Test device has firmware update available."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, FIRMWARE_UPDATE_AVAILABLE, update_firmware)
+
+    state = hass.states.get("update.friendly_name")
+
+    assert state
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_DEVICE_CLASS] == UpdateDeviceClass.FIRMWARE
+    assert state.attributes[ATTR_INSTALLED_VERSION] == "4.99.491"
+    assert state.attributes[ATTR_LATEST_VERSION] == "4.100.502"
+    assert (
+        state.attributes[ATTR_RELEASE_URL]
+        == "http://docs.linn.co.uk/wiki/index.php/ReleaseNotes"
+    )
+    assert (
+        state.attributes[ATTR_RELEASE_SUMMARY]
+        == "Release build version 4.100.502 (07 Jun 2023 12:29:48)"
+    )
+
+    await hass.services.async_call(
+        PLATFORM_DOMAIN,
+        SERVICE_INSTALL,
+        {ATTR_ENTITY_ID: "update.friendly_name"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    update_firmware.assert_called_once()
+
+
+async def test_firmware_update_not_required(hass: HomeAssistant):
+    """Ensure firmware install does nothing if up to date."""
+
+    update_firmware = AsyncMock()
+    await setup_integration(hass, LATEST_FIRMWARE_INSTALLED, update_firmware)
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            PLATFORM_DOMAIN,
+            SERVICE_INSTALL,
+            {ATTR_ENTITY_ID: "update.friendly_name"},
+            blocking=True,
+        )
+    update_firmware.assert_not_called()
diff --git a/tests/components/opower/__init__.py b/tests/components/opower/__init__.py
new file mode 100644
index 00000000000000..71aea27a69835b
--- /dev/null
+++ b/tests/components/opower/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Opower integration."""
diff --git a/tests/components/opower/conftest.py b/tests/components/opower/conftest.py
new file mode 100644
index 00000000000000..0ee910f84f4be4
--- /dev/null
+++ b/tests/components/opower/conftest.py
@@ -0,0 +1,23 @@
+"""Fixtures for the Opower integration tests."""
+import pytest
+
+from homeassistant.components.opower.const import DOMAIN
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    config_entry = MockConfigEntry(
+        title="Pacific Gas & Electric (test-username)",
+        domain=DOMAIN,
+        data={
+            "utility": "Pacific Gas and Electric Company (PG&E)",
+            "username": "test-username",
+            "password": "test-password",
+        },
+    )
+    config_entry.add_to_hass(hass)
+    return config_entry
diff --git a/tests/components/opower/test_config_flow.py b/tests/components/opower/test_config_flow.py
new file mode 100644
index 00000000000000..6a45a0dcc561a3
--- /dev/null
+++ b/tests/components/opower/test_config_flow.py
@@ -0,0 +1,206 @@
+"""Test the Opower config flow."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+from opower import CannotConnect, InvalidAuth
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.opower.const import DOMAIN
+from homeassistant.components.recorder import Recorder
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(autouse=True, name="mock_setup_entry")
+def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.opower.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def mock_unload_entry() -> Generator[AsyncMock, None, None]:
+    """Mock unloading a config entry."""
+    with patch(
+        "homeassistant.components.opower.async_unload_entry",
+        return_value=True,
+    ) as mock_unload_entry:
+        yield mock_unload_entry
+
+
+async def test_form(
+    recorder_mock: Recorder, hass: HomeAssistant, mock_setup_entry: AsyncMock
+) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert not result["errors"]
+
+    with patch(
+        "homeassistant.components.opower.config_flow.Opower.async_login",
+    ) as mock_login:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "utility": "Pacific Gas and Electric Company (PG&E)",
+                "username": "test-username",
+                "password": "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "Pacific Gas and Electric Company (PG&E) (test-username)"
+    assert result2["data"] == {
+        "utility": "Pacific Gas and Electric Company (PG&E)",
+        "username": "test-username",
+        "password": "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+    assert mock_login.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("api_exception", "expected_error"),
+    [
+        (InvalidAuth(), "invalid_auth"),
+        (CannotConnect(), "cannot_connect"),
+    ],
+)
+async def test_form_exceptions(
+    recorder_mock: Recorder, hass: HomeAssistant, api_exception, expected_error
+) -> None:
+    """Test we handle exceptions."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.opower.config_flow.Opower.async_login",
+        side_effect=api_exception,
+    ) as mock_login:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "utility": "Pacific Gas and Electric Company (PG&E)",
+                "username": "test-username",
+                "password": "test-password",
+            },
+        )
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": expected_error}
+    assert mock_login.call_count == 1
+
+
+async def test_form_already_configured(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test user input for config_entry that already exists."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.opower.config_flow.Opower.async_login",
+    ) as mock_login:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "utility": "Pacific Gas and Electric Company (PG&E)",
+                "username": "test-username",
+                "password": "test-password",
+            },
+        )
+
+    assert result2["type"] == FlowResultType.ABORT
+    assert result2["reason"] == "already_configured"
+    assert mock_login.call_count == 0
+
+
+async def test_form_not_already_configured(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test user input for config_entry different than the existing one."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.opower.config_flow.Opower.async_login",
+    ) as mock_login:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "utility": "Pacific Gas and Electric Company (PG&E)",
+                "username": "test-username2",
+                "password": "test-password",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == FlowResultType.CREATE_ENTRY
+    assert (
+        result2["title"] == "Pacific Gas and Electric Company (PG&E) (test-username2)"
+    )
+    assert result2["data"] == {
+        "utility": "Pacific Gas and Electric Company (PG&E)",
+        "username": "test-username2",
+        "password": "test-password",
+    }
+    assert len(mock_setup_entry.mock_calls) == 2
+    assert mock_login.call_count == 1
+
+
+async def test_form_valid_reauth(
+    recorder_mock: Recorder,
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_unload_entry: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test that we can handle a valid reauth."""
+    mock_config_entry.state = ConfigEntryState.LOADED
+    mock_config_entry.async_start_reauth(hass)
+    await hass.async_block_till_done()
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+    result = flows[0]
+    assert result["step_id"] == "reauth_confirm"
+    assert result["context"]["source"] == "reauth"
+    assert result["context"]["title_placeholders"] == {"name": mock_config_entry.title}
+
+    with patch(
+        "homeassistant.components.opower.config_flow.Opower.async_login",
+    ) as mock_login:
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {"username": "test-username", "password": "test-password2"},
+        )
+
+    assert result["type"] == FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+
+    await hass.async_block_till_done()
+    assert hass.config_entries.async_entries(DOMAIN)[0].data == {
+        "utility": "Pacific Gas and Electric Company (PG&E)",
+        "username": "test-username",
+        "password": "test-password2",
+    }
+    assert len(mock_unload_entry.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+    assert mock_login.call_count == 1
diff --git a/tests/components/otbr/__init__.py b/tests/components/otbr/__init__.py
index d6b2a406aa1ba3..1f103884db2825 100644
--- a/tests/components/otbr/__init__.py
+++ b/tests/components/otbr/__init__.py
@@ -3,7 +3,7 @@
 CONFIG_ENTRY_DATA = {"url": "http://core-silabs-multiprotocol:8081"}
 
 DATASET_CH15 = bytes.fromhex(
-    "0E080000000000010000000300000F35060004001FFFE00208F642646DA209B1C00708FDF57B5A"
+    "0E080000000000010000000300000F35060004001FFFE00208F642646DA209B1D00708FDF57B5A"
     "0FE2AAF60510DE98B5BA1A528FEE049D4B4B01835375030D4F70656E5468726561642048410102"
     "25A40410F5DD18371BFD29E1A601EF6FFAD94C030C0402A0F7F8"
 )
diff --git a/tests/components/otbr/conftest.py b/tests/components/otbr/conftest.py
index f0b3ca0a18d2cc..bb3b474519ec60 100644
--- a/tests/components/otbr/conftest.py
+++ b/tests/components/otbr/conftest.py
@@ -1,9 +1,10 @@
 """Test fixtures for the Open Thread Border Router integration."""
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 
 from homeassistant.components import otbr
+from homeassistant.core import HomeAssistant
 
 from . import CONFIG_ENTRY_DATA, DATASET_CH16
 
@@ -31,3 +32,12 @@ async def otbr_config_entry_fixture(hass):
 @pytest.fixture(autouse=True)
 def use_mocked_zeroconf(mock_async_zeroconf):
     """Mock zeroconf in all tests."""
+
+
+@pytest.fixture(name="multiprotocol_addon_manager_mock")
+def multiprotocol_addon_manager_mock_fixture(hass: HomeAssistant):
+    """Mock the Silicon Labs Multiprotocol add-on manager."""
+    mock_manager = Mock()
+    mock_manager.async_get_channel = Mock(return_value=None)
+    with patch.dict(hass.data, {"silabs_multiprotocol_addon_manager": mock_manager}):
+        yield mock_manager
diff --git a/tests/components/otbr/test_config_flow.py b/tests/components/otbr/test_config_flow.py
index 9fe30d709a730a..b6cb0df78cdc47 100644
--- a/tests/components/otbr/test_config_flow.py
+++ b/tests/components/otbr/test_config_flow.py
@@ -2,7 +2,7 @@
 import asyncio
 from http import HTTPStatus
 from typing import Any
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 import aiohttp
 import pytest
@@ -25,6 +25,23 @@
 )
 
 
+@pytest.fixture(name="addon_info")
+def addon_info_fixture():
+    """Mock Supervisor add-on info."""
+    with patch(
+        "homeassistant.components.otbr.config_flow.async_get_addon_info",
+    ) as addon_info:
+        addon_info.return_value = {
+            "available": True,
+            "hostname": None,
+            "options": {},
+            "state": None,
+            "update_available": False,
+            "version": None,
+        }
+        yield addon_info
+
+
 async def test_user_flow(
     hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -72,8 +89,8 @@ async def test_user_flow_router_not_setup(
     """
     url = "http://custom_url:1234"
     aioclient_mock.get(f"{url}/node/dataset/active", status=HTTPStatus.NO_CONTENT)
-    aioclient_mock.post(f"{url}/node/dataset/active", status=HTTPStatus.ACCEPTED)
-    aioclient_mock.post(f"{url}/node/state", status=HTTPStatus.OK)
+    aioclient_mock.put(f"{url}/node/dataset/active", status=HTTPStatus.CREATED)
+    aioclient_mock.put(f"{url}/node/state", status=HTTPStatus.OK)
 
     result = await hass.config_entries.flow.async_init(
         otbr.DOMAIN, context={"source": "user"}
@@ -96,14 +113,14 @@ async def test_user_flow_router_not_setup(
         )
 
     # Check we create a dataset and enable the router
-    assert aioclient_mock.mock_calls[-2][0] == "POST"
+    assert aioclient_mock.mock_calls[-2][0] == "PUT"
     assert aioclient_mock.mock_calls[-2][1].path == "/node/dataset/active"
     assert aioclient_mock.mock_calls[-2][2] == {
         "Channel": 15,
         "NetworkName": "home-assistant",
     }
 
-    assert aioclient_mock.mock_calls[-1][0] == "POST"
+    assert aioclient_mock.mock_calls[-1][0] == "PUT"
     assert aioclient_mock.mock_calls[-1][1].path == "/node/state"
     assert aioclient_mock.mock_calls[-1][2] == "enable"
 
@@ -176,7 +193,7 @@ async def test_user_flow_connect_error(hass: HomeAssistant, error) -> None:
 
 
 async def test_hassio_discovery_flow(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow."""
     url = "http://core-silabs-multiprotocol:8081"
@@ -195,7 +212,7 @@ async def test_hassio_discovery_flow(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -203,12 +220,101 @@ async def test_hassio_discovery_flow(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
+    assert config_entry.unique_id == HASSIO_DATA.uuid
+
+
+async def test_hassio_discovery_flow_yellow(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
+) -> None:
+    """Test the hassio discovery flow."""
+    url = "http://core-silabs-multiprotocol:8081"
+    aioclient_mock.get(f"{url}/node/dataset/active", text="aa")
+
+    addon_info.return_value = {
+        "available": True,
+        "hostname": None,
+        "options": {"device": "/dev/TTYAMA1"},
+        "state": None,
+        "update_available": False,
+        "version": None,
+    }
+
+    with patch(
+        "homeassistant.components.otbr.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry, patch(
+        "homeassistant.components.otbr.config_flow.yellow_hardware.async_info"
+    ):
+        result = await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA
+        )
+
+    expected_data = {
+        "url": f"http://{HASSIO_DATA.config['host']}:{HASSIO_DATA.config['port']}",
+    }
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Home Assistant Yellow"
+    assert result["data"] == expected_data
+    assert result["options"] == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
+    assert config_entry.data == expected_data
+    assert config_entry.options == {}
+    assert config_entry.title == "Home Assistant Yellow"
+    assert config_entry.unique_id == HASSIO_DATA.uuid
+
+
+async def test_hassio_discovery_flow_sky_connect(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
+) -> None:
+    """Test the hassio discovery flow."""
+    url = "http://core-silabs-multiprotocol:8081"
+    aioclient_mock.get(f"{url}/node/dataset/active", text="aa")
+
+    addon_info.return_value = {
+        "available": True,
+        "hostname": None,
+        "options": {
+            "device": (
+                "/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_"
+                "9e2adbd75b8beb119fe564a0f320645d-if00-port0"
+            )
+        },
+        "state": None,
+        "update_available": False,
+        "version": None,
+    }
+
+    with patch(
+        "homeassistant.components.otbr.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result = await hass.config_entries.flow.async_init(
+            otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA
+        )
+
+    expected_data = {
+        "url": f"http://{HASSIO_DATA.config['host']}:{HASSIO_DATA.config['port']}",
+    }
+
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Home Assistant SkyConnect"
+    assert result["data"] == expected_data
+    assert result["options"] == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
+    assert config_entry.data == expected_data
+    assert config_entry.options == {}
+    assert config_entry.title == "Home Assistant SkyConnect"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
 async def test_hassio_discovery_flow_router_not_setup(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -216,8 +322,8 @@ async def test_hassio_discovery_flow_router_not_setup(
     """
     url = "http://core-silabs-multiprotocol:8081"
     aioclient_mock.get(f"{url}/node/dataset/active", status=HTTPStatus.NO_CONTENT)
-    aioclient_mock.post(f"{url}/node/dataset/active", status=HTTPStatus.ACCEPTED)
-    aioclient_mock.post(f"{url}/node/state", status=HTTPStatus.OK)
+    aioclient_mock.put(f"{url}/node/dataset/active", status=HTTPStatus.CREATED)
+    aioclient_mock.put(f"{url}/node/state", status=HTTPStatus.OK)
 
     with patch(
         "homeassistant.components.otbr.config_flow.async_get_preferred_dataset",
@@ -231,14 +337,14 @@ async def test_hassio_discovery_flow_router_not_setup(
         )
 
     # Check we create a dataset and enable the router
-    assert aioclient_mock.mock_calls[-2][0] == "POST"
+    assert aioclient_mock.mock_calls[-2][0] == "PUT"
     assert aioclient_mock.mock_calls[-2][1].path == "/node/dataset/active"
     assert aioclient_mock.mock_calls[-2][2] == {
         "Channel": 15,
         "NetworkName": "home-assistant",
     }
 
-    assert aioclient_mock.mock_calls[-1][0] == "POST"
+    assert aioclient_mock.mock_calls[-1][0] == "PUT"
     assert aioclient_mock.mock_calls[-1][1].path == "/node/state"
     assert aioclient_mock.mock_calls[-1][2] == "enable"
 
@@ -247,7 +353,7 @@ async def test_hassio_discovery_flow_router_not_setup(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -255,12 +361,12 @@ async def test_hassio_discovery_flow_router_not_setup(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
 async def test_hassio_discovery_flow_router_not_setup_has_preferred(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, addon_info
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -268,8 +374,8 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     """
     url = "http://core-silabs-multiprotocol:8081"
     aioclient_mock.get(f"{url}/node/dataset/active", status=HTTPStatus.NO_CONTENT)
-    aioclient_mock.put(f"{url}/node/dataset/active", status=HTTPStatus.ACCEPTED)
-    aioclient_mock.post(f"{url}/node/state", status=HTTPStatus.OK)
+    aioclient_mock.put(f"{url}/node/dataset/active", status=HTTPStatus.CREATED)
+    aioclient_mock.put(f"{url}/node/state", status=HTTPStatus.OK)
 
     with patch(
         "homeassistant.components.otbr.config_flow.async_get_preferred_dataset",
@@ -287,7 +393,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     assert aioclient_mock.mock_calls[-2][1].path == "/node/dataset/active"
     assert aioclient_mock.mock_calls[-2][2] == DATASET_CH15.hex()
 
-    assert aioclient_mock.mock_calls[-1][0] == "POST"
+    assert aioclient_mock.mock_calls[-1][0] == "PUT"
     assert aioclient_mock.mock_calls[-1][1].path == "/node/state"
     assert aioclient_mock.mock_calls[-1][2] == "enable"
 
@@ -296,7 +402,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -304,12 +410,15 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
 async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    multiprotocol_addon_manager_mock,
+    addon_info,
 ) -> None:
     """Test the hassio discovery flow when the border router has no dataset.
 
@@ -318,11 +427,10 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     """
     url = "http://core-silabs-multiprotocol:8081"
     aioclient_mock.get(f"{url}/node/dataset/active", status=HTTPStatus.NO_CONTENT)
-    aioclient_mock.post(f"{url}/node/dataset/active", status=HTTPStatus.ACCEPTED)
-    aioclient_mock.post(f"{url}/node/state", status=HTTPStatus.OK)
+    aioclient_mock.put(f"{url}/node/dataset/active", status=HTTPStatus.CREATED)
+    aioclient_mock.put(f"{url}/node/state", status=HTTPStatus.OK)
 
-    networksettings = Mock()
-    networksettings.network_info.channel = 15
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
 
     with patch(
         "homeassistant.components.otbr.config_flow.async_get_preferred_dataset",
@@ -330,26 +438,20 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     ), patch(
         "homeassistant.components.otbr.async_setup_entry",
         return_value=True,
-    ) as mock_setup_entry, patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=networksettings,
-    ):
+    ) as mock_setup_entry:
         result = await hass.config_entries.flow.async_init(
             otbr.DOMAIN, context={"source": "hassio"}, data=HASSIO_DATA
         )
 
     # Check we create a dataset and enable the router
-    assert aioclient_mock.mock_calls[-2][0] == "POST"
+    assert aioclient_mock.mock_calls[-2][0] == "PUT"
     assert aioclient_mock.mock_calls[-2][1].path == "/node/dataset/active"
     assert aioclient_mock.mock_calls[-2][2] == {
         "Channel": 15,
         "NetworkName": "home-assistant",
     }
 
-    assert aioclient_mock.mock_calls[-1][0] == "POST"
+    assert aioclient_mock.mock_calls[-1][0] == "PUT"
     assert aioclient_mock.mock_calls[-1][1].path == "/node/state"
     assert aioclient_mock.mock_calls[-1][2] == "enable"
 
@@ -358,7 +460,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     }
 
     assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == "Open Thread Border Router"
+    assert result["title"] == "Silicon Labs Multiprotocol"
     assert result["data"] == expected_data
     assert result["options"] == {}
     assert len(mock_setup_entry.mock_calls) == 1
@@ -366,7 +468,7 @@ async def test_hassio_discovery_flow_router_not_setup_has_preferred_2(
     config_entry = hass.config_entries.async_entries(otbr.DOMAIN)[0]
     assert config_entry.data == expected_data
     assert config_entry.options == {}
-    assert config_entry.title == "Open Thread Border Router"
+    assert config_entry.title == "Silicon Labs Multiprotocol"
     assert config_entry.unique_id == HASSIO_DATA.uuid
 
 
diff --git a/tests/components/otbr/test_init.py b/tests/components/otbr/test_init.py
index bf481488a0a9d7..990c015244fc01 100644
--- a/tests/components/otbr/test_init.py
+++ b/tests/components/otbr/test_init.py
@@ -1,7 +1,7 @@
 """Test the Open Thread Border Router integration."""
 import asyncio
 from http import HTTPStatus
-from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, patch
 
 import aiohttp
 import pytest
@@ -24,12 +24,6 @@
 from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-DATASET_BAD_CHANNEL = bytes.fromhex(
-    "0E080000000000010000000035060004001FFFE00208F642646DA209B1C00708FDF57B5A"
-    "0FE2AAF60510DE98B5BA1A528FEE049D4B4B01835375030D4F70656E5468726561642048410102"
-    "25A40410F5DD18371BFD29E1A601EF6FFAD94C030C0402A0F7F8"
-)
-
 DATASET_NO_CHANNEL = bytes.fromhex(
     "0E08000000000001000035060004001FFFE00208F642646DA209B1C00708FDF57B5A"
     "0FE2AAF60510DE98B5BA1A528FEE049D4B4B01835375030D4F70656E5468726561642048410102"
@@ -65,7 +59,9 @@ async def test_import_dataset(hass: HomeAssistant) -> None:
     )
 
 
-async def test_import_share_radio_channel_collision(hass: HomeAssistant) -> None:
+async def test_import_share_radio_channel_collision(
+    hass: HomeAssistant, multiprotocol_addon_manager_mock
+) -> None:
     """Test the active dataset is imported at setup.
 
     This imports a dataset with different channel than ZHA when ZHA and OTBR share
@@ -73,8 +69,7 @@ async def test_import_share_radio_channel_collision(hass: HomeAssistant) -> None
     """
     issue_registry = ir.async_get(hass)
 
-    networksettings = Mock()
-    networksettings.network_info.channel = 15
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
 
     config_entry = MockConfigEntry(
         data=CONFIG_ENTRY_DATA,
@@ -87,13 +82,7 @@ async def test_import_share_radio_channel_collision(hass: HomeAssistant) -> None
         "python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=DATASET_CH16
     ), patch(
         "homeassistant.components.thread.dataset_store.DatasetStore.async_add"
-    ) as mock_add, patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=networksettings,
-    ):
+    ) as mock_add:
         assert await hass.config_entries.async_setup(config_entry.entry_id)
 
     mock_add.assert_called_once_with(otbr.DOMAIN, DATASET_CH16.hex())
@@ -103,11 +92,9 @@ async def test_import_share_radio_channel_collision(hass: HomeAssistant) -> None
     )
 
 
-@pytest.mark.parametrize(
-    "dataset", [DATASET_BAD_CHANNEL, DATASET_CH15, DATASET_NO_CHANNEL]
-)
+@pytest.mark.parametrize("dataset", [DATASET_CH15, DATASET_NO_CHANNEL])
 async def test_import_share_radio_no_channel_collision(
-    hass: HomeAssistant, dataset: bytes
+    hass: HomeAssistant, multiprotocol_addon_manager_mock, dataset: bytes
 ) -> None:
     """Test the active dataset is imported at setup.
 
@@ -115,8 +102,7 @@ async def test_import_share_radio_no_channel_collision(
     """
     issue_registry = ir.async_get(hass)
 
-    networksettings = Mock()
-    networksettings.network_info.channel = 15
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
 
     config_entry = MockConfigEntry(
         data=CONFIG_ENTRY_DATA,
@@ -129,13 +115,7 @@ async def test_import_share_radio_no_channel_collision(
         "python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=dataset
     ), patch(
         "homeassistant.components.thread.dataset_store.DatasetStore.async_add"
-    ) as mock_add, patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=networksettings,
-    ):
+    ) as mock_add:
         assert await hass.config_entries.async_setup(config_entry.entry_id)
 
     mock_add.assert_called_once_with(otbr.DOMAIN, dataset.hex())
diff --git a/tests/components/otbr/test_silabs_multiprotocol.py b/tests/components/otbr/test_silabs_multiprotocol.py
new file mode 100644
index 00000000000000..8dd07db6f22e7d
--- /dev/null
+++ b/tests/components/otbr/test_silabs_multiprotocol.py
@@ -0,0 +1,175 @@
+"""Test OTBR Silicon Labs Multiprotocol support."""
+from unittest.mock import patch
+
+import pytest
+from python_otbr_api import ActiveDataSet, tlv_parser
+
+from homeassistant.components import otbr
+from homeassistant.components.otbr import (
+    silabs_multiprotocol as otbr_silabs_multiprotocol,
+)
+from homeassistant.components.thread import dataset_store
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+
+from . import DATASET_CH16
+
+OTBR_MULTIPAN_URL = "http://core-silabs-multiprotocol:8081"
+OTBR_NON_MULTIPAN_URL = "/dev/ttyAMA1"
+DATASET_CH16_PENDING = (
+    "0E080000000000020000"  # ACTIVETIMESTAMP
+    "340400006699"  # DELAYTIMER
+    "000300000F"  # CHANNEL
+    "35060004001FFFE0"  # CHANNELMASK
+    "0208F642646DA209B1C0"  # EXTPANID
+    "0708FDF57B5A0FE2AAF6"  # MESHLOCALPREFIX
+    "0510DE98B5BA1A528FEE049D4B4B01835375"  # NETWORKKEY
+    "030D4F70656E546872656164204841"  # NETWORKNAME
+    "010225A4"  # PANID
+    "0410F5DD18371BFD29E1A601EF6FFAD94C03"  # PSKC
+    "0C0402A0F7F8"  # SECURITYPOLICY
+)
+
+
+async def test_async_change_channel(hass: HomeAssistant, otbr_config_entry) -> None:
+    """Test test_async_change_channel."""
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_CH16.hex()
+
+    with patch("python_otbr_api.OTBR.set_channel") as mock_set_channel, patch(
+        "python_otbr_api.OTBR.get_pending_dataset_tlvs",
+        return_value=bytes.fromhex(DATASET_CH16_PENDING),
+    ):
+        await otbr_silabs_multiprotocol.async_change_channel(hass, 15, delay=5 * 300)
+    mock_set_channel.assert_awaited_once_with(15, delay=5 * 300 * 1000)
+
+    pending_dataset = tlv_parser.parse_tlv(DATASET_CH16_PENDING)
+    pending_dataset.pop(tlv_parser.MeshcopTLVType.DELAYTIMER)
+
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == tlv_parser.encode_tlv(
+        pending_dataset
+    )
+
+
+async def test_async_change_channel_no_pending(
+    hass: HomeAssistant, otbr_config_entry
+) -> None:
+    """Test test_async_change_channel when the pending dataset already expired."""
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_CH16.hex()
+
+    with patch("python_otbr_api.OTBR.set_channel") as mock_set_channel, patch(
+        "python_otbr_api.OTBR.get_active_dataset_tlvs",
+        return_value=bytes.fromhex(DATASET_CH16_PENDING),
+    ), patch(
+        "python_otbr_api.OTBR.get_pending_dataset_tlvs",
+        return_value=None,
+    ):
+        await otbr_silabs_multiprotocol.async_change_channel(hass, 15, delay=5 * 300)
+    mock_set_channel.assert_awaited_once_with(15, delay=5 * 300 * 1000)
+
+    pending_dataset = tlv_parser.parse_tlv(DATASET_CH16_PENDING)
+    pending_dataset.pop(tlv_parser.MeshcopTLVType.DELAYTIMER)
+
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == tlv_parser.encode_tlv(
+        pending_dataset
+    )
+
+
+async def test_async_change_channel_no_update(
+    hass: HomeAssistant, otbr_config_entry
+) -> None:
+    """Test test_async_change_channel when we didn't get a dataset from the OTBR."""
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_CH16.hex()
+
+    with patch("python_otbr_api.OTBR.set_channel") as mock_set_channel, patch(
+        "python_otbr_api.OTBR.get_active_dataset_tlvs",
+        return_value=None,
+    ), patch(
+        "python_otbr_api.OTBR.get_pending_dataset_tlvs",
+        return_value=None,
+    ):
+        await otbr_silabs_multiprotocol.async_change_channel(hass, 15, delay=5 * 300)
+    mock_set_channel.assert_awaited_once_with(15, delay=5 * 300 * 1000)
+
+    assert list(store.datasets.values())[0].tlv == DATASET_CH16.hex()
+
+
+async def test_async_change_channel_no_otbr(hass: HomeAssistant) -> None:
+    """Test async_change_channel when otbr is not configured."""
+
+    with patch("python_otbr_api.OTBR.set_channel") as mock_set_channel:
+        await otbr_silabs_multiprotocol.async_change_channel(hass, 16, delay=0)
+    mock_set_channel.assert_not_awaited()
+
+
+async def test_async_get_channel(hass: HomeAssistant, otbr_config_entry) -> None:
+    """Test test_async_get_channel."""
+
+    with patch(
+        "python_otbr_api.OTBR.get_active_dataset",
+        return_value=ActiveDataSet(channel=11),
+    ) as mock_get_active_dataset:
+        assert await otbr_silabs_multiprotocol.async_get_channel(hass) == 11
+    mock_get_active_dataset.assert_awaited_once_with()
+
+
+async def test_async_get_channel_no_dataset(
+    hass: HomeAssistant, otbr_config_entry
+) -> None:
+    """Test test_async_get_channel."""
+
+    with patch(
+        "python_otbr_api.OTBR.get_active_dataset",
+        return_value=None,
+    ) as mock_get_active_dataset:
+        assert await otbr_silabs_multiprotocol.async_get_channel(hass) is None
+    mock_get_active_dataset.assert_awaited_once_with()
+
+
+async def test_async_get_channel_error(hass: HomeAssistant, otbr_config_entry) -> None:
+    """Test test_async_get_channel."""
+
+    with patch(
+        "python_otbr_api.OTBR.get_active_dataset",
+        side_effect=HomeAssistantError,
+    ) as mock_get_active_dataset:
+        assert await otbr_silabs_multiprotocol.async_get_channel(hass) is None
+    mock_get_active_dataset.assert_awaited_once_with()
+
+
+async def test_async_get_channel_no_otbr(hass: HomeAssistant) -> None:
+    """Test test_async_get_channel when otbr is not configured."""
+
+    with patch("python_otbr_api.OTBR.get_active_dataset") as mock_get_active_dataset:
+        await otbr_silabs_multiprotocol.async_get_channel(hass)
+    mock_get_active_dataset.assert_not_awaited()
+
+
+@pytest.mark.parametrize(
+    ("url", "expected"),
+    [(OTBR_MULTIPAN_URL, True), (OTBR_NON_MULTIPAN_URL, False)],
+)
+async def test_async_using_multipan(
+    hass: HomeAssistant, otbr_config_entry, url: str, expected: bool
+) -> None:
+    """Test async_change_channel when otbr is not configured."""
+    data: otbr.OTBRData = hass.data[otbr.DOMAIN]
+    data.url = url
+
+    assert await otbr_silabs_multiprotocol.async_using_multipan(hass) is expected
+
+
+async def test_async_using_multipan_no_otbr(hass: HomeAssistant) -> None:
+    """Test async_change_channel when otbr is not configured."""
+
+    assert await otbr_silabs_multiprotocol.async_using_multipan(hass) is False
diff --git a/tests/components/otbr/test_util.py b/tests/components/otbr/test_util.py
index af5306b3581b74..f8ed79b91ee3fb 100644
--- a/tests/components/otbr/test_util.py
+++ b/tests/components/otbr/test_util.py
@@ -1,5 +1,4 @@
 """Test OTBR Utility functions."""
-from unittest.mock import Mock, patch
 
 from homeassistant.components import otbr
 from homeassistant.core import HomeAssistant
@@ -8,51 +7,19 @@
 OTBR_NON_MULTIPAN_URL = "/dev/ttyAMA1"
 
 
-async def test_get_allowed_channel(hass: HomeAssistant) -> None:
+async def test_get_allowed_channel(
+    hass: HomeAssistant, multiprotocol_addon_manager_mock
+) -> None:
     """Test get_allowed_channel."""
 
-    zha_networksettings = Mock()
-    zha_networksettings.network_info.channel = 15
-
-    # OTBR multipan + No ZHA -> no restriction
+    # OTBR multipan + No configured channel -> no restriction
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = None
     assert await otbr.util.get_allowed_channel(hass, OTBR_MULTIPAN_URL) is None
 
-    # OTBR multipan + ZHA multipan empty settings -> no restriction
-    with patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=None,
-    ):
-        assert await otbr.util.get_allowed_channel(hass, OTBR_MULTIPAN_URL) is None
-
-    # OTBR multipan + ZHA not multipan using channel 15 -> no restriction
-    with patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="/dev/ttyAMA1",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=zha_networksettings,
-    ):
-        assert await otbr.util.get_allowed_channel(hass, OTBR_MULTIPAN_URL) is None
-
-    # OTBR multipan + ZHA multipan using channel 15 -> 15
-    with patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=zha_networksettings,
-    ):
-        assert await otbr.util.get_allowed_channel(hass, OTBR_MULTIPAN_URL) == 15
+    # OTBR multipan + multipan using channel 15 -> 15
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
+    assert await otbr.util.get_allowed_channel(hass, OTBR_MULTIPAN_URL) == 15
 
-    # OTBR not multipan + ZHA multipan using channel 15 -> no restriction
-    with patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=zha_networksettings,
-    ):
-        assert await otbr.util.get_allowed_channel(hass, OTBR_NON_MULTIPAN_URL) is None
+    # OTBR no multipan + multipan using channel 15 -> no restriction
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
+    assert await otbr.util.get_allowed_channel(hass, OTBR_NON_MULTIPAN_URL) is None
diff --git a/tests/components/otbr/test_websocket_api.py b/tests/components/otbr/test_websocket_api.py
index e6f492f5e5ff47..65bec9e8408e6b 100644
--- a/tests/components/otbr/test_websocket_api.py
+++ b/tests/components/otbr/test_websocket_api.py
@@ -1,5 +1,5 @@
 """Test OTBR Websocket API."""
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 import pytest
 import python_otbr_api
@@ -84,6 +84,8 @@ async def test_create_network(
     with patch(
         "python_otbr_api.OTBR.create_active_dataset"
     ) as create_dataset_mock, patch(
+        "python_otbr_api.OTBR.delete_active_dataset"
+    ) as delete_dataset_mock, patch(
         "python_otbr_api.OTBR.set_enabled"
     ) as set_enabled_mock, patch(
         "python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=DATASET_CH16
@@ -97,10 +99,9 @@ async def test_create_network(
         assert msg["result"] is None
 
     create_dataset_mock.assert_called_once_with(
-        python_otbr_api.models.OperationalDataSet(
-            channel=15, network_name="home-assistant"
-        )
+        python_otbr_api.models.ActiveDataSet(channel=15, network_name="home-assistant")
     )
+    delete_dataset_mock.assert_called_once_with()
     assert len(set_enabled_mock.mock_calls) == 2
     assert set_enabled_mock.mock_calls[0][1][0] is False
     assert set_enabled_mock.mock_calls[1][1][0] is True
@@ -153,7 +154,7 @@ async def test_create_network_fails_2(
     ), patch(
         "python_otbr_api.OTBR.create_active_dataset",
         side_effect=python_otbr_api.OTBRError,
-    ):
+    ), patch("python_otbr_api.OTBR.delete_active_dataset"):
         await websocket_client.send_json_auto_id({"type": "otbr/create_network"})
         msg = await websocket_client.receive_json()
 
@@ -173,6 +174,8 @@ async def test_create_network_fails_3(
         side_effect=[None, python_otbr_api.OTBRError],
     ), patch(
         "python_otbr_api.OTBR.create_active_dataset",
+    ), patch(
+        "python_otbr_api.OTBR.delete_active_dataset"
     ):
         await websocket_client.send_json_auto_id({"type": "otbr/create_network"})
         msg = await websocket_client.receive_json()
@@ -193,6 +196,8 @@ async def test_create_network_fails_4(
     ), patch(
         "python_otbr_api.OTBR.get_active_dataset_tlvs",
         side_effect=python_otbr_api.OTBRError,
+    ), patch(
+        "python_otbr_api.OTBR.delete_active_dataset"
     ):
         await websocket_client.send_json_auto_id({"type": "otbr/create_network"})
         msg = await websocket_client.receive_json()
@@ -210,7 +215,9 @@ async def test_create_network_fails_5(
     """Test create network."""
     with patch("python_otbr_api.OTBR.set_enabled"), patch(
         "python_otbr_api.OTBR.create_active_dataset"
-    ), patch("python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=None):
+    ), patch("python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=None), patch(
+        "python_otbr_api.OTBR.delete_active_dataset"
+    ):
         await websocket_client.send_json_auto_id({"type": "otbr/create_network"})
         msg = await websocket_client.receive_json()
 
@@ -218,6 +225,26 @@ async def test_create_network_fails_5(
     assert msg["error"]["code"] == "get_active_dataset_tlvs_empty"
 
 
+async def test_create_network_fails_6(
+    hass: HomeAssistant,
+    aioclient_mock: AiohttpClientMocker,
+    otbr_config_entry,
+    websocket_client,
+) -> None:
+    """Test create network."""
+    with patch("python_otbr_api.OTBR.set_enabled"), patch(
+        "python_otbr_api.OTBR.create_active_dataset"
+    ), patch("python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=None), patch(
+        "python_otbr_api.OTBR.delete_active_dataset",
+        side_effect=python_otbr_api.OTBRError,
+    ):
+        await websocket_client.send_json_auto_id({"type": "otbr/create_network"})
+        msg = await websocket_client.receive_json()
+
+    assert not msg["success"]
+    assert msg["error"]["code"] == "delete_active_dataset_failed"
+
+
 async def test_set_network(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
@@ -275,6 +302,7 @@ async def test_set_network_no_entry(
 async def test_set_network_channel_conflict(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,
+    multiprotocol_addon_manager_mock,
     otbr_config_entry,
     websocket_client,
 ) -> None:
@@ -283,24 +311,16 @@ async def test_set_network_channel_conflict(
     dataset_store = await thread.dataset_store.async_get_store(hass)
     dataset_id = list(dataset_store.datasets)[0]
 
-    networksettings = Mock()
-    networksettings.network_info.channel = 15
+    multiprotocol_addon_manager_mock.async_get_channel.return_value = 15
 
-    with patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_radio_path",
-        return_value="socket://core-silabs-multiprotocol:9999",
-    ), patch(
-        "homeassistant.components.otbr.util.zha_api.async_get_network_settings",
-        return_value=networksettings,
-    ):
-        await websocket_client.send_json_auto_id(
-            {
-                "type": "otbr/set_network",
-                "dataset_id": dataset_id,
-            }
-        )
+    await websocket_client.send_json_auto_id(
+        {
+            "type": "otbr/set_network",
+            "dataset_id": dataset_id,
+        }
+    )
 
-        msg = await websocket_client.receive_json()
+    msg = await websocket_client.receive_json()
 
     assert not msg["success"]
     assert msg["error"]["code"] == "channel_conflict"
diff --git a/tests/components/p1_monitor/test_sensor.py b/tests/components/p1_monitor/test_sensor.py
index 14ff3b1e519513..f84df458d4b76e 100644
--- a/tests/components/p1_monitor/test_sensor.py
+++ b/tests/components/p1_monitor/test_sensor.py
@@ -43,20 +43,23 @@ async def test_smartmeter(
     assert state
     assert entry.unique_id == f"{entry_id}_smartmeter_power_consumption"
     assert state.state == "877"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Power Consumption"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "SmartMeter Power consumption"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
     assert ATTR_ICON not in state.attributes
 
-    state = hass.states.get("sensor.smartmeter_energy_consumption_high")
-    entry = entity_registry.async_get("sensor.smartmeter_energy_consumption_high")
+    state = hass.states.get("sensor.smartmeter_energy_consumption_high_tariff")
+    entry = entity_registry.async_get(
+        "sensor.smartmeter_energy_consumption_high_tariff"
+    )
     assert entry
     assert state
     assert entry.unique_id == f"{entry_id}_smartmeter_energy_consumption_high"
     assert state.state == "2770.133"
     assert (
-        state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Consumption - High Tariff"
+        state.attributes.get(ATTR_FRIENDLY_NAME)
+        == "SmartMeter Energy consumption - High tariff"
     )
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
@@ -69,7 +72,7 @@ async def test_smartmeter(
     assert state
     assert entry.unique_id == f"{entry_id}_smartmeter_energy_tariff_period"
     assert state.state == "high"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Tariff Period"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "SmartMeter Energy tariff period"
     assert state.attributes.get(ATTR_ICON) == "mdi:calendar-clock"
     assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
     assert ATTR_DEVICE_CLASS not in state.attributes
@@ -100,7 +103,7 @@ async def test_phases(
     assert state
     assert entry.unique_id == f"{entry_id}_phases_voltage_phase_l1"
     assert state.state == "233.6"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Voltage Phase L1"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Phases Voltage phase L1"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricPotential.VOLT
@@ -114,7 +117,7 @@ async def test_phases(
     assert state
     assert entry.unique_id == f"{entry_id}_phases_current_phase_l1"
     assert state.state == "1.6"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Current Phase L1"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Phases Current phase L1"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfElectricCurrent.AMPERE
@@ -128,7 +131,7 @@ async def test_phases(
     assert state
     assert entry.unique_id == f"{entry_id}_phases_power_consumed_phase_l1"
     assert state.state == "315"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Power Consumed Phase L1"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Phases Power consumed phase L1"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
@@ -160,7 +163,10 @@ async def test_settings(
     assert state
     assert entry.unique_id == f"{entry_id}_settings_energy_consumption_price_low"
     assert state.state == "0.20522"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Consumption Price - Low"
+    assert (
+        state.attributes.get(ATTR_FRIENDLY_NAME)
+        == "Settings Energy consumption price - Low"
+    )
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
@@ -173,7 +179,10 @@ async def test_settings(
     assert state
     assert entry.unique_id == f"{entry_id}_settings_energy_production_price_low"
     assert state.state == "0.20522"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Production Price - Low"
+    assert (
+        state.attributes.get(ATTR_FRIENDLY_NAME)
+        == "Settings Energy production price - Low"
+    )
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
     assert (
         state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
@@ -205,7 +214,7 @@ async def test_watermeter(
     assert state
     assert entry.unique_id == f"{entry_id}_watermeter_consumption_day"
     assert state.state == "112.0"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Consumption Day"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "WaterMeter Consumption day"
     assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfVolume.LITERS
 
diff --git a/tests/components/persistent_notification/conftest.py b/tests/components/persistent_notification/conftest.py
new file mode 100644
index 00000000000000..d665c0075b36a4
--- /dev/null
+++ b/tests/components/persistent_notification/conftest.py
@@ -0,0 +1,12 @@
+"""The tests for the persistent notification component."""
+
+import pytest
+
+import homeassistant.components.persistent_notification as pn
+from homeassistant.setup import async_setup_component
+
+
+@pytest.fixture(autouse=True)
+async def setup_integration(hass):
+    """Set up persistent notification integration."""
+    assert await async_setup_component(hass, pn.DOMAIN, {})
diff --git a/tests/components/persistent_notification/test_init.py b/tests/components/persistent_notification/test_init.py
index de0ae25497a8ab..921f4b120450a0 100644
--- a/tests/components/persistent_notification/test_init.py
+++ b/tests/components/persistent_notification/test_init.py
@@ -1,40 +1,24 @@
 """The tests for the persistent notification component."""
-import pytest
+
 
 import homeassistant.components.persistent_notification as pn
 from homeassistant.components.websocket_api.const import TYPE_RESULT
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from tests.common import async_capture_events
 from tests.typing import WebSocketGenerator
 
 
-@pytest.fixture(autouse=True)
-async def setup_integration(hass):
-    """Set up persistent notification integration."""
-    assert await async_setup_component(hass, pn.DOMAIN, {})
-
-
 async def test_create(hass: HomeAssistant) -> None:
     """Test creating notification without title or notification id."""
-    notifications = hass.data[pn.DOMAIN]
+    notifications = pn._async_get_or_create_notifications(hass)
     assert len(hass.states.async_entity_ids(pn.DOMAIN)) == 0
     assert len(notifications) == 0
 
     pn.async_create(hass, "Hello World 2", title="2 beers")
-
-    entity_ids = hass.states.async_entity_ids(pn.DOMAIN)
-    assert len(entity_ids) == 1
     assert len(notifications) == 1
 
-    state = hass.states.get(entity_ids[0])
-    assert state.state == pn.STATE
-    assert state.attributes.get("message") == "Hello World 2"
-    assert state.attributes.get("title") == "2 beers"
-
-    notification = notifications.get(entity_ids[0])
-    assert notification["status"] == pn.STATUS_UNREAD
+    notification = notifications[list(notifications)[0]]
     assert notification["message"] == "Hello World 2"
     assert notification["title"] == "2 beers"
     assert notification["created_at"] is not None
@@ -42,86 +26,57 @@ async def test_create(hass: HomeAssistant) -> None:
 
 async def test_create_notification_id(hass: HomeAssistant) -> None:
     """Ensure overwrites existing notification with same id."""
-    notifications = hass.data[pn.DOMAIN]
+    notifications = pn._async_get_or_create_notifications(hass)
     assert len(hass.states.async_entity_ids(pn.DOMAIN)) == 0
     assert len(notifications) == 0
 
     pn.async_create(hass, "test", notification_id="Beer 2")
 
-    assert len(hass.states.async_entity_ids()) == 1
     assert len(notifications) == 1
+    notification = notifications[list(notifications)[0]]
 
-    entity_id = "persistent_notification.beer_2"
-    state = hass.states.get(entity_id)
-    assert state.attributes.get("message") == "test"
-
-    notification = notifications.get(entity_id)
     assert notification["message"] == "test"
     assert notification["title"] is None
 
     pn.async_create(hass, "test 2", notification_id="Beer 2")
 
     # We should have overwritten old one
-    assert len(hass.states.async_entity_ids()) == 1
-    state = hass.states.get(entity_id)
-    assert state.attributes.get("message") == "test 2"
+    notification = notifications[list(notifications)[0]]
 
-    notification = notifications.get(entity_id)
     assert notification["message"] == "test 2"
 
 
 async def test_dismiss_notification(hass: HomeAssistant) -> None:
     """Ensure removal of specific notification."""
-    notifications = hass.data[pn.DOMAIN]
-    assert len(hass.states.async_entity_ids(pn.DOMAIN)) == 0
+    notifications = pn._async_get_or_create_notifications(hass)
     assert len(notifications) == 0
 
     pn.async_create(hass, "test", notification_id="Beer 2")
 
-    assert len(hass.states.async_entity_ids(pn.DOMAIN)) == 1
     assert len(notifications) == 1
-    pn.async_dismiss(hass, notification_id="Beer 2")
+    pn.async_dismiss(hass, notification_id="Does Not Exist")
 
-    assert len(hass.states.async_entity_ids(pn.DOMAIN)) == 0
-    assert len(notifications) == 0
+    assert len(notifications) == 1
 
+    pn.async_dismiss(hass, notification_id="Beer 2")
 
-async def test_mark_read(hass: HomeAssistant) -> None:
-    """Ensure notification is marked as Read."""
-    events = async_capture_events(hass, pn.EVENT_PERSISTENT_NOTIFICATIONS_UPDATED)
-    notifications = hass.data[pn.DOMAIN]
     assert len(notifications) == 0
 
-    await hass.services.async_call(
-        pn.DOMAIN,
-        "create",
-        {"notification_id": "Beer 2", "message": "test"},
-        blocking=True,
-    )
 
-    entity_id = "persistent_notification.beer_2"
-    assert len(notifications) == 1
-    notification = notifications.get(entity_id)
-    assert notification["status"] == pn.STATUS_UNREAD
-    assert len(events) == 1
+async def test_dismiss_all_notifications(hass: HomeAssistant) -> None:
+    """Ensure removal of all notifications."""
+    notifications = pn._async_get_or_create_notifications(hass)
+    assert len(notifications) == 0
 
-    await hass.services.async_call(
-        pn.DOMAIN, "mark_read", {"notification_id": "Beer 2"}, blocking=True
-    )
+    pn.async_create(hass, "test", notification_id="Beer 2")
+    pn.async_create(hass, "test", notification_id="Beer 3")
+    pn.async_create(hass, "test", notification_id="Beer 4")
+    pn.async_create(hass, "test", notification_id="Beer 5")
 
-    assert len(notifications) == 1
-    notification = notifications.get(entity_id)
-    assert notification["status"] == pn.STATUS_READ
-    assert len(events) == 2
+    assert len(notifications) == 4
+    pn.async_dismiss_all(hass)
 
-    await hass.services.async_call(
-        pn.DOMAIN,
-        "dismiss",
-        {"notification_id": "Beer 2"},
-        blocking=True,
-    )
     assert len(notifications) == 0
-    assert len(events) == 3
 
 
 async def test_ws_get_notifications(
@@ -153,22 +108,115 @@ async def test_ws_get_notifications(
     assert notification["notification_id"] == "Beer 2"
     assert notification["message"] == "test"
     assert notification["title"] is None
-    assert notification["status"] == pn.STATUS_UNREAD
     assert notification["created_at"] is not None
 
-    # Mark Read
-    await hass.services.async_call(
-        pn.DOMAIN, "mark_read", {"notification_id": "Beer 2"}
-    )
-    await client.send_json({"id": 7, "type": "persistent_notification/get"})
+    # Dismiss
+    pn.async_dismiss(hass, "Beer 2")
+    await client.send_json({"id": 8, "type": "persistent_notification/get"})
     msg = await client.receive_json()
     notifications = msg["result"]
+    assert len(notifications) == 0
+
+
+async def test_ws_get_subscribe(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test websocket subscribe endpoint for retrieving persistent notifications."""
+    await async_setup_component(hass, pn.DOMAIN, {})
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json({"id": 5, "type": "persistent_notification/subscribe"})
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == TYPE_RESULT
+    assert msg["success"]
+
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == "event"
+    assert msg["event"]
+    event = msg["event"]
+    assert event["type"] == "current"
+    assert event["notifications"] == {}
+
+    # Create
+    pn.async_create(hass, "test", notification_id="Beer 2")
+
+    msg = await client.receive_json()
+    assert msg["id"] == 5
+    assert msg["type"] == "event"
+    assert msg["event"]
+    event = msg["event"]
+    assert event["type"] == "added"
+    notifications = event["notifications"]
     assert len(notifications) == 1
-    assert notifications[0]["status"] == pn.STATUS_READ
+    notification = notifications[list(notifications)[0]]
+    assert notification["notification_id"] == "Beer 2"
+    assert notification["message"] == "test"
+    assert notification["title"] is None
+    assert notification["created_at"] is not None
 
     # Dismiss
     pn.async_dismiss(hass, "Beer 2")
-    await client.send_json({"id": 8, "type": "persistent_notification/get"})
     msg = await client.receive_json()
-    notifications = msg["result"]
+    assert msg["id"] == 5
+    assert msg["type"] == "event"
+    assert msg["event"]
+    event = msg["event"]
+    assert event["type"] == "removed"
+
+
+async def test_manual_notification_id_round_trip(hass: HomeAssistant) -> None:
+    """Test that a manual notification id can be round tripped."""
+    notifications = pn._async_get_or_create_notifications(hass)
+    assert len(notifications) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "synology_diskstation_hub_notification", "message": "test"},
+        blocking=True,
+    )
+
+    assert len(notifications) == 1
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "dismiss",
+        {"notification_id": "synology_diskstation_hub_notification"},
+        blocking=True,
+    )
+
+    assert len(notifications) == 0
+
+
+async def test_manual_dismiss_all(hass: HomeAssistant) -> None:
+    """Test the dismiss all service."""
+    notifications = pn._async_get_or_create_notifications(hass)
+    assert len(notifications) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "Beer 1", "message": "test"},
+        blocking=True,
+    )
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "Beer 2", "message": "test 2"},
+        blocking=True,
+    )
+
+    assert len(notifications) == 2
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "dismiss_all",
+        None,
+        blocking=True,
+    )
+
     assert len(notifications) == 0
diff --git a/tests/components/persistent_notification/test_trigger.py b/tests/components/persistent_notification/test_trigger.py
new file mode 100644
index 00000000000000..3cf3655a3b67c9
--- /dev/null
+++ b/tests/components/persistent_notification/test_trigger.py
@@ -0,0 +1,101 @@
+"""The tests for the persistent notification component triggers."""
+from typing import Any
+
+import homeassistant.components.persistent_notification as pn
+from homeassistant.components.persistent_notification import trigger
+from homeassistant.core import Context, HomeAssistant, callback
+
+
+async def test_automation_with_pn_trigger(hass: HomeAssistant) -> None:
+    """Test automation with a persistent_notification trigger."""
+
+    result_any = []
+    result_dismissed = []
+    result_id = []
+
+    trigger_info = {"trigger_data": {}}
+
+    @callback
+    def trigger_callback_any(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_any.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification"},
+        trigger_callback_any,
+        trigger_info,
+    )
+
+    @callback
+    def trigger_callback_dismissed(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_dismissed.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification", "update_type": "removed"},
+        trigger_callback_dismissed,
+        trigger_info,
+    )
+
+    @callback
+    def trigger_callback_id(
+        run_variables: dict[str, Any], context: Context | None = None
+    ) -> None:
+        result_id.append(run_variables)
+
+    await trigger.async_attach_trigger(
+        hass,
+        {"platform": "persistent_notification", "notification_id": "42"},
+        trigger_callback_id,
+        trigger_info,
+    )
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "test_notification", "message": "test"},
+        blocking=True,
+    )
+
+    result = result_any[0].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.ADDED
+    assert result["notification"]["notification_id"] == "test_notification"
+    assert result["notification"]["message"] == "test"
+
+    assert len(result_dismissed) == 0
+    assert len(result_id) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "dismiss",
+        {"notification_id": "test_notification"},
+        blocking=True,
+    )
+
+    result = result_any[1].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.REMOVED
+    assert result["notification"]["notification_id"] == "test_notification"
+    assert result["notification"]["message"] == "test"
+    assert result_any[1] == result_dismissed[0]
+
+    assert len(result_id) == 0
+
+    await hass.services.async_call(
+        pn.DOMAIN,
+        "create",
+        {"notification_id": "42", "message": "Forty Two"},
+        blocking=True,
+    )
+
+    result = result_any[2].get("trigger")
+    assert result["platform"] == "persistent_notification"
+    assert result["update_type"] == pn.UpdateType.ADDED
+    assert result["notification"]["notification_id"] == "42"
+    assert result["notification"]["message"] == "Forty Two"
+    assert result_any[2] == result_id[0]
diff --git a/tests/components/person/conftest.py b/tests/components/person/conftest.py
new file mode 100644
index 00000000000000..4079ff242677f6
--- /dev/null
+++ b/tests/components/person/conftest.py
@@ -0,0 +1,45 @@
+"""The tests for the person component."""
+import logging
+
+import pytest
+
+from homeassistant.components import person
+from homeassistant.components.person import DOMAIN
+from homeassistant.helpers import collection
+from homeassistant.setup import async_setup_component
+
+DEVICE_TRACKER = "device_tracker.test_tracker"
+DEVICE_TRACKER_2 = "device_tracker.test_tracker_2"
+
+
+@pytest.fixture
+def storage_collection(hass):
+    """Return an empty storage collection."""
+    id_manager = collection.IDManager()
+    return person.PersonStorageCollection(
+        person.PersonStore(hass, person.STORAGE_VERSION, person.STORAGE_KEY),
+        id_manager,
+        collection.YamlCollection(
+            logging.getLogger(f"{person.__name__}.yaml_collection"), id_manager
+        ),
+    )
+
+
+@pytest.fixture
+def storage_setup(hass, hass_storage, hass_admin_user):
+    """Storage setup."""
+    hass_storage[DOMAIN] = {
+        "key": DOMAIN,
+        "version": 1,
+        "data": {
+            "persons": [
+                {
+                    "id": "1234",
+                    "name": "tracked person",
+                    "user_id": hass_admin_user.id,
+                    "device_trackers": [DEVICE_TRACKER],
+                }
+            ]
+        },
+    }
+    assert hass.loop.run_until_complete(async_setup_component(hass, DOMAIN, {}))
diff --git a/tests/components/person/test_init.py b/tests/components/person/test_init.py
index 433c9529e780d0..71491ee3cafde7 100644
--- a/tests/components/person/test_init.py
+++ b/tests/components/person/test_init.py
@@ -1,5 +1,4 @@
 """The tests for the person component."""
-import logging
 from typing import Any
 from unittest.mock import patch
 
@@ -24,48 +23,14 @@
     STATE_UNKNOWN,
 )
 from homeassistant.core import Context, CoreState, HomeAssistant, State
-from homeassistant.helpers import collection, entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 
+from .conftest import DEVICE_TRACKER, DEVICE_TRACKER_2
+
 from tests.common import MockUser, mock_component, mock_restore_cache
 from tests.typing import WebSocketGenerator
 
-DEVICE_TRACKER = "device_tracker.test_tracker"
-DEVICE_TRACKER_2 = "device_tracker.test_tracker_2"
-
-
-@pytest.fixture
-def storage_collection(hass):
-    """Return an empty storage collection."""
-    id_manager = collection.IDManager()
-    return person.PersonStorageCollection(
-        person.PersonStore(hass, person.STORAGE_VERSION, person.STORAGE_KEY),
-        id_manager,
-        collection.YamlCollection(
-            logging.getLogger(f"{person.__name__}.yaml_collection"), id_manager
-        ),
-    )
-
-
-@pytest.fixture
-def storage_setup(hass, hass_storage, hass_admin_user):
-    """Storage setup."""
-    hass_storage[DOMAIN] = {
-        "key": DOMAIN,
-        "version": 1,
-        "data": {
-            "persons": [
-                {
-                    "id": "1234",
-                    "name": "tracked person",
-                    "user_id": hass_admin_user.id,
-                    "device_trackers": [DEVICE_TRACKER],
-                }
-            ]
-        },
-    }
-    assert hass.loop.run_until_complete(async_setup_component(hass, DOMAIN, {}))
-
 
 async def test_minimal_setup(hass: HomeAssistant) -> None:
     """Test minimal config with only name."""
diff --git a/tests/components/person/test_recorder.py b/tests/components/person/test_recorder.py
index 879db2ec11f366..51b5691bd8e1ce 100644
--- a/tests/components/person/test_recorder.py
+++ b/tests/components/person/test_recorder.py
@@ -10,7 +10,7 @@
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import async_fire_time_changed
+from tests.common import MockUser, async_fire_time_changed
 from tests.components.recorder.common import async_wait_recording_done
 
 
@@ -18,6 +18,8 @@ async def test_exclude_attributes(
     recorder_mock: Recorder,
     hass: HomeAssistant,
     enable_custom_integrations: None,
+    hass_admin_user: MockUser,
+    storage_setup,
 ) -> None:
     """Test update attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/philips_js/test_device_trigger.py b/tests/components/philips_js/test_device_trigger.py
index a0c2ed34c1eaf4..897bc5ebc708ac 100644
--- a/tests/components/philips_js/test_device_trigger.py
+++ b/tests/components/philips_js/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Philips TV device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -8,11 +9,14 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -36,7 +40,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_device) -> None:
         hass, DeviceAutomationType.TRIGGER, mock_device.id
     )
     triggers = [trigger for trigger in triggers if trigger["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_turn_on_request(
diff --git a/tests/components/picnic/test_sensor.py b/tests/components/picnic/test_sensor.py
index 0d003547ef2b88..c47226d407e754 100644
--- a/tests/components/picnic/test_sensor.py
+++ b/tests/components/picnic/test_sensor.py
@@ -19,7 +19,7 @@
     STATE_UNKNOWN,
 )
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
@@ -177,7 +177,7 @@ async def _enable_all_sensors(self):
         # Trigger a reload of the data
         async_fire_time_changed(
             self.hass,
-            dt.utcnow()
+            dt_util.utcnow()
             + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
         )
         await self.hass.async_block_till_done()
diff --git a/tests/components/pilight/test_init.py b/tests/components/pilight/test_init.py
index 365cd942ab9071..96f384f98b9dee 100644
--- a/tests/components/pilight/test_init.py
+++ b/tests/components/pilight/test_init.py
@@ -11,7 +11,11 @@
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
-from tests.common import assert_setup_component, async_fire_time_changed
+from tests.common import (
+    assert_setup_component,
+    async_capture_events,
+    async_fire_time_changed,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -222,9 +226,9 @@ async def test_start_stop(mock_pilight_error, hass: HomeAssistant) -> None:
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_receive_code(mock_debug, hass: HomeAssistant) -> None:
+async def test_receive_code(hass: HomeAssistant) -> None:
     """Check if code receiving via pilight daemon works."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         assert await async_setup_component(hass, pilight.DOMAIN, {pilight.DOMAIN: {}})
 
@@ -239,18 +243,13 @@ async def test_receive_code(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
-        # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_exact_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_exact_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with matched data."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         whitelist = {
             "protocol": [PilightDaemonSim.test_message["protocol"]],
@@ -272,18 +271,14 @@ async def test_whitelist_exact_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_partial_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_partial_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with partially matched data, should work."""
+    events = async_capture_events(hass, pilight.EVENT)
     with assert_setup_component(4):
         whitelist = {
             "protocol": [PilightDaemonSim.test_message["protocol"]],
@@ -303,18 +298,15 @@ async def test_whitelist_partial_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_or_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_or_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with several subsection, should work."""
+    events = async_capture_events(hass, pilight.EVENT)
+
     with assert_setup_component(4):
         whitelist = {
             "protocol": [
@@ -337,18 +329,15 @@ async def test_whitelist_or_match(mock_debug, hass: HomeAssistant) -> None:
             },
             **PilightDaemonSim.test_message["message"],
         )
-        debug_log_call = mock_debug.call_args_list[-1]
-
         # Check if all message parts are put on event bus
-        for key, value in expected_message.items():
-            assert str(key) in str(debug_log_call)
-            assert str(value) in str(debug_log_call)
+        assert events[0].data == expected_message
 
 
 @patch("pilight.pilight.Client", PilightDaemonSim)
-@patch("homeassistant.core._LOGGER.debug")
-async def test_whitelist_no_match(mock_debug, hass: HomeAssistant) -> None:
+async def test_whitelist_no_match(hass: HomeAssistant) -> None:
     """Check whitelist filter with unmatched data, should not work."""
+    events = async_capture_events(hass, pilight.EVENT)
+
     with assert_setup_component(4):
         whitelist = {
             "protocol": ["wrong_protocol"],
@@ -360,9 +349,8 @@ async def test_whitelist_no_match(mock_debug, hass: HomeAssistant) -> None:
 
         await hass.async_start()
         await hass.async_block_till_done()
-        debug_log_call = mock_debug.call_args_list[-1]
 
-        assert "Event pilight_received" not in debug_log_call
+        assert len(events) == 0
 
 
 async def test_call_rate_delay_throttle_enabled(hass: HomeAssistant) -> None:
diff --git a/tests/components/ping/test_binary_sensor.py b/tests/components/ping/test_binary_sensor.py
index eae3d881fc0bf5..3389534483f6dd 100644
--- a/tests/components/ping/test_binary_sensor.py
+++ b/tests/components/ping/test_binary_sensor.py
@@ -12,13 +12,13 @@
 
 
 @pytest.fixture
-def mock_ping():
+def mock_ping() -> None:
     """Mock icmplib.ping."""
     with patch("homeassistant.components.ping.icmp_ping"):
         yield
 
 
-async def test_reload(hass: HomeAssistant, mock_ping) -> None:
+async def test_reload(hass: HomeAssistant, mock_ping: None) -> None:
     """Verify we can reload trend sensors."""
 
     await setup.async_setup_component(
diff --git a/tests/components/pjlink/test_media_player.py b/tests/components/pjlink/test_media_player.py
index 686ece5b7ecccc..941a3cefe3a8d6 100644
--- a/tests/components/pjlink/test_media_player.py
+++ b/tests/components/pjlink/test_media_player.py
@@ -12,7 +12,7 @@
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
@@ -206,7 +206,7 @@ async def test_update_unavailable(projector_from_address, hass: HomeAssistant) -
         assert state.state == "off"
 
         projector_from_address.side_effect = socket.timeout
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=10))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
         await hass.async_block_till_done()
 
         state = hass.states.get("media_player.test")
@@ -235,7 +235,7 @@ async def test_unavailable_time(mocked_projector, hass: HomeAssistant) -> None:
     assert state.attributes["is_volume_muted"] is not False
 
     mocked_projector.get_power.side_effect = ProjectorError("unavailable time")
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=10))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
 
     state = hass.states.get("media_player.test")
diff --git a/tests/components/plex/test_button.py b/tests/components/plex/test_button.py
index d2576c379a7bba..e8e734143b30fe 100644
--- a/tests/components/plex/test_button.py
+++ b/tests/components/plex/test_button.py
@@ -6,7 +6,7 @@
 from homeassistant.components.plex.const import DEBOUNCE_TIMEOUT
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -23,10 +23,10 @@ async def test_scan_clients_button_schedule(
 
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(seconds=DEBOUNCE_TIMEOUT),
+            dt_util.utcnow() + timedelta(seconds=DEBOUNCE_TIMEOUT),
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             BUTTON_DOMAIN,
             SERVICE_PRESS,
             {
diff --git a/tests/components/plex/test_media_search.py b/tests/components/plex/test_media_search.py
index 1a3e0279605410..0cc94134f1c9d1 100644
--- a/tests/components/plex/test_media_search.py
+++ b/tests/components/plex/test_media_search.py
@@ -30,7 +30,7 @@ async def test_media_lookups(
     requests_mock.post("/playqueues", text=playqueue_created)
     requests_mock.get("/player/playback/playMedia", status_code=200)
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -43,7 +43,7 @@ async def test_media_lookups(
     with pytest.raises(MediaNotFound) as excinfo, patch(
         "plexapi.server.PlexServer.fetchItem", side_effect=NotFound
     ):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -58,7 +58,7 @@ async def test_media_lookups(
     # TV show searches
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"library_name": "Not a Library", "show_name": "TV Show"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -71,7 +71,7 @@ async def test_media_lookups(
     assert "Library 'Not a Library' not found in" in str(excinfo.value)
 
     with patch("plexapi.library.LibrarySection.search") as search:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -83,7 +83,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"show.title": "TV Show", "libtype": "show"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -97,7 +97,7 @@ async def test_media_lookups(
             **{"episode.title": "An Episode", "libtype": "episode"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -111,7 +111,7 @@ async def test_media_lookups(
             **{"show.title": "TV Show", "season.index": 1, "libtype": "season"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -130,7 +130,7 @@ async def test_media_lookups(
             }
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -142,7 +142,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"artist.title": "Artist", "libtype": "artist"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -154,7 +154,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"album.title": "Album", "libtype": "album"})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -168,7 +168,7 @@ async def test_media_lookups(
             **{"artist.title": "Artist", "track.title": "Track 3", "libtype": "track"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -182,7 +182,7 @@ async def test_media_lookups(
             **{"artist.title": "Artist", "album.title": "Album", "libtype": "album"}
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -201,7 +201,7 @@ async def test_media_lookups(
             }
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -221,7 +221,7 @@ async def test_media_lookups(
         )
 
         # Movie searches
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -233,7 +233,7 @@ async def test_media_lookups(
         )
         search.assert_called_with(**{"movie.title": "Movie 1", "libtype": None})
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -247,7 +247,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"title": "Movie 1"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -262,7 +262,7 @@ async def test_media_lookups(
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"library_name": "Movies", "title": "Not a Movie"}'
         with patch("plexapi.library.LibrarySection.search", side_effect=BadRequest):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MEDIA_PLAYER_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
@@ -275,7 +275,7 @@ async def test_media_lookups(
     assert "Problem in query" in str(excinfo.value)
 
     # Playlist searches
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MEDIA_PLAYER_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -288,7 +288,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = '{"playlist_name": "Not a Playlist"}'
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -302,7 +302,7 @@ async def test_media_lookups(
 
     with pytest.raises(MediaNotFound) as excinfo:
         payload = "{}"
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MEDIA_PLAYER_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
diff --git a/tests/components/plex/test_playback.py b/tests/components/plex/test_playback.py
index 58dd49a0542189..c9dba4e4aca6d2 100644
--- a/tests/components/plex/test_playback.py
+++ b/tests/components/plex/test_playback.py
@@ -67,7 +67,7 @@ async def test_media_player_playback(
     with patch(
         "plexapi.library.LibrarySection.search", return_value=None
     ), pytest.raises(HomeAssistantError) as excinfo:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -87,7 +87,7 @@ async def test_media_player_playback(
     # Test movie success
     movies = [movie1]
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -102,7 +102,7 @@ async def test_media_player_playback(
     # Test movie success with resume
     playmedia_mock.reset()
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -117,7 +117,7 @@ async def test_media_player_playback(
 
     # Test movie success with media browser URL
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -132,7 +132,7 @@ async def test_media_player_playback(
 
     # Test movie success with media browser URL and resuming
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -148,7 +148,7 @@ async def test_media_player_playback(
 
     # Test movie success with legacy media browser URL
     playmedia_mock.reset()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -164,7 +164,7 @@ async def test_media_player_playback(
     playmedia_mock.reset()
     movies = [movie1, movie2]
     with patch("plexapi.library.LibrarySection.search", return_value=movies):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -182,7 +182,7 @@ async def test_media_player_playback(
     with pytest.raises(HomeAssistantError) as excinfo:
         payload = '{"library_name": "Movies", "title": "Movie" }'
         with patch("plexapi.library.LibrarySection.search", return_value=movies):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MP_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
@@ -200,7 +200,7 @@ async def test_media_player_playback(
     with patch("plexapi.library.LibrarySection.search", return_value=movies), patch(
         "homeassistant.components.plex.server.PlexServer.create_playqueue"
     ) as mock_create_playqueue:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -216,7 +216,7 @@ async def test_media_player_playback(
     # Test radio station
     playmedia_mock.reset()
     radio_id = "/library/sections/3/stations/1"
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         MP_DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
diff --git a/tests/components/plex/test_sensor.py b/tests/components/plex/test_sensor.py
index bd8654baf58152..9c73bf9f915a5d 100644
--- a/tests/components/plex/test_sensor.py
+++ b/tests/components/plex/test_sensor.py
@@ -13,7 +13,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .helpers import trigger_plex_update, wait_for_debouncer
 
@@ -125,7 +125,7 @@ async def test_library_sensor_values(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
 
     media = [MockPlexTVEpisode()]
@@ -196,7 +196,7 @@ async def test_library_sensor_values(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
 
     media = [MockPlexMovie()]
@@ -214,7 +214,7 @@ async def test_library_sensor_values(
         async_dispatcher_send(
             hass, PLEX_UPDATE_LIBRARY_SIGNAL.format(mock_plex_server.machine_identifier)
         )
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=3))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
         await hass.async_block_till_done()
 
     library_movies_sensor = hass.states.get("sensor.plex_server_1_library_movies")
@@ -232,7 +232,7 @@ async def test_library_sensor_values(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
 
     media = [MockPlexMusic()]
diff --git a/tests/components/plex/test_services.py b/tests/components/plex/test_services.py
index 12a36057056684..a74b3e91460ead 100644
--- a/tests/components/plex/test_services.py
+++ b/tests/components/plex/test_services.py
@@ -45,7 +45,7 @@ async def test_refresh_library(
 
     # Test with non-existent server
     with pytest.raises(HomeAssistantError):
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_REFRESH_LIBRARY,
             {"server_name": "Not a Server", "library_name": "Movies"},
@@ -54,7 +54,7 @@ async def test_refresh_library(
     assert not refresh.called
 
     # Test with non-existent library
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_REFRESH_LIBRARY,
         {"library_name": "Not a Library"},
@@ -63,7 +63,7 @@ async def test_refresh_library(
     assert not refresh.called
 
     # Test with valid library
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_REFRESH_LIBRARY,
         {"library_name": "Movies"},
@@ -96,7 +96,7 @@ async def test_refresh_library(
 
     # Test multiple servers available but none specified
     with pytest.raises(HomeAssistantError) as excinfo:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_REFRESH_LIBRARY,
             {"library_name": "Movies"},
@@ -108,7 +108,7 @@ async def test_refresh_library(
 
 async def test_scan_clients(hass: HomeAssistant, mock_plex_server) -> None:
     """Test scan_for_clients service call."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SCAN_CLIENTS,
         blocking=True,
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
index 6f61b45518be89..7c2aeb2a29acd5 100644
--- a/tests/components/profiler/test_init.py
+++ b/tests/components/profiler/test_init.py
@@ -224,6 +224,8 @@ async def test_log_scheduled(
 
     assert hass.services.has_service(DOMAIN, SERVICE_LOG_EVENT_LOOP_SCHEDULED)
 
+    hass.loop.call_later(0.1, lambda: None)
+
     await hass.services.async_call(
         DOMAIN, SERVICE_LOG_EVENT_LOOP_SCHEDULED, {}, blocking=True
     )
diff --git a/tests/components/prometheus/test_init.py b/tests/components/prometheus/test_init.py
index e328487fa7520f..8b0acb9c5b043a 100644
--- a/tests/components/prometheus/test_init.py
+++ b/tests/components/prometheus/test_init.py
@@ -5,6 +5,7 @@
 from typing import Any
 from unittest import mock
 
+from freezegun import freeze_time
 import prometheus_client
 import pytest
 
@@ -43,7 +44,6 @@
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONTENT_TYPE_TEXT_PLAIN,
     DEGREE,
-    EVENT_STATE_CHANGED,
     PERCENTAGE,
     STATE_CLOSED,
     STATE_CLOSING,
@@ -58,7 +58,7 @@
     UnitOfEnergy,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant, split_entity_id
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -941,10 +941,7 @@ async def sensor_fixture(
         suggested_object_id="radio_energy",
         original_name="Radio Energy",
     )
-    with mock.patch(
-        "homeassistant.util.dt.utcnow",
-        return_value=datetime.datetime(1970, 1, 2, tzinfo=dt_util.UTC),
-    ):
+    with freeze_time(datetime.datetime(1970, 1, 2, tzinfo=dt_util.UTC)):
         set_state_with_entry(hass, sensor_3, 14)
     data["sensor_3"] = sensor_3
 
@@ -1570,23 +1567,13 @@ def mock_client_fixture():
         yield counter_client
 
 
-@pytest.fixture
-def mock_bus(hass):
-    """Mock the event bus listener."""
-    hass.bus.listen = mock.MagicMock()
-
-
-@pytest.mark.usefixtures("mock_bus")
 async def test_minimal_config(hass: HomeAssistant, mock_client) -> None:
     """Test the minimal config and defaults of component."""
     config = {prometheus.DOMAIN: {}}
     assert await async_setup_component(hass, prometheus.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
 
 
-@pytest.mark.usefixtures("mock_bus")
 async def test_full_config(hass: HomeAssistant, mock_client) -> None:
     """Test the full config of component."""
     config = {
@@ -1609,21 +1596,6 @@ async def test_full_config(hass: HomeAssistant, mock_client) -> None:
     }
     assert await async_setup_component(hass, prometheus.DOMAIN, config)
     await hass.async_block_till_done()
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
-
-
-def make_event(entity_id):
-    """Make a mock event for test."""
-    domain = split_entity_id(entity_id)[0]
-    state = mock.MagicMock(
-        state="not blank",
-        domain=domain,
-        entity_id=entity_id,
-        object_id="entity",
-        attributes={},
-    )
-    return mock.MagicMock(data={"new_state": state}, time_fired=12345)
 
 
 async def _setup(hass, filter_config):
@@ -1631,13 +1603,11 @@ async def _setup(hass, filter_config):
     config = {prometheus.DOMAIN: {"filter": filter_config}}
     assert await async_setup_component(hass, prometheus.DOMAIN, config)
     await hass.async_block_till_done()
-    return hass.bus.listen.call_args_list[0][0][1]
 
 
-@pytest.mark.usefixtures("mock_bus")
 async def test_allowlist(hass: HomeAssistant, mock_client) -> None:
     """Test an allowlist only config."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "include_domains": ["fake"],
@@ -1656,18 +1626,17 @@ async def test_allowlist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = mock_client.labels.call_count == 1
         assert test.should_pass == was_called
         mock_client.labels.reset_mock()
 
 
-@pytest.mark.usefixtures("mock_bus")
 async def test_denylist(hass: HomeAssistant, mock_client) -> None:
     """Test a denylist only config."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "exclude_domains": ["fake"],
@@ -1686,18 +1655,17 @@ async def test_denylist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = mock_client.labels.call_count == 1
         assert test.should_pass == was_called
         mock_client.labels.reset_mock()
 
 
-@pytest.mark.usefixtures("mock_bus")
 async def test_filtered_denylist(hass: HomeAssistant, mock_client) -> None:
     """Test a denylist config with a filtering allowlist."""
-    handler_method = await _setup(
+    await _setup(
         hass,
         {
             "include_entities": ["fake.included", "test.excluded_test"],
@@ -1717,8 +1685,8 @@ async def test_filtered_denylist(hass: HomeAssistant, mock_client) -> None:
     ]
 
     for test in tests:
-        event = make_event(test.id)
-        handler_method(event)
+        hass.states.async_set(test.id, "not blank")
+        await hass.async_block_till_done()
 
         was_called = mock_client.labels.call_count == 1
         assert test.should_pass == was_called
diff --git a/tests/components/pure_energie/test_sensor.py b/tests/components/pure_energie/test_sensor.py
index 2881bf28d8f3bf..eb0b9634e83f94 100644
--- a/tests/components/pure_energie/test_sensor.py
+++ b/tests/components/pure_energie/test_sensor.py
@@ -34,7 +34,7 @@ async def test_sensors(
     assert state
     assert entry.unique_id == "aabbccddeeff_energy_consumption_total"
     assert state.state == "17762.1"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Consumption"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "home Energy consumption"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
@@ -46,7 +46,7 @@ async def test_sensors(
     assert state
     assert entry.unique_id == "aabbccddeeff_energy_production_total"
     assert state.state == "21214.6"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Energy Production"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "home Energy production"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
@@ -58,7 +58,7 @@ async def test_sensors(
     assert state
     assert entry.unique_id == "aabbccddeeff_power_flow"
     assert state.state == "338"
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Power Flow"
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == "home Power flow"
     assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
     assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
diff --git a/tests/components/purpleair/test_config_flow.py b/tests/components/purpleair/test_config_flow.py
index ce911183dfd956..503ba23e052d36 100644
--- a/tests/components/purpleair/test_config_flow.py
+++ b/tests/components/purpleair/test_config_flow.py
@@ -302,3 +302,29 @@ async def test_options_remove_sensor(
     # Unload to make sure the update does not run after the
     # mock is removed.
     await hass.config_entries.async_unload(config_entry.entry_id)
+
+
+async def test_options_settings(
+    hass: HomeAssistant, config_entry, setup_config_entry
+) -> None:
+    """Test setting settings via the options flow."""
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    assert result["type"] == data_entry_flow.FlowResultType.MENU
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"next_step_id": "settings"}
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "settings"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"show_on_map": True}
+    )
+    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["data"] == {
+        "sensor_indices": [TEST_SENSOR_INDEX1],
+        "show_on_map": True,
+    }
+
+    assert config_entry.options["show_on_map"] is True
diff --git a/tests/components/pvpc_hourly_pricing/test_config_flow.py b/tests/components/pvpc_hourly_pricing/test_config_flow.py
index 360e7f7f756878..8623830f0dd100 100644
--- a/tests/components/pvpc_hourly_pricing/test_config_flow.py
+++ b/tests/components/pvpc_hourly_pricing/test_config_flow.py
@@ -14,13 +14,14 @@
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
+from homeassistant.util import dt as dt_util
 
 from .conftest import check_valid_state
 
-from tests.common import async_fire_time_changed, date_util
+from tests.common import async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
 
-_MOCK_TIME_VALID_RESPONSES = datetime(2023, 1, 6, 12, 0, tzinfo=date_util.UTC)
+_MOCK_TIME_VALID_RESPONSES = datetime(2023, 1, 6, 12, 0, tzinfo=dt_util.UTC)
 
 
 async def test_config_flow(
diff --git a/tests/components/qnap/__init__.py b/tests/components/qnap/__init__.py
new file mode 100644
index 00000000000000..46978f6cc8d81e
--- /dev/null
+++ b/tests/components/qnap/__init__.py
@@ -0,0 +1 @@
+"""Tests for the QNAP integration."""
diff --git a/tests/components/qnap/conftest.py b/tests/components/qnap/conftest.py
new file mode 100644
index 00000000000000..7f26763d4d703f
--- /dev/null
+++ b/tests/components/qnap/conftest.py
@@ -0,0 +1,33 @@
+"""Setup the QNAP tests."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+TEST_HOST = "1.2.3.4"
+TEST_USERNAME = "admin"
+TEST_PASSWORD = "password"
+TEST_NAS_NAME = "Test NAS name"
+TEST_SERIAL = "123456789"
+
+TEST_SYSTEM_STATS = {"system": {"serial_number": TEST_SERIAL, "name": TEST_NAS_NAME}}
+
+
+@pytest.fixture
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.qnap.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+@pytest.fixture
+def qnap_connect(mock_get_source_ip: None) -> Generator[MagicMock, None, None]:
+    """Mock qnap connection."""
+    with patch(
+        "homeassistant.components.qnap.config_flow.QNAPStats", autospec=True
+    ) as host_mock_class:
+        host_mock = host_mock_class.return_value
+        host_mock.get_system_stats.return_value = TEST_SYSTEM_STATS
+        yield host_mock
diff --git a/tests/components/qnap/test_config_flow.py b/tests/components/qnap/test_config_flow.py
new file mode 100644
index 00000000000000..eb77109d62e609
--- /dev/null
+++ b/tests/components/qnap/test_config_flow.py
@@ -0,0 +1,110 @@
+"""Test the QNAP config flow."""
+from unittest.mock import MagicMock
+
+import pytest
+from requests.exceptions import ConnectTimeout
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.components.qnap import const
+from homeassistant.const import (
+    CONF_HOST,
+    CONF_PASSWORD,
+    CONF_PORT,
+    CONF_SSL,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
+from homeassistant.core import HomeAssistant
+
+from .conftest import TEST_HOST, TEST_PASSWORD, TEST_USERNAME
+
+STANDARD_CONFIG = {
+    CONF_USERNAME: TEST_USERNAME,
+    CONF_PASSWORD: TEST_PASSWORD,
+    CONF_HOST: TEST_HOST,
+}
+
+
+pytestmark = pytest.mark.usefixtures("mock_setup_entry", "qnap_connect")
+
+
+async def test_config_flow(hass: HomeAssistant, qnap_connect: MagicMock) -> None:
+    """Config flow manually initialized by the user."""
+    result = await hass.config_entries.flow.async_init(
+        const.DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    qnap_connect.get_system_stats.side_effect = ConnectTimeout("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+    qnap_connect.get_system_stats.side_effect = TypeError("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "invalid_auth"}
+
+    qnap_connect.get_system_stats.side_effect = Exception("Test error")
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "unknown"}
+
+    qnap_connect.get_system_stats.side_effect = None
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        STANDARD_CONFIG,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Test NAS name"
+    assert result["data"] == {
+        CONF_HOST: "1.2.3.4",
+        CONF_USERNAME: "admin",
+        CONF_PASSWORD: "password",
+        CONF_SSL: const.DEFAULT_SSL,
+        CONF_VERIFY_SSL: const.DEFAULT_VERIFY_SSL,
+        CONF_PORT: const.DEFAULT_PORT,
+    }
+
+
+async def test_config_flow_import(hass: HomeAssistant) -> None:
+    """Test import of YAML config."""
+    data = STANDARD_CONFIG
+    data[CONF_SSL] = const.DEFAULT_SSL
+    data[CONF_VERIFY_SSL] = const.DEFAULT_VERIFY_SSL
+    data[CONF_PORT] = const.DEFAULT_PORT
+    result = await hass.config_entries.flow.async_init(
+        const.DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data=data,
+    )
+
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Test NAS name"
+    assert result["data"] == {
+        CONF_HOST: "1.2.3.4",
+        CONF_USERNAME: "admin",
+        CONF_PASSWORD: "password",
+        CONF_SSL: const.DEFAULT_SSL,
+        CONF_VERIFY_SSL: const.DEFAULT_VERIFY_SSL,
+        CONF_PORT: const.DEFAULT_PORT,
+    }
diff --git a/tests/components/qnap_qsw/test_update.py b/tests/components/qnap_qsw/test_update.py
index 69f4a3d08b4d89..26b7157f64daac 100644
--- a/tests/components/qnap_qsw/test_update.py
+++ b/tests/components/qnap_qsw/test_update.py
@@ -1,11 +1,32 @@
 """The sensor tests for the QNAP QSW platform."""
 
-from aioqsw.const import API_RESULT, API_VERSION
+from unittest.mock import patch
 
-from homeassistant.const import STATE_OFF
+from aioqsw.const import API_ERROR_CODE, API_ERROR_MESSAGE, API_RESULT, API_VERSION
+
+from homeassistant.components.update import (
+    ATTR_BACKUP,
+    ATTR_IN_PROGRESS,
+    ATTR_INSTALLED_VERSION,
+    ATTR_LATEST_VERSION,
+    DOMAIN as UPDATE_DOMAIN,
+    SERVICE_INSTALL,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 
-from .util import FIRMWARE_INFO_MOCK, FIRMWARE_UPDATE_CHECK_MOCK, async_init_integration
+from .util import (
+    FIRMWARE_INFO_MOCK,
+    FIRMWARE_UPDATE_CHECK_MOCK,
+    USERS_VERIFICATION_MOCK,
+    async_init_integration,
+)
+
+FIRMWARE_UPDATE_LIVE_MOCK = {
+    API_ERROR_CODE: 200,
+    API_ERROR_MESSAGE: "OK",
+    API_RESULT: "None",
+}
 
 
 async def test_qnap_qsw_update(hass: HomeAssistant) -> None:
@@ -15,12 +36,50 @@ async def test_qnap_qsw_update(hass: HomeAssistant) -> None:
 
     update = hass.states.get("update.qsw_m408_4c_firmware_update")
     assert update is not None
-    assert update.state == STATE_OFF
+    assert update.state == STATE_ON
     assert (
-        update.attributes.get("installed_version")
+        update.attributes[ATTR_INSTALLED_VERSION]
         == FIRMWARE_INFO_MOCK[API_RESULT][API_VERSION]
     )
     assert (
-        update.attributes.get("latest_version")
+        update.attributes[ATTR_LATEST_VERSION]
+        == FIRMWARE_UPDATE_CHECK_MOCK[API_RESULT][API_VERSION]
+    )
+    assert update.attributes[ATTR_IN_PROGRESS] is False
+
+    with patch(
+        "homeassistant.components.qnap_qsw.QnapQswApi.get_firmware_update_check",
+        return_value=FIRMWARE_UPDATE_CHECK_MOCK,
+    ) as mock_firmware_update_check, patch(
+        "homeassistant.components.qnap_qsw.QnapQswApi.get_users_verification",
+        return_value=USERS_VERIFICATION_MOCK,
+    ) as mock_users_verification, patch(
+        "homeassistant.components.qnap_qsw.QnapQswApi.post_firmware_update_live",
+        return_value=FIRMWARE_UPDATE_LIVE_MOCK,
+    ) as mock_firmware_update_live:
+        await hass.services.async_call(
+            UPDATE_DOMAIN,
+            SERVICE_INSTALL,
+            {
+                ATTR_BACKUP: False,
+                ATTR_ENTITY_ID: "update.qsw_m408_4c_firmware_update",
+            },
+            blocking=True,
+        )
+
+        mock_firmware_update_check.assert_called_once()
+        mock_firmware_update_live.assert_called_once()
+        mock_users_verification.assert_called()
+
+    update = hass.states.get("update.qsw_m408_4c_firmware_update")
+    assert update is not None
+    assert update.state == STATE_OFF
+    assert (
+        update.attributes[ATTR_INSTALLED_VERSION]
+        == FIRMWARE_UPDATE_CHECK_MOCK[API_RESULT][API_VERSION]
+    )
+    assert (
+        update.attributes[ATTR_LATEST_VERSION]
         == FIRMWARE_UPDATE_CHECK_MOCK[API_RESULT][API_VERSION]
     )
+    assert update.attributes[ATTR_IN_PROGRESS] is False
diff --git a/tests/components/qnap_qsw/util.py b/tests/components/qnap_qsw/util.py
index 5ae801283bc56d..b0dd5d5bf60ff8 100644
--- a/tests/components/qnap_qsw/util.py
+++ b/tests/components/qnap_qsw/util.py
@@ -109,17 +109,17 @@
     API_ERROR_CODE: 200,
     API_ERROR_MESSAGE: "OK",
     API_RESULT: {
-        API_VERSION: "1.2.0",
-        API_NUMBER: "29649",
-        API_BUILD_NUMBER: "20220128",
-        API_DATE: "Fri, 28 Jan 2022 01:17:39 +0800",
+        API_VERSION: "1.3.0",
+        API_NUMBER: "527638",
+        API_BUILD_NUMBER: "20221123",
+        API_DATE: "Wed, 07, Dec 2022 16:30:00 +0800",
         API_DESCRIPTION: "",
         API_DOWNLOAD_URL: [
-            "https://download.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.2.0_S20220128_29649.img",
-            "https://eu1.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.2.0_S20220128_29649.img",
-            "https://us1.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.2.0_S20220128_29649.img",
+            "https://download.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.3.0_S20221123_527638.img",
+            "https://eu1.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.3.0_S20221123_527638.img",
+            "https://us1.qnap.com/Storage/Networking/QSW408FW/QSW-M408AC3-FW.v1.3.0_S20221123_527638.img",
         ],
-        API_NEWER: False,
+        API_NEWER: True,
     },
 }
 
diff --git a/tests/components/rainbird/test_binary_sensor.py b/tests/components/rainbird/test_binary_sensor.py
index 816f2a3b969b6a..cfa2c4d2684816 100644
--- a/tests/components/rainbird/test_binary_sensor.py
+++ b/tests/components/rainbird/test_binary_sensor.py
@@ -31,10 +31,10 @@ async def test_rainsensor(
 
     assert await setup_integration()
 
-    rainsensor = hass.states.get("binary_sensor.rainsensor")
+    rainsensor = hass.states.get("binary_sensor.rain_bird_controller_rainsensor")
     assert rainsensor is not None
     assert rainsensor.state == expected_state
     assert rainsensor.attributes == {
-        "friendly_name": "Rainsensor",
+        "friendly_name": "Rain Bird Controller Rainsensor",
         "icon": "mdi:water",
     }
diff --git a/tests/components/rainbird/test_sensor.py b/tests/components/rainbird/test_sensor.py
index e9923b1a05296f..049a5f15c45668 100644
--- a/tests/components/rainbird/test_sensor.py
+++ b/tests/components/rainbird/test_sensor.py
@@ -28,10 +28,10 @@ async def test_sensors(
 
     assert await setup_integration()
 
-    raindelay = hass.states.get("sensor.raindelay")
+    raindelay = hass.states.get("sensor.rain_bird_controller_raindelay")
     assert raindelay is not None
     assert raindelay.state == expected_state
     assert raindelay.attributes == {
-        "friendly_name": "Raindelay",
+        "friendly_name": "Rain Bird Controller Raindelay",
         "icon": "mdi:water-off",
     }
diff --git a/tests/components/recorder/common.py b/tests/components/recorder/common.py
index e017aa384f7877..521be81c89b6e5 100644
--- a/tests/components/recorder/common.py
+++ b/tests/components/recorder/common.py
@@ -13,6 +13,7 @@
 from typing import Any, Literal, cast
 from unittest.mock import patch, sentinel
 
+from freezegun import freeze_time
 from sqlalchemy import create_engine
 from sqlalchemy.orm.session import Session
 
@@ -282,9 +283,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=15 * 5)
 
     states = {mp: [], sns1: [], sns2: [], sns3: [], sns4: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -293,25 +292,18 @@ def set_state(entity_id, state, **kwargs):
         states[sns3].append(set_state(sns3, "10", attributes=sns3_attr))
         states[sns4].append(set_state(sns4, "10", attributes=sns4_attr))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         states[sns1].append(set_state(sns1, "15", attributes=sns1_attr))
         states[sns2].append(set_state(sns2, "15", attributes=sns2_attr))
         states[sns3].append(set_state(sns3, "15", attributes=sns3_attr))
         states[sns4].append(set_state(sns4, "15", attributes=sns4_attr))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[sns1].append(set_state(sns1, "20", attributes=sns1_attr))
         states[sns2].append(set_state(sns2, "20", attributes=sns2_attr))
         states[sns3].append(set_state(sns3, "20", attributes=sns3_attr))
diff --git a/tests/components/recorder/test_history.py b/tests/components/recorder/test_history.py
index b9c44f486b3817..be77f2907d6f2d 100644
--- a/tests/components/recorder/test_history.py
+++ b/tests/components/recorder/test_history.py
@@ -9,6 +9,7 @@
 import json
 from unittest.mock import patch, sentinel
 
+from freezegun import freeze_time
 import pytest
 from sqlalchemy import text
 
@@ -223,15 +224,11 @@ def set_state(state):
     point = start + timedelta(seconds=1)
     end = point + timedelta(seconds=1)
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("idle")
         set_state("YouTube")
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-    ):
+        freezer.move_to(point)
         states = [
             set_state("idle"),
             set_state("Netflix"),
@@ -239,9 +236,7 @@ def set_state(state):
             set_state("YouTube"),
         ]
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-    ):
+        freezer.move_to(end)
         set_state("Netflix")
         set_state("Plex")
 
@@ -272,32 +267,23 @@ def set_state(state):
     point4 = start + timedelta(seconds=1, microseconds=300)
     end = point + timedelta(seconds=1, microseconds=400)
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("idle")
         set_state("YouTube")
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-    ):
+        freezer.move_to(point)
         states = [set_state("idle")]
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-    ):
+
+        freezer.move_to(point2)
         states.append(set_state("Netflix"))
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point3
-    ):
+
+        freezer.move_to(point3)
         states.append(set_state("Plex"))
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point4
-    ):
+
+        freezer.move_to(point4)
         states.append(set_state("YouTube"))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-    ):
+        freezer.move_to(end)
         set_state("Netflix")
         set_state("Plex")
 
@@ -379,21 +365,15 @@ def set_state(state):
     start = dt_util.utcnow() - timedelta(minutes=2)
     point = start + timedelta(minutes=1)
     point2 = point + timedelta(minutes=1, seconds=1)
+    states = []
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("1")
 
-    states = []
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-    ):
+        freezer.move_to(point)
         states.append(set_state("2"))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-    ):
+        freezer.move_to(point2)
         states.append(set_state("3"))
 
     hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -415,21 +395,15 @@ def set_state(state):
     start = dt_util.utcnow() - timedelta(minutes=2)
     point = start + timedelta(minutes=1)
     point2 = point + timedelta(minutes=1, seconds=1)
+    states = []
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("1")
 
-    states = []
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-    ):
+        freezer.move_to(point)
         set_state("2")
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-    ):
+        freezer.move_to(point2)
         states.append(set_state("3"))
 
     hist = history.get_last_state_changes(hass, 1, entity_id)
@@ -457,14 +431,10 @@ def set_state(state):
     start = dt_util.utcnow() - timedelta(minutes=2)
     point = start + timedelta(minutes=1)
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("1")
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-    ):
+        freezer.move_to(point)
         set_state("2")
 
     hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -694,29 +664,18 @@ def set_state(state, **kwargs):
         points.append(start + timedelta(minutes=i))
 
     states = []
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-    ):
+    with freeze_time(start) as freezer:
         set_state("123", attributes={"attribute": 10.64})
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[0],
-    ):
+        freezer.move_to(points[0])
         # Attributes are different, state not
         states.append(set_state("123", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[1],
-    ):
+        freezer.move_to(points[1])
         # state is different, attributes not
         states.append(set_state("32", attributes={"attribute": 21.42}))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=points[2],
-    ):
+        freezer.move_to(points[2])
         # everything is different
         states.append(set_state("412", attributes={"attribute": 54.23}))
 
@@ -805,9 +764,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=1)
 
     states = {therm: [], therm2: [], mp: [], mp2: [], mp3: [], script_c: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -821,17 +778,12 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm, 20, attributes={"current_temperature": 19.5})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         # This state will be skipped only different in time
         set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt3)})
         # This state will be skipped because domain is excluded
@@ -846,9 +798,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm2, 20, attributes={"current_temperature": 19})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[mp].append(
             set_state(mp, "Netflix", attributes={"media_title": str(sentinel.mt4)})
         )
diff --git a/tests/components/recorder/test_history_db_schema_30.py b/tests/components/recorder/test_history_db_schema_30.py
index b04d172487cc7e..30d8de654d7e55 100644
--- a/tests/components/recorder/test_history_db_schema_30.py
+++ b/tests/components/recorder/test_history_db_schema_30.py
@@ -9,6 +9,7 @@
 import json
 from unittest.mock import patch, sentinel
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import recorder
@@ -129,15 +130,11 @@ def set_state(state):
         point = start + timedelta(seconds=1)
         end = point + timedelta(seconds=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("idle")
             set_state("YouTube")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             states = [
                 set_state("idle"),
                 set_state("Netflix"),
@@ -145,9 +142,7 @@ def set_state(state):
                 set_state("YouTube"),
             ]
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-        ):
+            freezer.move_to(end)
             set_state("Netflix")
             set_state("Plex")
 
@@ -180,32 +175,24 @@ def set_state(state):
         point4 = start + timedelta(seconds=1, microseconds=4)
         end = point + timedelta(seconds=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("idle")
             set_state("YouTube")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
+
             states = [set_state("idle")]
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-        ):
+            freezer.move_to(point2)
+
             states.append(set_state("Netflix"))
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point3
-        ):
+
+            freezer.move_to(point3)
             states.append(set_state("Plex"))
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point4
-        ):
+
+            freezer.move_to(point4)
             states.append(set_state("YouTube"))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-        ):
+            freezer.move_to(end)
             set_state("Netflix")
             set_state("Plex")
 
@@ -238,21 +225,15 @@ def set_state(state):
         start = dt_util.utcnow() - timedelta(minutes=2)
         point = start + timedelta(minutes=1)
         point2 = point + timedelta(minutes=1, seconds=1)
+        states = []
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("1")
 
-        states = []
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             states.append(set_state("2"))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-        ):
+            freezer.move_to(point2)
             states.append(set_state("3"))
 
         hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -282,14 +263,10 @@ def set_state(state):
         start = dt_util.utcnow() - timedelta(minutes=2)
         point = start + timedelta(minutes=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("1")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             set_state("2")
 
         hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -546,29 +523,18 @@ def set_state(state, **kwargs):
             points.append(start + timedelta(minutes=i))
 
         states = []
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("123", attributes={"attribute": 10.64})
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[0],
-        ):
+            freezer.move_to(points[0])
             # Attributes are different, state not
             states.append(set_state("123", attributes={"attribute": 21.42}))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[1],
-        ):
+            freezer.move_to(points[1])
             # state is different, attributes not
             states.append(set_state("32", attributes={"attribute": 21.42}))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[2],
-        ):
+            freezer.move_to(points[2])
             # everything is different
             states.append(set_state("412", attributes={"attribute": 54.23}))
 
@@ -630,9 +596,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=1)
 
     states = {therm: [], therm2: [], mp: [], mp2: [], mp3: [], script_c: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -646,17 +610,12 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm, 20, attributes={"current_temperature": 19.5})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         # This state will be skipped only different in time
         set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt3)})
         # This state will be skipped because domain is excluded
@@ -671,9 +630,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm2, 20, attributes={"current_temperature": 19})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[mp].append(
             set_state(mp, "Netflix", attributes={"media_title": str(sentinel.mt4)})
         )
diff --git a/tests/components/recorder/test_history_db_schema_32.py b/tests/components/recorder/test_history_db_schema_32.py
index abc80572c16f76..51e4bfdc4027fe 100644
--- a/tests/components/recorder/test_history_db_schema_32.py
+++ b/tests/components/recorder/test_history_db_schema_32.py
@@ -9,6 +9,7 @@
 import json
 from unittest.mock import patch, sentinel
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components import recorder
@@ -129,15 +130,11 @@ def set_state(state):
         point = start + timedelta(seconds=1)
         end = point + timedelta(seconds=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("idle")
             set_state("YouTube")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             states = [
                 set_state("idle"),
                 set_state("Netflix"),
@@ -145,9 +142,7 @@ def set_state(state):
                 set_state("YouTube"),
             ]
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-        ):
+            freezer.move_to(end)
             set_state("Netflix")
             set_state("Plex")
 
@@ -180,32 +175,23 @@ def set_state(state):
         point4 = start + timedelta(seconds=1, microseconds=4)
         end = point + timedelta(seconds=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("idle")
             set_state("YouTube")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             states = [set_state("idle")]
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-        ):
+
+            freezer.move_to(point2)
             states.append(set_state("Netflix"))
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point3
-        ):
+
+            freezer.move_to(point3)
             states.append(set_state("Plex"))
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point4
-        ):
+
+            freezer.move_to(point4)
             states.append(set_state("YouTube"))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-        ):
+            freezer.move_to(end)
             set_state("Netflix")
             set_state("Plex")
 
@@ -238,21 +224,15 @@ def set_state(state):
         start = dt_util.utcnow() - timedelta(minutes=2)
         point = start + timedelta(minutes=1)
         point2 = point + timedelta(minutes=1, seconds=1)
+        states = []
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("1")
 
-        states = []
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             states.append(set_state("2"))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point2
-        ):
+            freezer.move_to(point2)
             states.append(set_state("3"))
 
         hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -282,14 +262,10 @@ def set_state(state):
         start = dt_util.utcnow() - timedelta(minutes=2)
         point = start + timedelta(minutes=1)
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("1")
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=point
-        ):
+            freezer.move_to(point)
             set_state("2")
 
         hist = history.get_last_state_changes(hass, 2, entity_id)
@@ -537,29 +513,18 @@ def set_state(state, **kwargs):
             points.append(start + timedelta(minutes=i))
 
         states = []
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow", return_value=start
-        ):
+        with freeze_time(start) as freezer:
             set_state("123", attributes={"attribute": 10.64})
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[0],
-        ):
+            freezer.move_to(points[0])
             # Attributes are different, state not
             states.append(set_state("123", attributes={"attribute": 21.42}))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[1],
-        ):
+            freezer.move_to(points[1])
             # state is different, attributes not
             states.append(set_state("32", attributes={"attribute": 21.42}))
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=points[2],
-        ):
+            freezer.move_to(points[2])
             # everything is different
             states.append(set_state("412", attributes={"attribute": 54.23}))
 
@@ -621,9 +586,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=1)
 
     states = {therm: [], therm2: [], mp: [], mp2: [], mp3: [], script_c: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[mp].append(
             set_state(mp, "idle", attributes={"media_title": str(sentinel.mt1)})
         )
@@ -637,17 +600,12 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm, 20, attributes={"current_temperature": 19.5})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow",
-        return_value=one + timedelta(microseconds=1),
-    ):
+        freezer.move_to(one + timedelta(microseconds=1))
         states[mp].append(
             set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt2)})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         # This state will be skipped only different in time
         set_state(mp, "YouTube", attributes={"media_title": str(sentinel.mt3)})
         # This state will be skipped because domain is excluded
@@ -662,9 +620,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(therm2, 20, attributes={"current_temperature": 19})
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[mp].append(
             set_state(mp, "Netflix", attributes={"media_title": str(sentinel.mt4)})
         )
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index 84dbb9a2816399..4e9a0261ec2063 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -56,6 +56,10 @@
     SERVICE_PURGE,
     SERVICE_PURGE_ENTITIES,
 )
+from homeassistant.components.recorder.table_managers import (
+    state_attributes as state_attributes_table_manager,
+    states_meta as states_meta_table_manager,
+)
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
@@ -93,6 +97,15 @@
 from tests.typing import RecorderInstanceGenerator
 
 
+@pytest.fixture
+def small_cache_size() -> None:
+    """Patch the default cache size to 8."""
+    with patch.object(state_attributes_table_manager, "CACHE_SIZE", 8), patch.object(
+        states_meta_table_manager, "CACHE_SIZE", 8
+    ):
+        yield
+
+
 def _default_recorder(hass):
     """Return a recorder with reasonable defaults."""
     return Recorder(
@@ -1426,7 +1439,7 @@ def test_service_disable_events_not_recording(
     """Test that events are not recorded when recorder is disabled using service."""
     hass = hass_recorder()
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
@@ -1460,7 +1473,7 @@ def event_listener(event):
         )
         assert len(db_events) == 0
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_ENABLE,
         {},
@@ -1510,7 +1523,7 @@ def test_service_disable_states_not_recording(
     """Test that state changes are not recorded when recorder is disabled using service."""
     hass = hass_recorder()
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
@@ -1523,7 +1536,7 @@ def test_service_disable_states_not_recording(
     with session_scope(hass=hass, read_only=True) as session:
         assert len(list(session.query(States))) == 0
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_ENABLE,
         {},
@@ -1563,7 +1576,7 @@ def test_service_disable_run_information_recorded(tmp_path: Path) -> None:
         assert db_run_info[0].start is not None
         assert db_run_info[0].end is None
 
-    assert hass.services.call(
+    hass.services.call(
         DOMAIN,
         SERVICE_DISABLE,
         {},
@@ -2022,13 +2035,10 @@ def test_deduplication_event_data_inside_commit_interval(
         assert all(event.data_id == first_data_id for event in events)
 
 
-# Patch CACHE_SIZE since otherwise
-# the CI can fail because the test takes too long to run
-@patch(
-    "homeassistant.components.recorder.table_managers.state_attributes.CACHE_SIZE", 5
-)
 def test_deduplication_state_attributes_inside_commit_interval(
-    hass_recorder: Callable[..., HomeAssistant], caplog: pytest.LogCaptureFixture
+    small_cache_size: None,
+    hass_recorder: Callable[..., HomeAssistant],
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test deduplication of state attributes inside the commit interval."""
     hass = hass_recorder()
@@ -2306,16 +2316,15 @@ async def test_excluding_attributes_by_integration(
 
 
 async def test_lru_increases_with_many_entities(
-    recorder_mock: Recorder, hass: HomeAssistant
+    small_cache_size: None, recorder_mock: Recorder, hass: HomeAssistant
 ) -> None:
     """Test that the recorder's internal LRU cache increases with many entities."""
-    # We do not actually want to record 4096 entities so we mock the entity count
-    mock_entity_count = 4096
-    with patch.object(
-        hass.states, "async_entity_ids_count", return_value=mock_entity_count
-    ):
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
-        await async_wait_recording_done(hass)
+    mock_entity_count = 16
+    for idx in range(mock_entity_count):
+        hass.states.async_set(f"test.entity{idx}", "on")
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
+    await async_wait_recording_done(hass)
 
     assert (
         recorder_mock.state_attributes_manager._id_map.get_size()
diff --git a/tests/components/recorder/test_models.py b/tests/components/recorder/test_models.py
index 8797c153a7b5d5..c73a0db6c76161 100644
--- a/tests/components/recorder/test_models.py
+++ b/tests/components/recorder/test_models.py
@@ -24,7 +24,7 @@
 import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import InvalidEntityFormatError
-from homeassistant.util import dt, dt as dt_util
+from homeassistant.util import dt as dt_util
 
 
 def test_from_event_to_db_event() -> None:
@@ -85,7 +85,7 @@ def test_from_event_to_db_state_attributes() -> None:
 def test_repr() -> None:
     """Test converting event to db state repr."""
     attrs = {"this_attr": True}
-    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC, microsecond=432432)
+    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC, microsecond=432432)
     state = ha.State(
         "sensor.temperature",
         "18",
@@ -105,7 +105,7 @@ def test_repr() -> None:
 
 def test_states_repr_without_timestamp() -> None:
     """Test repr for a state without last_updated_ts."""
-    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC, microsecond=432432)
+    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC, microsecond=432432)
     states = States(
         entity_id="sensor.temp",
         attributes=None,
@@ -123,7 +123,7 @@ def test_states_repr_without_timestamp() -> None:
 
 def test_events_repr_without_timestamp() -> None:
     """Test repr for an event without time_fired_ts."""
-    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC, microsecond=432432)
+    fixed_time = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC, microsecond=432432)
     events = Events(
         event_type="any",
         event_data=None,
@@ -180,7 +180,7 @@ def test_states_from_native_invalid_entity_id() -> None:
 
 async def test_process_timestamp() -> None:
     """Test processing time stamp to UTC."""
-    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC)
+    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC)
     datetime_without_tzinfo = datetime(2016, 7, 9, 11, 0, 0)
     est = dt_util.get_time_zone("US/Eastern")
     datetime_est_timezone = datetime(2016, 7, 9, 11, 0, 0, tzinfo=est)
@@ -190,26 +190,26 @@ async def test_process_timestamp() -> None:
     datetime_hst_timezone = datetime(2016, 7, 9, 11, 0, 0, tzinfo=hst)
 
     assert process_timestamp(datetime_with_tzinfo) == datetime(
-        2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC
+        2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC
     )
     assert process_timestamp(datetime_without_tzinfo) == datetime(
-        2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC
+        2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC
     )
     assert process_timestamp(datetime_est_timezone) == datetime(
-        2016, 7, 9, 15, 0, tzinfo=dt.UTC
+        2016, 7, 9, 15, 0, tzinfo=dt_util.UTC
     )
     assert process_timestamp(datetime_nst_timezone) == datetime(
-        2016, 7, 9, 13, 30, tzinfo=dt.UTC
+        2016, 7, 9, 13, 30, tzinfo=dt_util.UTC
     )
     assert process_timestamp(datetime_hst_timezone) == datetime(
-        2016, 7, 9, 21, 0, tzinfo=dt.UTC
+        2016, 7, 9, 21, 0, tzinfo=dt_util.UTC
     )
     assert process_timestamp(None) is None
 
 
 async def test_process_timestamp_to_utc_isoformat() -> None:
     """Test processing time stamp to UTC isoformat."""
-    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC)
+    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC)
     datetime_without_tzinfo = datetime(2016, 7, 9, 11, 0, 0)
     est = dt_util.get_time_zone("US/Eastern")
     datetime_est_timezone = datetime(2016, 7, 9, 11, 0, 0, tzinfo=est)
@@ -271,7 +271,7 @@ async def test_lazy_state_handles_include_json(
         entity_id="sensor.invalid",
         shared_attrs="{INVALID_JSON}",
     )
-    assert LazyState(row, {}, None, row.entity_id, "", 1).attributes == {}
+    assert LazyState(row, {}, None, row.entity_id, "", 1, False).attributes == {}
     assert "Error converting row to state attributes" in caplog.text
 
 
@@ -283,7 +283,9 @@ async def test_lazy_state_can_decode_attributes(
         entity_id="sensor.invalid",
         attributes='{"shared":true}',
     )
-    assert LazyState(row, {}, None, row.entity_id, "", 1).attributes == {"shared": True}
+    assert LazyState(row, {}, None, row.entity_id, "", 1, False).attributes == {
+        "shared": True
+    }
 
 
 async def test_lazy_state_handles_different_last_updated_and_last_changed(
@@ -298,7 +300,9 @@ async def test_lazy_state_handles_different_last_updated_and_last_changed(
         last_updated_ts=now.timestamp(),
         last_changed_ts=(now - timedelta(seconds=60)).timestamp(),
     )
-    lstate = LazyState(row, {}, None, row.entity_id, row.state, row.last_updated_ts)
+    lstate = LazyState(
+        row, {}, None, row.entity_id, row.state, row.last_updated_ts, False
+    )
     assert lstate.as_dict() == {
         "attributes": {"shared": True},
         "entity_id": "sensor.valid",
@@ -329,7 +333,9 @@ async def test_lazy_state_handles_same_last_updated_and_last_changed(
         last_updated_ts=now.timestamp(),
         last_changed_ts=now.timestamp(),
     )
-    lstate = LazyState(row, {}, None, row.entity_id, row.state, row.last_updated_ts)
+    lstate = LazyState(
+        row, {}, None, row.entity_id, row.state, row.last_updated_ts, False
+    )
     assert lstate.as_dict() == {
         "attributes": {"shared": True},
         "entity_id": "sensor.valid",
@@ -403,7 +409,7 @@ async def test_process_datetime_to_timestamp_mirrors_utc_isoformat_behavior(
 ) -> None:
     """Test process_datetime_to_timestamp mirrors process_timestamp_to_utc_isoformat."""
     hass.config.set_time_zone(time_zone)
-    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC)
+    datetime_with_tzinfo = datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt_util.UTC)
     datetime_without_tzinfo = datetime(2016, 7, 9, 11, 0, 0)
     est = dt_util.get_time_zone("US/Eastern")
     datetime_est_timezone = datetime(2016, 7, 9, 11, 0, 0, tzinfo=est)
diff --git a/tests/components/recorder/test_purge.py b/tests/components/recorder/test_purge.py
index 61f2d57a081c53..096108e0349224 100644
--- a/tests/components/recorder/test_purge.py
+++ b/tests/components/recorder/test_purge.py
@@ -1438,10 +1438,7 @@ async def set_state(entity_id, state, **kwargs):
             state = f"dontpurgeme_{event_id}"
             attributes = {"dontpurgeme": True, **base_attributes}
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=timestamp,
-        ):
+        with freeze_time(timestamp):
             await set_state("test.recorder2", state, attributes=attributes)
 
 
@@ -1602,6 +1599,7 @@ def _add_state_with_state_attributes(
     )
 
 
+@pytest.mark.timeout(30)
 async def test_purge_many_old_events(
     async_setup_recorder_instance: RecorderInstanceGenerator, hass: HomeAssistant
 ) -> None:
diff --git a/tests/components/recorder/test_purge_v32_schema.py b/tests/components/recorder/test_purge_v32_schema.py
index 613c17b3d39a06..18c35e8eb81b42 100644
--- a/tests/components/recorder/test_purge_v32_schema.py
+++ b/tests/components/recorder/test_purge_v32_schema.py
@@ -733,10 +733,7 @@ async def set_state(entity_id, state, **kwargs):
             state = f"dontpurgeme_{event_id}"
             attributes = {"dontpurgeme": True, **base_attributes}
 
-        with patch(
-            "homeassistant.components.recorder.core.dt_util.utcnow",
-            return_value=timestamp,
-        ):
+        with freeze_time(timestamp):
             await set_state("test.recorder2", state, attributes=attributes)
 
 
diff --git a/tests/components/recorder/test_websocket_api.py b/tests/components/recorder/test_websocket_api.py
index 37f5dc77d00668..2c76c9473505dd 100644
--- a/tests/components/recorder/test_websocket_api.py
+++ b/tests/components/recorder/test_websocket_api.py
@@ -1973,6 +1973,36 @@ async def test_change_statistics_unit(
         ],
     }
 
+    # Changing to the same unit is allowed but does nothing
+    await client.send_json(
+        {
+            "id": 6,
+            "type": "recorder/change_statistics_unit",
+            "statistic_id": "sensor.test",
+            "new_unit_of_measurement": "W",
+            "old_unit_of_measurement": "W",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    await async_recorder_block_till_done(hass)
+
+    await client.send_json({"id": 7, "type": "recorder/list_statistic_ids"})
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == [
+        {
+            "statistic_id": "sensor.test",
+            "display_unit_of_measurement": "kW",
+            "has_mean": True,
+            "has_sum": False,
+            "name": None,
+            "source": "recorder",
+            "statistics_unit_of_measurement": "W",
+            "unit_class": "power",
+        }
+    ]
+
 
 async def test_change_statistics_unit_errors(
     recorder_mock: Recorder,
diff --git a/tests/components/remote/test_device_action.py b/tests/components/remote/test_device_action.py
index 15ff75e02c075e..97ff2fd58a0085 100644
--- a/tests/components/remote/test_device_action.py
+++ b/tests/components/remote/test_device_action.py
@@ -1,10 +1,11 @@
 """The test for remote device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -37,7 +41,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -45,7 +49,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -53,7 +57,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -79,7 +83,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -93,7 +97,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -101,20 +105,17 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -122,29 +123,29 @@ async def test_action(
         {
             automation.DOMAIN: [
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "trigger": {"platform": "event", "event_type": "test_off"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event2"},
+                    "trigger": {"platform": "event", "event_type": "test_on"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event3"},
+                    "trigger": {"platform": "event", "event_type": "test_toggle"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -152,29 +153,58 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
 
-    hass.bus.async_fire("test_event1")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
 
-    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_toggle")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_on_calls) == 1
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event3")
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
 
-    hass.bus.async_fire("test_event3")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py
index e20e86899507a5..b07747771d9d7f 100644
--- a/tests/components/remote/test_device_condition.py
+++ b/tests/components/remote/test_device_condition.py
@@ -1,13 +1,14 @@
 """The test for remote device automation."""
 from datetime import timedelta
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -16,12 +17,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -51,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -59,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -107,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -140,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a remote condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -164,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -183,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -199,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -208,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -216,24 +251,70 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_event2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
 
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
-    with patch("homeassistant.core.dt_util.utcnow") as mock_utcnow:
-        mock_utcnow.return_value = point1
+    with freeze_time(point1) as freezer:
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -245,7 +326,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -263,7 +344,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -271,18 +351,18 @@ async def test_if_fires_on_for_condition(
         assert len(calls) == 0
 
         # Time travel 10 secs into the future
-        mock_utcnow.return_value = point2
+        freezer.move_to(point2)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
         # Time travel 20 secs into the future
-        mock_utcnow.return_value = point3
+        freezer.move_to(point3)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 1
diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py
index cd35073280a8f5..b5dcca3dc4c9f2 100644
--- a/tests/components/remote/test_device_trigger.py
+++ b/tests/components/remote/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.remote import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -51,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -59,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -107,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -140,17 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a remote trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -162,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -186,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -210,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -232,38 +266,89 @@ async def test_if_fires_on_state_change(
             ]
         },
     )
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -275,7 +360,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -299,16 +384,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/renault/const.py b/tests/components/renault/const.py
index 2aceb5e74894c9..4b2a7dfc72bb46 100644
--- a/tests/components/renault/const.py
+++ b/tests/components/renault/const.py
@@ -151,7 +151,7 @@
             },
             {
                 ATTR_DEVICE_CLASS: SensorDeviceClass.BATTERY,
-                ATTR_ENTITY_ID: "sensor.reg_number_battery_level",
+                ATTR_ENTITY_ID: "sensor.reg_number_battery",
                 ATTR_STATE: "60",
                 ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
                 ATTR_UNIQUE_ID: "vf1aaaaa555777999_battery_level",
@@ -386,7 +386,7 @@
             },
             {
                 ATTR_DEVICE_CLASS: SensorDeviceClass.BATTERY,
-                ATTR_ENTITY_ID: "sensor.reg_number_battery_level",
+                ATTR_ENTITY_ID: "sensor.reg_number_battery",
                 ATTR_STATE: "50",
                 ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
                 ATTR_UNIQUE_ID: "vf1aaaaa555777999_battery_level",
@@ -621,7 +621,7 @@
             },
             {
                 ATTR_DEVICE_CLASS: SensorDeviceClass.BATTERY,
-                ATTR_ENTITY_ID: "sensor.reg_number_battery_level",
+                ATTR_ENTITY_ID: "sensor.reg_number_battery",
                 ATTR_STATE: "60",
                 ATTR_STATE_CLASS: SensorStateClass.MEASUREMENT,
                 ATTR_UNIQUE_ID: "vf1aaaaa555777123_battery_level",
diff --git a/tests/components/renault/snapshots/test_binary_sensor.ambr b/tests/components/renault/snapshots/test_binary_sensor.ambr
index ddeadd436cf960..9625810bedb50e 100644
--- a/tests/components/renault/snapshots/test_binary_sensor.ambr
+++ b/tests/components/renault/snapshots/test_binary_sensor.ambr
@@ -1,4 +1,1166 @@
 # serializer version: 1
+# name: test_binary_sensor_empty[captur_fuel]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[captur_fuel].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.LOCK: 'lock'>,
+      'original_icon': None,
+      'original_name': 'Lock',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777123_lock_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Hatch',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hatch_status',
+      'unique_id': 'vf1aaaaa555777123_hatch_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear left door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_left_door_status',
+      'unique_id': 'vf1aaaaa555777123_rear_left_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear right door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_right_door_status',
+      'unique_id': 'vf1aaaaa555777123_rear_right_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Driver door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'driver_door_status',
+      'unique_id': 'vf1aaaaa555777123_driver_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Passenger door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'passenger_door_status',
+      'unique_id': 'vf1aaaaa555777123_passenger_door_status',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[captur_fuel].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'lock',
+        'friendly_name': 'REG-NUMBER Lock',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Hatch',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear left door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear right door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Driver door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Passenger door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[captur_phev]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[captur_phev].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+      'original_icon': None,
+      'original_name': 'Plug',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777123_plugged_in',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.BATTERY_CHARGING: 'battery_charging'>,
+      'original_icon': None,
+      'original_name': 'Charging',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777123_charging',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.LOCK: 'lock'>,
+      'original_icon': None,
+      'original_name': 'Lock',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777123_lock_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Hatch',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hatch_status',
+      'unique_id': 'vf1aaaaa555777123_hatch_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear left door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_left_door_status',
+      'unique_id': 'vf1aaaaa555777123_rear_left_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear right door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_right_door_status',
+      'unique_id': 'vf1aaaaa555777123_rear_right_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Driver door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'driver_door_status',
+      'unique_id': 'vf1aaaaa555777123_driver_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Passenger door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'passenger_door_status',
+      'unique_id': 'vf1aaaaa555777123_passenger_door_status',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[captur_phev].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'plug',
+        'friendly_name': 'REG-NUMBER Plug',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery_charging',
+        'friendly_name': 'REG-NUMBER Charging',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'lock',
+        'friendly_name': 'REG-NUMBER Lock',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Hatch',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear left door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear right door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Driver door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Passenger door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_40]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X101VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_40].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+      'original_icon': None,
+      'original_name': 'Plug',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_plugged_in',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.BATTERY_CHARGING: 'battery_charging'>,
+      'original_icon': None,
+      'original_name': 'Charging',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_charging',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_hvac',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:fan-off',
+      'original_name': 'HVAC',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_status',
+      'unique_id': 'vf1aaaaa555777999_hvac_status',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_40].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'plug',
+        'friendly_name': 'REG-NUMBER Plug',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery_charging',
+        'friendly_name': 'REG-NUMBER Charging',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER HVAC',
+        'icon': 'mdi:fan-off',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_hvac',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_50]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X102VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_50].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.PLUG: 'plug'>,
+      'original_icon': None,
+      'original_name': 'Plug',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_plugged_in',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.BATTERY_CHARGING: 'battery_charging'>,
+      'original_icon': None,
+      'original_name': 'Charging',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_charging',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_hvac',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:fan-off',
+      'original_name': 'HVAC',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_status',
+      'unique_id': 'vf1aaaaa555777999_hvac_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.LOCK: 'lock'>,
+      'original_icon': None,
+      'original_name': 'Lock',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_lock_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Hatch',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hatch_status',
+      'unique_id': 'vf1aaaaa555777999_hatch_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear left door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_left_door_status',
+      'unique_id': 'vf1aaaaa555777999_rear_left_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Rear right door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'rear_right_door_status',
+      'unique_id': 'vf1aaaaa555777999_rear_right_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Driver door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'driver_door_status',
+      'unique_id': 'vf1aaaaa555777999_driver_door_status',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'binary_sensor',
+      'entity_category': None,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <BinarySensorDeviceClass.DOOR: 'door'>,
+      'original_icon': None,
+      'original_name': 'Passenger door',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'passenger_door_status',
+      'unique_id': 'vf1aaaaa555777999_passenger_door_status',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_binary_sensor_empty[zoe_50].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'plug',
+        'friendly_name': 'REG-NUMBER Plug',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_plug',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery_charging',
+        'friendly_name': 'REG-NUMBER Charging',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_charging',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER HVAC',
+        'icon': 'mdi:fan-off',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_hvac',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'lock',
+        'friendly_name': 'REG-NUMBER Lock',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_lock',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Hatch',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_hatch',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear left door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_left_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Rear right door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_rear_right_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Driver door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_driver_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'door',
+        'friendly_name': 'REG-NUMBER Passenger door',
+      }),
+      'context': <ANY>,
+      'entity_id': 'binary_sensor.reg_number_passenger_door',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
 # name: test_binary_sensors[captur_fuel]
   list([
     DeviceRegistryEntrySnapshot({
@@ -54,7 +1216,7 @@
       'original_name': 'Lock',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'lock_status',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777123_lock_status',
       'unit_of_measurement': None,
     }),
@@ -325,7 +1487,7 @@
       'original_name': 'Plug',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'plugged_in',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777123_plugged_in',
       'unit_of_measurement': None,
     }),
@@ -353,7 +1515,7 @@
       'original_name': 'Charging',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'charging',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777123_charging',
       'unit_of_measurement': None,
     }),
@@ -381,7 +1543,7 @@
       'original_name': 'Lock',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'lock_status',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777123_lock_status',
       'unit_of_measurement': None,
     }),
@@ -674,7 +1836,7 @@
       'original_name': 'Plug',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'plugged_in',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_plugged_in',
       'unit_of_measurement': None,
     }),
@@ -702,7 +1864,7 @@
       'original_name': 'Charging',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'charging',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_charging',
       'unit_of_measurement': None,
     }),
@@ -828,7 +1990,7 @@
       'original_name': 'Plug',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'plugged_in',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_plugged_in',
       'unit_of_measurement': None,
     }),
@@ -856,7 +2018,7 @@
       'original_name': 'Charging',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'charging',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_charging',
       'unit_of_measurement': None,
     }),
@@ -912,7 +2074,7 @@
       'original_name': 'Lock',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'lock_status',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_lock_status',
       'unit_of_measurement': None,
     }),
diff --git a/tests/components/renault/snapshots/test_button.ambr b/tests/components/renault/snapshots/test_button.ambr
index 8a0c8af7aa7942..8c56a3842ea62d 100644
--- a/tests/components/renault/snapshots/test_button.ambr
+++ b/tests/components/renault/snapshots/test_button.ambr
@@ -1,4 +1,542 @@
 # serializer version: 1
+# name: test_button_empty[captur_fuel]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[captur_fuel].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:air-conditioner',
+      'original_name': 'Start air conditioner',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_air_conditioner',
+      'unique_id': 'vf1aaaaa555777123_start_air_conditioner',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[captur_fuel].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start air conditioner',
+        'icon': 'mdi:air-conditioner',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_button_empty[captur_phev]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[captur_phev].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:air-conditioner',
+      'original_name': 'Start air conditioner',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_air_conditioner',
+      'unique_id': 'vf1aaaaa555777123_start_air_conditioner',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Start charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_charge',
+      'unique_id': 'vf1aaaaa555777123_start_charge',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_stop_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Stop charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'stop_charge',
+      'unique_id': 'vf1aaaaa555777123_stop_charge',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[captur_phev].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start air conditioner',
+        'icon': 'mdi:air-conditioner',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Stop charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_stop_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_40]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X101VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_40].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:air-conditioner',
+      'original_name': 'Start air conditioner',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_air_conditioner',
+      'unique_id': 'vf1aaaaa555777999_start_air_conditioner',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Start charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_charge',
+      'unique_id': 'vf1aaaaa555777999_start_charge',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_stop_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Stop charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'stop_charge',
+      'unique_id': 'vf1aaaaa555777999_stop_charge',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_40].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start air conditioner',
+        'icon': 'mdi:air-conditioner',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Stop charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_stop_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_50]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X102VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_50].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:air-conditioner',
+      'original_name': 'Start air conditioner',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_air_conditioner',
+      'unique_id': 'vf1aaaaa555777999_start_air_conditioner',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_start_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Start charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'start_charge',
+      'unique_id': 'vf1aaaaa555777999_start_charge',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'button',
+      'entity_category': None,
+      'entity_id': 'button.reg_number_stop_charge',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Stop charge',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'stop_charge',
+      'unique_id': 'vf1aaaaa555777999_stop_charge',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_button_empty[zoe_50].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start air conditioner',
+        'icon': 'mdi:air-conditioner',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_air_conditioner',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Start charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_start_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Stop charge',
+        'icon': 'mdi:ev-station',
+      }),
+      'context': <ANY>,
+      'entity_id': 'button.reg_number_stop_charge',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
 # name: test_buttons[captur_fuel]
   list([
     DeviceRegistryEntrySnapshot({
diff --git a/tests/components/renault/snapshots/test_device_tracker.ambr b/tests/components/renault/snapshots/test_device_tracker.ambr
index 571ef2203e10e5..474791791d992c 100644
--- a/tests/components/renault/snapshots/test_device_tracker.ambr
+++ b/tests/components/renault/snapshots/test_device_tracker.ambr
@@ -1,4 +1,272 @@
 # serializer version: 1
+# name: test_device_tracker_empty[captur_fuel]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[captur_fuel].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'device_tracker',
+      'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:car',
+      'original_name': 'Location',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location',
+      'unique_id': 'vf1aaaaa555777123_location',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[captur_fuel].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Location',
+        'icon': 'mdi:car',
+        'source_type': <SourceType.GPS: 'gps'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[captur_phev]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[captur_phev].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'device_tracker',
+      'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:car',
+      'original_name': 'Location',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location',
+      'unique_id': 'vf1aaaaa555777123_location',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[captur_phev].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Location',
+        'icon': 'mdi:car',
+        'source_type': <SourceType.GPS: 'gps'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_40]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X101VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_40].1
+  list([
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_40].2
+  list([
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_50]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X102VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_50].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'device_tracker',
+      'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:car',
+      'original_name': 'Location',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location',
+      'unique_id': 'vf1aaaaa555777999_location',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_device_tracker_empty[zoe_50].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Location',
+        'icon': 'mdi:car',
+        'source_type': <SourceType.GPS: 'gps'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'device_tracker.reg_number_location',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
 # name: test_device_trackers[captur_fuel]
   list([
     DeviceRegistryEntrySnapshot({
diff --git a/tests/components/renault/snapshots/test_select.ambr b/tests/components/renault/snapshots/test_select.ambr
index 4c7103ebe5b6bb..c5bbc6b20024b6 100644
--- a/tests/components/renault/snapshots/test_select.ambr
+++ b/tests/components/renault/snapshots/test_select.ambr
@@ -1,4 +1,302 @@
 # serializer version: 1
+# name: test_select_empty[captur_fuel]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[captur_fuel].1
+  list([
+  ])
+# ---
+# name: test_select_empty[captur_fuel].2
+  list([
+  ])
+# ---
+# name: test_select_empty[captur_phev]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[captur_phev].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'select',
+      'entity_category': None,
+      'entity_id': 'select.reg_number_charge_mode',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:calendar-remove',
+      'original_name': 'Charge mode',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_mode',
+      'unique_id': 'vf1aaaaa555777123_charge_mode',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[captur_phev].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charge mode',
+        'icon': 'mdi:calendar-remove',
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'select.reg_number_charge_mode',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_40]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X101VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_40].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'select',
+      'entity_category': None,
+      'entity_id': 'select.reg_number_charge_mode',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:calendar-remove',
+      'original_name': 'Charge mode',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_mode',
+      'unique_id': 'vf1aaaaa555777999_charge_mode',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_40].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charge mode',
+        'icon': 'mdi:calendar-remove',
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'select.reg_number_charge_mode',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_50]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X102VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_50].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'select',
+      'entity_category': None,
+      'entity_id': 'select.reg_number_charge_mode',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:calendar-remove',
+      'original_name': 'Charge mode',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_mode',
+      'unique_id': 'vf1aaaaa555777999_charge_mode',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_select_empty[zoe_50].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charge mode',
+        'icon': 'mdi:calendar-remove',
+        'options': list([
+          'always',
+          'always_charging',
+          'schedule_mode',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'select.reg_number_charge_mode',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
 # name: test_selects[captur_fuel]
   list([
     DeviceRegistryEntrySnapshot({
diff --git a/tests/components/renault/snapshots/test_sensor.ambr b/tests/components/renault/snapshots/test_sensor.ambr
index 2bf8c0c17bfe02..b4e2f105b3b34d 100644
--- a/tests/components/renault/snapshots/test_sensor.ambr
+++ b/tests/components/renault/snapshots/test_sensor.ambr
@@ -1,4 +1,2403 @@
 # serializer version: 1
+# name: test_sensor_empty[captur_fuel]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[captur_fuel].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_mileage',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:sign-direction',
+      'original_name': 'Mileage',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'mileage',
+      'unique_id': 'vf1aaaaa555777123_mileage',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_fuel_autonomy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:gas-station',
+      'original_name': 'Fuel autonomy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'fuel_autonomy',
+      'unique_id': 'vf1aaaaa555777123_fuel_autonomy',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_fuel_quantity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.VOLUME: 'volume'>,
+      'original_icon': 'mdi:fuel',
+      'original_name': 'Fuel quantity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'fuel_quantity',
+      'unique_id': 'vf1aaaaa555777123_fuel_quantity',
+      'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last location activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location_last_activity',
+      'unique_id': 'vf1aaaaa555777123_location_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state',
+      'unique_id': 'vf1aaaaa555777123_res_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start code',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state_code',
+      'unique_id': 'vf1aaaaa555777123_res_state_code',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[captur_fuel].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Mileage',
+        'icon': 'mdi:sign-direction',
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_mileage',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Fuel autonomy',
+        'icon': 'mdi:gas-station',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_fuel_autonomy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'volume',
+        'friendly_name': 'REG-NUMBER Fuel quantity',
+        'icon': 'mdi:fuel',
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+        'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_fuel_quantity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last location activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start code',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_sensor_empty[captur_phev]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777123',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Captur ii',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'XJB1SU',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[captur_phev].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+      'original_icon': None,
+      'original_name': 'Battery',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777123_battery_level',
+      'unit_of_measurement': '%',
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:flash-off',
+      'original_name': 'Charge state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_state',
+      'unique_id': 'vf1aaaaa555777123_charge_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:timer',
+      'original_name': 'Charging remaining time',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charging_remaining_time',
+      'unique_id': 'vf1aaaaa555777123_charging_remaining_time',
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_admissible_charging_power',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+      'original_icon': None,
+      'original_name': 'Admissible charging power',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'admissible_charging_power',
+      'unique_id': 'vf1aaaaa555777123_charging_power',
+      'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:power-plug-off',
+      'original_name': 'Plug state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'plug_state',
+      'unique_id': 'vf1aaaaa555777123_plug_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Battery autonomy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_autonomy',
+      'unique_id': 'vf1aaaaa555777123_battery_autonomy',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+      'original_icon': None,
+      'original_name': 'Battery available energy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_available_energy',
+      'unique_id': 'vf1aaaaa555777123_battery_available_energy',
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+      'original_icon': None,
+      'original_name': 'Battery temperature',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_temperature',
+      'unique_id': 'vf1aaaaa555777123_battery_temperature',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last battery activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_last_activity',
+      'unique_id': 'vf1aaaaa555777123_battery_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_mileage',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:sign-direction',
+      'original_name': 'Mileage',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'mileage',
+      'unique_id': 'vf1aaaaa555777123_mileage',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_fuel_autonomy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:gas-station',
+      'original_name': 'Fuel autonomy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'fuel_autonomy',
+      'unique_id': 'vf1aaaaa555777123_fuel_autonomy',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_fuel_quantity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.VOLUME: 'volume'>,
+      'original_icon': 'mdi:fuel',
+      'original_name': 'Fuel quantity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'fuel_quantity',
+      'unique_id': 'vf1aaaaa555777123_fuel_quantity',
+      'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last location activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location_last_activity',
+      'unique_id': 'vf1aaaaa555777123_location_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state',
+      'unique_id': 'vf1aaaaa555777123_res_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start code',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state_code',
+      'unique_id': 'vf1aaaaa555777123_res_state_code',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[captur_phev].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery',
+        'friendly_name': 'REG-NUMBER Battery',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': '%',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Charge state',
+        'icon': 'mdi:flash-off',
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charging remaining time',
+        'icon': 'mdi:timer',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'power',
+        'friendly_name': 'REG-NUMBER Admissible charging power',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_admissible_charging_power',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Plug state',
+        'icon': 'mdi:power-plug-off',
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Battery autonomy',
+        'icon': 'mdi:ev-station',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'energy',
+        'friendly_name': 'REG-NUMBER Battery available energy',
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+        'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'temperature',
+        'friendly_name': 'REG-NUMBER Battery temperature',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last battery activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Mileage',
+        'icon': 'mdi:sign-direction',
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_mileage',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Fuel autonomy',
+        'icon': 'mdi:gas-station',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_fuel_autonomy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'volume',
+        'friendly_name': 'REG-NUMBER Fuel quantity',
+        'icon': 'mdi:fuel',
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+        'unit_of_measurement': <UnitOfVolume.LITERS: 'L'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_fuel_quantity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last location activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start code',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_40]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X101VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_40].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+      'original_icon': None,
+      'original_name': 'Battery',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_battery_level',
+      'unit_of_measurement': '%',
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:flash-off',
+      'original_name': 'Charge state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_state',
+      'unique_id': 'vf1aaaaa555777999_charge_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:timer',
+      'original_name': 'Charging remaining time',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charging_remaining_time',
+      'unique_id': 'vf1aaaaa555777999_charging_remaining_time',
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charging_power',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+      'original_icon': None,
+      'original_name': 'Charging power',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charging_power',
+      'unique_id': 'vf1aaaaa555777999_charging_power',
+      'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:power-plug-off',
+      'original_name': 'Plug state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'plug_state',
+      'unique_id': 'vf1aaaaa555777999_plug_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Battery autonomy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_autonomy',
+      'unique_id': 'vf1aaaaa555777999_battery_autonomy',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+      'original_icon': None,
+      'original_name': 'Battery available energy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_available_energy',
+      'unique_id': 'vf1aaaaa555777999_battery_available_energy',
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+      'original_icon': None,
+      'original_name': 'Battery temperature',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_temperature',
+      'unique_id': 'vf1aaaaa555777999_battery_temperature',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last battery activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_last_activity',
+      'unique_id': 'vf1aaaaa555777999_battery_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_mileage',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:sign-direction',
+      'original_name': 'Mileage',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'mileage',
+      'unique_id': 'vf1aaaaa555777999_mileage',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_outside_temperature',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+      'original_icon': None,
+      'original_name': 'Outside temperature',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'outside_temperature',
+      'unique_id': 'vf1aaaaa555777999_outside_temperature',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_hvac_soc_threshold',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'HVAC SoC threshold',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_soc_threshold',
+      'unique_id': 'vf1aaaaa555777999_hvac_soc_threshold',
+      'unit_of_measurement': '%',
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_hvac_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last HVAC activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_last_activity',
+      'unique_id': 'vf1aaaaa555777999_hvac_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state',
+      'unique_id': 'vf1aaaaa555777999_res_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start code',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state_code',
+      'unique_id': 'vf1aaaaa555777999_res_state_code',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_40].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery',
+        'friendly_name': 'REG-NUMBER Battery',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': '%',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Charge state',
+        'icon': 'mdi:flash-off',
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charging remaining time',
+        'icon': 'mdi:timer',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'power',
+        'friendly_name': 'REG-NUMBER Charging power',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charging_power',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Plug state',
+        'icon': 'mdi:power-plug-off',
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Battery autonomy',
+        'icon': 'mdi:ev-station',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'energy',
+        'friendly_name': 'REG-NUMBER Battery available energy',
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+        'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'temperature',
+        'friendly_name': 'REG-NUMBER Battery temperature',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last battery activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Mileage',
+        'icon': 'mdi:sign-direction',
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_mileage',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'temperature',
+        'friendly_name': 'REG-NUMBER Outside temperature',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_outside_temperature',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER HVAC SoC threshold',
+        'unit_of_measurement': '%',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_hvac_soc_threshold',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last HVAC activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_hvac_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start code',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_50]
+  list([
+    DeviceRegistryEntrySnapshot({
+      'area_id': None,
+      'config_entries': <ANY>,
+      'configuration_url': None,
+      'connections': set({
+      }),
+      'disabled_by': None,
+      'entry_type': None,
+      'hw_version': None,
+      'id': <ANY>,
+      'identifiers': set({
+        tuple(
+          'renault',
+          'VF1AAAAA555777999',
+        ),
+      }),
+      'is_new': False,
+      'manufacturer': 'Renault',
+      'model': 'Zoe',
+      'name': 'REG-NUMBER',
+      'name_by_user': None,
+      'suggested_area': None,
+      'sw_version': 'X102VE',
+      'via_device_id': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_50].1
+  list([
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
+      'original_icon': None,
+      'original_name': 'Battery',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': None,
+      'unique_id': 'vf1aaaaa555777999_battery_level',
+      'unit_of_measurement': '%',
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:flash-off',
+      'original_name': 'Charge state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charge_state',
+      'unique_id': 'vf1aaaaa555777999_charge_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': 'mdi:timer',
+      'original_name': 'Charging remaining time',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'charging_remaining_time',
+      'unique_id': 'vf1aaaaa555777999_charging_remaining_time',
+      'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_admissible_charging_power',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.POWER: 'power'>,
+      'original_icon': None,
+      'original_name': 'Admissible charging power',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'admissible_charging_power',
+      'unique_id': 'vf1aaaaa555777999_charging_power',
+      'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
+      'original_icon': 'mdi:power-plug-off',
+      'original_name': 'Plug state',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'plug_state',
+      'unique_id': 'vf1aaaaa555777999_plug_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:ev-station',
+      'original_name': 'Battery autonomy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_autonomy',
+      'unique_id': 'vf1aaaaa555777999_battery_autonomy',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
+      'original_icon': None,
+      'original_name': 'Battery available energy',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_available_energy',
+      'unique_id': 'vf1aaaaa555777999_battery_available_energy',
+      'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+      'original_icon': None,
+      'original_name': 'Battery temperature',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_temperature',
+      'unique_id': 'vf1aaaaa555777999_battery_temperature',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last battery activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'battery_last_activity',
+      'unique_id': 'vf1aaaaa555777999_battery_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_mileage',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.DISTANCE: 'distance'>,
+      'original_icon': 'mdi:sign-direction',
+      'original_name': 'Mileage',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'mileage',
+      'unique_id': 'vf1aaaaa555777999_mileage',
+      'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': dict({
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+      }),
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_outside_temperature',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TEMPERATURE: 'temperature'>,
+      'original_icon': None,
+      'original_name': 'Outside temperature',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'outside_temperature',
+      'unique_id': 'vf1aaaaa555777999_outside_temperature',
+      'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_hvac_soc_threshold',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'HVAC SoC threshold',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_soc_threshold',
+      'unique_id': 'vf1aaaaa555777999_hvac_soc_threshold',
+      'unit_of_measurement': '%',
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_hvac_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last HVAC activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'hvac_last_activity',
+      'unique_id': 'vf1aaaaa555777999_hvac_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': <SensorDeviceClass.TIMESTAMP: 'timestamp'>,
+      'original_icon': None,
+      'original_name': 'Last location activity',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'location_last_activity',
+      'unique_id': 'vf1aaaaa555777999_location_last_activity',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state',
+      'unique_id': 'vf1aaaaa555777999_res_state',
+      'unit_of_measurement': None,
+    }),
+    EntityRegistryEntrySnapshot({
+      'aliases': set({
+      }),
+      'area_id': None,
+      'capabilities': None,
+      'config_entry_id': <ANY>,
+      'device_class': None,
+      'device_id': <ANY>,
+      'disabled_by': None,
+      'domain': 'sensor',
+      'entity_category': None,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'has_entity_name': True,
+      'hidden_by': None,
+      'icon': None,
+      'id': <ANY>,
+      'name': None,
+      'options': dict({
+      }),
+      'original_device_class': None,
+      'original_icon': None,
+      'original_name': 'Remote engine start code',
+      'platform': 'renault',
+      'supported_features': 0,
+      'translation_key': 'res_state_code',
+      'unique_id': 'vf1aaaaa555777999_res_state_code',
+      'unit_of_measurement': None,
+    }),
+  ])
+# ---
+# name: test_sensor_empty[zoe_50].2
+  list([
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'battery',
+        'friendly_name': 'REG-NUMBER Battery',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': '%',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Charge state',
+        'icon': 'mdi:flash-off',
+        'options': list([
+          'not_in_charge',
+          'waiting_for_a_planned_charge',
+          'charge_ended',
+          'waiting_for_current_charge',
+          'energy_flap_opened',
+          'charge_in_progress',
+          'charge_error',
+          'unavailable',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charge_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Charging remaining time',
+        'icon': 'mdi:timer',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTime.MINUTES: 'min'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_charging_remaining_time',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'power',
+        'friendly_name': 'REG-NUMBER Admissible charging power',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_admissible_charging_power',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'enum',
+        'friendly_name': 'REG-NUMBER Plug state',
+        'icon': 'mdi:power-plug-off',
+        'options': list([
+          'unplugged',
+          'plugged',
+          'plug_error',
+          'plug_unknown',
+        ]),
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_plug_state',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Battery autonomy',
+        'icon': 'mdi:ev-station',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_autonomy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'energy',
+        'friendly_name': 'REG-NUMBER Battery available energy',
+        'state_class': <SensorStateClass.TOTAL: 'total'>,
+        'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_available_energy',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'temperature',
+        'friendly_name': 'REG-NUMBER Battery temperature',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_battery_temperature',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last battery activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_battery_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'distance',
+        'friendly_name': 'REG-NUMBER Mileage',
+        'icon': 'mdi:sign-direction',
+        'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
+        'unit_of_measurement': <UnitOfLength.KILOMETERS: 'km'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_mileage',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'temperature',
+        'friendly_name': 'REG-NUMBER Outside temperature',
+        'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
+        'unit_of_measurement': <UnitOfTemperature.CELSIUS: '°C'>,
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_outside_temperature',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER HVAC SoC threshold',
+        'unit_of_measurement': '%',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_hvac_soc_threshold',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last HVAC activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_hvac_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'device_class': 'timestamp',
+        'friendly_name': 'REG-NUMBER Last location activity',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_last_location_activity',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+    StateSnapshot({
+      'attributes': ReadOnlyDict({
+        'friendly_name': 'REG-NUMBER Remote engine start code',
+      }),
+      'context': <ANY>,
+      'entity_id': 'sensor.reg_number_remote_engine_start_code',
+      'last_changed': <ANY>,
+      'last_updated': <ANY>,
+      'state': 'unknown',
+    }),
+  ])
+# ---
 # name: test_sensors[captur_fuel]
   list([
     DeviceRegistryEntrySnapshot({
@@ -327,7 +2726,7 @@
       'disabled_by': None,
       'domain': 'sensor',
       'entity_category': None,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'has_entity_name': True,
       'hidden_by': None,
       'icon': None,
@@ -337,10 +2736,10 @@
       }),
       'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
       'original_icon': None,
-      'original_name': 'Battery level',
+      'original_name': 'Battery',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'battery_level',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777123_battery_level',
       'unit_of_measurement': '%',
     }),
@@ -777,12 +3176,12 @@
     StateSnapshot({
       'attributes': ReadOnlyDict({
         'device_class': 'battery',
-        'friendly_name': 'REG-NUMBER Battery level',
+        'friendly_name': 'REG-NUMBER Battery',
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
         'unit_of_measurement': '%',
       }),
       'context': <ANY>,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'last_changed': <ANY>,
       'last_updated': <ANY>,
       'state': '60',
@@ -1023,7 +3422,7 @@
       'disabled_by': None,
       'domain': 'sensor',
       'entity_category': None,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'has_entity_name': True,
       'hidden_by': None,
       'icon': None,
@@ -1033,10 +3432,10 @@
       }),
       'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
       'original_icon': None,
-      'original_name': 'Battery level',
+      'original_name': 'Battery',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'battery_level',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_battery_level',
       'unit_of_measurement': '%',
     }),
@@ -1471,12 +3870,12 @@
     StateSnapshot({
       'attributes': ReadOnlyDict({
         'device_class': 'battery',
-        'friendly_name': 'REG-NUMBER Battery level',
+        'friendly_name': 'REG-NUMBER Battery',
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
         'unit_of_measurement': '%',
       }),
       'context': <ANY>,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'last_changed': <ANY>,
       'last_updated': <ANY>,
       'state': '60',
@@ -1713,7 +4112,7 @@
       'disabled_by': None,
       'domain': 'sensor',
       'entity_category': None,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'has_entity_name': True,
       'hidden_by': None,
       'icon': None,
@@ -1723,10 +4122,10 @@
       }),
       'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
       'original_icon': None,
-      'original_name': 'Battery level',
+      'original_name': 'Battery',
       'platform': 'renault',
       'supported_features': 0,
-      'translation_key': 'battery_level',
+      'translation_key': None,
       'unique_id': 'vf1aaaaa555777999_battery_level',
       'unit_of_measurement': '%',
     }),
@@ -2189,12 +4588,12 @@
     StateSnapshot({
       'attributes': ReadOnlyDict({
         'device_class': 'battery',
-        'friendly_name': 'REG-NUMBER Battery level',
+        'friendly_name': 'REG-NUMBER Battery',
         'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
         'unit_of_measurement': '%',
       }),
       'context': <ANY>,
-      'entity_id': 'sensor.reg_number_battery_level',
+      'entity_id': 'sensor.reg_number_battery',
       'last_changed': <ANY>,
       'last_updated': <ANY>,
       'state': '50',
diff --git a/tests/components/renault/test_binary_sensor.py b/tests/components/renault/test_binary_sensor.py
index 320c5cc30d594f..f1e3511dc2c56e 100644
--- a/tests/components/renault/test_binary_sensor.py
+++ b/tests/components/renault/test_binary_sensor.py
@@ -6,11 +6,11 @@
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_UNKNOWN, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import check_device_registry, check_entities_no_data, check_entities_unavailable
+from . import check_device_registry, check_entities_unavailable
 from .const import MOCK_VEHICLES
 
 pytestmark = pytest.mark.usefixtures("patch_renault_account", "patch_get_vehicles")
@@ -56,20 +56,29 @@ async def test_binary_sensors(
 async def test_binary_sensor_empty(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    vehicle_type: str,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test for Renault binary sensors with empty data from Renault."""
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    check_device_registry(device_registry, mock_vehicle["expected_device"])
+    # Ensure devices are correctly registered
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    assert device_entries == snapshot
 
-    expected_entities = mock_vehicle[Platform.BINARY_SENSOR]
-    assert len(entity_registry.entities) == len(expected_entities)
-    check_entities_no_data(hass, entity_registry, expected_entities, STATE_UNKNOWN)
+    # Ensure entities are correctly registered
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, config_entry.entry_id
+    )
+    assert entity_entries == snapshot
+
+    # Ensure entity states are correct
+    states = [hass.states.get(ent.entity_id) for ent in entity_entries]
+    assert states == snapshot
 
 
 @pytest.mark.usefixtures("fixtures_with_invalid_upstream_exception")
diff --git a/tests/components/renault/test_button.py b/tests/components/renault/test_button.py
index 576e3c05c2aee2..47a411ce791b94 100644
--- a/tests/components/renault/test_button.py
+++ b/tests/components/renault/test_button.py
@@ -60,20 +60,29 @@ async def test_buttons(
 async def test_button_empty(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    vehicle_type: str,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test for Renault device trackers with empty data from Renault."""
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    check_device_registry(device_registry, mock_vehicle["expected_device"])
+    # Ensure devices are correctly registered
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    assert device_entries == snapshot
 
-    expected_entities = mock_vehicle[Platform.BUTTON]
-    assert len(entity_registry.entities) == len(expected_entities)
-    check_entities_no_data(hass, entity_registry, expected_entities, STATE_UNKNOWN)
+    # Ensure entities are correctly registered
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, config_entry.entry_id
+    )
+    assert entity_entries == snapshot
+
+    # Ensure entity states are correct
+    states = [hass.states.get(ent.entity_id) for ent in entity_entries]
+    assert states == snapshot
 
 
 @pytest.mark.usefixtures("fixtures_with_invalid_upstream_exception")
diff --git a/tests/components/renault/test_device_tracker.py b/tests/components/renault/test_device_tracker.py
index 910524422ca98c..a551d2df986a25 100644
--- a/tests/components/renault/test_device_tracker.py
+++ b/tests/components/renault/test_device_tracker.py
@@ -6,11 +6,11 @@
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_UNKNOWN, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import check_device_registry, check_entities_no_data, check_entities_unavailable
+from . import check_device_registry, check_entities_unavailable
 from .const import MOCK_VEHICLES
 
 pytestmark = pytest.mark.usefixtures("patch_renault_account", "patch_get_vehicles")
@@ -56,20 +56,29 @@ async def test_device_trackers(
 async def test_device_tracker_empty(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    vehicle_type: str,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test for Renault device trackers with empty data from Renault."""
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    check_device_registry(device_registry, mock_vehicle["expected_device"])
+    # Ensure devices are correctly registered
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    assert device_entries == snapshot
 
-    expected_entities = mock_vehicle[Platform.DEVICE_TRACKER]
-    assert len(entity_registry.entities) == len(expected_entities)
-    check_entities_no_data(hass, entity_registry, expected_entities, STATE_UNKNOWN)
+    # Ensure entities are correctly registered
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, config_entry.entry_id
+    )
+    assert entity_entries == snapshot
+
+    # Ensure entity states are correct
+    states = [hass.states.get(ent.entity_id) for ent in entity_entries]
+    assert states == snapshot
 
 
 @pytest.mark.usefixtures("fixtures_with_invalid_upstream_exception")
diff --git a/tests/components/renault/test_select.py b/tests/components/renault/test_select.py
index 9b5a6b014528e6..f170dec6c4af5d 100644
--- a/tests/components/renault/test_select.py
+++ b/tests/components/renault/test_select.py
@@ -12,11 +12,11 @@
     SERVICE_SELECT_OPTION,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
+from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import check_device_registry, check_entities_no_data, check_entities_unavailable
+from . import check_device_registry, check_entities_unavailable
 from .const import MOCK_VEHICLES
 
 from tests.common import load_fixture
@@ -64,20 +64,29 @@ async def test_selects(
 async def test_select_empty(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    vehicle_type: str,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test for Renault selects with empty data from Renault."""
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    check_device_registry(device_registry, mock_vehicle["expected_device"])
+    # Ensure devices are correctly registered
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    assert device_entries == snapshot
 
-    expected_entities = mock_vehicle[Platform.SELECT]
-    assert len(entity_registry.entities) == len(expected_entities)
-    check_entities_no_data(hass, entity_registry, expected_entities, STATE_UNKNOWN)
+    # Ensure entities are correctly registered
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, config_entry.entry_id
+    )
+    assert entity_entries == snapshot
+
+    # Ensure entity states are correct
+    states = [hass.states.get(ent.entity_id) for ent in entity_entries]
+    assert states == snapshot
 
 
 @pytest.mark.usefixtures("fixtures_with_invalid_upstream_exception")
diff --git a/tests/components/renault/test_sensor.py b/tests/components/renault/test_sensor.py
index e0462834ae474a..fb61f31ec44d6a 100644
--- a/tests/components/renault/test_sensor.py
+++ b/tests/components/renault/test_sensor.py
@@ -6,11 +6,11 @@
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_UNKNOWN, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import check_device_registry, check_entities_no_data, check_entities_unavailable
+from . import check_device_registry, check_entities_unavailable
 from .const import MOCK_VEHICLES
 
 pytestmark = pytest.mark.usefixtures("patch_renault_account", "patch_get_vehicles")
@@ -62,21 +62,29 @@ async def test_sensors(
 async def test_sensor_empty(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
-    vehicle_type: str,
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
+    snapshot: SnapshotAssertion,
 ) -> None:
     """Test for Renault sensors with empty data from Renault."""
     await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    check_device_registry(device_registry, mock_vehicle["expected_device"])
+    # Ensure devices are correctly registered
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    assert device_entries == snapshot
 
-    expected_entities = mock_vehicle[Platform.SENSOR]
-    assert len(entity_registry.entities) == len(expected_entities)
+    # Ensure entities are correctly registered
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, config_entry.entry_id
+    )
+    assert entity_entries == snapshot
 
-    check_entities_no_data(hass, entity_registry, expected_entities, STATE_UNKNOWN)
+    # Ensure entity states are correct
+    states = [hass.states.get(ent.entity_id) for ent in entity_entries]
+    assert states == snapshot
 
 
 @pytest.mark.usefixtures(
diff --git a/tests/components/renson/__init__.py b/tests/components/renson/__init__.py
new file mode 100644
index 00000000000000..fa2bbe6b4a047f
--- /dev/null
+++ b/tests/components/renson/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Renson integration."""
diff --git a/tests/components/renson/test_config_flow.py b/tests/components/renson/test_config_flow.py
new file mode 100644
index 00000000000000..6b9f54cd454e11
--- /dev/null
+++ b/tests/components/renson/test_config_flow.py
@@ -0,0 +1,80 @@
+"""Test the Renson config flow."""
+from unittest.mock import patch
+
+from homeassistant import config_entries
+from homeassistant.components.renson.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import RESULT_TYPE_CREATE_ENTRY, RESULT_TYPE_FORM
+
+
+async def test_form(hass: HomeAssistant) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.renson.config_flow.renson",
+        return_value={"title": "Renson"},
+    ), patch(
+        "homeassistant.components.renson.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == RESULT_TYPE_CREATE_ENTRY
+    assert result2["title"] == "Renson"
+    assert result2["data"] == {
+        "host": "1.1.1.1",
+    }
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_form_cannot_connect(hass: HomeAssistant) -> None:
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.renson.config_flow.renson.RensonVentilation.connect",
+        return_value=False,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+
+    assert result2["type"] == RESULT_TYPE_FORM
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_unknown(hass: HomeAssistant) -> None:
+    """Test we handle unknown error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.renson.config_flow.renson.RensonVentilation.connect",
+        side_effect=ValueError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {
+                "host": "1.1.1.1",
+            },
+        )
+
+    assert result2["type"] == RESULT_TYPE_FORM
+    assert result2["errors"] == {"base": "unknown"}
diff --git a/tests/components/reolink/conftest.py b/tests/components/reolink/conftest.py
index d36aea905f74d9..1e6f9aa4902440 100644
--- a/tests/components/reolink/conftest.py
+++ b/tests/components/reolink/conftest.py
@@ -59,7 +59,7 @@ def reolink_connect(mock_get_source_ip: None) -> Generator[MagicMock, None, None
         host_mock.user_level = "admin"
         host_mock.sw_version_update_required = False
         host_mock.timeout = 60
-        host_mock.renewtimer = 600
+        host_mock.renewtimer.return_value = 600
         yield host_mock
 
 
diff --git a/tests/components/reolink/test_init.py b/tests/components/reolink/test_init.py
index 8dd6db270fb4b8..1e588d5e3a1220 100644
--- a/tests/components/reolink/test_init.py
+++ b/tests/components/reolink/test_init.py
@@ -148,7 +148,11 @@ async def test_webhook_repair_issue(
     hass: HomeAssistant, config_entry: MockConfigEntry
 ) -> None:
     """Test repairs issue is raised when the webhook url is unreachable."""
-    with patch("homeassistant.components.reolink.host.FIRST_ONVIF_TIMEOUT", new=0):
+    with patch(
+        "homeassistant.components.reolink.host.FIRST_ONVIF_TIMEOUT", new=0
+    ), patch(
+        "homeassistant.components.reolink.host.ReolinkHost._async_long_polling",
+    ):
         assert await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
diff --git a/tests/components/rest/test_sensor.py b/tests/components/rest/test_sensor.py
index fd595ef07a69ed..a7674937ab8583 100644
--- a/tests/components/rest/test_sensor.py
+++ b/tests/components/rest/test_sensor.py
@@ -899,7 +899,7 @@ async def test_update_with_xml_convert_bad_xml(
     state = hass.states.get("sensor.foo")
 
     assert state.state == STATE_UNKNOWN
-    assert "Erroneous XML" in caplog.text
+    assert "REST xml result could not be parsed" in caplog.text
     assert "Empty reply" in caplog.text
 
 
@@ -936,7 +936,7 @@ async def test_update_with_failed_get(
     state = hass.states.get("sensor.foo")
 
     assert state.state == STATE_UNKNOWN
-    assert "Erroneous XML" in caplog.text
+    assert "REST xml result could not be parsed" in caplog.text
     assert "Empty reply" in caplog.text
 
 
diff --git a/tests/components/rest/test_switch.py b/tests/components/rest/test_switch.py
index 5584fce5e3a0e4..a6895183d4e979 100644
--- a/tests/components/rest/test_switch.py
+++ b/tests/components/rest/test_switch.py
@@ -262,7 +262,7 @@ async def test_turn_on_success(hass: HomeAssistant) -> None:
 
     route = respx.post(RESOURCE) % HTTPStatus.OK
     respx.get(RESOURCE).mock(side_effect=httpx.RequestError)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -282,7 +282,7 @@ async def test_turn_on_status_not_ok(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     route = respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -302,7 +302,7 @@ async def test_turn_on_timeout(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -320,7 +320,7 @@ async def test_turn_off_success(hass: HomeAssistant) -> None:
 
     route = respx.post(RESOURCE) % HTTPStatus.OK
     respx.get(RESOURCE).mock(side_effect=httpx.RequestError)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -341,7 +341,7 @@ async def test_turn_off_status_not_ok(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     route = respx.post(RESOURCE) % HTTPStatus.INTERNAL_SERVER_ERROR
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
@@ -362,7 +362,7 @@ async def test_turn_off_timeout(hass: HomeAssistant) -> None:
     await _async_setup_test_switch(hass)
 
     respx.post(RESOURCE).mock(side_effect=asyncio.TimeoutError())
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
         {ATTR_ENTITY_ID: "switch.foo"},
diff --git a/tests/components/rflink/test_light.py b/tests/components/rflink/test_light.py
index ddbe478332365e..27dca72fd96409 100644
--- a/tests/components/rflink/test_light.py
+++ b/tests/components/rflink/test_light.py
@@ -4,6 +4,8 @@
 control of RFLink switch devices.
 
 """
+import asyncio
+
 from homeassistant.components.light import ATTR_BRIGHTNESS
 from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
 from homeassistant.const import (
@@ -283,7 +285,8 @@ async def test_signal_repetitions_cancelling(hass: HomeAssistant, monkeypatch) -
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: f"{DOMAIN}.test"}
     )
-
+    # Get background service time to start running
+    await asyncio.sleep(0)
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: f"{DOMAIN}.test"}, blocking=True
     )
diff --git a/tests/components/rfxtrx/test_device_action.py b/tests/components/rfxtrx/test_device_action.py
index 843f5a310ad62b..d53ef6a7a02b8d 100644
--- a/tests/components/rfxtrx/test_device_action.py
+++ b/tests/components/rfxtrx/test_device_action.py
@@ -3,8 +3,9 @@
 
 from typing import Any, NamedTuple
 
-import RFXtrx
 import pytest
+from pytest_unordered import unordered
+import RFXtrx
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,7 +18,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
 )
 
@@ -89,6 +89,14 @@ async def test_get_actions(
     device_entry = device_registry.async_get_device(device.device_identifiers, set())
     assert device_entry
 
+    # Add alternate identifiers, to make sure we can handle future formats
+    identifiers: list[str] = list(*device_entry.identifiers)
+    device_registry.async_update_device(
+        device_entry.id, merge_identifiers={(identifiers[0], "_".join(identifiers[1:]))}
+    )
+    device_entry = device_registry.async_get_device(device.device_identifiers, set())
+    assert device_entry
+
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
@@ -99,7 +107,7 @@ async def test_get_actions(
         for action_type in expected
     ]
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/rfxtrx/test_device_trigger.py b/tests/components/rfxtrx/test_device_trigger.py
index 78d6748a11733d..02e9ec87630897 100644
--- a/tests/components/rfxtrx/test_device_trigger.py
+++ b/tests/components/rfxtrx/test_device_trigger.py
@@ -4,6 +4,7 @@
 from typing import Any, NamedTuple
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -16,7 +17,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -88,6 +88,15 @@ async def test_get_triggers(
     await setup_entry(hass, {event.code: {}})
 
     device_entry = device_registry.async_get_device(event.device_identifiers, set())
+    assert device_entry
+
+    # Add alternate identifiers, to make sure we can handle future formats
+    identifiers: list[str] = list(*event.device_identifiers)
+    device_registry.async_update_device(
+        device_entry.id, merge_identifiers={(identifiers[0], "_".join(identifiers[1:]))}
+    )
+    device_entry = device_registry.async_get_device(event.device_identifiers, set())
+    assert device_entry
 
     expected_triggers = [
         {
@@ -104,7 +113,7 @@ async def test_get_triggers(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
     triggers = [value for value in triggers if value["domain"] == "rfxtrx"]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/components/ring/test_config_flow.py b/tests/components/ring/test_config_flow.py
index b8e06fc7fd36ba..3e0c354e8fa35f 100644
--- a/tests/components/ring/test_config_flow.py
+++ b/tests/components/ring/test_config_flow.py
@@ -22,8 +22,6 @@ async def test_form(hass: HomeAssistant) -> None:
             fetch_token=Mock(return_value={"access_token": "mock-token"})
         ),
     ), patch(
-        "homeassistant.components.ring.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.ring.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -39,7 +37,6 @@ async def test_form(hass: HomeAssistant) -> None:
         "username": "hello@home-assistant.io",
         "token": {"access_token": "mock-token"},
     }
-    assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
 
diff --git a/tests/components/ring/test_init.py b/tests/components/ring/test_init.py
index 68f50e3ee8f606..7e3f5344f73e01 100644
--- a/tests/components/ring/test_init.py
+++ b/tests/components/ring/test_init.py
@@ -1,5 +1,4 @@
 """The tests for the Ring component."""
-from datetime import timedelta
 
 import requests_mock
 
@@ -9,12 +8,6 @@
 
 from tests.common import load_fixture
 
-ATTRIBUTION = "Data provided by Ring.com"
-
-VALID_CONFIG = {
-    "ring": {"username": "foo", "password": "bar", "scan_interval": timedelta(10)}
-}
-
 
 async def test_setup(hass: HomeAssistant, requests_mock: requests_mock.Mocker) -> None:
     """Test the setup."""
@@ -39,5 +32,3 @@ async def test_setup(hass: HomeAssistant, requests_mock: requests_mock.Mocker) -
         "https://api.ring.com/clients_api/doorbots/987652/health",
         text=load_fixture("doorboot_health_attrs.json", "ring"),
     )
-
-    assert await ring.async_setup(hass, VALID_CONFIG)
diff --git a/tests/components/ring/test_siren.py b/tests/components/ring/test_siren.py
index fbbd14aaf4e61b..916da5d24fb002 100644
--- a/tests/components/ring/test_siren.py
+++ b/tests/components/ring/test_siren.py
@@ -59,10 +59,10 @@ async def test_default_ding_chime_can_be_played(
     assert state.state == "unknown"
 
 
-async def test_toggle_plays_default_chime(
+async def test_turn_on_plays_default_chime(
     hass: HomeAssistant, requests_mock: requests_mock.Mocker
 ) -> None:
-    """Tests the play chime request is sent correctly when toggled."""
+    """Tests the play chime request is sent correctly when turned on."""
     await setup_platform(hass, Platform.SIREN)
 
     # Mocks the response for playing a test sound
@@ -72,7 +72,7 @@ async def test_toggle_plays_default_chime(
     )
     await hass.services.async_call(
         "siren",
-        "toggle",
+        "turn_on",
         {"entity_id": "siren.downstairs_siren"},
         blocking=True,
     )
diff --git a/tests/components/risco/test_sensor.py b/tests/components/risco/test_sensor.py
index cb7e926a144bd9..e8bae275cc2070 100644
--- a/tests/components/risco/test_sensor.py
+++ b/tests/components/risco/test_sensor.py
@@ -11,7 +11,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -137,7 +137,7 @@ def _check_state(hass, category, entity_id):
     event_index = CATEGORIES_TO_EVENTS[category]
     event = TEST_EVENTS[event_index]
     state = hass.states.get(entity_id)
-    assert state.state == dt.parse_datetime(event.time).isoformat()
+    assert state.state == dt_util.parse_datetime(event.time).isoformat()
     assert state.attributes["category_id"] == event.category_id
     assert state.attributes["category_name"] == event.category_name
     assert state.attributes["type_id"] == event.type_id
@@ -192,7 +192,7 @@ async def test_cloud_setup(
         "homeassistant.components.risco.Store.async_load",
         return_value={LAST_EVENT_TIMESTAMP_KEY: TEST_EVENTS[0].time},
     ):
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=65))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=65))
         await hass.async_block_till_done()
         events_mock.assert_awaited_once_with(TEST_EVENTS[0].time, 10)
 
diff --git a/tests/components/rituals_perfume_genie/common.py b/tests/components/rituals_perfume_genie/common.py
index 1f12d3e651e7ec..f8bcc10ca5924e 100644
--- a/tests/components/rituals_perfume_genie/common.py
+++ b/tests/components/rituals_perfume_genie/common.py
@@ -7,7 +7,7 @@
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, load_json_object_fixture
 
 
 def mock_config_entry(unique_id: str, entry_id: str = "an_entry_id") -> MockConfigEntry:
@@ -58,6 +58,7 @@ def mock_diffuser(
     diffuser_mock.update_data = AsyncMock()
     diffuser_mock.version = version
     diffuser_mock.wifi_percentage = wifi_percentage
+    diffuser_mock.data = load_json_object_fixture("data.json", DOMAIN)
     return diffuser_mock
 
 
diff --git a/tests/components/rituals_perfume_genie/fixtures/data.json b/tests/components/rituals_perfume_genie/fixtures/data.json
new file mode 100644
index 00000000000000..e583c87e3daffc
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/fixtures/data.json
@@ -0,0 +1,121 @@
+{
+  "hub": {
+    "hublot": "LOT123",
+    "hash": "1234567890abcdefgghijklmnopqrstuvwxyz",
+    "status": 1,
+    "title": null,
+    "current_time": "2023-06-09T20:50",
+    "cached_time": "2023-06-09T20:48",
+    "ping_update": "25",
+    "attributes": {
+      "roomc": "4",
+      "speedc": "3",
+      "fanc": "1",
+      "roomnamec": "Living room",
+      "resetc": "",
+      "fspacenamec": "",
+      "fspacetypec": ""
+    },
+    "sensors": {
+      "wific": {
+        "id": 10,
+        "sensor_id": 1,
+        "title": "High",
+        "description": "",
+        "icon": "icon-signal.png",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "-69.99",
+        "max_value": "-0.00",
+        "interval": "1",
+        "created_at": "2017-03-10 16:17:30",
+        "updated_at": "2020-06-17 16:57:53",
+        "default": 0
+      },
+      "fillc": {
+        "id": 38,
+        "sensor_id": 3,
+        "title": "90-100%",
+        "description": "",
+        "icon": "icon-fill.png",
+        "image": "",
+        "discover_image": "",
+        "discover_url": "",
+        "min_value": "0",
+        "max_value": "2000",
+        "interval": "",
+        "created_at": "2017-10-16 07:50:23",
+        "updated_at": "2021-02-17 13:42:16",
+        "default": 0
+      },
+      "rfidc": {
+        "id": 54,
+        "sensor_id": 4,
+        "title": "Private Collection Sweet Jasmine",
+        "description": "",
+        "icon": "icon-jasmine.png",
+        "image": "background-jasmine.png",
+        "discover_image": "discover-jasmine.png",
+        "discover_url": "sweet-jasmine-cartridge-1105402.html",
+        "min_value": "05377650",
+        "max_value": "05377650",
+        "interval": "",
+        "created_at": "2019-04-04 07:53:32",
+        "updated_at": "2021-01-26 14:17:03",
+        "default": 0
+      },
+      "versionc": "5.2-rc15",
+      "ipc": "1682963060",
+      "rpsc": {
+        "id": 48,
+        "sensor_id": 12,
+        "title": "Fan on",
+        "description": "",
+        "icon": "",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "5",
+        "max_value": "10000",
+        "interval": "",
+        "created_at": "2018-01-23 12:05:45",
+        "updated_at": "2019-08-01 14:54:53",
+        "default": 0
+      },
+      "resetc": "External System",
+      "chipidc": "9820410",
+      "errorc": "",
+      "onlinec": {
+        "id": 31,
+        "sensor_id": 16,
+        "title": "Online",
+        "description": "",
+        "icon": "",
+        "image": "",
+        "discover_image": "",
+        "discover_url": null,
+        "min_value": "1",
+        "max_value": "1",
+        "interval": "",
+        "created_at": "2017-09-07 08:23:30",
+        "updated_at": "2017-09-07 08:23:30",
+        "default": 0
+      }
+    },
+    "settings": [
+      {
+        "schedule_id": 1835730,
+        "start": "07:30",
+        "end": "08:30",
+        "mon": 1,
+        "tue": 1,
+        "wed": 1,
+        "thu": 1,
+        "fri": 1,
+        "sat": 1,
+        "sun": 1
+      }
+    ]
+  }
+}
diff --git a/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr b/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000000..4edc7622af75a0
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/snapshots/test_diagnostics.ambr
@@ -0,0 +1,128 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'diffusers': list([
+      dict({
+        'hub': dict({
+          'attributes': dict({
+            'fanc': '1',
+            'fspacenamec': '',
+            'fspacetypec': '',
+            'resetc': '',
+            'roomc': '4',
+            'roomnamec': 'Living room',
+            'speedc': '3',
+          }),
+          'cached_time': '2023-06-09T20:48',
+          'current_time': '2023-06-09T20:50',
+          'hash': '**REDACTED**',
+          'hublot': '**REDACTED**',
+          'ping_update': '25',
+          'sensors': dict({
+            'chipidc': '9820410',
+            'errorc': '',
+            'fillc': dict({
+              'created_at': '2017-10-16 07:50:23',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': '',
+              'icon': 'icon-fill.png',
+              'id': 38,
+              'image': '',
+              'interval': '',
+              'max_value': '2000',
+              'min_value': '0',
+              'sensor_id': 3,
+              'title': '90-100%',
+              'updated_at': '2021-02-17 13:42:16',
+            }),
+            'ipc': '1682963060',
+            'onlinec': dict({
+              'created_at': '2017-09-07 08:23:30',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': '',
+              'id': 31,
+              'image': '',
+              'interval': '',
+              'max_value': '1',
+              'min_value': '1',
+              'sensor_id': 16,
+              'title': 'Online',
+              'updated_at': '2017-09-07 08:23:30',
+            }),
+            'resetc': 'External System',
+            'rfidc': dict({
+              'created_at': '2019-04-04 07:53:32',
+              'default': 0,
+              'description': '',
+              'discover_image': 'discover-jasmine.png',
+              'discover_url': 'sweet-jasmine-cartridge-1105402.html',
+              'icon': 'icon-jasmine.png',
+              'id': 54,
+              'image': 'background-jasmine.png',
+              'interval': '',
+              'max_value': '05377650',
+              'min_value': '05377650',
+              'sensor_id': 4,
+              'title': 'Private Collection Sweet Jasmine',
+              'updated_at': '2021-01-26 14:17:03',
+            }),
+            'rpsc': dict({
+              'created_at': '2018-01-23 12:05:45',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': '',
+              'id': 48,
+              'image': '',
+              'interval': '',
+              'max_value': '10000',
+              'min_value': '5',
+              'sensor_id': 12,
+              'title': 'Fan on',
+              'updated_at': '2019-08-01 14:54:53',
+            }),
+            'versionc': '5.2-rc15',
+            'wific': dict({
+              'created_at': '2017-03-10 16:17:30',
+              'default': 0,
+              'description': '',
+              'discover_image': '',
+              'discover_url': None,
+              'icon': 'icon-signal.png',
+              'id': 10,
+              'image': '',
+              'interval': '1',
+              'max_value': '-0.00',
+              'min_value': '-69.99',
+              'sensor_id': 1,
+              'title': 'High',
+              'updated_at': '2020-06-17 16:57:53',
+            }),
+          }),
+          'settings': list([
+            dict({
+              'end': '08:30',
+              'fri': 1,
+              'mon': 1,
+              'sat': 1,
+              'schedule_id': 1835730,
+              'start': '07:30',
+              'sun': 1,
+              'thu': 1,
+              'tue': 1,
+              'wed': 1,
+            }),
+          ]),
+          'status': 1,
+          'title': None,
+        }),
+      }),
+    ]),
+  })
+# ---
diff --git a/tests/components/rituals_perfume_genie/test_binary_sensor.py b/tests/components/rituals_perfume_genie/test_binary_sensor.py
index 082725a8f997c5..dae654d6e16c91 100644
--- a/tests/components/rituals_perfume_genie/test_binary_sensor.py
+++ b/tests/components/rituals_perfume_genie/test_binary_sensor.py
@@ -20,14 +20,14 @@ async def test_binary_sensors(
     await init_integration(hass, config_entry, [diffuser])
     hublot = diffuser.hublot
 
-    state = hass.states.get("binary_sensor.genie_battery_charging")
+    state = hass.states.get("binary_sensor.genie_charging")
     assert state
     assert state.state == STATE_ON
     assert (
         state.attributes[ATTR_DEVICE_CLASS] == BinarySensorDeviceClass.BATTERY_CHARGING
     )
 
-    entry = entity_registry.async_get("binary_sensor.genie_battery_charging")
+    entry = entity_registry.async_get("binary_sensor.genie_charging")
     assert entry
     assert entry.unique_id == f"{hublot}-charging"
     assert entry.entity_category == EntityCategory.DIAGNOSTIC
diff --git a/tests/components/rituals_perfume_genie/test_diagnostics.py b/tests/components/rituals_perfume_genie/test_diagnostics.py
new file mode 100644
index 00000000000000..a57f14f9afd9f5
--- /dev/null
+++ b/tests/components/rituals_perfume_genie/test_diagnostics.py
@@ -0,0 +1,25 @@
+"""Tests for the diagnostics data provided by the Rituals Perfume Genie integration."""
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from .common import init_integration, mock_config_entry, mock_diffuser
+
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics."""
+    config_entry = mock_config_entry(unique_id="number_test")
+    diffuser = mock_diffuser(hublot="lot123", perfume_amount=2)
+    await init_integration(hass, config_entry, [diffuser])
+
+    assert (
+        await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
+        == snapshot
+    )
diff --git a/tests/components/rituals_perfume_genie/test_sensor.py b/tests/components/rituals_perfume_genie/test_sensor.py
index af6d501d36adb9..eb4211f1a200f8 100644
--- a/tests/components/rituals_perfume_genie/test_sensor.py
+++ b/tests/components/rituals_perfume_genie/test_sensor.py
@@ -55,13 +55,13 @@ async def test_sensors_diffuser_v1_battery_cartridge(
     assert entry.unique_id == f"{hublot}-battery_percentage"
     assert entry.entity_category == EntityCategory.DIAGNOSTIC
 
-    state = hass.states.get("sensor.genie_wifi")
+    state = hass.states.get("sensor.genie_wi_fi_signal")
     assert state
     assert state.state == str(diffuser.wifi_percentage)
     assert state.attributes.get(ATTR_DEVICE_CLASS) is None
     assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
 
-    entry = entity_registry.async_get("sensor.genie_wifi")
+    entry = entity_registry.async_get("sensor.genie_wi_fi_signal")
     assert entry
     assert entry.unique_id == f"{hublot}-wifi_percentage"
     assert entry.entity_category == EntityCategory.DIAGNOSTIC
diff --git a/tests/components/roborock/conftest.py b/tests/components/roborock/conftest.py
index d767505feeb59b..eb281076825eda 100644
--- a/tests/components/roborock/conftest.py
+++ b/tests/components/roborock/conftest.py
@@ -12,7 +12,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
-from .mock_data import BASE_URL, HOME_DATA, PROP, USER_DATA, USER_EMAIL
+from .mock_data import BASE_URL, HOME_DATA, NETWORK_INFO, PROP, USER_DATA, USER_EMAIL
 
 from tests.common import MockConfigEntry
 
@@ -20,11 +20,17 @@
 @pytest.fixture(name="bypass_api_fixture")
 def bypass_api_fixture() -> None:
     """Skip calls to the API."""
-    with patch("homeassistant.components.roborock.RoborockMqttClient.connect"), patch(
-        "homeassistant.components.roborock.RoborockMqttClient.send_command"
+    with patch(
+        "homeassistant.components.roborock.RoborockMqttClient.async_connect"
+    ), patch(
+        "homeassistant.components.roborock.RoborockMqttClient._send_command"
     ), patch(
         "homeassistant.components.roborock.coordinator.RoborockLocalClient.get_prop",
         return_value=PROP,
+    ), patch(
+        "roborock.api.AttributeCache.async_value"
+    ), patch(
+        "roborock.api.AttributeCache.value"
     ):
         yield
 
@@ -53,7 +59,15 @@ async def setup_entry(
     with patch(
         "homeassistant.components.roborock.RoborockApiClient.get_home_data",
         return_value=HOME_DATA,
-    ), patch("homeassistant.components.roborock.RoborockMqttClient.get_networking"):
+    ), patch(
+        "homeassistant.components.roborock.RoborockMqttClient.get_networking",
+        return_value=NETWORK_INFO,
+    ), patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClient.get_prop",
+        return_value=PROP,
+    ), patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_message"
+    ):
         assert await async_setup_component(hass, DOMAIN, {})
     await hass.async_block_till_done()
     return mock_roborock_entry
diff --git a/tests/components/roborock/mock_data.py b/tests/components/roborock/mock_data.py
index 15e69cee9d9df0..6a2e1f4b5f1849 100644
--- a/tests/components/roborock/mock_data.py
+++ b/tests/components/roborock/mock_data.py
@@ -367,7 +367,12 @@
         "unsave_map_flag": 0,
     }
 )
-PROP = DeviceProp(STATUS, DND_TIMER, CLEAN_SUMMARY, CONSUMABLE, CLEAN_RECORD)
+PROP = DeviceProp(
+    status=STATUS,
+    clean_summary=CLEAN_SUMMARY,
+    consumable=CONSUMABLE,
+    last_clean_record=CLEAN_RECORD,
+)
 
 NETWORK_INFO = NetworkInfo(
     ip="123.232.12.1", ssid="wifi", mac="ac:cc:cc:cc:cc", bssid="bssid", rssi=90
diff --git a/tests/components/roborock/snapshots/test_diagnostics.ambr b/tests/components/roborock/snapshots/test_diagnostics.ambr
new file mode 100644
index 00000000000000..eb70e04110f29a
--- /dev/null
+++ b/tests/components/roborock/snapshots/test_diagnostics.ambr
@@ -0,0 +1,294 @@
+# serializer version: 1
+# name: test_diagnostics
+  dict({
+    'config_entry': dict({
+      'base_url': 'https://usiot.roborock.com',
+      'user_data': dict({
+        'avatarurl': 'https://files.roborock.com/iottest/default_avatar.png',
+        'country': 'US',
+        'countrycode': '1',
+        'nickname': 'user_nickname',
+        'region': 'us',
+        'rriot': dict({
+          'h': 'abc123',
+          'k': 'abc123',
+          'r': dict({
+            'a': 'https://api-us.roborock.com',
+            'l': 'https://wood-us.roborock.com',
+            'm': 'ssl://mqtt-us-2.roborock.com:8883',
+            'r': 'US',
+          }),
+          's': 'abc123',
+          'u': 'abc123',
+        }),
+        'rruid': '**REDACTED**',
+        'token': '**REDACTED**',
+        'tokentype': '',
+        'tuyaDeviceState': 2,
+        'uid': '**REDACTED**',
+      }),
+      'username': '**REDACTED**',
+    }),
+    'coordinators': dict({
+      '**REDACTED-0**': dict({
+        'api': dict({
+        }),
+        'roborock_device_info': dict({
+          'device': dict({
+            'activeTime': 1672364449,
+            'deviceStatus': dict({
+              '120': 0,
+              '121': 8,
+              '122': 100,
+              '123': 102,
+              '124': 203,
+              '125': 94,
+              '126': 90,
+              '127': 87,
+              '128': 0,
+              '133': 1,
+            }),
+            'duid': '**REDACTED**',
+            'extra': '{"RRPhotoPrivacyVersion": "1"}',
+            'featureSet': '2234201184108543',
+            'fv': '02.56.02',
+            'iconUrl': '',
+            'localKey': '**REDACTED**',
+            'name': 'Roborock S7 MaxV',
+            'newFeatureSet': '0000000000002041',
+            'online': True,
+            'productId': 'abc123',
+            'pv': '1.0',
+            'roomId': 2362003,
+            'share': False,
+            'silentOtaSwitch': True,
+            'sn': 'abc123',
+            'timeZoneId': 'America/Los_Angeles',
+            'tuyaMigrated': False,
+          }),
+          'network_info': dict({
+            'bssid': '**REDACTED**',
+            'ip': '123.232.12.1',
+            'mac': '**REDACTED**',
+            'rssi': 90,
+            'ssid': 'wifi',
+          }),
+          'product': dict({
+            'capability': 0,
+            'category': 'robot.vacuum.cleaner',
+            'code': 'a27',
+            'id': 'abc123',
+            'model': 'roborock.vacuum.a27',
+            'name': 'Roborock S7 MaxV',
+            'schema': list([
+              dict({
+                'code': 'rpc_request',
+                'id': '101',
+                'mode': 'rw',
+                'name': 'rpc_request',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'rpc_response',
+                'id': '102',
+                'mode': 'rw',
+                'name': 'rpc_response',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'error_code',
+                'id': '120',
+                'mode': 'ro',
+                'name': '错误代码',
+                'type': 'ENUM',
+              }),
+              dict({
+                'code': 'state',
+                'id': '121',
+                'mode': 'ro',
+                'name': '设备状态',
+                'type': 'ENUM',
+              }),
+              dict({
+                'code': 'battery',
+                'id': '122',
+                'mode': 'ro',
+                'name': '设备电量',
+                'type': 'ENUM',
+              }),
+              dict({
+                'code': 'fan_power',
+                'id': '123',
+                'mode': 'rw',
+                'name': '清扫模式',
+                'type': 'ENUM',
+              }),
+              dict({
+                'code': 'water_box_mode',
+                'id': '124',
+                'mode': 'rw',
+                'name': '拖地模式',
+                'type': 'ENUM',
+              }),
+              dict({
+                'code': 'main_brush_life',
+                'id': '125',
+                'mode': 'rw',
+                'name': '主刷寿命',
+                'type': 'VALUE',
+              }),
+              dict({
+                'code': 'side_brush_life',
+                'id': '126',
+                'mode': 'rw',
+                'name': '边刷寿命',
+                'type': 'VALUE',
+              }),
+              dict({
+                'code': 'filter_life',
+                'id': '127',
+                'mode': 'rw',
+                'name': '滤网寿命',
+                'type': 'VALUE',
+              }),
+              dict({
+                'code': 'additional_props',
+                'id': '128',
+                'mode': 'ro',
+                'name': '额外状态',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'task_complete',
+                'id': '130',
+                'mode': 'ro',
+                'name': '完成事件',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'task_cancel_low_power',
+                'id': '131',
+                'mode': 'ro',
+                'name': '电量不足任务取消',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'task_cancel_in_motion',
+                'id': '132',
+                'mode': 'ro',
+                'name': '运动中任务取消',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'charge_status',
+                'id': '133',
+                'mode': 'ro',
+                'name': '充电状态',
+                'type': 'RAW',
+              }),
+              dict({
+                'code': 'drying_status',
+                'id': '134',
+                'mode': 'ro',
+                'name': '烘干状态',
+                'type': 'RAW',
+              }),
+            ]),
+          }),
+          'props': dict({
+            'cleanSummary': dict({
+              'cleanArea': 1159182500,
+              'cleanCount': 31,
+              'cleanTime': 74382,
+              'dustCollectionCount': 25,
+              'records': list([
+                1672543330,
+                1672458041,
+              ]),
+              'squareMeterCleanArea': 1159.2,
+            }),
+            'consumable': dict({
+              'cleaningBrushWorkTimes': 65,
+              'dustCollectionWorkTimes': 25,
+              'filterElementWorkTime': 0,
+              'filterTimeLeft': 465618,
+              'filterWorkTime': 74382,
+              'mainBrushTimeLeft': 1005618,
+              'mainBrushWorkTime': 74382,
+              'sensorDirtyTime': 74382,
+              'sensorTimeLeft': 33618,
+              'sideBrushTimeLeft': 645618,
+              'sideBrushWorkTime': 74382,
+              'strainerWorkTimes': 65,
+            }),
+            'lastCleanRecord': dict({
+              'area': 20965000,
+              'avoidCount': 19,
+              'begin': 1672543330,
+              'cleanType': 3,
+              'complete': 1,
+              'duration': 1176,
+              'dustCollectionStatus': 1,
+              'end': 1672544638,
+              'error': 0,
+              'finishReason': 56,
+              'mapFlag': 0,
+              'squareMeterArea': 21.0,
+              'startType': 2,
+              'washCount': 2,
+            }),
+            'status': dict({
+              'adbumperStatus': list([
+                0,
+                0,
+                0,
+              ]),
+              'autoDustCollection': 1,
+              'avoidCount': 19,
+              'backType': -1,
+              'battery': 100,
+              'cameraStatus': 3457,
+              'chargeStatus': 1,
+              'cleanArea': 20965000,
+              'cleanTime': 1176,
+              'collisionAvoidStatus': 1,
+              'debugMode': 0,
+              'dndEnabled': 0,
+              'dockErrorStatus': 0,
+              'dockType': 3,
+              'dustCollectionStatus': 0,
+              'errorCode': 0,
+              'fanPower': 102,
+              'homeSecEnablePassword': 0,
+              'homeSecStatus': 0,
+              'inCleaning': 0,
+              'inFreshState': 1,
+              'inReturning': 0,
+              'isExploring': 0,
+              'isLocating': 0,
+              'labStatus': 1,
+              'lockStatus': 0,
+              'mapPresent': 1,
+              'mapStatus': 3,
+              'mopForbiddenEnable': 1,
+              'mopMode': 300,
+              'msgSeq': 458,
+              'msgVer': 2,
+              'squareMeterCleanArea': 21.0,
+              'state': 8,
+              'switchMapMode': 0,
+              'unsaveMapFlag': 0,
+              'unsaveMapReason': 0,
+              'washPhase': 0,
+              'washReady': 0,
+              'waterBoxCarriageStatus': 1,
+              'waterBoxMode': 203,
+              'waterBoxStatus': 1,
+              'waterShortageStatus': 0,
+            }),
+          }),
+        }),
+      }),
+    }),
+  })
+# ---
diff --git a/tests/components/roborock/test_diagnostics.py b/tests/components/roborock/test_diagnostics.py
new file mode 100644
index 00000000000000..a10cbcf057ebc3
--- /dev/null
+++ b/tests/components/roborock/test_diagnostics.py
@@ -0,0 +1,23 @@
+"""Tests for the diagnostics data provided by the Roborock integration."""
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+
+async def test_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test diagnostics for config entry."""
+    result = await get_diagnostics_for_config_entry(hass, hass_client, setup_entry)
+
+    assert isinstance(result, dict)
+    assert result == snapshot
diff --git a/tests/components/roborock/test_select.py b/tests/components/roborock/test_select.py
index 3b0ba8183b3a06..bcea4e6246bb5c 100644
--- a/tests/components/roborock/test_select.py
+++ b/tests/components/roborock/test_select.py
@@ -26,6 +26,8 @@ async def test_update_success(
     value: str,
 ) -> None:
     """Test allowed changing values for select entities."""
+    # Ensure that the entity exist, as these test can pass even if there is no entity.
+    assert hass.states.get(entity_id) is not None
     with patch(
         "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_message"
     ) as mock_send_message:
diff --git a/tests/components/roborock/test_sensor.py b/tests/components/roborock/test_sensor.py
new file mode 100644
index 00000000000000..daa904d482a5df
--- /dev/null
+++ b/tests/components/roborock/test_sensor.py
@@ -0,0 +1,38 @@
+"""Test Roborock Sensors."""
+
+from roborock.const import (
+    FILTER_REPLACE_TIME,
+    MAIN_BRUSH_REPLACE_TIME,
+    SENSOR_DIRTY_REPLACE_TIME,
+    SIDE_BRUSH_REPLACE_TIME,
+)
+
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+async def test_sensors(hass: HomeAssistant, setup_entry: MockConfigEntry) -> None:
+    """Test sensors and check test values are correctly set."""
+    assert len(hass.states.async_all("sensor")) == 9
+    assert hass.states.get("sensor.roborock_s7_maxv_main_brush_time_left").state == str(
+        MAIN_BRUSH_REPLACE_TIME - 74382
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_side_brush_time_left").state == str(
+        SIDE_BRUSH_REPLACE_TIME - 74382
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_filter_time_left").state == str(
+        FILTER_REPLACE_TIME - 74382
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_sensor_time_left").state == str(
+        SENSOR_DIRTY_REPLACE_TIME - 74382
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_cleaning_time").state == "1176"
+    assert (
+        hass.states.get("sensor.roborock_s7_maxv_total_cleaning_time").state == "74382"
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_status").state == "charging"
+    assert (
+        hass.states.get("sensor.roborock_s7_maxv_total_cleaning_area").state == "1159.2"
+    )
+    assert hass.states.get("sensor.roborock_s7_maxv_cleaning_area").state == "21.0"
diff --git a/tests/components/roborock/test_switch.py b/tests/components/roborock/test_switch.py
new file mode 100644
index 00000000000000..40ecdc267ed49c
--- /dev/null
+++ b/tests/components/roborock/test_switch.py
@@ -0,0 +1,50 @@
+"""Test Roborock Switch platform."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.switch import SERVICE_TURN_OFF, SERVICE_TURN_ON
+from homeassistant.core import HomeAssistant
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("entity_id"),
+    [
+        ("switch.roborock_s7_maxv_child_lock"),
+        ("switch.roborock_s7_maxv_status_indicator_light"),
+        ("switch.roborock_s7_maxv_do_not_disturb"),
+    ],
+)
+async def test_update_success(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    entity_id: str,
+) -> None:
+    """Test turning switch entities on and off."""
+    # Ensure that the entity exist, as these test can pass even if there is no entity.
+    assert hass.states.get(entity_id) is not None
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_message"
+    ) as mock_send_message:
+        await hass.services.async_call(
+            "switch",
+            SERVICE_TURN_ON,
+            service_data=None,
+            blocking=True,
+            target={"entity_id": entity_id},
+        )
+    assert mock_send_message.assert_called_once
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_message"
+    ) as mock_send_message:
+        await hass.services.async_call(
+            "switch",
+            SERVICE_TURN_OFF,
+            service_data=None,
+            blocking=True,
+            target={"entity_id": entity_id},
+        )
+    assert mock_send_message.assert_called_once
diff --git a/tests/components/roborock/test_vacuum.py b/tests/components/roborock/test_vacuum.py
index 80fbd4092c0550..080893f1d95925 100644
--- a/tests/components/roborock/test_vacuum.py
+++ b/tests/components/roborock/test_vacuum.py
@@ -20,7 +20,7 @@
 )
 from homeassistant.const import ATTR_ENTITY_ID, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
 
 from tests.common import MockConfigEntry
 
@@ -88,3 +88,37 @@ async def test_commands(
         assert mock_send_command.call_count == 1
         assert mock_send_command.call_args[0][0] == command
         assert mock_send_command.call_args[0][1] == called_params
+
+
+@pytest.mark.parametrize(
+    ("service", "issue_id"),
+    [
+        (SERVICE_START_PAUSE, "service_deprecation_start_pause"),
+    ],
+)
+async def test_issues(
+    hass: HomeAssistant,
+    bypass_api_fixture,
+    setup_entry: MockConfigEntry,
+    service: str,
+    issue_id: str,
+) -> None:
+    """Test issues raised by calling deprecated services."""
+    vacuum = hass.states.get(ENTITY_ID)
+    assert vacuum
+
+    data = {ATTR_ENTITY_ID: ENTITY_ID}
+    with patch(
+        "homeassistant.components.roborock.coordinator.RoborockLocalClient.send_command"
+    ):
+        await hass.services.async_call(
+            Platform.VACUUM,
+            service,
+            data,
+            blocking=True,
+        )
+
+    issue_registry = ir.async_get(hass)
+    issue = issue_registry.async_get_issue("roborock", issue_id)
+    assert issue.is_fixable is True
+    assert issue.is_persistent is True
diff --git a/tests/components/roku/fixtures/roku3-diagnostics-data.json b/tests/components/roku/fixtures/roku3-diagnostics-data.json
index 70ef552dfa7121..a3084b010c9069 100644
--- a/tests/components/roku/fixtures/roku3-diagnostics-data.json
+++ b/tests/components/roku/fixtures/roku3-diagnostics-data.json
@@ -73,6 +73,7 @@
     "supports_airplay": false,
     "supports_find_remote": false,
     "supports_private_listening": false,
+    "supports_wake_on_wlan": false,
     "version": "7.5.0",
     "wifi_mac": "b0:a7:37:96:4d:fb"
   },
diff --git a/tests/components/roku/test_media_player.py b/tests/components/roku/test_media_player.py
index 1363cf7e286563..5d4568ce7ac929 100644
--- a/tests/components/roku/test_media_player.py
+++ b/tests/components/roku/test_media_player.py
@@ -864,7 +864,7 @@ async def test_media_browse_local_source(
     assert msg["result"]["children"][0]["title"] == "Apps"
     assert msg["result"]["children"][0]["media_content_type"] == MediaType.APPS
 
-    assert msg["result"]["children"][1]["title"] == "Local Media"
+    assert msg["result"]["children"][1]["title"] == "My media"
     assert msg["result"]["children"][1]["media_class"] == MediaClass.DIRECTORY
     assert msg["result"]["children"][1]["media_content_type"] is None
     assert (
@@ -892,7 +892,7 @@ async def test_media_browse_local_source(
     assert msg["success"]
 
     assert msg["result"]
-    assert msg["result"]["title"] == "Local Media"
+    assert msg["result"]["title"] == "My media"
     assert msg["result"]["media_class"] == MediaClass.DIRECTORY
     assert msg["result"]["media_content_type"] is None
     assert len(msg["result"]["children"]) == 2
diff --git a/tests/components/safe_mode/test_init.py b/tests/components/safe_mode/test_init.py
index 043c65d7e43fda..82f5f5180dad17 100644
--- a/tests/components/safe_mode/test_init.py
+++ b/tests/components/safe_mode/test_init.py
@@ -2,9 +2,12 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from tests.common import async_get_persistent_notifications
+
 
 async def test_works(hass: HomeAssistant) -> None:
     """Test safe mode works."""
     assert await async_setup_component(hass, "safe_mode", {})
     await hass.async_block_till_done()
-    assert len(hass.states.async_entity_ids()) == 1
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications) == 1
diff --git a/tests/components/samsungtv/test_init.py b/tests/components/samsungtv/test_init.py
index e15d84913be5c2..7491f3b76b79ce 100644
--- a/tests/components/samsungtv/test_init.py
+++ b/tests/components/samsungtv/test_init.py
@@ -65,7 +65,7 @@ async def test_setup(hass: HomeAssistant) -> None:
     )
 
     # test host and port
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
 
diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py
index 1be9982d6c4174..3d3077a1c6ac1a 100644
--- a/tests/components/samsungtv/test_media_player.py
+++ b/tests/components/samsungtv/test_media_player.py
@@ -524,7 +524,7 @@ async def test_connection_closed_during_update_can_recover(
 async def test_send_key(hass: HomeAssistant, remote: Mock) -> None:
     """Test for send key."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -540,7 +540,7 @@ async def test_send_key_broken_pipe(hass: HomeAssistant, remote: Mock) -> None:
     """Testing broken pipe Exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=BrokenPipeError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -555,7 +555,7 @@ async def test_send_key_connection_closed_retry_succeed(
     remote.control = Mock(
         side_effect=[exceptions.ConnectionClosed("Boom"), DEFAULT_MOCK, DEFAULT_MOCK]
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -574,7 +574,7 @@ async def test_send_key_unhandled_response(hass: HomeAssistant, remote: Mock) ->
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=exceptions.UnhandledResponse("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -586,7 +586,7 @@ async def test_send_key_websocketexception(hass: HomeAssistant, remotews: Mock)
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands = Mock(side_effect=WebSocketException("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -600,7 +600,7 @@ async def test_send_key_websocketexception_encrypted(
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.send_commands = Mock(side_effect=WebSocketException("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -612,7 +612,7 @@ async def test_send_key_os_error_ws(hass: HomeAssistant, remotews: Mock) -> None
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -626,7 +626,7 @@ async def test_send_key_os_error_ws_encrypted(
     """Testing unhandled response exception."""
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.send_commands = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -637,7 +637,7 @@ async def test_send_key_os_error(hass: HomeAssistant, remote: Mock) -> None:
     """Testing broken pipe Exception."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.control = Mock(side_effect=OSError("Boom"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -656,12 +656,12 @@ async def test_name(hass: HomeAssistant) -> None:
 async def test_state(hass: HomeAssistant) -> None:
     """Test for state property."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
     assert state.state == STATE_ON
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     state = hass.states.get(ENTITY_ID)
@@ -711,7 +711,7 @@ async def test_turn_off_websocket(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -723,11 +723,11 @@ async def test_turn_off_websocket(
 
     # commands not sent : power off in progress
     remotews.send_commands.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "TV is powering off, not sending keys: ['KEY_VOLUP']" in caplog.text
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "Deezer"},
@@ -750,7 +750,7 @@ async def test_turn_off_websocket_frame(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -778,7 +778,7 @@ async def test_turn_off_encrypted_websocket(
     remoteencws.send_commands.reset_mock()
 
     caplog.clear()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -793,7 +793,7 @@ async def test_turn_off_encrypted_websocket(
 
     # commands not sent : power off in progress
     remoteencws.send_commands.reset_mock()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "TV is powering off, not sending keys: ['KEY_VOLUP']" in caplog.text
@@ -819,7 +819,7 @@ async def test_turn_off_encrypted_websocket_key_type(
     remoteencws.send_commands.reset_mock()
 
     caplog.clear()
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -834,7 +834,7 @@ async def test_turn_off_encrypted_websocket_key_type(
 async def test_turn_off_legacy(hass: HomeAssistant, remote: Mock) -> None:
     """Test for turn_off."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key called
@@ -849,7 +849,7 @@ async def test_turn_off_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     remote.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Could not establish connection" in caplog.text
@@ -863,7 +863,7 @@ async def test_turn_off_ws_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Error closing connection" in caplog.text
@@ -877,7 +877,7 @@ async def test_turn_off_encryptedws_os_error(
     caplog.set_level(logging.DEBUG)
     await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
     remoteencws.close = Mock(side_effect=OSError("BOOM"))
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     assert "Error closing connection" in caplog.text
@@ -886,7 +886,7 @@ async def test_turn_off_encryptedws_os_error(
 async def test_volume_up(hass: HomeAssistant, remote: Mock) -> None:
     """Test for volume_up."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -899,7 +899,7 @@ async def test_volume_up(hass: HomeAssistant, remote: Mock) -> None:
 async def test_volume_down(hass: HomeAssistant, remote: Mock) -> None:
     """Test for volume_down."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_DOWN, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -912,7 +912,7 @@ async def test_volume_down(hass: HomeAssistant, remote: Mock) -> None:
 async def test_mute_volume(hass: HomeAssistant, remote: Mock) -> None:
     """Test for mute_volume."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_MUTE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_MUTED: True},
@@ -928,7 +928,7 @@ async def test_mute_volume(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_play."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -937,7 +937,7 @@ async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
     assert remote.close.call_count == 1
     assert remote.close.call_args_list == [call()]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -950,7 +950,7 @@ async def test_media_play(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_pause."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -959,7 +959,7 @@ async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
     assert remote.close.call_count == 1
     assert remote.close.call_args_list == [call()]
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -972,7 +972,7 @@ async def test_media_pause(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_next_track(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_next_track."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_NEXT_TRACK, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -985,7 +985,7 @@ async def test_media_next_track(hass: HomeAssistant, remote: Mock) -> None:
 async def test_media_previous_track(hass: HomeAssistant, remote: Mock) -> None:
     """Test for media_previous_track."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     # key and update called
@@ -1009,7 +1009,7 @@ async def test_turn_on_wol(hass: HomeAssistant) -> None:
     with patch(
         "homeassistant.components.samsungtv.media_player.send_magic_packet"
     ) as mock_send_magic_packet:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, True
         )
         await hass.async_block_till_done()
@@ -1031,7 +1031,7 @@ async def test_play_media(hass: HomeAssistant, remote: Mock) -> None:
     """Test for play_media."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
     with patch("homeassistant.components.samsungtv.bridge.asyncio.sleep") as sleep:
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1060,7 +1060,7 @@ async def test_play_media_invalid_type(hass: HomeAssistant) -> None:
         url = "https://example.com"
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1082,7 +1082,7 @@ async def test_play_media_channel_as_string(hass: HomeAssistant) -> None:
         url = "https://example.com"
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1103,7 +1103,7 @@ async def test_play_media_channel_as_non_positive(hass: HomeAssistant) -> None:
     with patch("homeassistant.components.samsungtv.bridge.Remote") as remote:
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -1122,7 +1122,7 @@ async def test_play_media_channel_as_non_positive(hass: HomeAssistant) -> None:
 async def test_select_source(hass: HomeAssistant, remote: Mock) -> None:
     """Test for select_source."""
     await setup_samsungtv_entry(hass, MOCK_CONFIG)
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "HDMI"},
@@ -1140,7 +1140,7 @@ async def test_select_source_invalid_source(hass: HomeAssistant) -> None:
     with patch("homeassistant.components.samsungtv.bridge.Remote") as remote:
         await setup_samsungtv_entry(hass, MOCK_CONFIG)
         remote.reset_mock()
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             DOMAIN,
             SERVICE_SELECT_SOURCE,
             {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "INVALID"},
@@ -1158,7 +1158,7 @@ async def test_play_media_app(hass: HomeAssistant, remotews: Mock) -> None:
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_PLAY_MEDIA,
         {
@@ -1182,7 +1182,7 @@ async def test_select_source_app(hass: HomeAssistant, remotews: Mock) -> None:
     await setup_samsungtv_entry(hass, MOCK_CONFIGWS)
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_SELECT_SOURCE,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "Deezer"},
@@ -1207,7 +1207,7 @@ async def test_websocket_unsupported_remote_control(
 
     remotews.send_commands.reset_mock()
 
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )
     remotews.raise_mock_ws_event_callback(
@@ -1256,7 +1256,7 @@ async def test_volume_control_upnp(
     assert state.attributes[ATTR_MEDIA_VOLUME_MUTED] is False
 
     # Upnp action succeeds
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.5},
@@ -1270,7 +1270,7 @@ async def test_volume_control_upnp(
     dmr_device.async_set_volume_level.side_effect = UpnpActionResponseError(
         status=500, error_code=501, error_desc="Action Failed"
     )
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
@@ -1289,7 +1289,7 @@ async def test_upnp_not_available(
     assert "Unable to create Upnp DMR device" in caplog.text
 
     # Upnp action fails
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
@@ -1307,7 +1307,7 @@ async def test_upnp_missing_service(
     assert "Unable to create Upnp DMR device" in caplog.text
 
     # Upnp action fails
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         SERVICE_VOLUME_SET,
         {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.6},
diff --git a/tests/components/samsungtv/test_remote.py b/tests/components/samsungtv/test_remote.py
new file mode 100644
index 00000000000000..88cf47bf148e8a
--- /dev/null
+++ b/tests/components/samsungtv/test_remote.py
@@ -0,0 +1,93 @@
+"""The tests for the SamsungTV remote platform."""
+from unittest.mock import Mock
+
+import pytest
+from samsungtvws.encrypted.remote import SamsungTVEncryptedCommand
+
+from homeassistant.components.remote import (
+    ATTR_COMMAND,
+    DOMAIN as REMOTE_DOMAIN,
+    SERVICE_SEND_COMMAND,
+)
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from . import setup_samsungtv_entry
+from .test_media_player import MOCK_ENTRYDATA_ENCRYPTED_WS
+
+ENTITY_ID = f"{REMOTE_DOMAIN}.fake"
+
+
+@pytest.mark.usefixtures("remoteencws", "rest_api")
+async def test_setup(hass: HomeAssistant) -> None:
+    """Test setup with basic config."""
+    await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
+    assert hass.states.get(ENTITY_ID)
+
+
+@pytest.mark.usefixtures("remoteencws", "rest_api")
+async def test_unique_id(hass: HomeAssistant) -> None:
+    """Test unique id."""
+    await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
+
+    entity_registry = er.async_get(hass)
+
+    main = entity_registry.async_get(ENTITY_ID)
+    assert main.unique_id == "any"
+
+
+@pytest.mark.usefixtures("remoteencws", "rest_api")
+async def test_main_services(
+    hass: HomeAssistant, remoteencws: Mock, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test for turn_off."""
+    await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
+
+    remoteencws.send_commands.reset_mock()
+
+    await hass.services.async_call(
+        REMOTE_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+
+    # key called
+    assert remoteencws.send_commands.call_count == 1
+    commands = remoteencws.send_commands.call_args_list[0].args[0]
+    assert len(commands) == 2
+    assert isinstance(command := commands[0], SamsungTVEncryptedCommand)
+    assert command.body["param3"] == "KEY_POWEROFF"
+    assert isinstance(command := commands[1], SamsungTVEncryptedCommand)
+    assert command.body["param3"] == "KEY_POWER"
+
+    # commands not sent : power off in progress
+    remoteencws.send_commands.reset_mock()
+    await hass.services.async_call(
+        REMOTE_DOMAIN,
+        SERVICE_SEND_COMMAND,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["dash"]},
+        blocking=True,
+    )
+    assert "TV is powering off, not sending keys: ['dash']" in caplog.text
+    remoteencws.send_commands.assert_not_called()
+
+
+@pytest.mark.usefixtures("remoteencws", "rest_api")
+async def test_send_command_service(hass: HomeAssistant, remoteencws: Mock) -> None:
+    """Test the send command."""
+    await setup_samsungtv_entry(hass, MOCK_ENTRYDATA_ENCRYPTED_WS)
+
+    await hass.services.async_call(
+        REMOTE_DOMAIN,
+        SERVICE_SEND_COMMAND,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_COMMAND: ["dash"]},
+        blocking=True,
+    )
+
+    assert remoteencws.send_commands.call_count == 1
+    commands = remoteencws.send_commands.call_args_list[0].args[0]
+    assert len(commands) == 1
+    assert isinstance(command := commands[0], SamsungTVEncryptedCommand)
+    assert command.body["param3"] == "dash"
diff --git a/tests/components/script/conftest.py b/tests/components/script/conftest.py
index 5b98d7240becaf..8795ba3c018ad3 100644
--- a/tests/components/script/conftest.py
+++ b/tests/components/script/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for script tests."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index dc88ae2f0f2129..cc41b6c404cd24 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -1,6 +1,7 @@
 """The tests for the Script component."""
 import asyncio
 from datetime import timedelta
+from typing import Any
 from unittest.mock import Mock, patch
 
 import pytest
@@ -15,6 +16,7 @@
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
     STATE_OFF,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import (
     Context,
@@ -157,14 +159,32 @@ def state_listener(entity_id, old_state, new_state):
 ]
 
 
-@pytest.mark.parametrize("value", invalid_configs)
-async def test_setup_with_invalid_configs(hass: HomeAssistant, value) -> None:
+@pytest.mark.parametrize(
+    ("config", "nbr_script_entities"),
+    [
+        ({"test": {}}, 1),
+        # Invalid slug, entity can't be set up
+        ({"test hello world": {"sequence": [{"event": "bla"}]}}, 0),
+        (
+            {
+                "test": {
+                    "sequence": {
+                        "event": "test_event",
+                        "service": "homeassistant.turn_on",
+                    }
+                }
+            },
+            1,
+        ),
+    ],
+)
+async def test_setup_with_invalid_configs(
+    hass: HomeAssistant, config, nbr_script_entities
+) -> None:
     """Test setup with invalid configs."""
-    assert await async_setup_component(
-        hass, "script", {"script": value}
-    ), f"Script loaded with wrong config {value}"
+    assert await async_setup_component(hass, "script", {"script": config})
 
-    assert len(hass.states.async_entity_ids("script")) == 0
+    assert len(hass.states.async_entity_ids("script")) == nbr_script_entities
 
 
 @pytest.mark.parametrize(
@@ -176,6 +196,47 @@ async def test_setup_with_invalid_configs(hass: HomeAssistant, value) -> None:
             "has invalid object id",
             "invalid slug Bad Script",
         ),
+    ),
+)
+async def test_bad_config_validation_critical(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    object_id,
+    broken_config,
+    problem,
+    details,
+) -> None:
+    """Test bad script configuration which can be detected during validation."""
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                object_id: {"alias": "bad_script", **broken_config},
+                "good_script": {
+                    "alias": "good_script",
+                    "sequence": {
+                        "service": "test.automation",
+                        "entity_id": "hello.world",
+                    },
+                },
+            }
+        },
+    )
+
+    # Check we get the expected error message
+    assert (
+        f"Script with alias 'bad_script' {problem} and has been disabled: {details}"
+        in caplog.text
+    )
+
+    # Make sure one bad script does not prevent other scripts from setting up
+    assert hass.states.async_entity_ids("script") == ["script.good_script"]
+
+
+@pytest.mark.parametrize(
+    ("object_id", "broken_config", "problem", "details"),
+    (
         (
             "bad_script",
             {},
@@ -229,8 +290,13 @@ async def test_bad_config_validation(
         in caplog.text
     )
 
-    # Make sure one bad automation does not prevent other automations from setting up
-    assert hass.states.async_entity_ids("script") == ["script.good_script"]
+    # Make sure both scripts are setup
+    assert set(hass.states.async_entity_ids("script")) == {
+        "script.bad_script",
+        "script.good_script",
+    }
+    # The script failing validation should be unavailable
+    assert hass.states.get("script.bad_script").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize("running", ["no", "same", "different"])
@@ -592,6 +658,46 @@ async def test_async_get_descriptions_script(hass: HomeAssistant) -> None:
     )
 
 
+async def test_extraction_functions_not_setup(hass: HomeAssistant) -> None:
+    """Test extraction functions when script is not setup."""
+    assert script.scripts_with_area(hass, "area-in-both") == []
+    assert script.areas_in_script(hass, "script.test") == []
+    assert script.scripts_with_blueprint(hass, "blabla.yaml") == []
+    assert script.blueprint_in_script(hass, "script.test") is None
+    assert script.scripts_with_device(hass, "device-in-both") == []
+    assert script.devices_in_script(hass, "script.test") == []
+    assert script.scripts_with_entity(hass, "light.in_both") == []
+    assert script.entities_in_script(hass, "script.test") == []
+
+
+async def test_extraction_functions_unknown_script(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown script."""
+    assert await async_setup_component(hass, DOMAIN, {})
+    assert script.areas_in_script(hass, "script.unknown") == []
+    assert script.blueprint_in_script(hass, "script.unknown") is None
+    assert script.devices_in_script(hass, "script.unknown") == []
+    assert script.entities_in_script(hass, "script.unknown") == []
+
+
+async def test_extraction_functions_unavailable_script(hass: HomeAssistant) -> None:
+    """Test extraction functions for an unknown automation."""
+    entity_id = "script.test1"
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {DOMAIN: {"test1": {}}},
+    )
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+    assert script.scripts_with_area(hass, "area-in-both") == []
+    assert script.areas_in_script(hass, entity_id) == []
+    assert script.scripts_with_blueprint(hass, "blabla.yaml") == []
+    assert script.blueprint_in_script(hass, entity_id) is None
+    assert script.scripts_with_device(hass, "device-in-both") == []
+    assert script.devices_in_script(hass, entity_id) == []
+    assert script.scripts_with_entity(hass, "light.in_both") == []
+    assert script.entities_in_script(hass, entity_id) == []
+
+
 async def test_extraction_functions(hass: HomeAssistant) -> None:
     """Test extraction functions."""
     assert await async_setup_component(
@@ -615,6 +721,10 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                             "type": "turn_on",
                             "device_id": "device-in-both",
                         },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
                     ]
                 },
                 "test2": {
@@ -643,6 +753,28 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
                         },
                     ],
                 },
+                "test3": {
+                    "sequence": [
+                        {
+                            "service": "test.script",
+                            "data": {"entity_id": "light.in_both"},
+                        },
+                        {
+                            "condition": "state",
+                            "entity_id": "sensor.condition",
+                            "state": "100",
+                        },
+                        {"scene": "scene.hello"},
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-both"},
+                        },
+                        {
+                            "service": "test.test",
+                            "target": {"area_id": "area-in-last"},
+                        },
+                    ],
+                },
             }
         },
     )
@@ -650,6 +782,7 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
     assert set(script.scripts_with_entity(hass, "light.in_both")) == {
         "script.test1",
         "script.test2",
+        "script.test3",
     }
     assert set(script.entities_in_script(hass, "script.test1")) == {
         "light.in_both",
@@ -663,6 +796,15 @@ async def test_extraction_functions(hass: HomeAssistant) -> None:
         "device-in-both",
         "device-in-last",
     }
+    assert set(script.scripts_with_area(hass, "area-in-both")) == {
+        "script.test1",
+        "script.test3",
+    }
+    assert set(script.areas_in_script(hass, "script.test3")) == {
+        "area-in-both",
+        "area-in-last",
+    }
+    assert script.blueprint_in_script(hass, "script.test3") is None
 
 
 async def test_config_basic(hass: HomeAssistant) -> None:
@@ -1334,6 +1476,35 @@ def record_call(service):
     assert calls[1].data["entity_id"] == "script.custom_entity_id_2"
 
 
+async def test_blueprint_automation(hass: HomeAssistant, calls) -> None:
+    """Test blueprint script."""
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test_script": {
+                    "use_blueprint": {
+                        "path": "test_service.yaml",
+                        "input": {
+                            "service_to_call": "test.script",
+                        },
+                    }
+                }
+            }
+        },
+    )
+    await hass.services.async_call(
+        "script", "test_script", {"var_from_service": "hello"}, blocking=True
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert script.blueprint_in_script(hass, "script.test_script") == "test_service.yaml"
+    assert script.scripts_with_blueprint(hass, "test_service.yaml") == [
+        "script.test_script"
+    ]
+
+
 @pytest.mark.parametrize(
     ("blueprint_inputs", "problem", "details"),
     (
@@ -1416,3 +1587,75 @@ async def test_blueprint_script_fails_substitution(
         "{'service_to_call': 'test.automation'}: No substitution found for input blah"
         in caplog.text
     )
+
+
+@pytest.mark.parametrize("response", ({"value": 5}, '{"value": 5}'))
+async def test_responses(hass: HomeAssistant, response: Any) -> None:
+    """Test we can get responses."""
+    mock_restore_cache(hass, ())
+    assert await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "test": {
+                    "sequence": [
+                        {
+                            "variables": {"test_var": {"response": response}},
+                        },
+                        {
+                            "stop": "done",
+                            "response_variable": "test_var",
+                        },
+                    ]
+                }
+            }
+        },
+    )
+
+    assert await hass.services.async_call(
+        DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
+    ) == {"response": response}
+    # Validate we can also call it without return_response
+    assert (
+        await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=False
+        )
+        is None
+    )
+
+
+async def test_responses_no_response(hass: HomeAssistant) -> None:
+    """Test response variable not set."""
+    mock_restore_cache(hass, ())
+    assert await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "test": {
+                    "sequence": [
+                        {
+                            "stop": "done",
+                            "response_variable": "test_var",
+                        },
+                    ]
+                }
+            }
+        },
+    )
+
+    # Validate we can call it with return_response
+    assert (
+        await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
+        )
+        == {}
+    )
+    # Validate we can also call it without return_response
+    assert (
+        await hass.services.async_call(
+            DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=False
+        )
+        is None
+    )
diff --git a/tests/components/search/test_init.py b/tests/components/search/test_init.py
index 31de817c60f083..40ec9c22afe6b8 100644
--- a/tests/components/search/test_init.py
+++ b/tests/components/search/test_init.py
@@ -1,4 +1,6 @@
 """Tests for Search integration."""
+import pytest
+
 from homeassistant.components import search
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
@@ -10,9 +12,14 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import WebSocketGenerator
 
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 MOCK_ENTITY_SOURCES = {
     "light.platform_config_source": {
         "source": entity.SOURCE_PLATFORM_CONFIG,
@@ -442,6 +449,113 @@ async def test_person_lookup(hass: HomeAssistant) -> None:
     }
 
 
+async def test_automation_blueprint(hass):
+    """Test searching for automation blueprints."""
+
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": [
+                {
+                    "alias": "blueprint_automation_1",
+                    "trigger": {"platform": "template", "value_template": "true"},
+                    "use_blueprint": {
+                        "path": "test_event_service.yaml",
+                        "input": {
+                            "trigger_event": "blueprint_event_1",
+                            "service_to_call": "test.automation_1",
+                            "a_number": 5,
+                        },
+                    },
+                },
+                {
+                    "alias": "blueprint_automation_2",
+                    "trigger": {"platform": "template", "value_template": "true"},
+                    "use_blueprint": {
+                        "path": "test_event_service.yaml",
+                        "input": {
+                            "trigger_event": "blueprint_event_2",
+                            "service_to_call": "test.automation_2",
+                            "a_number": 5,
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Ensure automations set up correctly.
+    assert hass.states.get("automation.blueprint_automation_1") is not None
+    assert hass.states.get("automation.blueprint_automation_1") is not None
+
+    device_reg = dr.async_get(hass)
+    entity_reg = er.async_get(hass)
+
+    searcher = search.Searcher(hass, device_reg, entity_reg, MOCK_ENTITY_SOURCES)
+    assert searcher.async_search("automation", "automation.blueprint_automation_1") == {
+        "automation": {"automation.blueprint_automation_2"},
+        "automation_blueprint": {"test_event_service.yaml"},
+        "entity": {"light.kitchen"},
+    }
+
+    searcher = search.Searcher(hass, device_reg, entity_reg, MOCK_ENTITY_SOURCES)
+    assert searcher.async_search("automation_blueprint", "test_event_service.yaml") == {
+        "automation": {
+            "automation.blueprint_automation_1",
+            "automation.blueprint_automation_2",
+        },
+    }
+
+
+async def test_script_blueprint(hass):
+    """Test searching for script blueprints."""
+
+    assert await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "blueprint_script_1": {
+                    "use_blueprint": {
+                        "path": "test_service.yaml",
+                        "input": {
+                            "service_to_call": "test.automation",
+                        },
+                    }
+                },
+                "blueprint_script_2": {
+                    "use_blueprint": {
+                        "path": "test_service.yaml",
+                        "input": {
+                            "service_to_call": "test.automation",
+                        },
+                    }
+                },
+            }
+        },
+    )
+
+    # Ensure automations set up correctly.
+    assert hass.states.get("script.blueprint_script_1") is not None
+    assert hass.states.get("script.blueprint_script_1") is not None
+
+    device_reg = dr.async_get(hass)
+    entity_reg = er.async_get(hass)
+
+    searcher = search.Searcher(hass, device_reg, entity_reg, MOCK_ENTITY_SOURCES)
+    assert searcher.async_search("script", "script.blueprint_script_1") == {
+        "entity": {"light.kitchen"},
+        "script": {"script.blueprint_script_2"},
+        "script_blueprint": {"test_service.yaml"},
+    }
+
+    searcher = search.Searcher(hass, device_reg, entity_reg, MOCK_ENTITY_SOURCES)
+    assert searcher.async_search("script_blueprint", "test_service.yaml") == {
+        "script": {"script.blueprint_script_1", "script.blueprint_script_2"},
+    }
+
+
 async def test_ws_api(hass: HomeAssistant, hass_ws_client: WebSocketGenerator) -> None:
     """Test WS API."""
     assert await async_setup_component(hass, "search", {})
diff --git a/tests/components/select/test_device_action.py b/tests/components/select/test_device_action.py
index 168e47d5d68bfd..ce5d48bb358af9 100644
--- a/tests/components/select/test_device_action.py
+++ b/tests/components/select/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Select device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -17,7 +18,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -35,7 +35,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -43,7 +43,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": "select.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in [
@@ -57,7 +57,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -83,7 +83,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -97,7 +97,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in [
@@ -111,12 +111,16 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize("action_type", ("select_first", "select_last"))
-async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -> None:
+async def test_action_select_first_last(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
+) -> None:
     """Test for select_first and select_last actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -130,7 +134,7 @@ async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": action_type,
                     },
                 },
@@ -145,11 +149,53 @@ async def test_action_select_first_last(hass: HomeAssistant, action_type: str) -
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == action_type
-    assert select_calls[0].data == {"entity_id": "select.entity"}
+    assert select_calls[0].data == {"entity_id": entry.entity_id}
+
+
+@pytest.mark.parametrize("action_type", ("select_first", "select_last"))
+async def test_action_select_first_last_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
+) -> None:
+    """Test for select_first and select_last actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": action_type,
+                    },
+                },
+            ]
+        },
+    )
+
+    select_calls = async_mock_service(hass, DOMAIN, action_type)
 
+    hass.bus.async_fire("test_event")
+    await hass.async_block_till_done()
+    assert len(select_calls) == 1
+    assert select_calls[0].domain == DOMAIN
+    assert select_calls[0].service == action_type
+    assert select_calls[0].data == {"entity_id": entry.entity_id}
 
-async def test_action_select_option(hass: HomeAssistant) -> None:
+
+async def test_action_select_option(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test for select_option action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -163,7 +209,7 @@ async def test_action_select_option(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "select_option",
                         "option": "option1",
                     },
@@ -179,14 +225,16 @@ async def test_action_select_option(hass: HomeAssistant) -> None:
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == "select_option"
-    assert select_calls[0].data == {"entity_id": "select.entity", "option": "option1"}
+    assert select_calls[0].data == {"entity_id": entry.entity_id, "option": "option1"}
 
 
 @pytest.mark.parametrize("action_type", ["select_next", "select_previous"])
 async def test_action_select_next_previous(
-    hass: HomeAssistant, action_type: str
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, action_type: str
 ) -> None:
     """Test for select_next and select_previous actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -200,7 +248,7 @@ async def test_action_select_next_previous(
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": action_type,
                         "cycle": False,
                     },
@@ -216,16 +264,20 @@ async def test_action_select_next_previous(
     assert len(select_calls) == 1
     assert select_calls[0].domain == DOMAIN
     assert select_calls[0].service == action_type
-    assert select_calls[0].data == {"entity_id": "select.entity", "cycle": False}
+    assert select_calls[0].data == {"entity_id": entry.entity_id, "cycle": False}
 
 
-async def test_get_action_capabilities(hass: HomeAssistant) -> None:
+async def test_get_action_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_option",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
         "option": "option1",
     }
 
@@ -245,7 +297,109 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+    ]
+
+    # Test next/previous actions
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_next",
+        "entity_id": entry.id,
+    }
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "cycle",
+            "optional": True,
+            "type": "boolean",
+            "default": True,
+        },
+    ]
+
+    config["type"] = "select_previous"
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "cycle",
+            "optional": True,
+            "type": "boolean",
+            "default": True,
+        },
+    ]
+
+    # Test action types without extra fields
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_first",
+        "entity_id": entry.id,
+    }
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities == {}
+
+    config["type"] = "select_last"
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities == {}
+
+
+async def test_get_action_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select action."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "select_option",
+        "entity_id": entry.entity_id,
+        "option": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_action_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [],
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_action_capabilities(hass, config)
@@ -267,7 +421,7 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_next",
-        "entity_id": "select.test",
+        "entity_id": entry.entity_id,
     }
     capabilities = await async_get_action_capabilities(hass, config)
     assert capabilities
@@ -303,7 +457,7 @@ async def test_get_action_capabilities(hass: HomeAssistant) -> None:
         "platform": "device",
         "domain": DOMAIN,
         "type": "select_first",
-        "entity_id": "select.test",
+        "entity_id": entry.entity_id,
     }
     capabilities = await async_get_action_capabilities(hass, config)
     assert capabilities == {}
diff --git a/tests/components/select/test_device_condition.py b/tests/components/select/test_device_condition.py
index 738089e7f9be6f..18ebd428891eeb 100644
--- a/tests/components/select/test_device_condition.py
+++ b/tests/components/select/test_device_condition.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -21,7 +22,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -45,7 +45,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -54,14 +54,14 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": "selected_option",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -87,7 +87,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -101,7 +101,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["selected_option"]
@@ -109,13 +109,17 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_if_selected_option(
-    hass: HomeAssistant, calls: list[ServiceCall]
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test for selected_option conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -128,7 +132,7 @@ async def test_if_selected_option(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "select.entity",
+                            "entity_id": entry.id,
                             "type": "selected_option",
                             "option": "option1",
                         }
@@ -147,7 +151,7 @@ async def test_if_selected_option(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "select.entity",
+                            "entity_id": entry.id,
                             "type": "selected_option",
                             "option": "option2",
                         }
@@ -170,7 +174,7 @@ async def test_if_selected_option(
     assert len(calls) == 0
 
     hass.states.async_set(
-        "select.entity", "option1", {"options": ["option1", "option2"]}
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
     )
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
@@ -179,7 +183,7 @@ async def test_if_selected_option(
     assert calls[0].data["result"] == "option1 - event - test_event1"
 
     hass.states.async_set(
-        "select.entity", "option2", {"options": ["option1", "option2"]}
+        entry.entity_id, "option2", {"options": ["option1", "option2"]}
     )
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
@@ -188,13 +192,122 @@ async def test_if_selected_option(
     assert calls[1].data["result"] == "option2 - event - test_event2"
 
 
-async def test_get_condition_capabilities(hass: HomeAssistant) -> None:
+async def test_if_selected_option_legacy(
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test for selected_option conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "selected_option",
+                            "option": "option1",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "result": "option1 - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["result"] == "option1 - event - test_event1"
+
+
+async def test_get_condition_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select condition."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "selected_option",
+        "entity_id": entry.id,
+        "option": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_condition_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_condition_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "option",
+            "required": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select condition."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "selected_option",
-        "entity_id": "select.test",
+        "entity_id": entry.entity_id,
         "option": "option1",
     }
 
@@ -219,7 +332,9 @@ async def test_get_condition_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_condition_capabilities(hass, config)
diff --git a/tests/components/select/test_device_trigger.py b/tests/components/select/test_device_trigger.py
index ed33884bff9646..8a6ccd43abed72 100644
--- a/tests/components/select/test_device_trigger.py
+++ b/tests/components/select/test_device_trigger.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 from homeassistant.components import automation
@@ -21,7 +22,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -45,7 +45,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -54,14 +54,14 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": "current_option_changed",
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
     ]
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -87,7 +87,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -101,7 +101,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["current_option_changed"]
@@ -109,13 +109,17 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     hass.states.async_set(
-        "select.entity", "option1", {"options": ["option1", "option2", "option3"]}
+        entry.entity_id, "option1", {"options": ["option1", "option2", "option3"]}
     )
 
     assert await async_setup_component(
@@ -128,7 +132,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "to": "option2",
                     },
@@ -149,7 +153,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "from": "option2",
                     },
@@ -170,7 +174,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "select.entity",
+                        "entity_id": entry.id,
                         "type": "current_option_changed",
                         "from": "option3",
                         "to": "option1",
@@ -192,37 +196,94 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Test triggering device trigger with a to state
-    hass.states.async_set("select.entity", "option2")
+    hass.states.async_set(entry.entity_id, "option2")
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data[
-        "some"
-    ] == "to - device - {} - option1 - option2 - None - 0".format("select.entity")
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - option1 - option2 - None - 0"
+    )
 
     # Test triggering device trigger with a from state
-    hass.states.async_set("select.entity", "option3")
+    hass.states.async_set(entry.entity_id, "option3")
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data[
-        "some"
-    ] == "from - device - {} - option2 - option3 - None - 0".format("select.entity")
+    assert (
+        calls[1].data["some"]
+        == f"from - device - {entry.entity_id} - option2 - option3 - None - 0"
+    )
 
     # Test triggering device trigger with both a from and to state
-    hass.states.async_set("select.entity", "option1")
+    hass.states.async_set(entry.entity_id, "option1")
     await hass.async_block_till_done()
     assert len(calls) == 3
-    assert calls[2].data[
-        "some"
-    ] == "from-to - device - {} - option3 - option1 - None - 0".format("select.entity")
+    assert (
+        calls[2].data["some"]
+        == f"from-to - device - {entry.entity_id} - option3 - option1 - None - 0"
+    )
 
 
-async def test_get_trigger_capabilities(hass: HomeAssistant) -> None:
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2", "option3"]}
+    )
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "current_option_changed",
+                        "to": "option2",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data": {
+                            "some": (
+                                "to - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}} - {{ trigger.for }} - "
+                                "{{ trigger.id}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Test triggering device trigger with a to state
+    hass.states.async_set(entry.entity_id, "option2")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"to - device - {entry.entity_id} - option1 - option2 - None - 0"
+    )
+
+
+async def test_get_trigger_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test we get the expected capabilities from a select trigger."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     config = {
         "platform": "device",
         "domain": DOMAIN,
         "type": "current_option_changed",
-        "entity_id": "select.test",
+        "entity_id": entry.id,
         "to": "option1",
     }
 
@@ -253,7 +314,120 @@ async def test_get_trigger_capabilities(hass: HomeAssistant) -> None:
     ]
 
     # Mock an entity
-    hass.states.async_set("select.test", "option1", {"options": ["option1", "option2"]})
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
+
+    # Test if we get the right capabilities now
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [("option1", "option1"), ("option2", "option2")],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_trigger_capabilities_unknown(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select trigger."""
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "current_option_changed",
+        "entity_id": "12345",
+        "to": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test we get the expected capabilities from a select trigger."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    config = {
+        "platform": "device",
+        "domain": DOMAIN,
+        "type": "current_option_changed",
+        "entity_id": entry.entity_id,
+        "to": "option1",
+    }
+
+    # Test when entity doesn't exists
+    capabilities = await async_get_trigger_capabilities(hass, config)
+    assert capabilities
+    assert "extra_fields" in capabilities
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [
+        {
+            "name": "from",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "to",
+            "optional": True,
+            "type": "select",
+            "options": [],
+        },
+        {
+            "name": "for",
+            "optional": True,
+            "type": "positive_time_period_dict",
+        },
+    ]
+
+    # Mock an entity
+    hass.states.async_set(
+        entry.entity_id, "option1", {"options": ["option1", "option2"]}
+    )
 
     # Test if we get the right capabilities now
     capabilities = await async_get_trigger_capabilities(hass, config)
diff --git a/tests/components/select/test_recorder.py b/tests/components/select/test_recorder.py
index 903d24d39bb0bd..53911578d538fd 100644
--- a/tests/components/select/test_recorder.py
+++ b/tests/components/select/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import select
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
 from homeassistant.components.select import ATTR_OPTIONS
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def select_only() -> None:
+    """Enable only the select platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.SELECT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test select registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/senseme/__init__.py b/tests/components/senseme/__init__.py
deleted file mode 100644
index 43d586328bb7f9..00000000000000
--- a/tests/components/senseme/__init__.py
+++ /dev/null
@@ -1,142 +0,0 @@
-"""Tests for the SenseME integration."""
-
-from contextlib import contextmanager
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from aiosenseme import SensemeDevice, SensemeDiscovery
-
-from homeassistant.components.senseme import config_flow
-
-MOCK_NAME = "Haiku Fan"
-MOCK_UUID = "77a6b7b3-925d-4695-a415-76d76dca4444"
-MOCK_ADDRESS = "127.0.0.1"
-MOCK_MAC = "20:F8:5E:92:5A:75"
-
-
-def _mock_device():
-    device = MagicMock(auto_spec=SensemeDevice)
-    device.async_update = AsyncMock()
-    device.model = "Haiku Fan"
-    device.fan_speed_max = 7
-    device.mac = "aa:bb:cc:dd:ee:ff"
-    device.fan_dir = "REV"
-    device.has_light = True
-    device.is_light = False
-    device.light_brightness = 50
-    device.room_name = "Main"
-    device.room_type = "Main"
-    device.fw_version = "1"
-    device.fan_autocomfort = "COOLING"
-    device.fan_smartmode = "OFF"
-    device.fan_whoosh_mode = "on"
-    device.name = MOCK_NAME
-    device.uuid = MOCK_UUID
-    device.address = MOCK_ADDRESS
-    device.get_device_info = {
-        "name": MOCK_NAME,
-        "uuid": MOCK_UUID,
-        "mac": MOCK_ADDRESS,
-        "address": MOCK_ADDRESS,
-        "base_model": "FAN,HAIKU,HSERIES",
-        "has_light": False,
-        "has_sensor": True,
-        "is_fan": True,
-        "is_light": False,
-    }
-    return device
-
-
-device_alternate_ip = MagicMock(auto_spec=SensemeDevice)
-device_alternate_ip.async_update = AsyncMock()
-device_alternate_ip.model = "Haiku Fan"
-device_alternate_ip.fan_speed_max = 7
-device_alternate_ip.mac = "aa:bb:cc:dd:ee:ff"
-device_alternate_ip.fan_dir = "REV"
-device_alternate_ip.room_name = "Main"
-device_alternate_ip.room_type = "Main"
-device_alternate_ip.fw_version = "1"
-device_alternate_ip.fan_autocomfort = "on"
-device_alternate_ip.fan_smartmode = "on"
-device_alternate_ip.fan_whoosh_mode = "on"
-device_alternate_ip.name = MOCK_NAME
-device_alternate_ip.uuid = MOCK_UUID
-device_alternate_ip.address = "127.0.0.8"
-device_alternate_ip.get_device_info = {
-    "name": MOCK_NAME,
-    "uuid": MOCK_UUID,
-    "mac": "20:F8:5E:92:5A:75",
-    "address": "127.0.0.8",
-    "base_model": "FAN,HAIKU,HSERIES",
-    "has_light": False,
-    "has_sensor": True,
-    "is_fan": True,
-    "is_light": False,
-}
-
-
-device2 = MagicMock(auto_spec=SensemeDevice)
-device2.async_update = AsyncMock()
-device2.model = "Haiku Fan"
-device2.fan_speed_max = 7
-device2.mac = "aa:bb:cc:dd:ee:ff"
-device2.fan_dir = "FWD"
-device2.room_name = "Main"
-device2.room_type = "Main"
-device2.fw_version = "1"
-device2.fan_autocomfort = "on"
-device2.fan_smartmode = "on"
-device2.fan_whoosh_mode = "on"
-device2.name = "Device 2"
-device2.uuid = "uuid2"
-device2.address = "127.0.0.2"
-device2.get_device_info = {
-    "name": "Device 2",
-    "uuid": "uuid2",
-    "mac": "20:F8:5E:92:5A:76",
-    "address": "127.0.0.2",
-    "base_model": "FAN,HAIKU,HSERIES",
-    "has_light": True,
-    "has_sensor": True,
-    "is_fan": True,
-    "is_light": False,
-}
-
-device_no_uuid = MagicMock(auto_spec=SensemeDevice)
-device_no_uuid.uuid = None
-
-
-MOCK_DEVICE = _mock_device()
-MOCK_DEVICE_ALTERNATE_IP = device_alternate_ip
-MOCK_DEVICE2 = device2
-MOCK_DEVICE_NO_UUID = device_no_uuid
-
-
-def _patch_discovery(device=None, no_device=None):
-    """Patch discovery."""
-    mock_senseme_discovery = MagicMock(auto_spec=SensemeDiscovery)
-    if not no_device:
-        mock_senseme_discovery.devices = [device or MOCK_DEVICE]
-
-    @contextmanager
-    def _patcher():
-        with patch.object(config_flow, "DISCOVER_TIMEOUT", 0), patch(
-            "homeassistant.components.senseme.discovery.SensemeDiscovery",
-            return_value=mock_senseme_discovery,
-        ):
-            yield
-
-    return _patcher()
-
-
-def _patch_device(device=None, no_device=False):
-    async def _device_mocker(*args, **kwargs):
-        if no_device:
-            return False, None
-        if device:
-            return True, device
-        return True, _mock_device()
-
-    return patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        new=_device_mocker,
-    )
diff --git a/tests/components/senseme/test_config_flow.py b/tests/components/senseme/test_config_flow.py
deleted file mode 100644
index 63850dff3b5079..00000000000000
--- a/tests/components/senseme/test_config_flow.py
+++ /dev/null
@@ -1,361 +0,0 @@
-"""Test the SenseME config flow."""
-from unittest.mock import patch
-
-from homeassistant import config_entries
-from homeassistant.components import dhcp
-from homeassistant.components.senseme.const import DOMAIN
-from homeassistant.const import CONF_HOST, CONF_ID
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import (
-    MOCK_ADDRESS,
-    MOCK_DEVICE,
-    MOCK_DEVICE2,
-    MOCK_DEVICE_ALTERNATE_IP,
-    MOCK_DEVICE_NO_UUID,
-    MOCK_MAC,
-    MOCK_UUID,
-    _patch_discovery,
-)
-
-from tests.common import MockConfigEntry
-
-DHCP_DISCOVERY = dhcp.DhcpServiceInfo(
-    hostname="any",
-    ip=MOCK_ADDRESS,
-    macaddress=MOCK_MAC,
-)
-
-
-async def test_form_user(hass: HomeAssistant) -> None:
-    """Test we get the form as a user."""
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_manual_entry(hass: HomeAssistant) -> None:
-    """Test we get the form as a user with a discovery but user chooses manual."""
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": None,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.FORM
-    assert result2["step_id"] == "manual"
-
-    with patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result3 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Haiku Fan"
-    assert result3["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_no_discovery(hass: HomeAssistant) -> None:
-    """Test we get the form as a user with no discovery."""
-
-    with _patch_discovery(no_device=True), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: "not a valid address",
-            },
-        )
-        await hass.async_block_till_done()
-
-        assert result2["type"] == FlowResultType.FORM
-        assert result2["step_id"] == "manual"
-        assert result2["errors"] == {CONF_HOST: "invalid_host"}
-
-        result3 = await hass.config_entries.flow.async_configure(
-            result2["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.CREATE_ENTRY
-    assert result3["title"] == "Haiku Fan"
-    assert result3["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_form_user_manual_entry_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we get the form as a user."""
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_USER}
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": None,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.FORM
-    assert result2["step_id"] == "manual"
-
-    with patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=None,
-    ):
-        result3 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                CONF_HOST: MOCK_ADDRESS,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result3["type"] == FlowResultType.FORM
-    assert result3["step_id"] == "manual"
-    assert result3["errors"] == {CONF_HOST: "cannot_connect"}
-
-
-async def test_discovery(hass: HomeAssistant) -> None:
-    """Test we can setup a discovered device."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE2.get_device_info,
-        },
-        unique_id=MOCK_DEVICE2.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE2),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={CONF_ID: MOCK_UUID},
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_discovery_existing_device_no_ip_change(hass: HomeAssistant) -> None:
-    """Test we can setup a discovered device."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE.get_device_info,
-        },
-        unique_id=MOCK_DEVICE.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-    with _patch_discovery():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={CONF_ID: MOCK_UUID},
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "already_configured"
-
-
-async def test_discovery_existing_device_ip_change(hass: HomeAssistant) -> None:
-    """Test a config entry ips get updated from discovery."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE.get_device_info,
-        },
-        unique_id=MOCK_DEVICE.uuid,
-    )
-    entry.add_to_hass(hass)
-
-    with _patch_discovery(device=MOCK_DEVICE_ALTERNATE_IP), patch(
-        "homeassistant.components.senseme.async_get_device_by_device_info",
-        return_value=(True, MOCK_DEVICE),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
-            data={CONF_ID: MOCK_UUID},
-        )
-        await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-    assert entry.data["info"]["address"] == "127.0.0.8"
-
-
-async def test_dhcp_discovery_existing_config_entry(hass: HomeAssistant) -> None:
-    """Test dhcp discovery is aborted if there is an existing config entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "info": MOCK_DEVICE2.get_device_info,
-        },
-        unique_id=MOCK_DEVICE2.uuid,
-    )
-    entry.add_to_hass(hass)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-    )
-    assert result["type"] == FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_dhcp_discovery(hass: HomeAssistant) -> None:
-    """Test we can setup a dhcp discovered device."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE,
-    ), patch(
-        "homeassistant.components.senseme.async_setup_entry",
-        return_value=True,
-    ) as mock_setup_entry:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert not result["errors"]
-
-        result2 = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            {
-                "device": MOCK_UUID,
-            },
-        )
-        await hass.async_block_till_done()
-
-    assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Haiku Fan"
-    assert result2["data"] == {
-        "info": MOCK_DEVICE.get_device_info,
-    }
-    assert len(mock_setup_entry.mock_calls) == 1
-
-
-async def test_dhcp_discovery_cannot_connect(hass: HomeAssistant) -> None:
-    """Test we abort if we cannot cannot to a dhcp discovered device."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=None,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "cannot_connect"
-
-
-async def test_dhcp_discovery_cannot_connect_no_uuid(hass: HomeAssistant) -> None:
-    """Test we abort if the discovered device has no uuid."""
-    with _patch_discovery(), patch(
-        "homeassistant.components.senseme.config_flow.async_get_device_by_ip_address",
-        return_value=MOCK_DEVICE_NO_UUID,
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": config_entries.SOURCE_DHCP}, data=DHCP_DISCOVERY
-        )
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "cannot_connect"
diff --git a/tests/components/senseme/test_light.py b/tests/components/senseme/test_light.py
deleted file mode 100644
index d4a8eddc91c146..00000000000000
--- a/tests/components/senseme/test_light.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Tests for senseme light platform."""
-from aiosenseme import SensemeDevice
-
-from homeassistant.components import senseme
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_COLOR_MODE,
-    ATTR_COLOR_TEMP,
-    ATTR_SUPPORTED_COLOR_MODES,
-    DOMAIN as LIGHT_DOMAIN,
-    SERVICE_TURN_OFF,
-    SERVICE_TURN_ON,
-    ColorMode,
-)
-from homeassistant.components.senseme.const import DOMAIN
-from homeassistant.const import ATTR_ENTITY_ID, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.setup import async_setup_component
-
-from . import _mock_device, _patch_device, _patch_discovery
-
-from tests.common import MockConfigEntry
-
-
-async def _setup_mocked_entry(hass: HomeAssistant, device: SensemeDevice) -> None:
-    """Set up a mocked entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        data={"info": device.get_device_info},
-        unique_id=device.uuid,
-    )
-    entry.add_to_hass(hass)
-    with _patch_discovery(), _patch_device(device=device):
-        await async_setup_component(hass, senseme.DOMAIN, {senseme.DOMAIN: {}})
-        await hass.async_block_till_done()
-
-
-async def test_light_unique_id(hass: HomeAssistant) -> None:
-    """Test a light unique id."""
-    device = _mock_device()
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-    entity_registry = er.async_get(hass)
-    assert entity_registry.async_get(entity_id).unique_id == f"{device.uuid}-LIGHT"
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-
-
-async def test_fan_light(hass: HomeAssistant) -> None:
-    """Test a fan light."""
-    device = _mock_device()
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.BRIGHTNESS
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is False
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is True
-
-
-async def test_fan_light_no_brightness(hass: HomeAssistant) -> None:
-    """Test a fan light without brightness."""
-    device = _mock_device()
-    device.brightness = None
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.BRIGHTNESS
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.BRIGHTNESS]
-
-
-async def test_standalone_light(hass: HomeAssistant) -> None:
-    """Test a standalone light."""
-    device = _mock_device()
-    device.is_light = True
-    device.light_color_temp_max = 6500
-    device.light_color_temp_min = 2700
-    device.light_color_temp = 4000
-    await _setup_mocked_entry(hass, device)
-    entity_id = "light.haiku_fan_light"
-
-    state = hass.states.get(entity_id)
-    assert state.state == STATE_ON
-    attributes = state.attributes
-    assert attributes[ATTR_BRIGHTNESS] == 255
-    assert attributes[ATTR_COLOR_MODE] == ColorMode.COLOR_TEMP
-    assert attributes[ATTR_SUPPORTED_COLOR_MODES] == [ColorMode.COLOR_TEMP]
-    assert attributes[ATTR_COLOR_TEMP] == 250
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is False
-
-    await hass.services.async_call(
-        LIGHT_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}, blocking=True
-    )
-    assert device.light_on is True
diff --git a/tests/components/sensibo/test_binary_sensor.py b/tests/components/sensibo/test_binary_sensor.py
index d99dd2e8715e20..bb190908847c78 100644
--- a/tests/components/sensibo/test_binary_sensor.py
+++ b/tests/components/sensibo/test_binary_sensor.py
@@ -9,7 +9,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -53,7 +53,7 @@ async def test_binary_sensor(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_button.py b/tests/components/sensibo/test_button.py
index 77c70d6b55cb7e..da6a68af2d1ceb 100644
--- a/tests/components/sensibo/test_button.py
+++ b/tests/components/sensibo/test_button.py
@@ -13,7 +13,7 @@
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -35,7 +35,9 @@ async def test_button(
     assert state_filter_clean.state is STATE_ON
     assert state_filter_last_reset.state == "2022-03-12T15:24:26+00:00"
 
-    today = datetime(datetime.now().year + 1, 6, 19, 20, 0, 0).replace(tzinfo=dt.UTC)
+    today = datetime(datetime.now().year + 1, 6, 19, 20, 0, 0).replace(
+        tzinfo=dt_util.UTC
+    )
     today_str = today.isoformat()
     freezer.move_to(today)
 
@@ -69,7 +71,7 @@ async def test_button(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_climate.py b/tests/components/sensibo/test_climate.py
index be5b539fa069f6..b2108d3e6f4c04 100644
--- a/tests/components/sensibo/test_climate.py
+++ b/tests/components/sensibo/test_climate.py
@@ -55,7 +55,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -162,7 +162,7 @@ async def test_climate_fan(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -228,7 +228,7 @@ async def test_climate_swing(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -381,7 +381,7 @@ async def test_climate_temperatures(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -434,7 +434,7 @@ async def test_climate_temperature_is_none(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -488,7 +488,7 @@ async def test_climate_hvac_mode(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -520,7 +520,7 @@ async def test_climate_hvac_mode(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -559,7 +559,7 @@ async def test_climate_on_off(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -619,7 +619,7 @@ async def test_climate_service_failed(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -658,7 +658,7 @@ async def test_climate_assumed_state(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -707,7 +707,7 @@ async def test_climate_no_fan_no_swing(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -733,7 +733,7 @@ async def test_climate_set_timer(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -803,7 +803,7 @@ async def test_climate_set_timer(
     monkeypatch.setattr(
         get_data.parsed["ABC999111"],
         "timer_time",
-        datetime(2022, 6, 6, 12, 00, 00, tzinfo=dt.UTC),
+        datetime(2022, 6, 6, 12, 00, 00, tzinfo=dt_util.UTC),
     )
 
     with patch(
@@ -812,7 +812,7 @@ async def test_climate_set_timer(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -837,7 +837,7 @@ async def test_climate_pure_boost(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -908,7 +908,7 @@ async def test_climate_pure_boost(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -941,7 +941,7 @@ async def test_climate_climate_react(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -1075,7 +1075,7 @@ async def test_climate_climate_react(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -1104,7 +1104,7 @@ async def test_climate_climate_react_fahrenheit(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -1218,7 +1218,7 @@ async def test_climate_climate_react_fahrenheit(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -1247,7 +1247,7 @@ async def test_climate_full_ac_state(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -1311,7 +1311,7 @@ async def test_climate_full_ac_state(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_coordinator.py b/tests/components/sensibo/test_coordinator.py
index f0b9d60f112746..3c02fb0d3a9834 100644
--- a/tests/components/sensibo/test_coordinator.py
+++ b/tests/components/sensibo/test_coordinator.py
@@ -12,7 +12,7 @@
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import ENTRY_CONFIG
 
@@ -54,7 +54,7 @@ async def test_coordinator(
         mock_data.reset_mock()
 
         mock_data.side_effect = SensiboError("info")
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=1))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=1))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state = hass.states.get("climate.hallway")
@@ -63,7 +63,7 @@ async def test_coordinator(
 
         mock_data.return_value = SensiboData(raw={}, parsed={})
         mock_data.side_effect = None
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=3))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=3))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state = hass.states.get("climate.hallway")
@@ -75,7 +75,7 @@ async def test_coordinator(
 
         mock_data.return_value = get_data
         mock_data.side_effect = None
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=5))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=5))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state = hass.states.get("climate.hallway")
@@ -83,7 +83,7 @@ async def test_coordinator(
         mock_data.reset_mock()
 
         mock_data.side_effect = AuthenticationError("info")
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=7))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=7))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state = hass.states.get("climate.hallway")
diff --git a/tests/components/sensibo/test_number.py b/tests/components/sensibo/test_number.py
index 1f96835596012a..bdf3e5721c7b4a 100644
--- a/tests/components/sensibo/test_number.py
+++ b/tests/components/sensibo/test_number.py
@@ -16,7 +16,7 @@
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -43,7 +43,7 @@ async def test_number(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_select.py b/tests/components/sensibo/test_select.py
index b3b9140a2bbd92..7d8e373141591d 100644
--- a/tests/components/sensibo/test_select.py
+++ b/tests/components/sensibo/test_select.py
@@ -16,7 +16,7 @@
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -42,7 +42,7 @@ async def test_select(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -76,7 +76,7 @@ async def test_select_set_option(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -122,7 +122,7 @@ async def test_select_set_option(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_sensor.py b/tests/components/sensibo/test_sensor.py
index 8d3f705215c26d..003c2f27903d48 100644
--- a/tests/components/sensibo/test_sensor.py
+++ b/tests/components/sensibo/test_sensor.py
@@ -9,7 +9,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -61,7 +61,7 @@ async def test_sensor(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_switch.py b/tests/components/sensibo/test_switch.py
index ba0755bd861f9f..c6d47ceed666f1 100644
--- a/tests/components/sensibo/test_switch.py
+++ b/tests/components/sensibo/test_switch.py
@@ -18,7 +18,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -62,7 +62,7 @@ async def test_switch_timer(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
     state1 = hass.states.get("switch.hallway_timer")
@@ -95,7 +95,7 @@ async def test_switch_timer(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -140,7 +140,7 @@ async def test_switch_pure_boost(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
     state1 = hass.states.get("switch.kitchen_pure_boost")
@@ -171,7 +171,7 @@ async def test_switch_pure_boost(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -262,7 +262,7 @@ async def test_switch_climate_react(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
     state1 = hass.states.get("switch.hallway_climate_react")
@@ -293,7 +293,7 @@ async def test_switch_climate_react(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
@@ -317,7 +317,7 @@ async def test_switch_climate_react_no_data(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensibo/test_update.py b/tests/components/sensibo/test_update.py
index 406f4a8d70f258..c65ee5995eebe3 100644
--- a/tests/components/sensibo/test_update.py
+++ b/tests/components/sensibo/test_update.py
@@ -10,7 +10,7 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -39,7 +39,7 @@ async def test_select(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=5),
+            dt_util.utcnow() + timedelta(minutes=5),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/sensor/test_device_condition.py b/tests/components/sensor/test_device_condition.py
index 5e93bf2a64c45c..301baf0fc497c4 100644
--- a/tests/components/sensor/test_device_condition.py
+++ b/tests/components/sensor/test_device_condition.py
@@ -1,5 +1,6 @@
 """The test for sensor device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -21,15 +22,18 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.testing_config.custom_components.test.sensor import UNITS_OF_MEASUREMENT
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Track calls to a mock service."""
@@ -87,6 +91,7 @@ async def test_get_conditions(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    sensor_entries = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -95,7 +100,7 @@ async def test_get_conditions(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in SensorDeviceClass:
-        entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -108,7 +113,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -120,7 +125,7 @@ async def test_get_conditions(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
     assert len(conditions) == 27
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -146,7 +151,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -161,7 +166,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_value"]
@@ -169,7 +174,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_conditions_no_state(
@@ -184,16 +189,16 @@ async def test_get_conditions_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_ids = {}
+    sensor_entries = {}
     for device_class in SensorDeviceClass:
-        entity_ids[device_class] = entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             f"5678_{device_class}",
             device_id=device_entry.id,
             original_device_class=device_class,
             unit_of_measurement=UNITS_OF_MEASUREMENT.get(device_class),
-        ).entity_id
+        )
 
     await hass.async_block_till_done()
 
@@ -203,7 +208,7 @@ async def test_get_conditions_no_state(
             "domain": DOMAIN,
             "type": condition["type"],
             "device_id": device_entry.id,
-            "entity_id": entity_ids[device_class],
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -214,7 +219,7 @@ async def test_get_conditions_no_state(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -242,7 +247,7 @@ async def test_get_conditions_no_unit_or_stateclass(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -256,7 +261,7 @@ async def test_get_conditions_no_unit_or_stateclass(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in condition_types
@@ -264,7 +269,7 @@ async def test_get_conditions_no_unit_or_stateclass(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -336,8 +341,82 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+@pytest.mark.parametrize(
+    ("set_state", "device_class_reg", "device_class_state", "unit_reg", "unit_state"),
+    [
+        (False, SensorDeviceClass.BATTERY, None, PERCENTAGE, None),
+        (True, None, SensorDeviceClass.BATTERY, None, PERCENTAGE),
+    ],
+)
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    device_class_reg,
+    device_class_state,
+    unit_reg,
+    unit_state,
+) -> None:
+    """Test we get the expected capabilities from a sensor condition."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+        device_id=device_entry.id,
+        original_device_class=device_class_reg,
+        unit_of_measurement=unit_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"device_class": device_class_state, "unit_of_measurement": unit_state},
+        )
+
+    expected_capabilities = {
+        "extra_fields": [
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "above",
+                "optional": True,
+                "type": "float",
+            },
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "below",
+                "optional": True,
+                "type": "float",
+            },
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    assert len(conditions) == 1
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_get_condition_capabilities_none(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
     """Test we get the expected capabilities from a sensor condition."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -346,6 +425,12 @@ async def test_get_condition_capabilities_none(
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
 
+    entry_none = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["none"].unique_id,
+    )
+
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
@@ -354,14 +439,14 @@ async def test_get_condition_capabilities_none(
             "condition": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": "sensor.beer",
+            "entity_id": "01234567890123456789012345678901",
             "type": "is_battery_level",
         },
         {
             "condition": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": platform.ENTITIES["none"].entity_id,
+            "entity_id": entry_none.id,
             "type": "is_battery_level",
         },
     ]
@@ -376,18 +461,13 @@ async def test_get_condition_capabilities_none(
 
 async def test_if_state_not_above_below(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
 ) -> None:
     """Test for bad value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -401,7 +481,7 @@ async def test_if_state_not_above_below(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                         }
                     ],
@@ -414,16 +494,73 @@ async def test_if_state_not_above_below(
 
 
 async def test_if_state_above(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.id,
+                            "type": "is_battery_level",
+                            "above": 10,
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "{{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                }
+            ]
+        },
+    )
     await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 9)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 11)
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "event - test_event1"
+
+
+async def test_if_state_above_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for value conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -437,7 +574,7 @@ async def test_if_state_above(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.entity_id,
                             "type": "is_battery_level",
                             "above": 10,
                         }
@@ -454,19 +591,18 @@ async def test_if_state_above(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
@@ -474,16 +610,15 @@ async def test_if_state_above(
 
 
 async def test_if_state_below(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -497,7 +632,7 @@ async def test_if_state_below(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                             "below": 10,
                         }
@@ -514,19 +649,18 @@ async def test_if_state_below(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
@@ -534,16 +668,15 @@ async def test_if_state_below(
 
 
 async def test_if_state_between(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -557,7 +690,7 @@ async def test_if_state_between(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": sensor1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_battery_level",
                             "above": 10,
                             "below": 20,
@@ -575,30 +708,29 @@ async def test_if_state_between(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert calls[0].data["some"] == "event - test_event1"
 
-    hass.states.async_set(sensor1.entity_id, 21)
+    hass.states.async_set(entry.entity_id, 21)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 1
 
-    hass.states.async_set(sensor1.entity_id, 19)
+    hass.states.async_set(entry.entity_id, 19)
     hass.bus.async_fire("test_event1")
     await hass.async_block_till_done()
     assert len(calls) == 2
diff --git a/tests/components/sensor/test_device_trigger.py b/tests/components/sensor/test_device_trigger.py
index 37f44a5b40dc1a..7045d71fb789ec 100644
--- a/tests/components/sensor/test_device_trigger.py
+++ b/tests/components/sensor/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -24,16 +25,19 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.testing_config.custom_components.test.sensor import UNITS_OF_MEASUREMENT
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture
 def calls(hass: HomeAssistant) -> list[ServiceCall]:
     """Track calls to a mock service."""
@@ -89,6 +93,7 @@ async def test_get_triggers(
     platform.init()
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
+    sensor_entries: dict[SensorDeviceClass, er.RegistryEntry] = {}
 
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
@@ -97,7 +102,7 @@ async def test_get_triggers(
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
     for device_class in SensorDeviceClass:
-        entity_registry.async_get_or_create(
+        sensor_entries[device_class] = entity_registry.async_get_or_create(
             DOMAIN,
             "test",
             platform.ENTITIES[device_class].unique_id,
@@ -110,7 +115,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger["type"],
             "device_id": device_entry.id,
-            "entity_id": platform.ENTITIES[device_class].entity_id,
+            "entity_id": sensor_entries[device_class].id,
             "metadata": {"secondary": False},
         }
         for device_class in SensorDeviceClass
@@ -122,7 +127,7 @@ async def test_get_triggers(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
     assert len(triggers) == 27
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -148,7 +153,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -163,7 +168,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["value"]
@@ -171,7 +176,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -199,7 +204,7 @@ async def test_get_triggers_no_unit_or_stateclass(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -213,7 +218,7 @@ async def test_get_triggers_no_unit_or_stateclass(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in trigger_types
@@ -221,7 +226,7 @@ async def test_get_triggers_no_unit_or_stateclass(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -294,8 +299,81 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+@pytest.mark.parametrize(
+    ("set_state", "device_class_reg", "device_class_state", "unit_reg", "unit_state"),
+    [
+        (False, SensorDeviceClass.BATTERY, None, PERCENTAGE, None),
+        (True, None, SensorDeviceClass.BATTERY, None, PERCENTAGE),
+    ],
+)
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    set_state,
+    device_class_reg,
+    device_class_state,
+    unit_reg,
+    unit_state,
+) -> None:
+    """Test we get the expected capabilities from a sensor trigger."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+    platform.init()
+
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_id = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["battery"].unique_id,
+        device_id=device_entry.id,
+        original_device_class=device_class_reg,
+        unit_of_measurement=unit_reg,
+    ).entity_id
+    if set_state:
+        hass.states.async_set(
+            entity_id,
+            None,
+            {"device_class": device_class_state, "unit_of_measurement": unit_state},
+        )
+
+    expected_capabilities = {
+        "extra_fields": [
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "above",
+                "optional": True,
+                "type": "float",
+            },
+            {
+                "description": {"suffix": PERCENTAGE},
+                "name": "below",
+                "optional": True,
+                "type": "float",
+            },
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"},
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 1
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_get_trigger_capabilities_none(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    enable_custom_integrations: None,
 ) -> None:
     """Test we get the expected capabilities from a sensor trigger."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -304,6 +382,12 @@ async def test_get_trigger_capabilities_none(
     config_entry = MockConfigEntry(domain="test", data={})
     config_entry.add_to_hass(hass)
 
+    entry_none = entity_registry.async_get_or_create(
+        DOMAIN,
+        "test",
+        platform.ENTITIES["none"].unique_id,
+    )
+
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
@@ -312,14 +396,14 @@ async def test_get_trigger_capabilities_none(
             "platform": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": "sensor.beer",
+            "entity_id": "01234567890123456789012345678901",
             "type": "is_battery_level",
         },
         {
             "platform": "device",
             "device_id": "8770c43885354d5fa27604db6817f63f",
             "domain": "sensor",
-            "entity_id": platform.ENTITIES["none"].entity_id,
+            "entity_id": entry_none.id,
             "type": "is_battery_level",
         },
     ]
@@ -334,17 +418,13 @@ async def test_get_trigger_capabilities_none(
 
 async def test_if_fires_not_on_above_below(
     hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
     calls,
     caplog: pytest.LogCaptureFixture,
     enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    sensor1 = platform.ENTITIES["battery"]
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -356,7 +436,7 @@ async def test_if_fires_not_on_above_below(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                     },
                     "action": {"service": "test.automation"},
@@ -368,15 +448,15 @@ async def test_if_fires_not_on_above_below(
 
 
 async def test_if_fires_on_state_above(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -388,7 +468,7 @@ async def test_if_fires_on_state_above(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                     },
@@ -412,31 +492,30 @@ async def test_if_fires_on_state_above(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 9 - 11 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
     )
 
 
 async def test_if_fires_on_state_below(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -448,7 +527,7 @@ async def test_if_fires_on_state_below(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "below": 10,
                     },
@@ -472,31 +551,30 @@ async def test_if_fires_on_state_below(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 11 - 9 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 11 - 9 - None"
     )
 
 
 async def test_if_fires_on_state_between(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for value triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -508,7 +586,7 @@ async def test_if_fires_on_state_between(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                         "below": 20,
@@ -533,43 +611,100 @@ async def test_if_fires_on_state_between(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 9)
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 1
-    assert calls[0].data["some"] == "bat_low device - {} - 9 - 11 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
     )
 
-    hass.states.async_set(sensor1.entity_id, 21)
+    hass.states.async_set(entry.entity_id, 21)
     await hass.async_block_till_done()
     assert len(calls) == 1
 
-    hass.states.async_set(sensor1.entity_id, 19)
+    hass.states.async_set(entry.entity_id, 19)
     await hass.async_block_till_done()
     assert len(calls) == 2
-    assert calls[1].data["some"] == "bat_low device - {} - 21 - 19 - None".format(
-        sensor1.entity_id
+    assert (
+        calls[1].data["some"] == f"bat_low device - {entry.entity_id} - 21 - 19 - None"
     )
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for value triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "battery_level",
+                        "above": 10,
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "bat_low {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 9)
     await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, 11)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"] == f"bat_low device - {entry.entity_id} - 9 - 11 - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    sensor1 = platform.ENTITIES["battery"]
+    hass.states.async_set(entry.entity_id, STATE_UNKNOWN, {"device_class": "battery"})
 
     assert await async_setup_component(
         hass,
@@ -581,7 +716,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": sensor1.entity_id,
+                        "entity_id": entry.id,
                         "type": "battery_level",
                         "above": 10,
                         "for": {"seconds": 5},
@@ -606,11 +741,10 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(sensor1.entity_id).state == STATE_UNKNOWN
     assert len(calls) == 0
 
-    hass.states.async_set(sensor1.entity_id, 10)
-    hass.states.async_set(sensor1.entity_id, 11)
+    hass.states.async_set(entry.entity_id, 10)
+    hass.states.async_set(entry.entity_id, 11)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -619,5 +753,5 @@ async def test_if_fires_on_state_change_with_for(
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {sensor1.entity_id} - 10 - 11 - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - 10 - 11 - 0:00:05"
     )
diff --git a/tests/components/sensor/test_init.py b/tests/components/sensor/test_init.py
index adcbb8084b7682..b5d425029d08fc 100644
--- a/tests/components/sensor/test_init.py
+++ b/tests/components/sensor/test_init.py
@@ -1,6 +1,7 @@
 """The test for sensor entity."""
 from __future__ import annotations
 
+from collections.abc import Generator
 from datetime import date, datetime, timezone
 from decimal import Decimal
 from typing import Any
@@ -11,10 +12,15 @@
 from homeassistant.components.sensor import (
     DEVICE_CLASS_STATE_CLASSES,
     DEVICE_CLASS_UNITS,
+    DOMAIN as SENSOR_DOMAIN,
     SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
     SensorStateClass,
+    async_rounded_state,
     async_update_suggested_units,
 )
+from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     PERCENTAGE,
@@ -30,12 +36,24 @@
 )
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM
 
-from tests.common import mock_restore_cache_with_extra_data
+from tests.common import (
+    MockConfigEntry,
+    MockModule,
+    MockPlatform,
+    async_mock_restore_state_shutdown_restart,
+    mock_config_flow,
+    mock_integration,
+    mock_platform,
+    mock_restore_cache_with_extra_data,
+)
+
+TEST_DOMAIN = "test"
 
 
 @pytest.mark.parametrize(
@@ -397,7 +415,7 @@ async def test_restore_sensor_save_state(
     await hass.async_block_till_done()
 
     # Trigger saving state
-    await hass.async_stop()
+    await async_mock_restore_state_shutdown_restart(hass)
 
     assert len(hass_storage[RESTORE_STATE_KEY]["data"]) == 1
     state = hass_storage[RESTORE_STATE_KEY]["data"][0]["state"]
@@ -540,6 +558,22 @@ async def test_restore_sensor_restore_state(
             100,
             "38",
         ),
+        (
+            SensorDeviceClass.ATMOSPHERIC_PRESSURE,
+            UnitOfPressure.INHG,
+            UnitOfPressure.HPA,
+            UnitOfPressure.HPA,
+            -0.00,
+            "0.0",
+        ),
+        (
+            SensorDeviceClass.ATMOSPHERIC_PRESSURE,
+            UnitOfPressure.INHG,
+            UnitOfPressure.HPA,
+            UnitOfPressure.HPA,
+            -0.00001,
+            "0",
+        ),
     ],
 )
 async def test_custom_unit(
@@ -575,10 +609,15 @@ async def test_custom_unit(
     assert await async_setup_component(hass, "sensor", {"sensor": {"platform": "test"}})
     await hass.async_block_till_done()
 
-    state = hass.states.get(entity0.entity_id)
+    entity_id = entity0.entity_id
+    state = hass.states.get(entity_id)
     assert state.state == custom_state
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == state_unit
 
+    assert (
+        async_rounded_state(hass, entity_id, hass.states.get(entity_id)) == custom_state
+    )
+
 
 @pytest.mark.parametrize(
     (
@@ -885,7 +924,7 @@ async def test_custom_unit_change(
             "1000000",
             "1093613",
             SensorDeviceClass.DISTANCE,
-        ),
+        )
     ],
 )
 async def test_unit_conversion_priority(
@@ -1113,6 +1152,9 @@ async def test_unit_conversion_priority_precision(
         "sensor": {"suggested_display_precision": 2},
         "sensor.private": {"suggested_unit_of_measurement": automatic_unit},
     }
+    assert float(async_rounded_state(hass, entity0.entity_id, state)) == pytest.approx(
+        round(automatic_state, 2)
+    )
 
     # Unregistered entity -> Follow native unit
     state = hass.states.get(entity1.entity_id)
@@ -1155,6 +1197,20 @@ async def test_unit_conversion_priority_precision(
     assert float(state.state) == pytest.approx(custom_state)
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == custom_unit
 
+    # Set a display_precision, this should have priority over suggested_display_precision
+    entity_registry.async_update_entity_options(
+        entity0.entity_id,
+        "sensor",
+        {"suggested_display_precision": 2, "display_precision": 4},
+    )
+    entry0 = entity_registry.async_get(entity0.entity_id)
+    assert entry0.options["sensor"]["suggested_display_precision"] == 2
+    assert entry0.options["sensor"]["display_precision"] == 4
+    await hass.async_block_till_done()
+    assert float(async_rounded_state(hass, entity0.entity_id, state)) == pytest.approx(
+        round(custom_state, 4)
+    )
+
 
 @pytest.mark.parametrize(
     (
@@ -2257,3 +2313,127 @@ async def test_unit_conversion_update(
     state = hass.states.get(entity3.entity_id)
     assert state.state == suggested_state
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == suggested_unit
+
+
+class MockFlow(ConfigFlow):
+    """Test flow."""
+
+
+@pytest.fixture(autouse=True)
+def config_flow_fixture(hass: HomeAssistant) -> Generator[None, None, None]:
+    """Mock config flow."""
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+
+    with mock_config_flow(TEST_DOMAIN, MockFlow):
+        yield
+
+
+async def test_name(hass: HomeAssistant) -> None:
+    """Test sensor name."""
+
+    async def async_setup_entry_init(
+        hass: HomeAssistant, config_entry: ConfigEntry
+    ) -> bool:
+        """Set up test config entry."""
+        await hass.config_entries.async_forward_entry_setup(config_entry, SENSOR_DOMAIN)
+        return True
+
+    mock_platform(hass, f"{TEST_DOMAIN}.config_flow")
+    mock_integration(
+        hass,
+        MockModule(
+            TEST_DOMAIN,
+            async_setup_entry=async_setup_entry_init,
+        ),
+    )
+
+    # Unnamed sensor without device class -> no name
+    entity1 = SensorEntity()
+    entity1.entity_id = "sensor.test1"
+
+    # Unnamed sensor with device class but has_entity_name False -> no name
+    entity2 = SensorEntity()
+    entity2.entity_id = "sensor.test2"
+    entity2._attr_device_class = SensorDeviceClass.BATTERY
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity3 = SensorEntity()
+    entity3.entity_id = "sensor.test3"
+    entity3._attr_device_class = SensorDeviceClass.BATTERY
+    entity3._attr_has_entity_name = True
+
+    # Unnamed sensor with device class and has_entity_name True -> named
+    entity4 = SensorEntity()
+    entity4.entity_id = "sensor.test4"
+    entity4.entity_description = SensorEntityDescription(
+        "test",
+        SensorDeviceClass.BATTERY,
+        has_entity_name=True,
+    )
+
+    async def async_setup_entry_platform(
+        hass: HomeAssistant,
+        config_entry: ConfigEntry,
+        async_add_entities: AddEntitiesCallback,
+    ) -> None:
+        """Set up test stt platform via config entry."""
+        async_add_entities([entity1, entity2, entity3, entity4])
+
+    mock_platform(
+        hass,
+        f"{TEST_DOMAIN}.{SENSOR_DOMAIN}",
+        MockPlatform(async_setup_entry=async_setup_entry_platform),
+    )
+
+    config_entry = MockConfigEntry(domain=TEST_DOMAIN)
+    config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(entity1.entity_id)
+    assert state.attributes == {}
+
+    state = hass.states.get(entity2.entity_id)
+    assert state.attributes == {"device_class": "battery"}
+
+    state = hass.states.get(entity3.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
+
+    state = hass.states.get(entity4.entity_id)
+    assert state.attributes == {"device_class": "battery", "friendly_name": "Battery"}
+
+
+def test_async_rounded_state_unregistered_entity_is_passthrough(
+    hass: HomeAssistant,
+) -> None:
+    """Test async_rounded_state on unregistered entity is passthrough."""
+    hass.states.async_set("sensor.test", "1.004")
+    state = hass.states.get("sensor.test")
+    assert async_rounded_state(hass, "sensor.test", state) == "1.004"
+    hass.states.async_set("sensor.test", "-0.0")
+    state = hass.states.get("sensor.test")
+    assert async_rounded_state(hass, "sensor.test", state) == "-0.0"
+
+
+def test_async_rounded_state_registered_entity_with_display_precision(
+    hass: HomeAssistant,
+) -> None:
+    """Test async_rounded_state on registered with display precision.
+
+    The -0 should be dropped.
+    """
+    entity_registry = er.async_get(hass)
+
+    entry = entity_registry.async_get_or_create("sensor", "test", "very_unique")
+    entity_registry.async_update_entity_options(
+        entry.entity_id,
+        "sensor",
+        {"suggested_display_precision": 2, "display_precision": 4},
+    )
+    entity_id = entry.entity_id
+    hass.states.async_set(entity_id, "1.004")
+    state = hass.states.get(entity_id)
+    assert async_rounded_state(hass, entity_id, state) == "1.0040"
+    hass.states.async_set(entity_id, "-0.0")
+    state = hass.states.get(entity_id)
+    assert async_rounded_state(hass, entity_id, state) == "0.0000"
diff --git a/tests/components/sensor/test_recorder.py b/tests/components/sensor/test_recorder.py
index 53fb2493d70618..65b0a0b9485676 100644
--- a/tests/components/sensor/test_recorder.py
+++ b/tests/components/sensor/test_recorder.py
@@ -7,6 +7,8 @@
 from statistics import mean
 from unittest.mock import patch
 
+from freezegun import freeze_time
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant import loader
@@ -155,7 +157,8 @@ def test_compile_hourly_statistics(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -251,17 +254,13 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=10 * 5)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[entity_id].append(
             set_state(entity_id, str(seq[0]), attributes=attributes)
         )
 
-    # Record two states at the exact same time
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        # Record two states at the exact same time
+        freezer.move_to(two)
         states[entity_id].append(
             set_state(entity_id, str(seq[1]), attributes=attributes)
         )
@@ -269,9 +268,7 @@ def set_state(entity_id, state, **kwargs):
             set_state(entity_id, str(seq[2]), attributes=attributes)
         )
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[entity_id].append(
             set_state(entity_id, str(seq[3]), attributes=attributes)
         )
@@ -371,9 +368,7 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=10 * 5)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+    with freeze_time(two):
         states[entity_id].append(
             set_state(entity_id, str(seq[0]), attributes=attributes)
         )
@@ -480,9 +475,7 @@ def set_state(entity_id, state, **kwargs):
     end = zero + timedelta(minutes=5)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=end
-    ):
+    with freeze_time(end):
         states[entity_id].append(
             set_state(entity_id, str(seq[0]), attributes=attributes)
         )
@@ -559,7 +552,8 @@ def test_compile_hourly_statistics_purged_state_changes(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -568,9 +562,7 @@ def test_compile_hourly_statistics_purged_state_changes(
     mean = min = max = float(hist["sensor.test1"][-1].state)
 
     # Purge all states from the database
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=four
-    ):
+    with freeze_time(four):
         hass.services.call("recorder", "purge", {"keep_days": 0})
         hass.block_till_done()
         wait_recording_done(hass)
@@ -623,31 +615,32 @@ def test_compile_hourly_statistics_wrong_unit(
     hass = hass_recorder()
     setup_component(hass, "sensor", {})
     wait_recording_done(hass)  # Wait for the sensor recorder platform to be added
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-
-    attributes_tmp = dict(attributes)
-    attributes_tmp["unit_of_measurement"] = "invalid"
-    _, _states = record_states(hass, zero, "sensor.test2", attributes_tmp)
-    states = {**states, **_states}
-    attributes_tmp.pop("unit_of_measurement")
-    _, _states = record_states(hass, zero, "sensor.test3", attributes_tmp)
-    states = {**states, **_states}
-
-    attributes_tmp = dict(attributes)
-    attributes_tmp["state_class"] = "invalid"
-    _, _states = record_states(hass, zero, "sensor.test4", attributes_tmp)
-    states = {**states, **_states}
-    attributes_tmp.pop("state_class")
-    _, _states = record_states(hass, zero, "sensor.test5", attributes_tmp)
-    states = {**states, **_states}
-
-    attributes_tmp = dict(attributes)
-    attributes_tmp["device_class"] = "invalid"
-    _, _states = record_states(hass, zero, "sensor.test6", attributes_tmp)
-    states = {**states, **_states}
-    attributes_tmp.pop("device_class")
-    _, _states = record_states(hass, zero, "sensor.test7", attributes_tmp)
-    states = {**states, **_states}
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+
+        attributes_tmp = dict(attributes)
+        attributes_tmp["unit_of_measurement"] = "invalid"
+        _, _states = record_states(hass, freezer, zero, "sensor.test2", attributes_tmp)
+        states = {**states, **_states}
+        attributes_tmp.pop("unit_of_measurement")
+        _, _states = record_states(hass, freezer, zero, "sensor.test3", attributes_tmp)
+        states = {**states, **_states}
+
+        attributes_tmp = dict(attributes)
+        attributes_tmp["state_class"] = "invalid"
+        _, _states = record_states(hass, freezer, zero, "sensor.test4", attributes_tmp)
+        states = {**states, **_states}
+        attributes_tmp.pop("state_class")
+        _, _states = record_states(hass, freezer, zero, "sensor.test5", attributes_tmp)
+        states = {**states, **_states}
+
+        attributes_tmp = dict(attributes)
+        attributes_tmp["device_class"] = "invalid"
+        _, _states = record_states(hass, freezer, zero, "sensor.test6", attributes_tmp)
+        states = {**states, **_states}
+        attributes_tmp.pop("device_class")
+        _, _states = record_states(hass, freezer, zero, "sensor.test7", attributes_tmp)
+        states = {**states, **_states}
 
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -832,7 +825,6 @@ async def test_compile_hourly_sum_statistics_amount(
     period0_end = period1 = period0 + timedelta(minutes=5)
     period1_end = period2 = period0 + timedelta(minutes=10)
     period2_end = period0 + timedelta(minutes=15)
-    client = await hass_ws_client()
     hass.config.units = units
     await async_setup_component(hass, "sensor", {})
     # Wait for the sensor recorder platform to be added
@@ -844,10 +836,10 @@ async def test_compile_hourly_sum_statistics_amount(
         "last_reset": None,
     }
     seq = [10, 15, 20, 10, 30, 40, 50, 60, 70]
-
-    four, eight, states = await hass.async_add_executor_job(
-        record_meter_states, hass, period0, "sensor.test1", attributes, seq
-    )
+    with freeze_time(period0) as freezer:
+        four, eight, states = await hass.async_add_executor_job(
+            record_meter_states, hass, freezer, period0, "sensor.test1", attributes, seq
+        )
     await async_wait_recording_done(hass)
     hist = history.get_significant_states(
         hass,
@@ -938,6 +930,8 @@ async def test_compile_hourly_sum_statistics_amount(
     assert "Compiling initial sum statistics for sensor.test1" in caplog.text
     assert "Detected new cycle for sensor.test1, value dropped" not in caplog.text
 
+    client = await hass_ws_client()
+
     # Adjust the inserted statistics
     await client.send_json(
         {
@@ -1028,28 +1022,28 @@ def test_compile_hourly_sum_statistics_amount_reset_every_state_change(
     assert seq[0] != seq[-1]
 
     states = {"sensor.test1": []}
-
-    # Insert states for a 1st statistics period
-    one = zero
-    for i in range(len(seq)):
-        one = one + timedelta(seconds=5)
-        attributes = dict(attributes)
-        attributes["last_reset"] = dt_util.as_local(one).isoformat()
-        _states = record_meter_state(
-            hass, one, "sensor.test1", attributes, seq[i : i + 1]
-        )
-        states["sensor.test1"].extend(_states["sensor.test1"])
-
-    # Insert states for a 2nd statistics period
-    two = zero + timedelta(minutes=5)
-    for i in range(len(seq)):
-        two = two + timedelta(seconds=5)
-        attributes = dict(attributes)
-        attributes["last_reset"] = dt_util.as_local(two).isoformat()
-        _states = record_meter_state(
-            hass, two, "sensor.test1", attributes, seq[i : i + 1]
-        )
-        states["sensor.test1"].extend(_states["sensor.test1"])
+    with freeze_time(zero) as freezer:
+        # Insert states for a 1st statistics period
+        one = zero
+        for i in range(len(seq)):
+            one = one + timedelta(seconds=5)
+            attributes = dict(attributes)
+            attributes["last_reset"] = dt_util.as_local(one).isoformat()
+            _states = record_meter_state(
+                hass, freezer, one, "sensor.test1", attributes, seq[i : i + 1]
+            )
+            states["sensor.test1"].extend(_states["sensor.test1"])
+
+        # Insert states for a 2nd statistics period
+        two = zero + timedelta(minutes=5)
+        for i in range(len(seq)):
+            two = two + timedelta(seconds=5)
+            attributes = dict(attributes)
+            attributes["last_reset"] = dt_util.as_local(two).isoformat()
+            _states = record_meter_state(
+                hass, freezer, two, "sensor.test1", attributes, seq[i : i + 1]
+            )
+            states["sensor.test1"].extend(_states["sensor.test1"])
 
     hist = history.get_significant_states(
         hass,
@@ -1147,17 +1141,18 @@ def test_compile_hourly_sum_statistics_amount_invalid_last_reset(
     states = {"sensor.test1": []}
 
     # Insert states
-    one = zero
-    for i in range(len(seq)):
-        one = one + timedelta(seconds=5)
-        attributes = dict(attributes)
-        attributes["last_reset"] = dt_util.as_local(one).isoformat()
-        if i == 3:
-            attributes["last_reset"] = "festivus"  # not a valid time
-        _states = record_meter_state(
-            hass, one, "sensor.test1", attributes, seq[i : i + 1]
-        )
-        states["sensor.test1"].extend(_states["sensor.test1"])
+    with freeze_time(zero) as freezer:
+        one = zero
+        for i in range(len(seq)):
+            one = one + timedelta(seconds=5)
+            attributes = dict(attributes)
+            attributes["last_reset"] = dt_util.as_local(one).isoformat()
+            if i == 3:
+                attributes["last_reset"] = "festivus"  # not a valid time
+            _states = record_meter_state(
+                hass, freezer, one, "sensor.test1", attributes, seq[i : i + 1]
+            )
+            states["sensor.test1"].extend(_states["sensor.test1"])
 
     hist = history.get_significant_states(
         hass,
@@ -1243,15 +1238,16 @@ def test_compile_hourly_sum_statistics_nan_inf_state(
     seq = [10, math.nan, 15, 15, 20, math.inf, 20, 10]
 
     states = {"sensor.test1": []}
-    one = zero
-    for i in range(len(seq)):
-        one = one + timedelta(seconds=5)
-        attributes = dict(attributes)
-        attributes["last_reset"] = dt_util.as_local(one).isoformat()
-        _states = record_meter_state(
-            hass, one, "sensor.test1", attributes, seq[i : i + 1]
-        )
-        states["sensor.test1"].extend(_states["sensor.test1"])
+    with freeze_time(zero) as freezer:
+        one = zero
+        for i in range(len(seq)):
+            one = one + timedelta(seconds=5)
+            attributes = dict(attributes)
+            attributes["last_reset"] = dt_util.as_local(one).isoformat()
+            _states = record_meter_state(
+                hass, freezer, one, "sensor.test1", attributes, seq[i : i + 1]
+            )
+            states["sensor.test1"].extend(_states["sensor.test1"])
 
     hist = history.get_significant_states(
         hass,
@@ -1391,10 +1387,13 @@ def test_compile_hourly_sum_statistics_negative_state(
         states[entity_id].append(state)
         offending_state = 6
     one = zero
-    for i in range(len(seq)):
-        one = one + timedelta(seconds=5)
-        _states = record_meter_state(hass, one, entity_id, attributes, seq[i : i + 1])
-        states[entity_id].extend(_states[entity_id])
+    with freeze_time(zero) as freezer:
+        for i in range(len(seq)):
+            one = one + timedelta(seconds=5)
+            _states = record_meter_state(
+                hass, freezer, one, entity_id, attributes, seq[i : i + 1]
+            )
+            states[entity_id].extend(_states[entity_id])
 
     hist = history.get_significant_states(
         hass,
@@ -1486,10 +1485,10 @@ def test_compile_hourly_sum_statistics_total_no_reset(
         "unit_of_measurement": state_unit,
     }
     seq = [10, 15, 20, 10, 30, 40, 50, 60, 70]
-
-    four, eight, states = record_meter_states(
-        hass, period0, "sensor.test1", attributes, seq
-    )
+    with freeze_time(period0) as freezer:
+        four, eight, states = record_meter_states(
+            hass, freezer, period0, "sensor.test1", attributes, seq
+        )
     wait_recording_done(hass)
     hist = history.get_significant_states(
         hass,
@@ -1598,10 +1597,10 @@ def test_compile_hourly_sum_statistics_total_increasing(
         "unit_of_measurement": state_unit,
     }
     seq = [10, 15, 20, 10, 30, 40, 50, 60, 70]
-
-    four, eight, states = record_meter_states(
-        hass, period0, "sensor.test1", attributes, seq
-    )
+    with freeze_time(period0) as freezer:
+        four, eight, states = record_meter_states(
+            hass, freezer, period0, "sensor.test1", attributes, seq
+        )
     wait_recording_done(hass)
     hist = history.get_significant_states(
         hass,
@@ -1708,10 +1707,10 @@ def test_compile_hourly_sum_statistics_total_increasing_small_dip(
         "unit_of_measurement": state_unit,
     }
     seq = [10, 15, 20, 19, 30, 40, 39, 60, 70]
-
-    four, eight, states = record_meter_states(
-        hass, period0, "sensor.test1", attributes, seq
-    )
+    with freeze_time(period0) as freezer:
+        four, eight, states = record_meter_states(
+            hass, freezer, period0, "sensor.test1", attributes, seq
+        )
     wait_recording_done(hass)
     hist = history.get_significant_states(
         hass,
@@ -1816,12 +1815,17 @@ def test_compile_hourly_energy_statistics_unsupported(
     seq2 = [110, 120, 130, 0, 30, 45, 55, 65, 75]
     seq3 = [0, 0, 5, 10, 30, 50, 60, 80, 90]
 
-    four, eight, states = record_meter_states(
-        hass, period0, "sensor.test1", sns1_attr, seq1
-    )
-    _, _, _states = record_meter_states(hass, period0, "sensor.test2", sns2_attr, seq2)
-    states = {**states, **_states}
-    _, _, _states = record_meter_states(hass, period0, "sensor.test3", sns3_attr, seq3)
+    with freeze_time(period0) as freezer:
+        four, eight, states = record_meter_states(
+            hass, freezer, period0, "sensor.test1", sns1_attr, seq1
+        )
+        _, _, _states = record_meter_states(
+            hass, freezer, period0, "sensor.test2", sns2_attr, seq2
+        )
+        states = {**states, **_states}
+        _, _, _states = record_meter_states(
+            hass, freezer, period0, "sensor.test3", sns3_attr, seq3
+        )
     states = {**states, **_states}
     wait_recording_done(hass)
 
@@ -1914,12 +1918,17 @@ def test_compile_hourly_energy_statistics_multiple(
     seq2 = [110, 120, 130, 0, 30, 45, 55, 65, 75]
     seq3 = [0, 0, 5, 10, 30, 50, 60, 80, 90]
 
-    four, eight, states = record_meter_states(
-        hass, period0, "sensor.test1", sns1_attr, seq1
-    )
-    _, _, _states = record_meter_states(hass, period0, "sensor.test2", sns2_attr, seq2)
-    states = {**states, **_states}
-    _, _, _states = record_meter_states(hass, period0, "sensor.test3", sns3_attr, seq3)
+    with freeze_time(period0) as freezer:
+        four, eight, states = record_meter_states(
+            hass, freezer, period0, "sensor.test1", sns1_attr, seq1
+        )
+        _, _, _states = record_meter_states(
+            hass, freezer, period0, "sensor.test2", sns2_attr, seq2
+        )
+        states = {**states, **_states}
+        _, _, _states = record_meter_states(
+            hass, freezer, period0, "sensor.test3", sns3_attr, seq3
+        )
     states = {**states, **_states}
     wait_recording_done(hass)
     hist = history.get_significant_states(
@@ -2114,7 +2123,8 @@ def test_compile_hourly_statistics_unchanged(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -2224,7 +2234,8 @@ def test_compile_hourly_statistics_unavailable(
     four, states = record_states_partially_unavailable(
         hass, zero, "sensor.test1", attributes
     )
-    _, _states = record_states(hass, zero, "sensor.test2", attributes)
+    with freeze_time(zero) as freezer:
+        _, _states = record_states(hass, freezer, zero, "sensor.test2", attributes)
     states = {**states, **_states}
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -2440,16 +2451,17 @@ def test_compile_hourly_statistics_changing_units_1(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    attributes["unit_of_measurement"] = state_unit2
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        attributes["unit_of_measurement"] = state_unit2
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -2565,12 +2577,13 @@ def test_compile_hourly_statistics_changing_units_2(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    attributes["unit_of_measurement"] = "cats"
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        attributes["unit_of_measurement"] = "cats"
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -2640,16 +2653,17 @@ def test_compile_hourly_statistics_changing_units_3(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    attributes["unit_of_measurement"] = "cats"
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        attributes["unit_of_measurement"] = "cats"
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
     )
@@ -2757,10 +2771,16 @@ def test_compile_hourly_statistics_convert_units_1(
         "state_class": "measurement",
         "unit_of_measurement": state_unit_1,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes, seq=[0, 1, None]
-    )
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        four, _states = record_states(
+            hass,
+            freezer,
+            zero + timedelta(minutes=5),
+            "sensor.test1",
+            attributes,
+            seq=[0, 1, None],
+        )
     states["sensor.test1"] += _states["sensor.test1"]
 
     do_adhoc_statistics(hass, start=zero)
@@ -2796,9 +2816,10 @@ def test_compile_hourly_statistics_convert_units_1(
     }
 
     attributes["unit_of_measurement"] = state_unit_2
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
+    with freeze_time(four) as freezer:
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -2894,15 +2915,16 @@ def test_compile_hourly_statistics_equivalent_units_1(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    attributes["unit_of_measurement"] = state_unit2
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        attributes["unit_of_measurement"] = state_unit2
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -3014,11 +3036,12 @@ def test_compile_hourly_statistics_equivalent_units_2(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
-    attributes["unit_of_measurement"] = state_unit2
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
+        attributes["unit_of_measurement"] = state_unit2
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -3104,7 +3127,8 @@ def test_compile_hourly_statistics_changing_device_class_1(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
 
     do_adhoc_statistics(hass, start=zero)
     wait_recording_done(hass)
@@ -3140,13 +3164,14 @@ def test_compile_hourly_statistics_changing_device_class_1(
 
     # Update device class and record additional states in the original UoM
     attributes["device_class"] = device_class
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
+    with freeze_time(zero) as freezer:
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -3197,13 +3222,14 @@ def test_compile_hourly_statistics_changing_device_class_1(
 
     # Update device class and record additional states in a different UoM
     attributes["unit_of_measurement"] = statistic_unit
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=15), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=20), "sensor.test1", attributes
-    )
+    with freeze_time(zero) as freezer:
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=15), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=20), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -3308,7 +3334,8 @@ def test_compile_hourly_statistics_changing_device_class_2(
         "state_class": "measurement",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, zero, "sensor.test1", attributes)
+    with freeze_time(zero) as freezer:
+        four, states = record_states(hass, freezer, zero, "sensor.test1", attributes)
 
     do_adhoc_statistics(hass, start=zero)
     wait_recording_done(hass)
@@ -3344,13 +3371,14 @@ def test_compile_hourly_statistics_changing_device_class_2(
 
     # Remove device class and record additional states
     attributes.pop("device_class")
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=5), "sensor.test1", attributes
-    )
-    states["sensor.test1"] += _states["sensor.test1"]
-    four, _states = record_states(
-        hass, zero + timedelta(minutes=10), "sensor.test1", attributes
-    )
+    with freeze_time(zero) as freezer:
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=5), "sensor.test1", attributes
+        )
+        states["sensor.test1"] += _states["sensor.test1"]
+        four, _states = record_states(
+            hass, freezer, zero + timedelta(minutes=10), "sensor.test1", attributes
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, zero, four, hass.states.async_entity_ids()
@@ -3445,7 +3473,10 @@ def test_compile_hourly_statistics_changing_state_class(
         "state_class": "total_increasing",
         "unit_of_measurement": state_unit,
     }
-    four, states = record_states(hass, period0, "sensor.test1", attributes_1)
+    with freeze_time(period0) as freezer:
+        four, states = record_states(
+            hass, freezer, period0, "sensor.test1", attributes_1
+        )
     do_adhoc_statistics(hass, start=period0)
     wait_recording_done(hass)
     statistic_ids = list_statistic_ids(hass)
@@ -3477,7 +3508,10 @@ def test_compile_hourly_statistics_changing_state_class(
     }
 
     # Add more states, with changed state class
-    four, _states = record_states(hass, period1, "sensor.test1", attributes_2)
+    with freeze_time(period1) as freezer:
+        four, _states = record_states(
+            hass, freezer, period1, "sensor.test1", attributes_2
+        )
     states["sensor.test1"] += _states["sensor.test1"]
     hist = history.get_significant_states(
         hass, period0, four, hass.states.async_entity_ids()
@@ -3542,6 +3576,7 @@ def test_compile_hourly_statistics_changing_state_class(
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
+@pytest.mark.timeout(25)
 def test_compile_statistics_hourly_daily_monthly_summary(
     hass_recorder: Callable[..., HomeAssistant], caplog: pytest.LogCaptureFixture
 ) -> None:
@@ -3551,9 +3586,7 @@ def test_compile_statistics_hourly_daily_monthly_summary(
     zero = zero.replace(
         year=2021, month=9, day=1, hour=5, minute=0, second=0, microsecond=0
     )
-    with patch(
-        "homeassistant.components.recorder.db_schema.dt_util.utcnow", return_value=zero
-    ):
+    with freeze_time(zero):
         hass = hass_recorder()
         # Remove this after dropping the use of the hass_recorder fixture
         hass.config.set_time_zone("America/Regina")
@@ -3618,55 +3651,69 @@ def _sum(seq, last_state, last_sum):
         "sensor.test4": None,
     }
     start = zero
-    for i in range(24):
-        seq = [-10, 15, 30]
-        # test1 has same value in every period
-        four, _states = record_states(hass, start, "sensor.test1", attributes, seq)
-        states["sensor.test1"] += _states["sensor.test1"]
-        last_state = last_states["sensor.test1"]
-        expected_minima["sensor.test1"].append(_min(seq, last_state))
-        expected_maxima["sensor.test1"].append(_max(seq, last_state))
-        expected_averages["sensor.test1"].append(_weighted_average(seq, i, last_state))
-        last_states["sensor.test1"] = seq[-1]
-        # test2 values change: min/max at the last state
-        seq = [-10 * (i + 1), 15 * (i + 1), 30 * (i + 1)]
-        four, _states = record_states(hass, start, "sensor.test2", attributes, seq)
-        states["sensor.test2"] += _states["sensor.test2"]
-        last_state = last_states["sensor.test2"]
-        expected_minima["sensor.test2"].append(_min(seq, last_state))
-        expected_maxima["sensor.test2"].append(_max(seq, last_state))
-        expected_averages["sensor.test2"].append(_weighted_average(seq, i, last_state))
-        last_states["sensor.test2"] = seq[-1]
-        # test3 values change: min/max at the first state
-        seq = [-10 * (23 - i + 1), 15 * (23 - i + 1), 30 * (23 - i + 1)]
-        four, _states = record_states(hass, start, "sensor.test3", attributes, seq)
-        states["sensor.test3"] += _states["sensor.test3"]
-        last_state = last_states["sensor.test3"]
-        expected_minima["sensor.test3"].append(_min(seq, last_state))
-        expected_maxima["sensor.test3"].append(_max(seq, last_state))
-        expected_averages["sensor.test3"].append(_weighted_average(seq, i, last_state))
-        last_states["sensor.test3"] = seq[-1]
-        # test4 values grow
-        seq = [i, i + 0.5, i + 0.75]
-        start_meter = start
-        for j in range(len(seq)):
-            _states = record_meter_state(
-                hass,
-                start_meter,
-                "sensor.test4",
-                sum_attributes,
-                seq[j : j + 1],
+    with freeze_time(start) as freezer:
+        for i in range(24):
+            seq = [-10, 15, 30]
+            # test1 has same value in every period
+            four, _states = record_states(
+                hass, freezer, start, "sensor.test1", attributes, seq
             )
-            start_meter += timedelta(minutes=1)
-            states["sensor.test4"] += _states["sensor.test4"]
-        last_state = last_states["sensor.test4"]
-        expected_states["sensor.test4"].append(seq[-1])
-        expected_sums["sensor.test4"].append(
-            _sum(seq, last_state, expected_sums["sensor.test4"])
-        )
-        last_states["sensor.test4"] = seq[-1]
+            states["sensor.test1"] += _states["sensor.test1"]
+            last_state = last_states["sensor.test1"]
+            expected_minima["sensor.test1"].append(_min(seq, last_state))
+            expected_maxima["sensor.test1"].append(_max(seq, last_state))
+            expected_averages["sensor.test1"].append(
+                _weighted_average(seq, i, last_state)
+            )
+            last_states["sensor.test1"] = seq[-1]
+            # test2 values change: min/max at the last state
+            seq = [-10 * (i + 1), 15 * (i + 1), 30 * (i + 1)]
+            four, _states = record_states(
+                hass, freezer, start, "sensor.test2", attributes, seq
+            )
+            states["sensor.test2"] += _states["sensor.test2"]
+            last_state = last_states["sensor.test2"]
+            expected_minima["sensor.test2"].append(_min(seq, last_state))
+            expected_maxima["sensor.test2"].append(_max(seq, last_state))
+            expected_averages["sensor.test2"].append(
+                _weighted_average(seq, i, last_state)
+            )
+            last_states["sensor.test2"] = seq[-1]
+            # test3 values change: min/max at the first state
+            seq = [-10 * (23 - i + 1), 15 * (23 - i + 1), 30 * (23 - i + 1)]
+            four, _states = record_states(
+                hass, freezer, start, "sensor.test3", attributes, seq
+            )
+            states["sensor.test3"] += _states["sensor.test3"]
+            last_state = last_states["sensor.test3"]
+            expected_minima["sensor.test3"].append(_min(seq, last_state))
+            expected_maxima["sensor.test3"].append(_max(seq, last_state))
+            expected_averages["sensor.test3"].append(
+                _weighted_average(seq, i, last_state)
+            )
+            last_states["sensor.test3"] = seq[-1]
+            # test4 values grow
+            seq = [i, i + 0.5, i + 0.75]
+            start_meter = start
+            for j in range(len(seq)):
+                _states = record_meter_state(
+                    hass,
+                    freezer,
+                    start_meter,
+                    "sensor.test4",
+                    sum_attributes,
+                    seq[j : j + 1],
+                )
+                start_meter += timedelta(minutes=1)
+                states["sensor.test4"] += _states["sensor.test4"]
+            last_state = last_states["sensor.test4"]
+            expected_states["sensor.test4"].append(seq[-1])
+            expected_sums["sensor.test4"].append(
+                _sum(seq, last_state, expected_sums["sensor.test4"])
+            )
+            last_states["sensor.test4"] = seq[-1]
 
-        start += timedelta(minutes=5)
+            start += timedelta(minutes=5)
     hist = history.get_significant_states(
         hass,
         zero - timedelta.resolution,
@@ -3961,7 +4008,14 @@ def _sum(seq, last_state, last_sum):
     assert "Error while processing event StatisticsTask" not in caplog.text
 
 
-def record_states(hass, zero, entity_id, attributes, seq=None):
+def record_states(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    zero: datetime,
+    entity_id: str,
+    attributes,
+    seq=None,
+):
     """Record some test states.
 
     We inject a bunch of state updates for measurement sensors.
@@ -3982,26 +4036,14 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=10 * 5)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
-        states[entity_id].append(
-            set_state(entity_id, str(seq[0]), attributes=attributes)
-        )
+    freezer.move_to(one)
+    states[entity_id].append(set_state(entity_id, str(seq[0]), attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
-        states[entity_id].append(
-            set_state(entity_id, str(seq[1]), attributes=attributes)
-        )
+    freezer.move_to(two)
+    states[entity_id].append(set_state(entity_id, str(seq[1]), attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
-        states[entity_id].append(
-            set_state(entity_id, str(seq[2]), attributes=attributes)
-        )
+    freezer.move_to(three)
+    states[entity_id].append(set_state(entity_id, str(seq[2]), attributes=attributes))
 
     return four, states
 
@@ -4989,7 +5031,14 @@ async def assert_validation_result(client, expected_result):
     await assert_validation_result(client, {})
 
 
-def record_meter_states(hass, zero, entity_id, _attributes, seq):
+def record_meter_states(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    zero: datetime,
+    entity_id: str,
+    _attributes,
+    seq,
+):
     """Record some test states.
 
     We inject a bunch of state updates for meter sensors.
@@ -5014,59 +5063,49 @@ def set_state(entity_id, state, **kwargs):
         attributes["last_reset"] = zero.isoformat()
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=zero
-    ):
-        states[entity_id].append(set_state(entity_id, seq[0], attributes=attributes))
+    freezer.move_to(zero)
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
-        states[entity_id].append(set_state(entity_id, seq[1], attributes=attributes))
+    states[entity_id].append(set_state(entity_id, seq[0], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
-        states[entity_id].append(set_state(entity_id, seq[2], attributes=attributes))
+    freezer.move_to(one)
+    states[entity_id].append(set_state(entity_id, seq[1], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
-        states[entity_id].append(set_state(entity_id, seq[3], attributes=attributes))
+    freezer.move_to(two)
+    states[entity_id].append(set_state(entity_id, seq[2], attributes=attributes))
+
+    freezer.move_to(three)
+    states[entity_id].append(set_state(entity_id, seq[3], attributes=attributes))
 
     attributes = dict(_attributes)
     if "last_reset" in _attributes:
         attributes["last_reset"] = four.isoformat()
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=four
-    ):
-        states[entity_id].append(set_state(entity_id, seq[4], attributes=attributes))
+    freezer.move_to(four)
+    states[entity_id].append(set_state(entity_id, seq[4], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=five
-    ):
-        states[entity_id].append(set_state(entity_id, seq[5], attributes=attributes))
+    freezer.move_to(five)
+    states[entity_id].append(set_state(entity_id, seq[5], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=six
-    ):
-        states[entity_id].append(set_state(entity_id, seq[6], attributes=attributes))
+    freezer.move_to(six)
+    states[entity_id].append(set_state(entity_id, seq[6], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=seven
-    ):
-        states[entity_id].append(set_state(entity_id, seq[7], attributes=attributes))
+    freezer.move_to(seven)
+    states[entity_id].append(set_state(entity_id, seq[7], attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=eight
-    ):
-        states[entity_id].append(set_state(entity_id, seq[8], attributes=attributes))
+    freezer.move_to(eight)
+    states[entity_id].append(set_state(entity_id, seq[8], attributes=attributes))
 
     return four, eight, states
 
 
-def record_meter_state(hass, zero, entity_id, attributes, seq):
+def record_meter_state(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    zero: datetime,
+    entity_id: str,
+    attributes,
+    seq,
+):
     """Record test state.
 
     We inject a state update for meter sensor.
@@ -5079,10 +5118,8 @@ def set_state(entity_id, state, **kwargs):
         return hass.states.get(entity_id)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=zero
-    ):
-        states[entity_id].append(set_state(entity_id, seq[0], attributes=attributes))
+    freezer.move_to(zero)
+    states[entity_id].append(set_state(entity_id, seq[0], attributes=attributes))
 
     return states
 
@@ -5105,19 +5142,13 @@ def set_state(entity_id, state, **kwargs):
     four = three + timedelta(seconds=15 * 5)
 
     states = {entity_id: []}
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=one
-    ):
+    with freeze_time(one) as freezer:
         states[entity_id].append(set_state(entity_id, "10", attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=two
-    ):
+        freezer.move_to(two)
         states[entity_id].append(set_state(entity_id, "25", attributes=attributes))
 
-    with patch(
-        "homeassistant.components.recorder.core.dt_util.utcnow", return_value=three
-    ):
+        freezer.move_to(three)
         states[entity_id].append(
             set_state(entity_id, STATE_UNAVAILABLE, attributes=attributes)
         )
diff --git a/tests/components/sharkiq/test_config_flow.py b/tests/components/sharkiq/test_config_flow.py
index 248bb57f04c644..a98eff6f2bb002 100644
--- a/tests/components/sharkiq/test_config_flow.py
+++ b/tests/components/sharkiq/test_config_flow.py
@@ -29,7 +29,7 @@ async def test_setup_success_no_region(hass: HomeAssistant) -> None:
     )
     mock_config.add_to_hass(hass)
 
-    result = await async_setup_component(hass=hass, domain=DOMAIN, config=mock_config)
+    result = await async_setup_component(hass=hass, domain=DOMAIN, config={})
 
     assert result is True
 
diff --git a/tests/components/sharkiq/test_vacuum.py b/tests/components/sharkiq/test_vacuum.py
index cfd62c9deafc53..4a54b900be1894 100644
--- a/tests/components/sharkiq/test_vacuum.py
+++ b/tests/components/sharkiq/test_vacuum.py
@@ -64,7 +64,6 @@
     | VacuumEntityFeature.RETURN_HOME
     | VacuumEntityFeature.START
     | VacuumEntityFeature.STATE
-    | VacuumEntityFeature.STATUS
     | VacuumEntityFeature.STOP
     | VacuumEntityFeature.LOCATE
 )
diff --git a/tests/components/shelly/__init__.py b/tests/components/shelly/__init__.py
index 346eed45baf8f8..67f47b0e7e3ed4 100644
--- a/tests/components/shelly/__init__.py
+++ b/tests/components/shelly/__init__.py
@@ -20,7 +20,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.helpers.entity_registry import async_get
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -80,14 +80,14 @@ def inject_rpc_device_event(
 
 async def mock_rest_update(hass: HomeAssistant, seconds=REST_SENSORS_UPDATE_INTERVAL):
     """Move time to create REST sensors update event."""
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=seconds))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=seconds))
     await hass.async_block_till_done()
 
 
 async def mock_polling_rpc_update(hass: HomeAssistant):
     """Move time to create polling RPC sensors update event."""
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=RPC_SENSORS_POLLING_INTERVAL)
+        hass, dt_util.utcnow() + timedelta(seconds=RPC_SENSORS_POLLING_INTERVAL)
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/shelly/conftest.py b/tests/components/shelly/conftest.py
index 8fa5b0eaeac081..2a80233aeb9939 100644
--- a/tests/components/shelly/conftest.py
+++ b/tests/components/shelly/conftest.py
@@ -190,6 +190,7 @@ def mock_light_set_state(
         "apower": 85.3,
     },
     "temperature:0": {"tC": 22.9},
+    "illuminance:0": {"lux": 345},
     "sys": {
         "available_updates": {
             "beta": {"version": "some_beta_version"},
diff --git a/tests/components/shelly/test_button.py b/tests/components/shelly/test_button.py
index fdb2cd60450fc5..42fa83b32a1f96 100644
--- a/tests/components/shelly/test_button.py
+++ b/tests/components/shelly/test_button.py
@@ -1,9 +1,13 @@
 """Tests for Shelly button platform."""
 from __future__ import annotations
 
+import pytest
+
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.shelly.const import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from . import init_integration
 
@@ -38,3 +42,48 @@ async def test_rpc_button(hass: HomeAssistant, mock_rpc_device) -> None:
         blocking=True,
     )
     assert mock_rpc_device.trigger_reboot.call_count == 1
+
+
+@pytest.mark.parametrize(
+    ("gen", "old_unique_id", "new_unique_id", "migration"),
+    [
+        (2, "test_name_reboot", "123456789ABC_reboot", True),
+        (1, "test_name_reboot", "123456789ABC_reboot", True),
+        (2, "123456789ABC_reboot", "123456789ABC_reboot", False),
+    ],
+)
+async def test_migrate_unique_id(
+    hass: HomeAssistant,
+    mock_block_device,
+    mock_rpc_device,
+    caplog: pytest.LogCaptureFixture,
+    gen: int,
+    old_unique_id: str,
+    new_unique_id: str,
+    migration: bool,
+) -> None:
+    """Test migration of unique_id."""
+    entry = await init_integration(hass, gen, skip_setup=True)
+
+    entity_registry = er.async_get(hass)
+    entity: er.RegistryEntry = entity_registry.async_get_or_create(
+        suggested_object_id="test_name_reboot",
+        disabled_by=None,
+        domain=BUTTON_DOMAIN,
+        platform=DOMAIN,
+        unique_id=old_unique_id,
+        config_entry=entry,
+    )
+    assert entity.unique_id == old_unique_id
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    entity_entry = entity_registry.async_get("button.test_name_reboot")
+    assert entity_entry
+    assert entity_entry.unique_id == new_unique_id
+
+    assert (
+        bool("Migrating unique_id for button.test_name_reboot" in caplog.text)
+        == migration
+    )
diff --git a/tests/components/shelly/test_config_flow.py b/tests/components/shelly/test_config_flow.py
index 210db65dfda82c..7a29d7b1a42b8f 100644
--- a/tests/components/shelly/test_config_flow.py
+++ b/tests/components/shelly/test_config_flow.py
@@ -858,7 +858,7 @@ async def test_options_flow_disabled_gen_1(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "shelly",
         }
     )
@@ -879,7 +879,7 @@ async def test_options_flow_enabled_gen_2(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "shelly",
         }
     )
@@ -900,7 +900,7 @@ async def test_options_flow_disabled_sleepy_gen_2(
     await ws_client.send_json(
         {
             "id": 5,
-            "type": "config_entries/get_matching",
+            "type": "config_entries/get",
             "domain": "shelly",
         }
     )
@@ -1117,3 +1117,35 @@ async def test_zeroconf_sleeping_device_not_triggers_refresh(
     await hass.async_block_till_done()
     assert len(mock_rpc_device.initialize.mock_calls) == 0
     assert "device did not update" not in caplog.text
+
+
+async def test_sleeping_device_gen2_with_new_firmware(
+    hass: HomeAssistant, mock_rpc_device, monkeypatch
+) -> None:
+    """Test sleeping device Gen2 with firmware 1.0.0 or later."""
+    monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 666)
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    with patch(
+        "homeassistant.components.shelly.config_flow.get_info",
+        return_value={"mac": "test-mac", "gen": 2},
+    ), patch("homeassistant.components.shelly.async_setup", return_value=True), patch(
+        "homeassistant.components.shelly.async_setup_entry",
+        return_value=True,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {"host": "1.1.1.1"},
+        )
+        await hass.async_block_till_done()
+
+    assert result["data"] == {
+        "host": "1.1.1.1",
+        "model": "SNSW-002P16EU",
+        "sleep_period": 666,
+        "gen": 2,
+    }
diff --git a/tests/components/shelly/test_coordinator.py b/tests/components/shelly/test_coordinator.py
index 8dc4e092f2f394..9039893999d1dc 100644
--- a/tests/components/shelly/test_coordinator.py
+++ b/tests/components/shelly/test_coordinator.py
@@ -1,6 +1,6 @@
 """Tests for Shelly coordinator."""
 from datetime import timedelta
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
 
@@ -24,7 +24,7 @@
     async_entries_for_config_entry,
     async_get as async_get_dev_reg,
 )
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import (
     init_integration,
@@ -64,7 +64,7 @@ async def test_block_reload_on_cfg_change(
 
     # Wait for debouncer
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -94,7 +94,7 @@ async def test_block_no_reload_on_bulb_changes(
 
     # Wait for debouncer
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -110,7 +110,7 @@ async def test_block_no_reload_on_bulb_changes(
 
     # Wait for debouncer
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
     )
     await hass.async_block_till_done()
 
@@ -132,7 +132,7 @@ async def test_block_polling_auth_error(
 
     # Move time to generate polling
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 15)
+        hass, dt_util.utcnow() + timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 15)
     )
     await hass.async_block_till_done()
 
@@ -198,7 +198,7 @@ async def test_block_polling_connection_error(
 
     # Move time to generate polling
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 15)
+        hass, dt_util.utcnow() + timedelta(seconds=UPDATE_PERIOD_MULTIPLIER * 15)
     )
     await hass.async_block_till_done()
 
@@ -242,7 +242,7 @@ async def test_block_sleeping_device_no_periodic_updates(
 
     # Move time to generate polling
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=SLEEP_PERIOD_MULTIPLIER * 1000)
+        hass, dt_util.utcnow() + timedelta(seconds=SLEEP_PERIOD_MULTIPLIER * 1000)
     )
     await hass.async_block_till_done()
 
@@ -328,13 +328,66 @@ async def test_rpc_reload_on_cfg_change(
 
     # Wait for debouncer
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
+        hass, dt_util.utcnow() + timedelta(seconds=ENTRY_RELOAD_COOLDOWN)
     )
     await hass.async_block_till_done()
 
     assert hass.states.get("switch.test_switch_0") is None
 
 
+async def test_rpc_reload_with_invalid_auth(
+    hass: HomeAssistant, mock_rpc_device, monkeypatch
+) -> None:
+    """Test RPC when InvalidAuthError is raising during config entry reload."""
+    with patch(
+        "homeassistant.components.shelly.coordinator.async_stop_scanner",
+        side_effect=[None, InvalidAuthError, None],
+    ):
+        entry = await init_integration(hass, 2)
+
+        inject_rpc_device_event(
+            monkeypatch,
+            mock_rpc_device,
+            {
+                "events": [
+                    {
+                        "data": [],
+                        "event": "config_changed",
+                        "id": 1,
+                        "ts": 1668522399.2,
+                    },
+                    {
+                        "data": [],
+                        "id": 2,
+                        "ts": 1668522399.2,
+                    },
+                ],
+                "ts": 1668522399.2,
+            },
+        )
+
+        await hass.async_block_till_done()
+
+        # Move time to generate reconnect
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + timedelta(seconds=RPC_RECONNECT_INTERVAL)
+        )
+        await hass.async_block_till_done()
+
+    assert entry.state == ConfigEntryState.LOADED
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+
+    flow = flows[0]
+    assert flow.get("step_id") == "reauth_confirm"
+    assert flow.get("handler") == DOMAIN
+
+    assert "context" in flow
+    assert flow["context"].get("source") == SOURCE_REAUTH
+    assert flow["context"].get("entry_id") == entry.entry_id
+
+
 async def test_rpc_click_event(
     hass: HomeAssistant, mock_rpc_device, events, monkeypatch
 ) -> None:
@@ -394,7 +447,7 @@ async def test_rpc_update_entry_sleep_period(
     # Move time to generate sleep period update
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 3600)
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=600 * SLEEP_PERIOD_MULTIPLIER)
+        hass, dt_util.utcnow() + timedelta(seconds=600 * SLEEP_PERIOD_MULTIPLIER)
     )
     await hass.async_block_till_done()
 
@@ -423,7 +476,7 @@ async def test_rpc_sleeping_device_no_periodic_updates(
 
     # Move time to generate polling
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=SLEEP_PERIOD_MULTIPLIER * 1000)
+        hass, dt_util.utcnow() + timedelta(seconds=SLEEP_PERIOD_MULTIPLIER * 1000)
     )
     await hass.async_block_till_done()
 
@@ -449,7 +502,7 @@ async def test_rpc_reconnect_auth_error(
 
     # Move time to generate reconnect
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=RPC_RECONNECT_INTERVAL)
+        hass, dt_util.utcnow() + timedelta(seconds=RPC_RECONNECT_INTERVAL)
     )
     await hass.async_block_till_done()
 
@@ -519,7 +572,7 @@ async def test_rpc_reconnect_error(
 
     # Move time to generate reconnect
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=RPC_RECONNECT_INTERVAL)
+        hass, dt_util.utcnow() + timedelta(seconds=RPC_RECONNECT_INTERVAL)
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/shelly/test_device_trigger.py b/tests/components/shelly/test_device_trigger.py
index 30a7cfe75d8fee..6e8c3bf8005184 100644
--- a/tests/components/shelly/test_device_trigger.py
+++ b/tests/components/shelly/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for Shelly device triggers."""
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.components import automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -26,7 +27,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
 )
 
@@ -74,7 +74,7 @@ async def test_get_triggers_block_device(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) -> None:
@@ -106,7 +106,7 @@ async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) ->
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> None:
@@ -131,7 +131,7 @@ async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> No
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_non_initialized_devices(
@@ -149,7 +149,7 @@ async def test_get_triggers_non_initialized_devices(
         hass, DeviceAutomationType.TRIGGER, device.id
     )
     triggers = [value for value in triggers if value["domain"] == DOMAIN]
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_for_invalid_device_id(
diff --git a/tests/components/shelly/test_init.py b/tests/components/shelly/test_init.py
index 42ec4578016315..be6e319c8ac72a 100644
--- a/tests/components/shelly/test_init.py
+++ b/tests/components/shelly/test_init.py
@@ -17,7 +17,7 @@
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.setup import async_setup_component
 
-from . import MOCK_MAC, init_integration
+from . import MOCK_MAC, init_integration, mutate_rpc_device_status
 
 from tests.common import MockConfigEntry
 
@@ -155,6 +155,22 @@ async def test_sleeping_rpc_device_online(
     assert entry.data["sleep_period"] == device_sleep
 
 
+async def test_sleeping_rpc_device_online_new_firmware(
+    hass: HomeAssistant,
+    mock_rpc_device,
+    monkeypatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test sleeping device Gen2 with firmware 1.0.0 or later."""
+    entry = await init_integration(hass, 2, sleep_period=None)
+    assert "will resume when device is online" in caplog.text
+
+    mutate_rpc_device_status(monkeypatch, mock_rpc_device, "sys", "wakeup_period", 1500)
+    mock_rpc_device.mock_update()
+    assert "online, resuming setup" in caplog.text
+    assert entry.data["sleep_period"] == 1500
+
+
 @pytest.mark.parametrize(
     ("gen", "entity_id"),
     [
diff --git a/tests/components/shelly/test_number.py b/tests/components/shelly/test_number.py
index 57a8e801b929df..403d2f2993d4ed 100644
--- a/tests/components/shelly/test_number.py
+++ b/tests/components/shelly/test_number.py
@@ -17,7 +17,7 @@
 
 from . import init_integration, register_device, register_entity
 
-from tests.common import mock_restore_cache
+from tests.common import mock_restore_cache_with_extra_data
 
 DEVICE_BLOCK_ID = 4
 
@@ -62,7 +62,14 @@ async def test_block_restored_number(
         entry,
         capabilities,
     )
-    mock_restore_cache(hass, [State(entity_id, "40")])
+    extra_data = {
+        "native_max_value": 100,
+        "native_min_value": 0,
+        "native_step": 1,
+        "native_unit_of_measurement": "%",
+        "native_value": "40",
+    }
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
 
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
diff --git a/tests/components/shelly/test_sensor.py b/tests/components/shelly/test_sensor.py
index d5da1e96bce77c..d87460fb17d0dc 100644
--- a/tests/components/shelly/test_sensor.py
+++ b/tests/components/shelly/test_sensor.py
@@ -20,7 +20,7 @@
     register_entity,
 )
 
-from tests.common import mock_restore_cache
+from tests.common import mock_restore_cache_with_extra_data
 
 RELAY_BLOCK_ID = 0
 SENSOR_BLOCK_ID = 3
@@ -137,7 +137,9 @@ async def test_block_restored_sleeping_sensor(
     entity_id = register_entity(
         hass, SENSOR_DOMAIN, "test_name_temperature", "sensor_0-temp", entry
     )
-    mock_restore_cache(hass, [State(entity_id, "20.4")])
+    extra_data = {"native_value": "20.4", "native_unit_of_measurement": "°C"}
+
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
@@ -216,7 +218,9 @@ async def test_block_not_matched_restored_sleeping_sensor(
     entity_id = register_entity(
         hass, SENSOR_DOMAIN, "test_name_temperature", "sensor_0-temp", entry
     )
-    mock_restore_cache(hass, [State(entity_id, "20.4")])
+    extra_data = {"native_value": "20.4", "native_unit_of_measurement": "°C"}
+
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_block_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
@@ -274,6 +278,16 @@ async def test_rpc_sensor(hass: HomeAssistant, mock_rpc_device, monkeypatch) ->
     assert hass.states.get(entity_id).state == STATE_UNKNOWN
 
 
+async def test_rpc_illuminance_sensor(
+    hass: HomeAssistant, mock_rpc_device, monkeypatch
+) -> None:
+    """Test RPC illuminacne sensor."""
+    entity_id = f"{SENSOR_DOMAIN}.test_name_illuminance"
+    await init_integration(hass, 2)
+
+    assert hass.states.get(entity_id).state == "345"
+
+
 async def test_rpc_sensor_error(
     hass: HomeAssistant, mock_rpc_device, monkeypatch
 ) -> None:
@@ -347,8 +361,9 @@ async def test_rpc_restored_sleeping_sensor(
         "temperature:0-temperature_0",
         entry,
     )
+    extra_data = {"native_value": "21.0", "native_unit_of_measurement": "°C"}
 
-    mock_restore_cache(hass, [State(entity_id, "21.0")])
+    mock_restore_cache_with_extra_data(hass, ((State(entity_id, ""), extra_data),))
     monkeypatch.setattr(mock_rpc_device, "initialized", False)
 
     await hass.config_entries.async_setup(entry.entry_id)
diff --git a/tests/components/shelly/test_utils.py b/tests/components/shelly/test_utils.py
index 701e8b487cb788..1bf660deb2a4c5 100644
--- a/tests/components/shelly/test_utils.py
+++ b/tests/components/shelly/test_utils.py
@@ -11,7 +11,7 @@
     get_rpc_input_triggers,
     is_block_momentary_input,
 )
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 DEVICE_BLOCK_ID = 4
 
@@ -153,12 +153,12 @@ async def test_get_block_device_sleep_period(settings, sleep_period) -> None:
 async def test_get_device_uptime() -> None:
     """Test block test get device uptime."""
     assert get_device_uptime(
-        55, dt.as_utc(dt.parse_datetime("2019-01-10 18:42:00+00:00"))
-    ) == dt.as_utc(dt.parse_datetime("2019-01-10 18:42:00+00:00"))
+        55, dt_util.as_utc(dt_util.parse_datetime("2019-01-10 18:42:00+00:00"))
+    ) == dt_util.as_utc(dt_util.parse_datetime("2019-01-10 18:42:00+00:00"))
 
     assert get_device_uptime(
-        50, dt.as_utc(dt.parse_datetime("2019-01-10 18:42:00+00:00"))
-    ) == dt.as_utc(dt.parse_datetime("2019-01-10 18:42:10+00:00"))
+        50, dt_util.as_utc(dt_util.parse_datetime("2019-01-10 18:42:00+00:00"))
+    ) == dt_util.as_utc(dt_util.parse_datetime("2019-01-10 18:42:10+00:00"))
 
 
 async def test_get_block_input_triggers(mock_block_device, monkeypatch) -> None:
diff --git a/tests/components/slack/test_config_flow.py b/tests/components/slack/test_config_flow.py
index 97c8e6ee743b0f..e941e4ba47ca77 100644
--- a/tests/components/slack/test_config_flow.py
+++ b/tests/components/slack/test_config_flow.py
@@ -90,51 +90,3 @@ async def test_flow_user_unknown_error(hass: HomeAssistant) -> None:
     assert result["type"] == data_entry_flow.FlowResultType.FORM
     assert result["step_id"] == "user"
     assert result["errors"] == {"base": "unknown"}
-
-
-async def test_flow_import(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test an import flow."""
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_DATA,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
-    assert result["title"] == TEAM_NAME
-    assert result["data"] == CONF_DATA
-
-
-async def test_flow_import_no_name(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test import flow with no name in config."""
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_INPUT,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
-    assert result["title"] == TEAM_NAME
-    assert result["data"] == CONF_DATA
-
-
-async def test_flow_import_already_configured(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test an import flow already configured."""
-    create_entry(hass)
-    mock_connection(aioclient_mock)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data=CONF_DATA,
-    )
-
-    assert result["type"] == data_entry_flow.FlowResultType.ABORT
-    assert result["reason"] == "already_configured"
diff --git a/tests/components/smartthings/test_binary_sensor.py b/tests/components/smartthings/test_binary_sensor.py
index 0b697786b18054..b6f2159ae13edb 100644
--- a/tests/components/smartthings/test_binary_sensor.py
+++ b/tests/components/smartthings/test_binary_sensor.py
@@ -51,7 +51,15 @@ async def test_entity_and_device_attributes(
     """Test the attributes of the entity are correct."""
     # Arrange
     device = device_factory(
-        "Motion Sensor 1", [Capability.motion_sensor], {Attribute.motion: "inactive"}
+        "Motion Sensor 1",
+        [Capability.motion_sensor],
+        {
+            Attribute.motion: "inactive",
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
     )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
@@ -66,8 +74,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smartthings/test_climate.py b/tests/components/smartthings/test_climate.py
index 02f6af46655142..fe917504dcd478 100644
--- a/tests/components/smartthings/test_climate.py
+++ b/tests/components/smartthings/test_climate.py
@@ -112,6 +112,10 @@ def thermostat_fixture(device_factory):
             ],
             Attribute.thermostat_operating_state: "idle",
             Attribute.humidity: 34,
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
         },
     )
     device.status.attributes[Attribute.temperature] = Status(70, "F", None)
@@ -581,5 +585,7 @@ async def test_entity_and_device_attributes(hass: HomeAssistant, thermostat) ->
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, thermostat.device_id)}
     assert entry.name == thermostat.label
-    assert entry.model == thermostat.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
diff --git a/tests/components/smartthings/test_cover.py b/tests/components/smartthings/test_cover.py
index 715f26beaa7e0a..f8c21166fe1c02 100644
--- a/tests/components/smartthings/test_cover.py
+++ b/tests/components/smartthings/test_cover.py
@@ -33,7 +33,15 @@ async def test_entity_and_device_attributes(
     """Test the attributes of the entity are correct."""
     # Arrange
     device = device_factory(
-        "Garage", [Capability.garage_door_control], {Attribute.door: "open"}
+        "Garage",
+        [Capability.garage_door_control],
+        {
+            Attribute.door: "open",
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
     )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
@@ -49,8 +57,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_open(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smartthings/test_fan.py b/tests/components/smartthings/test_fan.py
index 120a90fb2f45d9..aef9ce319e73a3 100644
--- a/tests/components/smartthings/test_fan.py
+++ b/tests/components/smartthings/test_fan.py
@@ -48,7 +48,14 @@ async def test_entity_and_device_attributes(
     device = device_factory(
         "Fan 1",
         capabilities=[Capability.switch, Capability.fan_speed],
-        status={Attribute.switch: "on", Attribute.fan_speed: 2},
+        status={
+            Attribute.switch: "on",
+            Attribute.fan_speed: 2,
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
     )
     # Act
     await setup_platform(hass, FAN_DOMAIN, devices=[device])
@@ -64,8 +71,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_turn_off(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smartthings/test_light.py b/tests/components/smartthings/test_light.py
index 713b156fc4f2e0..0e01910c84a05d 100644
--- a/tests/components/smartthings/test_light.py
+++ b/tests/components/smartthings/test_light.py
@@ -109,7 +109,16 @@ async def test_entity_and_device_attributes(
 ) -> None:
     """Test the attributes of the entity are correct."""
     # Arrange
-    device = device_factory("Light 1", [Capability.switch, Capability.switch_level])
+    device = device_factory(
+        "Light 1",
+        [Capability.switch, Capability.switch_level],
+        {
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
+    )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
     # Act
@@ -124,8 +133,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_turn_off(hass: HomeAssistant, light_devices) -> None:
diff --git a/tests/components/smartthings/test_lock.py b/tests/components/smartthings/test_lock.py
index 6c01bc2b6c4af2..0d237cec132da0 100644
--- a/tests/components/smartthings/test_lock.py
+++ b/tests/components/smartthings/test_lock.py
@@ -22,7 +22,17 @@ async def test_entity_and_device_attributes(
 ) -> None:
     """Test the attributes of the entity are correct."""
     # Arrange
-    device = device_factory("Lock_1", [Capability.lock], {Attribute.lock: "unlocked"})
+    device = device_factory(
+        "Lock_1",
+        [Capability.lock],
+        {
+            Attribute.lock: "unlocked",
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
+    )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
     # Act
@@ -37,8 +47,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_lock(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smartthings/test_sensor.py b/tests/components/smartthings/test_sensor.py
index 01745878bf08a8..cc7b67145c1e0f 100644
--- a/tests/components/smartthings/test_sensor.py
+++ b/tests/components/smartthings/test_sensor.py
@@ -90,7 +90,17 @@ async def test_entity_and_device_attributes(
 ) -> None:
     """Test the attributes of the entity are correct."""
     # Arrange
-    device = device_factory("Sensor 1", [Capability.battery], {Attribute.battery: 100})
+    device = device_factory(
+        "Sensor 1",
+        [Capability.battery],
+        {
+            Attribute.battery: 100,
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
+    )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
     # Act
@@ -105,8 +115,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_energy_sensors_for_switch_device(
@@ -117,7 +129,15 @@ async def test_energy_sensors_for_switch_device(
     device = device_factory(
         "Switch_1",
         [Capability.switch, Capability.power_meter, Capability.energy_meter],
-        {Attribute.switch: "off", Attribute.power: 355, Attribute.energy: 11.422},
+        {
+            Attribute.switch: "off",
+            Attribute.power: 355,
+            Attribute.energy: 11.422,
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
     )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
@@ -136,8 +156,10 @@ async def test_energy_sensors_for_switch_device(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
     state = hass.states.get("sensor.switch_1_power_meter")
     assert state
@@ -151,8 +173,10 @@ async def test_energy_sensors_for_switch_device(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_power_consumption_sensor(hass: HomeAssistant, device_factory) -> None:
@@ -171,7 +195,11 @@ async def test_power_consumption_sensor(hass: HomeAssistant, device_factory) ->
                 "energySaved": 0,
                 "start": "2021-07-30T16:45:25Z",
                 "end": "2021-07-30T16:58:33Z",
-            }
+            },
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
         },
     )
     entity_registry = er.async_get(hass)
@@ -190,8 +218,10 @@ async def test_power_consumption_sensor(hass: HomeAssistant, device_factory) ->
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
     state = hass.states.get("sensor.refrigerator_power")
     assert state
@@ -206,13 +236,21 @@ async def test_power_consumption_sensor(hass: HomeAssistant, device_factory) ->
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
     device = device_factory(
         "vacuum",
         [Capability.power_consumption_report],
-        {Attribute.power_consumption: {}},
+        {
+            Attribute.power_consumption: {},
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
     )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
@@ -230,8 +268,10 @@ async def test_power_consumption_sensor(hass: HomeAssistant, device_factory) ->
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_update_from_signal(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smartthings/test_switch.py b/tests/components/smartthings/test_switch.py
index 81bb8579cfd031..f90395f0064197 100644
--- a/tests/components/smartthings/test_switch.py
+++ b/tests/components/smartthings/test_switch.py
@@ -21,7 +21,17 @@ async def test_entity_and_device_attributes(
 ) -> None:
     """Test the attributes of the entity are correct."""
     # Arrange
-    device = device_factory("Switch_1", [Capability.switch], {Attribute.switch: "on"})
+    device = device_factory(
+        "Switch_1",
+        [Capability.switch],
+        {
+            Attribute.switch: "on",
+            Attribute.mnmo: "123",
+            Attribute.mnmn: "Generic manufacturer",
+            Attribute.mnhw: "v4.56",
+            Attribute.mnfv: "v7.89",
+        },
+    )
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
     # Act
@@ -36,8 +46,10 @@ async def test_entity_and_device_attributes(
     assert entry.configuration_url == "https://account.smartthings.com"
     assert entry.identifiers == {(DOMAIN, device.device_id)}
     assert entry.name == device.label
-    assert entry.model == device.device_type_name
-    assert entry.manufacturer == "Unavailable"
+    assert entry.model == "123"
+    assert entry.manufacturer == "Generic manufacturer"
+    assert entry.hw_version == "v4.56"
+    assert entry.sw_version == "v7.89"
 
 
 async def test_turn_off(hass: HomeAssistant, device_factory) -> None:
diff --git a/tests/components/smarttub/__init__.py b/tests/components/smarttub/__init__.py
index b19af1ee59a91b..f6abd4cb5d7c2b 100644
--- a/tests/components/smarttub/__init__.py
+++ b/tests/components/smarttub/__init__.py
@@ -3,13 +3,13 @@
 from datetime import timedelta
 
 from homeassistant.components.smarttub.const import SCAN_INTERVAL
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
 
 async def trigger_update(hass):
     """Trigger a polling update by moving time forward."""
-    new_time = dt.utcnow() + timedelta(seconds=SCAN_INTERVAL + 1)
+    new_time = dt_util.utcnow() + timedelta(seconds=SCAN_INTERVAL + 1)
     async_fire_time_changed(hass, new_time)
     await hass.async_block_till_done()
diff --git a/tests/components/smhi/test_weather.py b/tests/components/smhi/test_weather.py
index 57998b725f9993..55b07530c3903a 100644
--- a/tests/components/smhi/test_weather.py
+++ b/tests/components/smhi/test_weather.py
@@ -6,14 +6,11 @@
 import pytest
 from smhi.smhi_lib import APIURL_TEMPLATE, SmhiForecast, SmhiForecastException
 
-from homeassistant.components.smhi.const import (
-    ATTR_SMHI_CLOUDINESS,
-    ATTR_SMHI_THUNDER_PROBABILITY,
-    ATTR_SMHI_WIND_GUST_SPEED,
-)
+from homeassistant.components.smhi.const import ATTR_SMHI_THUNDER_PROBABILITY
 from homeassistant.components.smhi.weather import CONDITION_CLASSES, RETRY_TIMEOUT
 from homeassistant.components.weather import (
     ATTR_FORECAST,
+    ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
@@ -21,6 +18,7 @@
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_PRESSURE,
@@ -31,6 +29,10 @@
     ATTR_WEATHER_WIND_SPEED_UNIT,
     DOMAIN as WEATHER_DOMAIN,
 )
+from homeassistant.components.weather.const import (
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_WIND_GUST_SPEED,
+)
 from homeassistant.const import ATTR_ATTRIBUTION, STATE_UNKNOWN, UnitOfSpeed
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -64,9 +66,9 @@ async def test_setup_hass(
 
     assert state
     assert state.state == "sunny"
-    assert state.attributes[ATTR_SMHI_CLOUDINESS] == 50
+    assert state.attributes[ATTR_WEATHER_CLOUD_COVERAGE] == 50
     assert state.attributes[ATTR_SMHI_THUNDER_PROBABILITY] == 33
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 16.92
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 16.92
     assert state.attributes[ATTR_ATTRIBUTION].find("SMHI") >= 0
     assert state.attributes[ATTR_WEATHER_HUMIDITY] == 55
     assert state.attributes[ATTR_WEATHER_PRESSURE] == 1024
@@ -85,6 +87,8 @@ async def test_setup_hass(
     assert forecast[ATTR_FORECAST_PRESSURE] == 1026
     assert forecast[ATTR_FORECAST_WIND_BEARING] == 203
     assert forecast[ATTR_FORECAST_WIND_SPEED] == 6.12
+    assert forecast[ATTR_FORECAST_WIND_GUST_SPEED] == 18.36
+    assert forecast[ATTR_FORECAST_CLOUD_COVERAGE] == 100
 
 
 async def test_properties_no_data(hass: HomeAssistant) -> None:
@@ -112,9 +116,9 @@ async def test_properties_no_data(hass: HomeAssistant) -> None:
     assert ATTR_WEATHER_WIND_SPEED not in state.attributes
     assert ATTR_WEATHER_WIND_BEARING not in state.attributes
     assert ATTR_FORECAST not in state.attributes
-    assert ATTR_SMHI_CLOUDINESS not in state.attributes
+    assert ATTR_WEATHER_CLOUD_COVERAGE not in state.attributes
     assert ATTR_SMHI_THUNDER_PROBABILITY not in state.attributes
-    assert ATTR_SMHI_WIND_GUST_SPEED not in state.attributes
+    assert ATTR_WEATHER_WIND_GUST_SPEED not in state.attributes
 
 
 async def test_properties_unknown_symbol(hass: HomeAssistant) -> None:
@@ -337,7 +341,7 @@ async def test_custom_speed_unit(
 
     assert state
     assert state.name == "test"
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 16.92
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 16.92
 
     entity_reg = er.async_get(hass)
     entity_reg.async_update_entity_options(
@@ -349,4 +353,4 @@ async def test_custom_speed_unit(
     await hass.async_block_till_done()
 
     state = hass.states.get(ENTITY_ID)
-    assert state.attributes[ATTR_SMHI_WIND_GUST_SPEED] == 4.7
+    assert state.attributes[ATTR_WEATHER_WIND_GUST_SPEED] == 4.7
diff --git a/tests/components/songpal/test_media_player.py b/tests/components/songpal/test_media_player.py
index 86a9456fa8b97d..534e2e6e9e69bf 100644
--- a/tests/components/songpal/test_media_player.py
+++ b/tests/components/songpal/test_media_player.py
@@ -14,7 +14,10 @@
 
 from homeassistant.components import media_player, songpal
 from homeassistant.components.media_player import MediaPlayerEntityFeature
-from homeassistant.components.songpal.const import SET_SOUND_SETTING
+from homeassistant.components.songpal.const import (
+    ERROR_REQUEST_RETRY,
+    SET_SOUND_SETTING,
+)
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -53,6 +56,15 @@ def _get_attributes(hass):
     return state.as_dict()["attributes"]
 
 
+async def _call(hass, service, **argv):
+    await hass.services.async_call(
+        media_player.DOMAIN,
+        service,
+        {"entity_id": ENTITY_ID, **argv},
+        blocking=True,
+    )
+
+
 async def test_setup_platform(hass: HomeAssistant) -> None:
     """Test the legacy setup platform."""
     mocked_device = _create_mocked_device(throw_exception=True)
@@ -91,8 +103,8 @@ async def test_setup_failed(
         await hass.async_block_till_done()
     all_states = hass.states.async_all()
     assert len(all_states) == 0
-    warning_records = [x for x in caplog.records if x.levelno == logging.WARNING]
-    assert len(warning_records) == 2
+    assert "[name(http://0.0.0.0:10000/sony)] Unable to connect" in caplog.text
+    assert "Platform songpal not ready yet: Unable to do POST request" in caplog.text
     assert not any(x.levelno == logging.ERROR for x in caplog.records)
     caplog.clear()
 
@@ -222,32 +234,24 @@ async def test_services(hass: HomeAssistant) -> None:
         await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
 
-    async def _call(service, **argv):
-        await hass.services.async_call(
-            media_player.DOMAIN,
-            service,
-            {"entity_id": ENTITY_ID, **argv},
-            blocking=True,
-        )
-
-    await _call(media_player.SERVICE_TURN_ON)
-    await _call(media_player.SERVICE_TURN_OFF)
-    await _call(media_player.SERVICE_TOGGLE)
+    await _call(hass, media_player.SERVICE_TURN_ON)
+    await _call(hass, media_player.SERVICE_TURN_OFF)
+    await _call(hass, media_player.SERVICE_TOGGLE)
     assert mocked_device.set_power.call_count == 3
     mocked_device.set_power.assert_has_calls([call(True), call(False), call(False)])
 
-    await _call(media_player.SERVICE_VOLUME_SET, volume_level=0.6)
-    await _call(media_player.SERVICE_VOLUME_UP)
-    await _call(media_player.SERVICE_VOLUME_DOWN)
+    await _call(hass, media_player.SERVICE_VOLUME_SET, volume_level=0.6)
+    await _call(hass, media_player.SERVICE_VOLUME_UP)
+    await _call(hass, media_player.SERVICE_VOLUME_DOWN)
     assert mocked_device.volume1.set_volume.call_count == 3
     mocked_device.volume1.set_volume.assert_has_calls([call(60), call(51), call(49)])
 
-    await _call(media_player.SERVICE_VOLUME_MUTE, is_volume_muted=True)
+    await _call(hass, media_player.SERVICE_VOLUME_MUTE, is_volume_muted=True)
     mocked_device.volume1.set_mute.assert_called_once_with(True)
 
-    await _call(media_player.SERVICE_SELECT_SOURCE, source="none")
+    await _call(hass, media_player.SERVICE_SELECT_SOURCE, source="none")
     mocked_device.input1.activate.assert_not_called()
-    await _call(media_player.SERVICE_SELECT_SOURCE, source="title1")
+    await _call(hass, media_player.SERVICE_SELECT_SOURCE, source="title1")
     mocked_device.input1.activate.assert_called_once()
 
     await hass.services.async_call(
@@ -366,3 +370,33 @@ async def _assert_state():
     assert warning_records[0].message.endswith("Got disconnected, trying to reconnect")
     assert warning_records[1].message.endswith("Connection reestablished")
     assert not any(x.levelno == logging.ERROR for x in caplog.records)
+
+
+@pytest.mark.parametrize(
+    "service", [media_player.SERVICE_TURN_ON, media_player.SERVICE_TURN_OFF]
+)
+@pytest.mark.parametrize(
+    ("error_code", "swallow"), [(ERROR_REQUEST_RETRY, True), (1234, False)]
+)
+async def test_error_swallowing(hass, caplog, service, error_code, swallow):
+    """Test swallowing specific errors on turn_on and turn_off."""
+    mocked_device = _create_mocked_device()
+    entry = MockConfigEntry(domain=songpal.DOMAIN, data=CONF_DATA)
+    entry.add_to_hass(hass)
+
+    with _patch_media_player_device(mocked_device):
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    type(mocked_device).set_power = AsyncMock(
+        side_effect=[
+            SongpalException("Error to swallow", error=(error_code, "Error to swallow"))
+        ]
+    )
+
+    if swallow:
+        await _call(hass, service)
+        assert "Swallowing" in caplog.text
+    else:
+        with pytest.raises(SongpalException):
+            await _call(hass, service)
diff --git a/tests/components/sonos/conftest.py b/tests/components/sonos/conftest.py
index 4e01ba02edd2c2..730f0f5e8f33ef 100644
--- a/tests/components/sonos/conftest.py
+++ b/tests/components/sonos/conftest.py
@@ -13,13 +13,33 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
+class SonosMockEventListener:
+    """Mock the event listener."""
+
+    def __init__(self, ip_address: str) -> None:
+        """Initialize the mock event listener."""
+        self.address = [ip_address, "8080"]
+
+
+class SonosMockSubscribe:
+    """Mock the subscription."""
+
+    def __init__(self, ip_address: str, *args, **kwargs) -> None:
+        """Initialize the mock subscriber."""
+        self.event_listener = SonosMockEventListener(ip_address)
+        self.service = Mock()
+
+    async def unsubscribe(self) -> None:
+        """Unsubscribe mock."""
+
+
 class SonosMockService:
     """Mock a Sonos Service used in callbacks."""
 
-    def __init__(self, service_type):
+    def __init__(self, service_type, ip_address="192.168.42.2") -> None:
         """Initialize the instance."""
         self.service_type = service_type
-        self.subscribe = AsyncMock()
+        self.subscribe = AsyncMock(return_value=SonosMockSubscribe(ip_address))
 
 
 class SonosMockEvent:
@@ -84,28 +104,59 @@ def config_entry_fixture():
     return MockConfigEntry(domain=DOMAIN, title="Sonos")
 
 
-@pytest.fixture(name="soco")
-def soco_fixture(
-    music_library, speaker_info, current_track_info_empty, battery_info, alarm_clock
-):
-    """Create a mock soco SoCo fixture."""
-    with patch("homeassistant.components.sonos.SoCo", autospec=True) as mock, patch(
-        "socket.gethostbyname", return_value="192.168.42.2"
-    ):
-        mock_soco = mock.return_value
-        mock_soco.ip_address = "192.168.42.2"
-        mock_soco.uid = "RINCON_test"
+class MockSoCo(MagicMock):
+    """Mock the Soco Object."""
+
+    @property
+    def visible_zones(self):
+        """Return visible zones and allow property to be overridden by device classes."""
+        return {self}
+
+
+class SoCoMockFactory:
+    """Factory for creating SoCo Mocks."""
+
+    def __init__(
+        self,
+        music_library,
+        speaker_info,
+        current_track_info_empty,
+        battery_info,
+        alarm_clock,
+    ) -> None:
+        """Initialize the mock factory."""
+        self.mock_list: dict[str, MockSoCo] = {}
+        self.music_library = music_library
+        self.speaker_info = speaker_info
+        self.current_track_info = current_track_info_empty
+        self.battery_info = battery_info
+        self.alarm_clock = alarm_clock
+
+    def cache_mock(
+        self, mock_soco: MockSoCo, ip_address: str, name: str = "Zone A"
+    ) -> MockSoCo:
+        """Put a user created mock into the cache."""
+        mock_soco.mock_add_spec(SoCo)
+        mock_soco.ip_address = ip_address
+        if ip_address != "192.168.42.2":
+            mock_soco.uid = f"RINCON_test_{ip_address}"
+        else:
+            mock_soco.uid = "RINCON_test"
         mock_soco.play_mode = "NORMAL"
-        mock_soco.music_library = music_library
-        mock_soco.get_current_track_info.return_value = current_track_info_empty
+        mock_soco.music_library = self.music_library
+        mock_soco.get_current_track_info.return_value = self.current_track_info
         mock_soco.music_source_from_uri = SoCo.music_source_from_uri
-        mock_soco.get_speaker_info.return_value = speaker_info
-        mock_soco.avTransport = SonosMockService("AVTransport")
-        mock_soco.renderingControl = SonosMockService("RenderingControl")
-        mock_soco.zoneGroupTopology = SonosMockService("ZoneGroupTopology")
-        mock_soco.contentDirectory = SonosMockService("ContentDirectory")
-        mock_soco.deviceProperties = SonosMockService("DeviceProperties")
-        mock_soco.alarmClock = alarm_clock
+        my_speaker_info = self.speaker_info.copy()
+        my_speaker_info["zone_name"] = name
+        my_speaker_info["uid"] = mock_soco.uid
+        mock_soco.get_speaker_info = Mock(return_value=my_speaker_info)
+
+        mock_soco.avTransport = SonosMockService("AVTransport", ip_address)
+        mock_soco.renderingControl = SonosMockService("RenderingControl", ip_address)
+        mock_soco.zoneGroupTopology = SonosMockService("ZoneGroupTopology", ip_address)
+        mock_soco.contentDirectory = SonosMockService("ContentDirectory", ip_address)
+        mock_soco.deviceProperties = SonosMockService("DeviceProperties", ip_address)
+        mock_soco.alarmClock = self.alarm_clock
         mock_soco.mute = False
         mock_soco.night_mode = True
         mock_soco.dialog_level = True
@@ -123,11 +174,48 @@ def soco_fixture(
         mock_soco.surround_level = 3
         mock_soco.music_surround_level = 4
         mock_soco.soundbar_audio_input_format = "Dolby 5.1"
-        mock_soco.get_battery_info.return_value = battery_info
+        mock_soco.get_battery_info.return_value = self.battery_info
         mock_soco.all_zones = {mock_soco}
-        mock_soco.visible_zones = {mock_soco}
         mock_soco.group.coordinator = mock_soco
-        yield mock_soco
+        self.mock_list[ip_address] = mock_soco
+        return mock_soco
+
+    def get_mock(self, *args) -> SoCo:
+        """Return a mock."""
+        if len(args) > 0:
+            ip_address = args[0]
+        else:
+            ip_address = "192.168.42.2"
+        if ip_address in self.mock_list:
+            return self.mock_list[ip_address]
+        mock_soco = MockSoCo(name=f"Soco Mock {ip_address}")
+        self.cache_mock(mock_soco, ip_address)
+        return mock_soco
+
+
+def patch_gethostbyname(host: str) -> str:
+    """Mock to return host name as ip address for testing."""
+    return host
+
+
+@pytest.fixture(name="soco_factory")
+def soco_factory(
+    music_library, speaker_info, current_track_info_empty, battery_info, alarm_clock
+):
+    """Create factory for instantiating SoCo mocks."""
+    factory = SoCoMockFactory(
+        music_library, speaker_info, current_track_info_empty, battery_info, alarm_clock
+    )
+    with patch("homeassistant.components.sonos.SoCo", new=factory.get_mock), patch(
+        "socket.gethostbyname", side_effect=patch_gethostbyname
+    ), patch("homeassistant.components.sonos.ZGS_SUBSCRIPTION_TIMEOUT", 0):
+        yield factory
+
+
+@pytest.fixture(name="soco")
+def soco_fixture(soco_factory):
+    """Create a default mock soco SoCo fixture."""
+    return soco_factory.get_mock()
 
 
 @pytest.fixture(autouse=True)
@@ -172,7 +260,7 @@ async def do_callback(hass, callback, *args, **kwargs):
 @pytest.fixture(name="config")
 def config_fixture():
     """Create hass config fixture."""
-    return {DOMAIN: {MP_DOMAIN: {CONF_HOSTS: ["192.168.42.1"]}}}
+    return {DOMAIN: {MP_DOMAIN: {CONF_HOSTS: ["192.168.42.2"]}}}
 
 
 @pytest.fixture(name="music_library")
diff --git a/tests/components/sonos/test_init.py b/tests/components/sonos/test_init.py
index 596946e9f8b3ac..d4072055407107 100644
--- a/tests/components/sonos/test_init.py
+++ b/tests/components/sonos/test_init.py
@@ -1,16 +1,31 @@
 """Tests for the Sonos config flow."""
+import asyncio
 import logging
-from unittest.mock import patch
+import sys
+from unittest.mock import Mock, patch
+
+if sys.version_info[:2] < (3, 11):
+    from async_timeout import timeout as asyncio_timeout
+else:
+    from asyncio import timeout as asyncio_timeout
 
 import pytest
 
 from homeassistant import config_entries, data_entry_flow
 from homeassistant.components import sonos, zeroconf
 from homeassistant.components.sonos import SonosDiscoveryManager
-from homeassistant.components.sonos.const import DATA_SONOS_DISCOVERY_MANAGER
-from homeassistant.core import HomeAssistant
+from homeassistant.components.sonos.const import (
+    DATA_SONOS_DISCOVERY_MANAGER,
+    SONOS_SPEAKER_ACTIVITY,
+)
+from homeassistant.components.sonos.exception import SonosUpdateError
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.setup import async_setup_component
 
+from .conftest import MockSoCo, SoCoMockFactory
+
 
 async def test_creating_entry_sets_up_media_player(
     hass: HomeAssistant, zeroconf_payload: zeroconf.ZeroconfServiceInfo
@@ -84,7 +99,9 @@ async def test_async_poll_manual_hosts_warnings(
     manager.hosts.add("10.10.10.10")
     with caplog.at_level(logging.DEBUG), patch.object(
         manager, "_async_handle_discovery_message"
-    ), patch("homeassistant.components.sonos.async_call_later"), patch(
+    ), patch(
+        "homeassistant.components.sonos.async_call_later"
+    ) as mock_async_call_later, patch(
         "homeassistant.components.sonos.async_dispatcher_send"
     ), patch(
         "homeassistant.components.sonos.sync_get_visible_zones",
@@ -103,6 +120,7 @@ async def test_async_poll_manual_hosts_warnings(
         record = caplog.records[0]
         assert record.levelname == "WARNING"
         assert "Could not get visible Sonos devices from" in record.message
+        assert mock_async_call_later.call_count == 1
 
         # Second call fails again, it should be logged as a DEBUG message
         caplog.clear()
@@ -111,6 +129,7 @@ async def test_async_poll_manual_hosts_warnings(
         record = caplog.records[0]
         assert record.levelname == "DEBUG"
         assert "Could not get visible Sonos devices from" in record.message
+        assert mock_async_call_later.call_count == 2
 
         # Third call succeeds, it should log an info message
         caplog.clear()
@@ -118,12 +137,14 @@ async def test_async_poll_manual_hosts_warnings(
         assert len(caplog.messages) == 1
         record = caplog.records[0]
         assert record.levelname == "INFO"
-        assert "Connection restablished to Sonos device" in record.message
+        assert "Connection reestablished to Sonos device" in record.message
+        assert mock_async_call_later.call_count == 3
 
         # Fourth call succeeds again, no need to log
         caplog.clear()
         await manager.async_poll_manual_hosts()
         assert len(caplog.messages) == 0
+        assert mock_async_call_later.call_count == 4
 
         # Fifth call fail again again, should be logged as a WARNING message
         caplog.clear()
@@ -132,3 +153,288 @@ async def test_async_poll_manual_hosts_warnings(
         record = caplog.records[0]
         assert record.levelname == "WARNING"
         assert "Could not get visible Sonos devices from" in record.message
+        assert mock_async_call_later.call_count == 5
+
+
+class _MockSoCoOsError(MockSoCo):
+    @property
+    def visible_zones(self):
+        raise OSError()
+
+
+class _MockSoCoVisibleZones(MockSoCo):
+    def set_visible_zones(self, visible_zones) -> None:
+        """Set visible zones."""
+        self.vz_return = visible_zones  # pylint: disable=attribute-defined-outside-init
+
+    @property
+    def visible_zones(self):
+        return self.vz_return
+
+
+async def _setup_hass(hass: HomeAssistant):
+    await async_setup_component(
+        hass,
+        sonos.DOMAIN,
+        {
+            "sonos": {
+                "media_player": {
+                    "interface_addr": "127.0.0.1",
+                    "hosts": ["10.10.10.1", "10.10.10.2"],
+                }
+            }
+        },
+    )
+    await hass.async_block_till_done()
+
+
+async def test_async_poll_manual_hosts_1(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Tests first device fails, second device successful, speakers do not exist."""
+    soco_1 = soco_factory.cache_mock(_MockSoCoOsError(), "10.10.10.1", "Living Room")
+    soco_2 = soco_factory.cache_mock(MockSoCo(), "10.10.10.2", "Bedroom")
+
+    with caplog.at_level(logging.WARNING):
+        await _setup_hass(hass)
+        assert "media_player.bedroom" in entity_registry.entities
+        assert "media_player.living_room" not in entity_registry.entities
+        assert (
+            f"Could not get visible Sonos devices from {soco_1.ip_address}"
+            in caplog.text
+        )
+        assert (
+            f"Could not get visible Sonos devices from {soco_2.ip_address}"
+            not in caplog.text
+        )
+
+
+async def test_async_poll_manual_hosts_2(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test first device success, second device fails, speakers do not exist."""
+    soco_1 = soco_factory.cache_mock(MockSoCo(), "10.10.10.1", "Living Room")
+    soco_2 = soco_factory.cache_mock(_MockSoCoOsError(), "10.10.10.2", "Bedroom")
+
+    with caplog.at_level(logging.WARNING):
+        await _setup_hass(hass)
+        assert "media_player.bedroom" not in entity_registry.entities
+        assert "media_player.living_room" in entity_registry.entities
+        assert (
+            f"Could not get visible Sonos devices from {soco_1.ip_address}"
+            not in caplog.text
+        )
+        assert (
+            f"Could not get visible Sonos devices from {soco_2.ip_address}"
+            in caplog.text
+        )
+
+
+async def test_async_poll_manual_hosts_3(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test both devices fail, speakers do not exist."""
+    soco_1 = soco_factory.cache_mock(_MockSoCoOsError(), "10.10.10.1", "Living Room")
+    soco_2 = soco_factory.cache_mock(_MockSoCoOsError(), "10.10.10.2", "Bedroom")
+
+    with caplog.at_level(logging.WARNING):
+        await _setup_hass(hass)
+        assert "media_player.bedroom" not in entity_registry.entities
+        assert "media_player.living_room" not in entity_registry.entities
+        assert (
+            f"Could not get visible Sonos devices from {soco_1.ip_address}"
+            in caplog.text
+        )
+        assert (
+            f"Could not get visible Sonos devices from {soco_2.ip_address}"
+            in caplog.text
+        )
+
+
+async def test_async_poll_manual_hosts_4(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test both devices are successful, speakers do not exist."""
+    soco_1 = soco_factory.cache_mock(MockSoCo(), "10.10.10.1", "Living Room")
+    soco_2 = soco_factory.cache_mock(MockSoCo(), "10.10.10.2", "Bedroom")
+
+    with caplog.at_level(logging.WARNING):
+        await _setup_hass(hass)
+        assert "media_player.bedroom" in entity_registry.entities
+        assert "media_player.living_room" in entity_registry.entities
+        assert (
+            f"Could not get visible Sonos devices from {soco_1.ip_address}"
+            not in caplog.text
+        )
+        assert (
+            f"Could not get visible Sonos devices from {soco_2.ip_address}"
+            not in caplog.text
+        )
+
+
+class SpeakerActivity:
+    """Unit test class to track speaker activity messages."""
+
+    def __init__(self, hass: HomeAssistant, soco: MockSoCo) -> None:
+        """Create the object from soco."""
+        self.soco = soco
+        self.hass = hass
+        self.call_count: int = 0
+        self.event = asyncio.Event()
+        async_dispatcher_connect(
+            self.hass,
+            f"{SONOS_SPEAKER_ACTIVITY}-{self.soco.uid}",
+            self.speaker_activity,
+        )
+
+    @callback
+    def speaker_activity(self, source: str) -> None:
+        """Track the last activity on this speaker, set availability and resubscribe."""
+        if source == "manual zone scan":
+            self.event.set()
+            self.call_count += 1
+
+
+async def test_async_poll_manual_hosts_5(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test both succeed, speakers exist and unavailable, ping succeeds."""
+    soco_1 = soco_factory.cache_mock(MockSoCo(), "10.10.10.1", "Living Room")
+    soco_1.renderingControl = Mock()
+    soco_1.renderingControl.GetVolume = Mock()
+    speaker_1_activity = SpeakerActivity(hass, soco_1)
+    soco_2 = soco_factory.cache_mock(MockSoCo(), "10.10.10.2", "Bedroom")
+    soco_2.renderingControl = Mock()
+    soco_2.renderingControl.GetVolume = Mock()
+    speaker_2_activity = SpeakerActivity(hass, soco_2)
+    with patch(
+        "homeassistant.components.sonos.DISCOVERY_INTERVAL"
+    ) as mock_discovery_interval:
+        # Speed up manual discovery interval so second iteration runs sooner
+        mock_discovery_interval.total_seconds = Mock(side_effect=[0.5, 60])
+
+        await _setup_hass(hass)
+
+        assert "media_player.bedroom" in entity_registry.entities
+        assert "media_player.living_room" in entity_registry.entities
+
+        with caplog.at_level(logging.DEBUG):
+            caplog.clear()
+            await speaker_1_activity.event.wait()
+            await speaker_2_activity.event.wait()
+            await hass.async_block_till_done()
+            assert speaker_1_activity.call_count == 1
+            assert speaker_2_activity.call_count == 1
+            assert "Activity on Living Room" in caplog.text
+            assert "Activity on Bedroom" in caplog.text
+
+
+async def test_async_poll_manual_hosts_6(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test both succeed, speakers exist and unavailable, pings fail."""
+    soco_1 = soco_factory.cache_mock(MockSoCo(), "10.10.10.1", "Living Room")
+    # Rendering Control Get Volume is what speaker ping calls.
+    soco_1.renderingControl = Mock()
+    soco_1.renderingControl.GetVolume = Mock()
+    soco_1.renderingControl.GetVolume.side_effect = SonosUpdateError()
+    speaker_1_activity = SpeakerActivity(hass, soco_1)
+    soco_2 = soco_factory.cache_mock(MockSoCo(), "10.10.10.2", "Bedroom")
+    soco_2.renderingControl = Mock()
+    soco_2.renderingControl.GetVolume = Mock()
+    soco_2.renderingControl.GetVolume.side_effect = SonosUpdateError()
+    speaker_2_activity = SpeakerActivity(hass, soco_2)
+
+    with patch(
+        "homeassistant.components.sonos.DISCOVERY_INTERVAL"
+    ) as mock_discovery_interval:
+        # Speed up manual discovery interval so second iteration runs sooner
+        mock_discovery_interval.total_seconds = Mock(side_effect=[0.5, 60])
+        await _setup_hass(hass)
+
+        assert "media_player.bedroom" in entity_registry.entities
+        assert "media_player.living_room" in entity_registry.entities
+
+        with caplog.at_level(logging.DEBUG):
+            caplog.clear()
+            # The discovery events should not fire, wait with a timeout.
+            with pytest.raises(asyncio.TimeoutError):
+                async with asyncio_timeout(1.0):
+                    await speaker_1_activity.event.wait()
+            await hass.async_block_till_done()
+            assert "Activity on Living Room" not in caplog.text
+            assert "Activity on Bedroom" not in caplog.text
+            assert speaker_1_activity.call_count == 0
+            assert speaker_2_activity.call_count == 0
+
+
+async def test_async_poll_manual_hosts_7(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test both succeed, speaker do not exist, new hosts found in visible zones."""
+    soco_1 = soco_factory.cache_mock(
+        _MockSoCoVisibleZones(), "10.10.10.1", "Living Room"
+    )
+    soco_2 = soco_factory.cache_mock(_MockSoCoVisibleZones(), "10.10.10.2", "Bedroom")
+    soco_3 = soco_factory.cache_mock(MockSoCo(), "10.10.10.3", "Basement")
+    soco_4 = soco_factory.cache_mock(MockSoCo(), "10.10.10.4", "Garage")
+    soco_5 = soco_factory.cache_mock(MockSoCo(), "10.10.10.5", "Studio")
+
+    soco_1.set_visible_zones({soco_1, soco_2, soco_3, soco_4, soco_5})
+    soco_2.set_visible_zones({soco_1, soco_2, soco_3, soco_4, soco_5})
+
+    await _setup_hass(hass)
+    await hass.async_block_till_done()
+
+    assert "media_player.bedroom" in entity_registry.entities
+    assert "media_player.living_room" in entity_registry.entities
+    assert "media_player.basement" in entity_registry.entities
+    assert "media_player.garage" in entity_registry.entities
+    assert "media_player.studio" in entity_registry.entities
+
+
+async def test_async_poll_manual_hosts_8(
+    hass: HomeAssistant,
+    soco_factory: SoCoMockFactory,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test both succeed, speaker do not exist, invisible zone."""
+    soco_1 = soco_factory.cache_mock(
+        _MockSoCoVisibleZones(), "10.10.10.1", "Living Room"
+    )
+    soco_2 = soco_factory.cache_mock(_MockSoCoVisibleZones(), "10.10.10.2", "Bedroom")
+    soco_3 = soco_factory.cache_mock(MockSoCo(), "10.10.10.3", "Basement")
+    soco_4 = soco_factory.cache_mock(MockSoCo(), "10.10.10.4", "Garage")
+    soco_5 = soco_factory.cache_mock(MockSoCo(), "10.10.10.5", "Studio")
+
+    soco_1.set_visible_zones({soco_2, soco_3, soco_4, soco_5})
+    soco_2.set_visible_zones({soco_2, soco_3, soco_4, soco_5})
+
+    await _setup_hass(hass)
+    await hass.async_block_till_done()
+
+    assert "media_player.bedroom" in entity_registry.entities
+    assert "media_player.living_room" not in entity_registry.entities
+    assert "media_player.basement" in entity_registry.entities
+    assert "media_player.garage" in entity_registry.entities
+    assert "media_player.studio" in entity_registry.entities
diff --git a/tests/components/sonos/test_plex_playback.py b/tests/components/sonos/test_plex_playback.py
index a612359ac78097..99269ca10efcfa 100644
--- a/tests/components/sonos/test_plex_playback.py
+++ b/tests/components/sonos/test_plex_playback.py
@@ -34,7 +34,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
         "homeassistant.components.sonos.media_player.SonosMediaPlayerEntity.set_shuffle"
     ) as mock_shuffle:
         # Test successful Plex service call
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -59,7 +59,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
             '"album_name": "Album", "shuffle": 1}'
         )
 
-        assert await hass.services.async_call(
+        await hass.services.async_call(
             MP_DOMAIN,
             SERVICE_PLAY_MEDIA,
             {
@@ -107,7 +107,7 @@ async def test_plex_play_media(hass: HomeAssistant, async_autosetup_sonos) -> No
             "homeassistant.components.plex.services.get_plex_server",
             return_value=mock_plex_server,
         ):
-            assert await hass.services.async_call(
+            await hass.services.async_call(
                 MP_DOMAIN,
                 SERVICE_PLAY_MEDIA,
                 {
diff --git a/tests/components/sonos/test_switch.py b/tests/components/sonos/test_switch.py
index 405d99f5a17a6f..301c4a641ea567 100644
--- a/tests/components/sonos/test_switch.py
+++ b/tests/components/sonos/test_switch.py
@@ -16,7 +16,7 @@
 from homeassistant.const import ATTR_TIME, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import SonosMockEvent
 
@@ -114,7 +114,7 @@ async def test_switch_attributes(
     with patch.object(hass.data[DATA_SONOS_DISCOVERY_MANAGER], "async_shutdown") as m:
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+            dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
         )
         await hass.async_block_till_done()
         assert m.called
diff --git a/tests/components/soundtouch/test_media_player.py b/tests/components/soundtouch/test_media_player.py
index c01742854b2163..0bae58a1c00aed 100644
--- a/tests/components/soundtouch/test_media_player.py
+++ b/tests/components/soundtouch/test_media_player.py
@@ -31,7 +31,7 @@
 from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import DEVICE_1_ENTITY_ID, DEVICE_2_ENTITY_ID
 
@@ -662,7 +662,7 @@ async def test_zone_attributes(
     # Fast-forward time to allow all entities to be set up and updated again
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/sql/test_sensor.py b/tests/components/sql/test_sensor.py
index cd123556daf821..a6aa18c9294607 100644
--- a/tests/components/sql/test_sensor.py
+++ b/tests/components/sql/test_sensor.py
@@ -17,7 +17,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import (
     YAML_CONFIG,
@@ -218,7 +218,7 @@ def execute(self, query: Any) -> None:
         await init_integration(hass, config)
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=1),
+            dt_util.utcnow() + timedelta(minutes=1),
         )
         await hass.async_block_till_done()
 
@@ -399,7 +399,7 @@ async def test_no_issue_when_view_has_the_text_entity_id_in_it(
         )
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=1),
+            dt_util.utcnow() + timedelta(minutes=1),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/statistics/test_sensor.py b/tests/components/statistics/test_sensor.py
index 831ef91597de95..4b77e2d072535b 100644
--- a/tests/components/statistics/test_sensor.py
+++ b/tests/components/statistics/test_sensor.py
@@ -7,6 +7,8 @@
 from typing import Any
 from unittest.mock import patch
 
+from freezegun import freeze_time
+
 from homeassistant import config as hass_config
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.sensor import (
@@ -380,16 +382,9 @@ async def test_sampling_size_1(hass: HomeAssistant) -> None:
 async def test_age_limit_expiry(hass: HomeAssistant) -> None:
     """Test that values are removed with given max age."""
     now = dt_util.utcnow()
-    mock_data = {
-        "return_time": datetime(now.year + 1, 8, 2, 12, 23, tzinfo=dt_util.UTC)
-    }
-
-    def mock_now():
-        return mock_data["return_time"]
+    current_time = datetime(now.year + 1, 8, 2, 12, 23, tzinfo=dt_util.UTC)
 
-    with patch(
-        "homeassistant.components.statistics.sensor.dt_util.utcnow", new=mock_now
-    ):
+    with freeze_time(current_time) as freezer:
         assert await async_setup_component(
             hass,
             "sensor",
@@ -409,8 +404,9 @@ def mock_now():
         await hass.async_block_till_done()
 
         for value in VALUES_NUMERIC:
-            mock_data["return_time"] += timedelta(minutes=1)
-            async_fire_time_changed(hass, mock_data["return_time"])
+            current_time += timedelta(minutes=1)
+            freezer.move_to(current_time)
+            async_fire_time_changed(hass, current_time)
             hass.states.async_set(
                 "sensor.test_monitored",
                 str(value),
@@ -429,8 +425,9 @@ def mock_now():
 
         # Values expire over time. Only two are left
 
-        mock_data["return_time"] += timedelta(minutes=3)
-        async_fire_time_changed(hass, mock_data["return_time"])
+        current_time += timedelta(minutes=3)
+        freezer.move_to(current_time)
+        async_fire_time_changed(hass, current_time)
         await hass.async_block_till_done()
 
         state = hass.states.get("sensor.test")
@@ -442,8 +439,9 @@ def mock_now():
 
         # Values expire over time. Only one is left
 
-        mock_data["return_time"] += timedelta(minutes=1)
-        async_fire_time_changed(hass, mock_data["return_time"])
+        current_time += timedelta(minutes=1)
+        freezer.move_to(current_time)
+        async_fire_time_changed(hass, current_time)
         await hass.async_block_till_done()
 
         state = hass.states.get("sensor.test")
@@ -455,8 +453,9 @@ def mock_now():
 
         # Values expire over time. Buffer is empty
 
-        mock_data["return_time"] += timedelta(minutes=1)
-        async_fire_time_changed(hass, mock_data["return_time"])
+        current_time += timedelta(minutes=1)
+        freezer.move_to(current_time)
+        async_fire_time_changed(hass, current_time)
         await hass.async_block_till_done()
 
         state = hass.states.get("sensor.test")
@@ -785,12 +784,8 @@ async def test_unitless_source_sensor(hass: HomeAssistant) -> None:
 async def test_state_characteristics(hass: HomeAssistant) -> None:
     """Test configured state characteristic for value and unit."""
     now = dt_util.utcnow()
+    current_time = datetime(now.year + 1, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC)
     start_datetime = datetime(now.year + 1, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC)
-    mock_data = {"return_time": start_datetime}
-
-    def mock_now():
-        return mock_data["return_time"]
-
     characteristics: Sequence[dict[str, Any]] = (
         {
             "source_sensor_domain": "sensor",
@@ -1119,9 +1114,7 @@ def mock_now():
             }
         )
 
-    with patch(
-        "homeassistant.components.statistics.sensor.dt_util.utcnow", new=mock_now
-    ):
+    with freeze_time(current_time) as freezer:
         assert await async_setup_component(
             hass,
             "sensor",
@@ -1132,8 +1125,9 @@ def mock_now():
         # With all values in buffer
 
         for i in range(len(VALUES_NUMERIC)):
-            mock_data["return_time"] += timedelta(minutes=1)
-            async_fire_time_changed(hass, mock_data["return_time"])
+            current_time += timedelta(minutes=1)
+            freezer.move_to(current_time)
+            async_fire_time_changed(hass, current_time)
             hass.states.async_set(
                 "sensor.test_monitored",
                 str(VALUES_NUMERIC[i]),
@@ -1167,8 +1161,9 @@ def mock_now():
 
         # With single value in buffer
 
-        mock_data["return_time"] += timedelta(minutes=8)
-        async_fire_time_changed(hass, mock_data["return_time"])
+        current_time += timedelta(minutes=8)
+        freezer.move_to(current_time)
+        async_fire_time_changed(hass, current_time)
         await hass.async_block_till_done()
 
         for characteristic in characteristics:
@@ -1189,8 +1184,9 @@ def mock_now():
 
         # With empty buffer
 
-        mock_data["return_time"] += timedelta(minutes=1)
-        async_fire_time_changed(hass, mock_data["return_time"])
+        current_time += timedelta(minutes=1)
+        freezer.move_to(current_time)
+        async_fire_time_changed(hass, current_time)
         await hass.async_block_till_done()
 
         for characteristic in characteristics:
@@ -1295,12 +1291,7 @@ async def test_initialize_from_database_with_maxage(
 ) -> None:
     """Test initializing the statistics from the database."""
     now = dt_util.utcnow()
-    mock_data = {
-        "return_time": datetime(now.year + 1, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC)
-    }
-
-    def mock_now():
-        return mock_data["return_time"]
+    current_time = datetime(now.year + 1, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC)
 
     # Testing correct retrieval from recorder, thus we do not
     # want purging to occur within the class itself.
@@ -1311,9 +1302,9 @@ def mock_purge(self, *args):
     await hass.async_block_till_done()
     await async_wait_recording_done(hass)
 
-    with patch(
-        "homeassistant.components.statistics.sensor.dt_util.utcnow", new=mock_now
-    ), patch.object(StatisticsSensor, "_purge_old_states", mock_purge):
+    with freeze_time(current_time) as freezer, patch.object(
+        StatisticsSensor, "_purge_old_states", mock_purge
+    ):
         for value in VALUES_NUMERIC:
             hass.states.async_set(
                 "sensor.test_monitored",
@@ -1321,7 +1312,9 @@ def mock_purge(self, *args):
                 {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS},
             )
             await hass.async_block_till_done()
-            mock_data["return_time"] += timedelta(hours=1)
+            current_time += timedelta(hours=1)
+            freezer.move_to(current_time)
+
         await async_wait_recording_done(hass)
         # create the statistics component, get filled from database
         assert await async_setup_component(
@@ -1347,7 +1340,7 @@ def mock_purge(self, *args):
     assert state.attributes.get("age_coverage_ratio") == round(2 / 3, 2)
     # The max_age timestamp should be 1 hour before what we have right
     # now in mock_data['return_time'].
-    assert mock_data["return_time"] == datetime.strptime(
+    assert current_time == datetime.strptime(
         state.state, "%Y-%m-%dT%H:%M:%S%z"
     ) + timedelta(hours=1)
 
diff --git a/tests/components/statsd/test_init.py b/tests/components/statsd/test_init.py
index 2b94d8c07905a4..1b48b6195e5f9b 100644
--- a/tests/components/statsd/test_init.py
+++ b/tests/components/statsd/test_init.py
@@ -1,13 +1,12 @@
 """The tests for the StatsD feeder."""
 from unittest import mock
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 import voluptuous as vol
 
 import homeassistant.components.statsd as statsd
-from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON
-import homeassistant.core as ha
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -32,15 +31,15 @@ def test_invalid_config() -> None:
 async def test_statsd_setup_full(hass: HomeAssistant) -> None:
     """Test setup with all data."""
     config = {"statsd": {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}}
-    hass.bus.listen = MagicMock()
     with patch("statsd.StatsClient") as mock_init:
         assert await async_setup_component(hass, statsd.DOMAIN, config)
 
         assert mock_init.call_count == 1
         assert mock_init.call_args == mock.call(host="host", port=123, prefix="foo")
 
-    assert hass.bus.listen.called
-    assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
+        hass.states.async_set("domain.test", "on")
+        await hass.async_block_till_done()
+        assert len(mock_init.mock_calls) == 3
 
 
 async def test_statsd_setup_defaults(hass: HomeAssistant) -> None:
@@ -50,13 +49,14 @@ async def test_statsd_setup_defaults(hass: HomeAssistant) -> None:
     config["statsd"][statsd.CONF_PORT] = statsd.DEFAULT_PORT
     config["statsd"][statsd.CONF_PREFIX] = statsd.DEFAULT_PREFIX
 
-    hass.bus.listen = MagicMock()
     with patch("statsd.StatsClient") as mock_init:
         assert await async_setup_component(hass, statsd.DOMAIN, config)
 
         assert mock_init.call_count == 1
         assert mock_init.call_args == mock.call(host="host", port=8125, prefix="hass")
-    assert hass.bus.listen.called
+        hass.states.async_set("domain.test", "on")
+        await hass.async_block_till_done()
+        assert len(mock_init.mock_calls) == 3
 
 
 async def test_event_listener_defaults(hass: HomeAssistant, mock_client) -> None:
@@ -65,31 +65,27 @@ async def test_event_listener_defaults(hass: HomeAssistant, mock_client) -> None
 
     config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
 
-    hass.bus.listen = MagicMock()
     await async_setup_component(hass, statsd.DOMAIN, config)
-    assert hass.bus.listen.called
-    handler_method = hass.bus.listen.call_args_list[0][0][1]
 
     valid = {"1": 1, "1.0": 1.0, "custom": 3, STATE_ON: 1, STATE_OFF: 0}
     for in_, out in valid.items():
-        state = MagicMock(state=in_, attributes={"attribute key": 3.2})
-        handler_method(MagicMock(data={"new_state": state}))
+        hass.states.async_set("domain.test", in_, {"attribute key": 3.2})
+        await hass.async_block_till_done()
         mock_client.gauge.assert_has_calls(
-            [mock.call(state.entity_id, out, statsd.DEFAULT_RATE)]
+            [mock.call("domain.test", out, statsd.DEFAULT_RATE)]
         )
 
         mock_client.gauge.reset_mock()
 
         assert mock_client.incr.call_count == 1
         assert mock_client.incr.call_args == mock.call(
-            state.entity_id, rate=statsd.DEFAULT_RATE
+            "domain.test", rate=statsd.DEFAULT_RATE
         )
         mock_client.incr.reset_mock()
 
     for invalid in ("foo", "", object):
-        handler_method(
-            MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
-        )
+        hass.states.async_set("domain.test", invalid, {})
+        await hass.async_block_till_done()
         assert not mock_client.gauge.called
         assert mock_client.incr.called
 
@@ -100,19 +96,16 @@ async def test_event_listener_attr_details(hass: HomeAssistant, mock_client) ->
 
     config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
 
-    hass.bus.listen = MagicMock()
     await async_setup_component(hass, statsd.DOMAIN, config)
-    assert hass.bus.listen.called
-    handler_method = hass.bus.listen.call_args_list[0][0][1]
 
     valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0}
     for in_, out in valid.items():
-        state = MagicMock(state=in_, attributes={"attribute key": 3.2})
-        handler_method(MagicMock(data={"new_state": state}))
+        hass.states.async_set("domain.test", in_, {"attribute key": 3.2})
+        await hass.async_block_till_done()
         mock_client.gauge.assert_has_calls(
             [
-                mock.call(f"{state.entity_id}.state", out, statsd.DEFAULT_RATE),
-                mock.call(f"{state.entity_id}.attribute_key", 3.2, statsd.DEFAULT_RATE),
+                mock.call("domain.test.state", out, statsd.DEFAULT_RATE),
+                mock.call("domain.test.attribute_key", 3.2, statsd.DEFAULT_RATE),
             ]
         )
 
@@ -120,13 +113,12 @@ async def test_event_listener_attr_details(hass: HomeAssistant, mock_client) ->
 
         assert mock_client.incr.call_count == 1
         assert mock_client.incr.call_args == mock.call(
-            state.entity_id, rate=statsd.DEFAULT_RATE
+            "domain.test", rate=statsd.DEFAULT_RATE
         )
         mock_client.incr.reset_mock()
 
     for invalid in ("foo", "", object):
-        handler_method(
-            MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
-        )
+        hass.states.async_set("domain.test", invalid, {})
+        await hass.async_block_till_done()
         assert not mock_client.gauge.called
         assert mock_client.incr.called
diff --git a/tests/components/steam_online/__init__.py b/tests/components/steam_online/__init__.py
index d41554e4d044b1..786c5d6778252b 100644
--- a/tests/components/steam_online/__init__.py
+++ b/tests/components/steam_online/__init__.py
@@ -1,5 +1,8 @@
 """Tests for Steam integration."""
+import random
+import string
 from unittest.mock import patch
+import urllib.parse
 
 import steam
 
@@ -11,8 +14,8 @@
 from tests.common import MockConfigEntry
 
 API_KEY = "abc123"
-ACCOUNT_1 = "1234567890"
-ACCOUNT_2 = "1234567891"
+ACCOUNT_1 = "12345678901234567"
+ACCOUNT_2 = "12345678912345678"
 ACCOUNT_NAME_1 = "testaccount1"
 ACCOUNT_NAME_2 = "testaccount2"
 
@@ -30,6 +33,8 @@
     }
 }
 
+MAX_LENGTH_STEAM_IDS = 30
+
 
 def create_entry(hass: HomeAssistant) -> MockConfigEntry:
     """Add config entry in Home Assistant."""
@@ -62,16 +67,32 @@ def ISteamUser(self) -> None:
 
     def GetFriendList(self, steamid: str) -> dict:
         """Get friend list."""
-        return {"friendslist": {"friends": [{"steamid": ACCOUNT_2}]}}
-
-    def GetPlayerSummaries(self, steamids: str) -> dict:
+        fake_friends = [{"steamid": ACCOUNT_2}]
+        for _i in range(0, 4):
+            fake_friends.append(
+                {"steamid": "".join(random.choices(string.digits, k=len(ACCOUNT_1)))}
+            )
+        return {"friendslist": {"friends": fake_friends}}
+
+    def GetPlayerSummaries(self, steamids: str | list[str]) -> dict:
         """Get player summaries."""
+        assert len(urllib.parse.quote(str(steamids))) <= MAX_LENGTH_STEAM_IDS
         return {
             "response": {
                 "players": {
                     "player": [
-                        {"steamid": ACCOUNT_1, "personaname": ACCOUNT_NAME_1},
-                        {"steamid": ACCOUNT_2, "personaname": ACCOUNT_NAME_2},
+                        {
+                            "steamid": ACCOUNT_1,
+                            "personaname": ACCOUNT_NAME_1,
+                            "personastate": 1,
+                            "avatarmedium": "",
+                        },
+                        {
+                            "steamid": ACCOUNT_2,
+                            "personaname": ACCOUNT_NAME_2,
+                            "personastate": 2,
+                            "avatarmedium": "",
+                        },
                     ]
                 }
             }
diff --git a/tests/components/steam_online/test_config_flow.py b/tests/components/steam_online/test_config_flow.py
index a9d81a16fba14f..a62adb18776541 100644
--- a/tests/components/steam_online/test_config_flow.py
+++ b/tests/components/steam_online/test_config_flow.py
@@ -138,7 +138,10 @@ async def test_flow_reauth(hass: HomeAssistant) -> None:
 async def test_options_flow(hass: HomeAssistant) -> None:
     """Test updating options."""
     entry = create_entry(hass)
-    with patch_interface():
+    with patch_interface(), patch(
+        "homeassistant.components.steam_online.config_flow.MAX_IDS_TO_REQUEST",
+        return_value=2,
+    ):
         await hass.config_entries.async_setup(entry.entry_id)
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
@@ -159,7 +162,10 @@ async def test_options_flow(hass: HomeAssistant) -> None:
 async def test_options_flow_deselect(hass: HomeAssistant) -> None:
     """Test deselecting user."""
     entry = create_entry(hass)
-    with patch_interface():
+    with patch_interface(), patch(
+        "homeassistant.components.steam_online.config_flow.MAX_IDS_TO_REQUEST",
+        return_value=2,
+    ):
         await hass.config_entries.async_setup(entry.entry_id)
         result = await hass.config_entries.options.async_init(entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/stt/test_init.py b/tests/components/stt/test_init.py
index 5a7e93a72a271f..4100df94b9eea8 100644
--- a/tests/components/stt/test_init.py
+++ b/tests/components/stt/test_init.py
@@ -392,7 +392,7 @@ async def test_ws_list_engines(
     setup: MockProvider | MockProviderEntity,
     engine_id: str,
 ) -> None:
-    """Test listing speech to text engines."""
+    """Test listing speech-to-text engines."""
     client = await hass_ws_client()
 
     await client.send_json_auto_id({"type": "stt/engine/list"})
diff --git a/tests/components/stt/test_legacy.py b/tests/components/stt/test_legacy.py
index a95a1f0f6f494a..7176b866b002b0 100644
--- a/tests/components/stt/test_legacy.py
+++ b/tests/components/stt/test_legacy.py
@@ -26,7 +26,7 @@ async def test_invalid_platform(
     )
     await hass.async_block_till_done()
 
-    assert "Unknown speech to text platform specified" in caplog.text
+    assert "Unknown speech-to-text platform specified" in caplog.text
 
 
 async def test_platform_setup_with_error(
diff --git a/tests/components/sun/test_trigger.py b/tests/components/sun/test_trigger.py
index 08910010d5f36c..9d8f5d82a51128 100644
--- a/tests/components/sun/test_trigger.py
+++ b/tests/components/sun/test_trigger.py
@@ -19,7 +19,11 @@
 import homeassistant.util.dt as dt_util
 
 from tests.common import async_fire_time_changed, async_mock_service, mock_component
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/switch/test_device_action.py b/tests/components/switch/test_device_action.py
index a52474fe03079a..85799a49a349d1 100644
--- a/tests/components/switch/test_device_action.py
+++ b/tests/components/switch/test_device_action.py
@@ -1,10 +1,11 @@
 """The test for switch device automation."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -37,7 +41,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = []
@@ -46,7 +50,7 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -54,7 +58,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -80,7 +84,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -94,7 +98,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_off", "turn_on", "toggle"]
@@ -102,20 +106,17 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off actions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
     assert await async_setup_component(
         hass,
@@ -123,29 +124,29 @@ async def test_action(
         {
             automation.DOMAIN: [
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "trigger": {"platform": "event", "event_type": "test_off"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event2"},
+                    "trigger": {"platform": "event", "event_type": "test_on"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
                 {
-                    "trigger": {"platform": "event", "event_type": "test_event3"},
+                    "trigger": {"platform": "event", "event_type": "test_toggle"},
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "toggle",
                     },
                 },
@@ -153,29 +154,58 @@ async def test_action(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
-    assert len(calls) == 0
 
-    hass.bus.async_fire("test_event1")
-    await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    turn_on_calls = async_mock_service(hass, DOMAIN, "turn_on")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+    toggle_calls = async_mock_service(hass, DOMAIN, "toggle")
 
-    hass.bus.async_fire("test_event1")
+    hass.bus.async_fire("test_toggle")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
+    assert len(toggle_calls) == 1
+    assert toggle_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event2")
+    hass.bus.async_fire("test_on")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_on_calls) == 1
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
 
-    hass.bus.async_fire("test_event3")
+
+async def test_action_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_off"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_OFF
 
-    hass.bus.async_fire("test_event3")
+    turn_off_calls = async_mock_service(hass, DOMAIN, "turn_off")
+
+    hass.bus.async_fire("test_off")
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
+    assert len(turn_off_calls) == 1
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py
index 6a1a269c4e1ce3..c60954e335f74a 100644
--- a/tests/components/switch/test_device_condition.py
+++ b/tests/components/switch/test_device_condition.py
@@ -1,13 +1,14 @@
 """The test for switch device automation."""
 from datetime import timedelta
-from unittest.mock import patch
 
+from freezegun import freeze_time
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -16,12 +17,15 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -51,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_off", "is_on"]
@@ -59,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_off", "is_on"]
@@ -107,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 async def test_get_condition_capabilities(
@@ -140,17 +144,49 @@ async def test_get_condition_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_condition_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch condition."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    conditions = await async_get_device_automations(
+        hass, DeviceAutomationType.CONDITION, device_entry.id
+    )
+    for condition in conditions:
+        condition["entity_id"] = entity_registry.async_get(
+            condition["entity_id"]
+        ).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.CONDITION, condition
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_state(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off conditions."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -164,7 +200,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_on",
                         }
                     ],
@@ -183,7 +219,7 @@ async def test_if_state(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                         }
                     ],
@@ -199,7 +235,6 @@ async def test_if_state(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
     hass.bus.async_fire("test_event1")
@@ -208,7 +243,7 @@ async def test_if_state(
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_on event - test_event1"
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -216,24 +251,69 @@ async def test_if_state(
     assert calls[1].data["some"] == "is_off event - test_event2"
 
 
+async def test_if_state_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_on",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_on {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(("platform", "event.event_type"))
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_on event - test_event1"
+
+
 async def test_if_fires_on_for_condition(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for firing if condition is on with delay."""
     point1 = dt_util.utcnow()
     point2 = point1 + timedelta(seconds=10)
     point3 = point2 + timedelta(seconds=10)
 
-    platform = getattr(hass.components, f"test.{DOMAIN}")
-
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
-    with patch("homeassistant.core.dt_util.utcnow") as mock_utcnow:
-        mock_utcnow.return_value = point1
+    with freeze_time(point1) as freezer:
         assert await async_setup_component(
             hass,
             automation.DOMAIN,
@@ -245,7 +325,7 @@ async def test_if_fires_on_for_condition(
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": ent1.entity_id,
+                            "entity_id": entry.id,
                             "type": "is_off",
                             "for": {"seconds": 5},
                         },
@@ -263,7 +343,6 @@ async def test_if_fires_on_for_condition(
             },
         )
         await hass.async_block_till_done()
-        assert hass.states.get(ent1.entity_id).state == STATE_ON
         assert len(calls) == 0
 
         hass.bus.async_fire("test_event1")
@@ -271,18 +350,18 @@ async def test_if_fires_on_for_condition(
         assert len(calls) == 0
 
         # Time travel 10 secs into the future
-        mock_utcnow.return_value = point2
+        freezer.move_to(point2)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
-        hass.states.async_set(ent1.entity_id, STATE_OFF)
+        hass.states.async_set(entry.entity_id, STATE_OFF)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 0
 
         # Time travel 20 secs into the future
-        mock_utcnow.return_value = point3
+        freezer.move_to(point3)
         hass.bus.async_fire("test_event1")
         await hass.async_block_till_done()
         assert len(calls) == 1
diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py
index 8d55149648aaf1..32f8f65b114b56 100644
--- a/tests/components/switch/test_device_trigger.py
+++ b/tests/components/switch/test_device_trigger.py
@@ -2,11 +2,12 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
 from homeassistant.components.switch import DOMAIN
-from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCategory
+from homeassistant.const import STATE_OFF, STATE_ON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -51,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -59,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -107,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -140,17 +144,47 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a switch trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
-    await hass.async_block_till_done()
-
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -162,7 +196,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -186,7 +220,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                     },
                     "action": {
@@ -210,7 +244,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "changed_states",
                     },
                     "action": {
@@ -233,37 +267,90 @@ async def test_if_fires_on_state_change(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert {calls[0].data["some"], calls[1].data["some"]} == {
-        f"turn_off device - {ent1.entity_id} - on - off - None",
-        f"turn_on_or_off device - {ent1.entity_id} - on - off - None",
+        f"turn_off device - {entry.entity_id} - on - off - None",
+        f"turn_on_or_off device - {entry.entity_id} - on - off - None",
     }
 
-    hass.states.async_set(ent1.entity_id, STATE_ON)
+    hass.states.async_set(entry.entity_id, STATE_ON)
     await hass.async_block_till_done()
     assert len(calls) == 4
     assert {calls[2].data["some"], calls[3].data["some"]} == {
-        f"turn_on device - {ent1.entity_id} - off - on - None",
-        f"turn_on_or_off device - {ent1.entity_id} - off - on - None",
+        f"turn_on device - {entry.entity_id} - off - on - None",
+        f"turn_on_or_off device - {entry.entity_id} - off - on - None",
     }
 
 
-async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls, enable_custom_integrations: None
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
 ) -> None:
-    """Test for triggers firing with delay."""
-    platform = getattr(hass.components, f"test.{DOMAIN}")
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
-    platform.init()
-    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "turn_off {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
     await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - None"
+    )
+
+
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls,
+    enable_custom_integrations: None,
+) -> None:
+    """Test for triggers firing with delay."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
 
-    ent1, ent2, ent3 = platform.ENTITIES
+    hass.states.async_set(entry.entity_id, STATE_ON)
 
     assert await async_setup_component(
         hass,
@@ -275,7 +362,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": ent1.entity_id,
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
@@ -299,16 +386,16 @@ async def test_if_fires_on_state_change_with_for(
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(ent1.entity_id).state == STATE_ON
     assert len(calls) == 0
 
-    hass.states.async_set(ent1.entity_id, STATE_OFF)
+    hass.states.async_set(entry.entity_id, STATE_OFF)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert len(calls) == 1
     await hass.async_block_till_done()
-    assert calls[0].data["some"] == "turn_off device - {} - on - off - 0:00:05".format(
-        ent1.entity_id
+    assert (
+        calls[0].data["some"]
+        == f"turn_off device - {entry.entity_id} - on - off - 0:00:05"
     )
diff --git a/tests/components/switchbee/test_config_flow.py b/tests/components/switchbee/test_config_flow.py
index baa342807556b3..239777a4da35ca 100644
--- a/tests/components/switchbee/test_config_flow.py
+++ b/tests/components/switchbee/test_config_flow.py
@@ -2,6 +2,8 @@
 import json
 from unittest.mock import patch
 
+import pytest
+
 from homeassistant import config_entries
 from homeassistant.components.switchbee.config_flow import SwitchBeeError
 from homeassistant.components.switchbee.const import DOMAIN
@@ -14,10 +16,15 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
-async def test_form(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize("test_cucode_in_coordinator_data", [False, True])
+async def test_form(hass: HomeAssistant, test_cucode_in_coordinator_data) -> None:
     """Test we get the form."""
 
     coordinator_data = json.loads(load_fixture("switchbee.json", "switchbee"))
+
+    if test_cucode_in_coordinator_data:
+        coordinator_data["data"]["cuCode"] = "300F123456"
+
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
diff --git a/tests/components/switcher_kis/test_init.py b/tests/components/switcher_kis/test_init.py
index 8006e81783af17..6b592b2507718d 100644
--- a/tests/components/switcher_kis/test_init.py
+++ b/tests/components/switcher_kis/test_init.py
@@ -14,7 +14,7 @@
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt, slugify
+from homeassistant.util import dt as dt_util, slugify
 
 from . import init_integration
 from .consts import DUMMY_SWITCHER_DEVICES, YAML_CONFIG
@@ -63,7 +63,7 @@ async def test_update_fail(
     assert len(hass.data[DOMAIN][DATA_DEVICE]) == 2
 
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=MAX_UPDATE_INTERVAL_SEC + 1)
+        hass, dt_util.utcnow() + timedelta(seconds=MAX_UPDATE_INTERVAL_SEC + 1)
     )
     await hass.async_block_till_done()
 
@@ -84,7 +84,7 @@ async def test_update_fail(
     mock_bridge.mock_callbacks(DUMMY_SWITCHER_DEVICES)
     await hass.async_block_till_done()
     async_fire_time_changed(
-        hass, dt.utcnow() + timedelta(seconds=MAX_UPDATE_INTERVAL_SEC - 1)
+        hass, dt_util.utcnow() + timedelta(seconds=MAX_UPDATE_INTERVAL_SEC - 1)
     )
 
     for device in DUMMY_SWITCHER_DEVICES:
diff --git a/tests/components/tado/fixtures/home_state.json b/tests/components/tado/fixtures/home_state.json
new file mode 100644
index 00000000000000..dc073fbfd78ed4
--- /dev/null
+++ b/tests/components/tado/fixtures/home_state.json
@@ -0,0 +1,4 @@
+{
+  "presence": "HOME",
+  "presenceLocked": false
+}
diff --git a/tests/components/tado/test_climate.py b/tests/components/tado/test_climate.py
index 35e017278aa6db..fd4ae87ac64975 100644
--- a/tests/components/tado/test_climate.py
+++ b/tests/components/tado/test_climate.py
@@ -22,8 +22,8 @@ async def test_air_con(hass: HomeAssistant) -> None:
         "hvac_modes": ["off", "auto", "heat", "cool", "heat_cool", "dry", "fan_only"],
         "max_temp": 31.0,
         "min_temp": 16.0,
-        "preset_mode": "home",
-        "preset_modes": ["away", "home"],
+        "preset_mode": "auto",
+        "preset_modes": ["away", "home", "auto"],
         "supported_features": 25,
         "target_temp_step": 1,
         "temperature": 17.8,
@@ -49,8 +49,8 @@ async def test_heater(hass: HomeAssistant) -> None:
         "hvac_modes": ["off", "auto", "heat"],
         "max_temp": 31.0,
         "min_temp": 16.0,
-        "preset_mode": "home",
-        "preset_modes": ["away", "home"],
+        "preset_mode": "auto",
+        "preset_modes": ["away", "home", "auto"],
         "supported_features": 17,
         "target_temp_step": 1,
         "temperature": 20.5,
@@ -78,8 +78,8 @@ async def test_smartac_with_swing(hass: HomeAssistant) -> None:
         "hvac_modes": ["off", "auto", "heat", "cool", "heat_cool", "dry", "fan_only"],
         "max_temp": 30.0,
         "min_temp": 16.0,
-        "preset_mode": "home",
-        "preset_modes": ["away", "home"],
+        "preset_mode": "auto",
+        "preset_modes": ["away", "home", "auto"],
         "swing_modes": ["on", "off"],
         "supported_features": 57,
         "target_temp_step": 1.0,
diff --git a/tests/components/tado/util.py b/tests/components/tado/util.py
index 899d2ce1f21dc0..21e0e255ed11fa 100644
--- a/tests/components/tado/util.py
+++ b/tests/components/tado/util.py
@@ -19,6 +19,7 @@ async def async_init_integration(
     devices_fixture = "tado/devices.json"
     me_fixture = "tado/me.json"
     weather_fixture = "tado/weather.json"
+    home_state_fixture = "tado/home_state.json"
     zones_fixture = "tado/zones.json"
     zone_states_fixture = "tado/zone_states.json"
 
@@ -61,6 +62,10 @@ async def async_init_integration(
             "https://my.tado.com/api/v2/homes/1/weather",
             text=load_fixture(weather_fixture),
         )
+        m.get(
+            "https://my.tado.com/api/v2/homes/1/state",
+            text=load_fixture(home_state_fixture),
+        )
         m.get(
             "https://my.tado.com/api/v2/homes/1/devices",
             text=load_fixture(devices_fixture),
diff --git a/tests/components/tag/test_trigger.py b/tests/components/tag/test_trigger.py
index 5fe0664f5d9019..2780b928027519 100644
--- a/tests/components/tag/test_trigger.py
+++ b/tests/components/tag/test_trigger.py
@@ -9,7 +9,11 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import async_mock_service
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/tasmota/test_device_trigger.py b/tests/components/tasmota/test_device_trigger.py
index c999e6c068389e..880f4ed0e7585e 100644
--- a/tests/components/tasmota/test_device_trigger.py
+++ b/tests/components/tasmota/test_device_trigger.py
@@ -5,6 +5,7 @@
 
 from hatasmota.switch import TasmotaSwitchTriggerConfig
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -18,14 +19,17 @@
 from .test_common import DEFAULT_CONFIG, remove_device
 
 from tests.common import (
-    assert_lists_same,
     async_fire_mqtt_message,
     async_get_device_automations,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import MqttMockHAClient, WebSocketGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 async def test_get_triggers_btn(
     hass: HomeAssistant,
     device_reg,
@@ -70,7 +74,7 @@ async def test_get_triggers_btn(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_swc(
@@ -105,7 +109,7 @@ async def test_get_triggers_swc(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_unknown_triggers(
@@ -154,7 +158,7 @@ async def test_get_unknown_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 async def test_get_non_existing_triggers(
@@ -179,7 +183,7 @@ async def test_get_non_existing_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
 
 @pytest.mark.no_fail_on_log_exception
@@ -211,7 +215,7 @@ async def test_discover_bad_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
     # Trigger an exception when the entity is discovered
     class FakeTrigger(TasmotaSwitchTriggerConfig):
@@ -247,7 +251,7 @@ def is_active(self):
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, [])
+    assert triggers == []
 
     # Rediscover without exception
     async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
@@ -267,7 +271,7 @@ def is_active(self):
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_update_remove_triggers(
diff --git a/tests/components/tasmota/test_sensor.py b/tests/components/tasmota/test_sensor.py
index 1d9334a2657a79..6a896615c734c8 100644
--- a/tests/components/tasmota/test_sensor.py
+++ b/tests/components/tasmota/test_sensor.py
@@ -19,7 +19,7 @@
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNKNOWN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .test_common import (
     DEFAULT_CONFIG,
@@ -727,7 +727,7 @@ async def test_restart_time_status_sensor_state_via_mqtt(
     assert not state.attributes.get(ATTR_ASSUMED_STATE)
 
     # Test polled state update
-    utc_now = datetime.datetime(2020, 11, 11, 8, 0, 0, tzinfo=dt.UTC)
+    utc_now = datetime.datetime(2020, 11, 11, 8, 0, 0, tzinfo=dt_util.UTC)
     hatasmota.status_sensor.datetime.now.return_value = utc_now
     async_fire_mqtt_message(
         hass,
@@ -931,7 +931,8 @@ async def test_enable_status_sensor(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow()
+        + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/template/test_image.py b/tests/components/template/test_image.py
new file mode 100644
index 00000000000000..17b84e327b1267
--- /dev/null
+++ b/tests/components/template/test_image.py
@@ -0,0 +1,507 @@
+"""The tests for the Template image platform."""
+from http import HTTPStatus
+from io import BytesIO
+from typing import Any
+
+import httpx
+from PIL import Image
+import pytest
+import respx
+
+from homeassistant import setup
+from homeassistant.components.input_text import (
+    ATTR_VALUE as INPUT_TEXT_ATTR_VALUE,
+    DOMAIN as INPUT_TEXT_DOMAIN,
+    SERVICE_SET_VALUE as INPUT_TEXT_SERVICE_SET_VALUE,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_PICTURE,
+    CONF_ENTITY_ID,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_registry import async_get
+from homeassistant.util import dt as dt_util
+
+from tests.common import assert_setup_component
+from tests.typing import ClientSessionGenerator
+
+_DEFAULT = object()
+_TEST_IMAGE = "image.template_image"
+_URL_INPUT_TEXT = "input_text.url"
+
+
+@pytest.fixture
+def imgbytes_jpg():
+    """Image in RAM for testing."""
+    buf = BytesIO()  # fake image in ram for testing.
+    Image.new("RGB", (1, 1)).save(buf, format="jpeg")
+    return bytes(buf.getbuffer())
+
+
+@pytest.fixture
+def imgbytes2_jpg():
+    """Image in RAM for testing."""
+    buf = BytesIO()  # fake image in ram for testing.
+    Image.new("RGB", (1, 1), 100).save(buf, format="jpeg")
+    return bytes(buf.getbuffer())
+
+
+async def _assert_state(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    expected_state: str,
+    expected_image: bytes | None,
+    entity_id: str = _TEST_IMAGE,
+    expected_content_type: str = "image/jpeg",
+    expected_entity_picture: Any = _DEFAULT,
+    expected_status: HTTPStatus = HTTPStatus.OK,
+):
+    """Verify image's state."""
+    state = hass.states.get(entity_id)
+    attributes = state.attributes
+    assert state.state == expected_state
+    if expected_entity_picture is _DEFAULT:
+        expected_entity_picture = (
+            f"/api/image_proxy/{entity_id}?token={attributes['access_token']}"
+        )
+
+    assert attributes.get(ATTR_ENTITY_PICTURE) == expected_entity_picture
+
+    client = await hass_client()
+
+    resp = await client.get(f"/api/image_proxy/{entity_id}")
+    assert resp.content_type == expected_content_type
+    assert resp.status == expected_status
+    body = await resp.read()
+    assert body == expected_image
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_platform_config(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test configuring under the platform key does not work."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "image"):
+        assert await setup.async_setup_component(
+            hass,
+            "image",
+            {
+                "image": {
+                    "platform": "template",
+                    "url": "{{ 'http://example.com' }}",
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_missing_optional_config(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test: missing optional template is ok."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "{{ 'http://example.com' }}",
+                    }
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_multiple_configs(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test: multiple image entities get created."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": [
+                        {
+                            "url": "{{ 'http://example.com' }}",
+                        },
+                        {
+                            "url": "{{ 'http://example2.com' }}",
+                        },
+                    ]
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        f"{_TEST_IMAGE}_2",
+        expected_content_type="image/png",
+    )
+
+
+async def test_missing_required_keys(hass: HomeAssistant) -> None:
+    """Test: missing required fields will fail."""
+    with assert_setup_component(0, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "name": "a name",
+                    }
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all("image") == []
+
+
+async def test_unique_id(hass: HomeAssistant) -> None:
+    """Test unique_id configuration."""
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "unique_id": "b",
+                    "image": {
+                        "url": "http://example.com",
+                        "unique_id": "a",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    ent_reg = async_get(hass)
+    entry = ent_reg.async_get(_TEST_IMAGE)
+    assert entry
+    assert entry.unique_id == "b-a"
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_custom_entity_picture(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test custom entity picture."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "http://example.com",
+                        "picture": "http://example2.com",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes_jpg,
+        expected_entity_picture="http://example2.com",
+    )
+
+
+@respx.mock
+async def test_template_error(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator
+) -> None:
+    """Test handling template error."""
+    respx.get("http://example.com").side_effect = httpx.TimeoutException
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": "{{ no_such_variable.url }}",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    await _assert_state(
+        hass,
+        hass_client,
+        STATE_UNKNOWN,
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_content_type="text/plain",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_templates_with_entities(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test templates with values from other entities."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    with assert_setup_component(1, "input_text"):
+        assert await setup.async_setup_component(
+            hass,
+            "input_text",
+            {
+                "input_text": {
+                    "url": {
+                        "initial": "http://example.com",
+                        "name": "url",
+                    },
+                }
+            },
+        )
+
+    with assert_setup_component(1, "template"):
+        assert await setup.async_setup_component(
+            hass,
+            "template",
+            {
+                "template": {
+                    "image": {
+                        "url": f"{{{{ states('{_URL_INPUT_TEXT}') }}}}",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    await hass.services.async_call(
+        INPUT_TEXT_DOMAIN,
+        INPUT_TEXT_SERVICE_SET_VALUE,
+        {CONF_ENTITY_ID: _URL_INPUT_TEXT, INPUT_TEXT_ATTR_VALUE: "http://example2.com"},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        expected_content_type="image/png",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_trigger_image(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    imgbytes_jpg,
+    imgbytes2_jpg,
+) -> None:
+    """Test trigger based template image."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+    respx.get("http://example2.com").respond(
+        stream=imgbytes2_jpg, content_type="image/png"
+    )
+
+    assert await setup.async_setup_component(
+        hass,
+        "template",
+        {
+            "template": [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event"},
+                    "image": [
+                        {
+                            "url": "{{ trigger.event.data.url }}",
+                        },
+                    ],
+                },
+            ],
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    # No image is loaded, expect error
+    await _assert_state(
+        hass,
+        hass_client,
+        "unknown",
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_content_type="text/plain",
+    )
+
+    hass.bus.async_fire("test_event", {"url": "http://example.com"})
+    await hass.async_block_till_done()
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    # Check the image is not refetched
+    await _assert_state(hass, hass_client, expected_state, imgbytes_jpg)
+    assert respx.get("http://example.com").call_count == 1
+
+    hass.bus.async_fire("test_event", {"url": "http://example2.com"})
+    await hass.async_block_till_done()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes2_jpg,
+        expected_content_type="image/png",
+    )
+
+
+@respx.mock
+@pytest.mark.freeze_time("2023-04-01 00:00:00+00:00")
+async def test_trigger_image_custom_entity_picture(
+    hass: HomeAssistant, hass_client: ClientSessionGenerator, imgbytes_jpg
+) -> None:
+    """Test trigger based template image with custom entity picture."""
+    respx.get("http://example.com").respond(
+        stream=imgbytes_jpg, content_type="image/jpeg"
+    )
+
+    assert await setup.async_setup_component(
+        hass,
+        "template",
+        {
+            "template": [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event"},
+                    "image": [
+                        {
+                            "url": "{{ trigger.event.data.url }}",
+                            "picture": "http://example2.com",
+                        },
+                    ],
+                },
+            ],
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    # No image is loaded, expect error
+    await _assert_state(
+        hass,
+        hass_client,
+        "unknown",
+        b"500: Internal Server Error",
+        expected_status=HTTPStatus.INTERNAL_SERVER_ERROR,
+        expected_entity_picture="http://example2.com",
+        expected_content_type="text/plain",
+    )
+
+    hass.bus.async_fire("test_event", {"url": "http://example.com"})
+    await hass.async_block_till_done()
+    expected_state = dt_util.utcnow().isoformat()
+    await _assert_state(
+        hass,
+        hass_client,
+        expected_state,
+        imgbytes_jpg,
+        expected_entity_picture="http://example2.com",
+    )
diff --git a/tests/components/template/test_trigger.py b/tests/components/template/test_trigger.py
index c85c7a6d57b6b4..84fdadfec0d97c 100644
--- a/tests/components/template/test_trigger.py
+++ b/tests/components/template/test_trigger.py
@@ -7,7 +7,12 @@
 
 import homeassistant.components.automation as automation
 from homeassistant.components.template import trigger as template_trigger
-from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
@@ -389,7 +394,7 @@ async def test_if_action(hass: HomeAssistant, start_ha, calls) -> None:
     assert len(calls) == 1
 
 
-@pytest.mark.parametrize(("count", "domain"), [(0, automation.DOMAIN)])
+@pytest.mark.parametrize(("count", "domain"), [(1, automation.DOMAIN)])
 @pytest.mark.parametrize(
     "config",
     [
@@ -405,6 +410,7 @@ async def test_if_fires_on_change_with_bad_template(
     hass: HomeAssistant, start_ha, calls
 ) -> None:
     """Test for firing on change with bad template."""
+    assert hass.states.get("automation.automation_0").state == STATE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(("count", "domain"), [(1, automation.DOMAIN)])
diff --git a/tests/components/template/test_weather.py b/tests/components/template/test_weather.py
index c987f7a2c30b1e..38cf439987d7e3 100644
--- a/tests/components/template/test_weather.py
+++ b/tests/components/template/test_weather.py
@@ -2,12 +2,16 @@
 import pytest
 
 from homeassistant.components.weather import (
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
     ATTR_WEATHER_HUMIDITY,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRESSURE,
     ATTR_WEATHER_TEMPERATURE,
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     DOMAIN,
 )
@@ -35,6 +39,10 @@
                     "wind_bearing_template": "{{ states('sensor.windbearing') }}",
                     "ozone_template": "{{ states('sensor.ozone') }}",
                     "visibility_template": "{{ states('sensor.visibility') }}",
+                    "wind_gust_speed_template": "{{ states('sensor.wind_gust_speed') }}",
+                    "cloud_coverage_template": "{{ states('sensor.cloud_coverage') }}",
+                    "dew_point_template": "{{ states('sensor.dew_point') }}",
+                    "apparent_temperature_template": "{{ states('sensor.apparent_temperature') }}",
                 },
             ]
         },
@@ -55,6 +63,10 @@ async def test_template_state_text(hass: HomeAssistant, start_ha) -> None:
         ("sensor.windbearing", ATTR_WEATHER_WIND_BEARING, 180),
         ("sensor.ozone", ATTR_WEATHER_OZONE, 25),
         ("sensor.visibility", ATTR_WEATHER_VISIBILITY, 4.6),
+        ("sensor.wind_gust_speed", ATTR_WEATHER_WIND_GUST_SPEED, 30),
+        ("sensor.cloud_coverage", ATTR_WEATHER_CLOUD_COVERAGE, 75),
+        ("sensor.dew_point", ATTR_WEATHER_DEW_POINT, 2.2),
+        ("sensor.apparent_temperature", ATTR_WEATHER_APPARENT_TEMPERATURE, 25),
     ]:
         hass.states.async_set(attr, value)
         await hass.async_block_till_done()
diff --git a/tests/components/text/test_device_action.py b/tests/components/text/test_device_action.py
index d3e50103e7062b..88bf692b711bb8 100644
--- a/tests/components/text/test_device_action.py
+++ b/tests/components/text/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Text device actions."""
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 
 import homeassistant.components.automation as automation
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 async def test_get_actions(
@@ -36,7 +40,7 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     hass.states.async_set("text.test_5678", 0.5, {"min_value": 0.0, "max_value": 1.0})
@@ -45,14 +49,14 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "text.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -78,7 +82,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -92,7 +96,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["set_value"]
@@ -100,7 +104,7 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_action_no_state(
@@ -115,7 +119,7 @@ async def test_get_action_no_state(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_actions = [
@@ -123,19 +127,20 @@ async def test_get_action_no_state(
             "domain": DOMAIN,
             "type": "set_value",
             "device_id": device_entry.id,
-            "entity_id": "text.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         },
     ]
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for actions."""
-    hass.states.async_set("text.entity", 0.5, {"min_value": 0.0, "max_value": 1.0})
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
 
     assert await async_setup_component(
         hass,
@@ -150,7 +155,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "text.entity",
+                        "entity_id": entry.id,
                         "type": "set_value",
                         "value": 0.3,
                     },
@@ -169,14 +174,78 @@ async def test_action(hass: HomeAssistant) -> None:
     assert len(calls) == 1
 
 
-async def test_capabilities(hass: HomeAssistant) -> None:
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    hass.states.async_set(entry.entity_id, 0.5, {"min_value": 0.0, "max_value": 1.0})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_value",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "set_value",
+                        "value": 0.3,
+                    },
+                },
+            ]
+        },
+    )
+
+    calls = async_mock_service(hass, DOMAIN, "set_value")
+
+    assert len(calls) == 0
+
+    hass.bus.async_fire("test_event_set_value")
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+
+
+async def test_capabilities(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+    capabilities = await device_action.async_get_action_capabilities(
+        hass,
+        {
+            "domain": DOMAIN,
+            "device_id": "abcdefgh",
+            "entity_id": entry.id,
+            "type": "set_value",
+        },
+    )
+
+    assert capabilities and "extra_fields" in capabilities
+
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == [{"name": "value", "required": True, "type": "string"}]
+
+
+async def test_capabilities_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
     """Test getting capabilities."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
     capabilities = await device_action.async_get_action_capabilities(
         hass,
         {
             "domain": DOMAIN,
             "device_id": "abcdefgh",
-            "entity_id": "text.entity",
+            "entity_id": entry.entity_id,
             "type": "set_value",
         },
     )
diff --git a/tests/components/text/test_init.py b/tests/components/text/test_init.py
index 666ffe18774084..d144cc86c9158f 100644
--- a/tests/components/text/test_init.py
+++ b/tests/components/text/test_init.py
@@ -20,7 +20,10 @@
 from homeassistant.helpers.restore_state import STORAGE_KEY as RESTORE_STATE_KEY
 from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache_with_extra_data
+from tests.common import (
+    async_mock_restore_state_shutdown_restart,
+    mock_restore_cache_with_extra_data,
+)
 
 
 class MockTextEntity(TextEntity):
@@ -141,7 +144,7 @@ async def test_restore_number_save_state(
     await hass.async_block_till_done()
 
     # Trigger saving state
-    await hass.async_stop()
+    await async_mock_restore_state_shutdown_restart(hass)
 
     assert len(hass_storage[RESTORE_STATE_KEY]["data"]) == 1
     state = hass_storage[RESTORE_STATE_KEY]["data"][0]["state"]
diff --git a/tests/components/text/test_recorder.py b/tests/components/text/test_recorder.py
index 54134ee501a6a3..da9ec810da95fc 100644
--- a/tests/components/text/test_recorder.py
+++ b/tests/components/text/test_recorder.py
@@ -2,12 +2,15 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from unittest.mock import patch
+
+import pytest
 
 from homeassistant.components import text
 from homeassistant.components.recorder import Recorder
 from homeassistant.components.recorder.history import get_significant_states
 from homeassistant.components.text import ATTR_MAX, ATTR_MIN, ATTR_MODE, ATTR_PATTERN
-from homeassistant.const import ATTR_FRIENDLY_NAME
+from homeassistant.const import ATTR_FRIENDLY_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
@@ -16,6 +19,16 @@
 from tests.components.recorder.common import async_wait_recording_done
 
 
+@pytest.fixture(autouse=True)
+async def text_only() -> None:
+    """Enable only the text platform."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [Platform.TEXT],
+    ):
+        yield
+
+
 async def test_exclude_attributes(recorder_mock: Recorder, hass: HomeAssistant) -> None:
     """Test siren registered attributes to be excluded."""
     now = dt_util.utcnow()
diff --git a/tests/components/thread/__init__.py b/tests/components/thread/__init__.py
index fd3cc3d9d85918..e7435b8e94a241 100644
--- a/tests/components/thread/__init__.py
+++ b/tests/components/thread/__init__.py
@@ -7,13 +7,13 @@
 )
 
 DATASET_2 = (
-    "0E080000000000010000000300000F35060004001FFFE0020811111111222222220708FDAD70BF"
+    "0E080000000000010000000300000F35060004001FFFE0020811111111222222330708FDAD70BF"
     "E5AA15DD051000112233445566778899AABBCCDDEEFF030E486f6d65417373697374616e742101"
     "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
 )
 
 DATASET_3 = (
-    "0E080000000000010000000300000F35060004001FFFE0020811111111222222220708FDAD70BF"
+    "0E080000000000010000000300000F35060004001FFFE0020811111111222222440708FDAD70BF"
     "E5AA15DD051000112233445566778899AABBCCDDEEFF030E7ef09f90a3f09f90a5f09f90a47e01"
     "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
 )
diff --git a/tests/components/thread/test_dataset_store.py b/tests/components/thread/test_dataset_store.py
index 212db0de06f1b8..1ed754dbdcd744 100644
--- a/tests/components/thread/test_dataset_store.py
+++ b/tests/components/thread/test_dataset_store.py
@@ -26,7 +26,25 @@
 )
 
 DATASET_1_NO_CHANNEL = (
-    "0E08000000000001000035060004001FFFE0020811111111222222220708FDAD70BF"
+    "0E08000000000001000035060004001FFFE0020811111111222222250708FDAD70BF"
+    "E5AA15DD051000112233445566778899AABBCCDDEEFF030E4F70656E54687265616444656D6F01"
+    "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
+)
+
+DATASET_1_NO_EXTPANID = (
+    "0E080000000000010000000300000F35060004001FFFE00708FDAD70BF"
+    "E5AA15DD051000112233445566778899AABBCCDDEEFF030E4F70656E54687265616444656D6F01"
+    "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
+)
+
+DATASET_1_NO_ACTIVETIMESTAMP = (
+    "000300000F35060004001FFFE0020811111111222222220708FDAD70BF"
+    "E5AA15DD051000112233445566778899AABBCCDDEEFF030E4F70656E54687265616444656D6F01"
+    "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
+)
+
+DATASET_1_LARGER_TIMESTAMP = (
+    "0E080000000000020000000300000F35060004001FFFE0020811111111222222220708FDAD70BF"
     "E5AA15DD051000112233445566778899AABBCCDDEEFF030E4F70656E54687265616444656D6F01"
     "0212340410445F2B5CA6F2A93A55CE570A70EFEECB0C0402A0F7F8"
 )
@@ -121,7 +139,6 @@ async def test_dataset_properties(hass: HomeAssistant) -> None:
         {"source": "Google", "tlv": DATASET_1},
         {"source": "Multipan", "tlv": DATASET_2},
         {"source": "🎅", "tlv": DATASET_3},
-        {"source": "test1", "tlv": DATASET_1_BAD_CHANNEL},
         {"source": "test2", "tlv": DATASET_1_NO_CHANNEL},
     ]
 
@@ -136,10 +153,8 @@ async def test_dataset_properties(hass: HomeAssistant) -> None:
             dataset_2 = dataset
         if dataset.source == "🎅":
             dataset_3 = dataset
-        if dataset.source == "test1":
-            dataset_4 = dataset
         if dataset.source == "test2":
-            dataset_5 = dataset
+            dataset_4 = dataset
 
     dataset = store.async_get(dataset_1.id)
     assert dataset == dataset_1
@@ -151,14 +166,14 @@ async def test_dataset_properties(hass: HomeAssistant) -> None:
     dataset = store.async_get(dataset_2.id)
     assert dataset == dataset_2
     assert dataset.channel == 15
-    assert dataset.extended_pan_id == "1111111122222222"
+    assert dataset.extended_pan_id == "1111111122222233"
     assert dataset.network_name == "HomeAssistant!"
     assert dataset.pan_id == "1234"
 
     dataset = store.async_get(dataset_3.id)
     assert dataset == dataset_3
     assert dataset.channel == 15
-    assert dataset.extended_pan_id == "1111111122222222"
+    assert dataset.extended_pan_id == "1111111122222244"
     assert dataset.network_name == "~🐣🐥🐤~"
     assert dataset.pan_id == "1234"
 
@@ -166,9 +181,57 @@ async def test_dataset_properties(hass: HomeAssistant) -> None:
     assert dataset == dataset_4
     assert dataset.channel is None
 
-    dataset = store.async_get(dataset_5.id)
-    assert dataset == dataset_5
-    assert dataset.channel is None
+
+@pytest.mark.parametrize(
+    ("dataset", "error"),
+    [
+        (DATASET_1_BAD_CHANNEL, TLVError),
+        (DATASET_1_NO_EXTPANID, HomeAssistantError),
+        (DATASET_1_NO_ACTIVETIMESTAMP, HomeAssistantError),
+    ],
+)
+async def test_add_bad_dataset(hass: HomeAssistant, dataset, error) -> None:
+    """Test adding a bad dataset."""
+    with pytest.raises(error):
+        await dataset_store.async_add_dataset(hass, "test", dataset)
+
+
+async def test_update_dataset_newer(hass: HomeAssistant, caplog) -> None:
+    """Test updating a dataset."""
+    await dataset_store.async_add_dataset(hass, "test", DATASET_1)
+    await dataset_store.async_add_dataset(hass, "test", DATASET_1_LARGER_TIMESTAMP)
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1_LARGER_TIMESTAMP
+
+    assert (
+        "Updating dataset with same extended PAN ID and newer active timestamp"
+        in caplog.text
+    )
+    assert (
+        "Got dataset with same extended PAN ID and same or older active timestamp"
+        not in caplog.text
+    )
+
+
+async def test_update_dataset_older(hass: HomeAssistant, caplog) -> None:
+    """Test updating a dataset."""
+    await dataset_store.async_add_dataset(hass, "test", DATASET_1_LARGER_TIMESTAMP)
+    await dataset_store.async_add_dataset(hass, "test", DATASET_1)
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1_LARGER_TIMESTAMP
+
+    assert (
+        "Updating dataset with same extended PAN ID and newer active timestamp"
+        not in caplog.text
+    )
+    assert (
+        "Got dataset with same extended PAN ID and same or older active timestamp"
+        in caplog.text
+    )
 
 
 async def test_load_datasets(hass: HomeAssistant) -> None:
@@ -241,19 +304,19 @@ async def test_loading_datasets_from_storage(
                     "created": "2023-02-02T09:41:13.746514+00:00",
                     "id": "id1",
                     "source": "source_1",
-                    "tlv": "DATASET_1",
+                    "tlv": DATASET_1,
                 },
                 {
                     "created": "2023-02-02T09:41:13.746514+00:00",
                     "id": "id2",
                     "source": "source_2",
-                    "tlv": "DATASET_2",
+                    "tlv": DATASET_2,
                 },
                 {
                     "created": "2023-02-02T09:41:13.746514+00:00",
                     "id": "id3",
                     "source": "source_3",
-                    "tlv": "DATASET_3",
+                    "tlv": DATASET_3,
                 },
             ],
             "preferred_dataset": "id1",
@@ -263,3 +326,189 @@ async def test_loading_datasets_from_storage(
     store = await dataset_store.async_get_store(hass)
     assert len(store.datasets) == 3
     assert store.preferred_dataset == "id1"
+
+
+async def test_migrate_drop_bad_datasets(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog
+) -> None:
+    """Test migrating the dataset store when the store has bad datasets."""
+    hass_storage[dataset_store.STORAGE_KEY] = {
+        "version": dataset_store.STORAGE_VERSION_MAJOR,
+        "minor_version": 1,
+        "data": {
+            "datasets": [
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id1",
+                    "source": "source_1",
+                    "tlv": DATASET_1,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id2",
+                    "source": "source_2",
+                    "tlv": DATASET_1_NO_EXTPANID,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id3",
+                    "source": "source_3",
+                    "tlv": DATASET_1_NO_ACTIVETIMESTAMP,
+                },
+            ],
+            "preferred_dataset": "id1",
+        },
+    }
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1
+    assert store.preferred_dataset == "id1"
+
+    assert f"Dropped invalid Thread dataset '{DATASET_1_NO_EXTPANID}'" in caplog.text
+    assert (
+        f"Dropped invalid Thread dataset '{DATASET_1_NO_ACTIVETIMESTAMP}'"
+        in caplog.text
+    )
+
+
+async def test_migrate_drop_bad_datasets_preferred(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog
+) -> None:
+    """Test migrating the dataset store when the store has bad datasets."""
+    hass_storage[dataset_store.STORAGE_KEY] = {
+        "version": dataset_store.STORAGE_VERSION_MAJOR,
+        "minor_version": 1,
+        "data": {
+            "datasets": [
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id1",
+                    "source": "source_1",
+                    "tlv": DATASET_1,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id2",
+                    "source": "source_2",
+                    "tlv": DATASET_1_NO_EXTPANID,
+                },
+            ],
+            "preferred_dataset": "id2",
+        },
+    }
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert store.preferred_dataset is None
+
+
+async def test_migrate_drop_duplicate_datasets(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog
+) -> None:
+    """Test migrating the dataset store when the store has duplicated datasets."""
+    hass_storage[dataset_store.STORAGE_KEY] = {
+        "version": dataset_store.STORAGE_VERSION_MAJOR,
+        "minor_version": 1,
+        "data": {
+            "datasets": [
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id1",
+                    "source": "source_1",
+                    "tlv": DATASET_1,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id2",
+                    "source": "source_2",
+                    "tlv": DATASET_1_LARGER_TIMESTAMP,
+                },
+            ],
+            "preferred_dataset": None,
+        },
+    }
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1_LARGER_TIMESTAMP
+    assert store.preferred_dataset is None
+
+    assert (
+        f"Dropped duplicated Thread dataset '{DATASET_1}' "
+        f"(duplicate of '{DATASET_1_LARGER_TIMESTAMP}')"
+    ) in caplog.text
+
+
+async def test_migrate_drop_duplicate_datasets_2(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog
+) -> None:
+    """Test migrating the dataset store when the store has duplicated datasets."""
+    hass_storage[dataset_store.STORAGE_KEY] = {
+        "version": dataset_store.STORAGE_VERSION_MAJOR,
+        "minor_version": 1,
+        "data": {
+            "datasets": [
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id2",
+                    "source": "source_2",
+                    "tlv": DATASET_1_LARGER_TIMESTAMP,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id1",
+                    "source": "source_1",
+                    "tlv": DATASET_1,
+                },
+            ],
+            "preferred_dataset": None,
+        },
+    }
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1_LARGER_TIMESTAMP
+    assert store.preferred_dataset is None
+
+    assert (
+        f"Dropped duplicated Thread dataset '{DATASET_1}' "
+        f"(duplicate of '{DATASET_1_LARGER_TIMESTAMP}')"
+    ) in caplog.text
+
+
+async def test_migrate_drop_duplicate_datasets_preferred(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog
+) -> None:
+    """Test migrating the dataset store when the store has duplicated datasets."""
+    hass_storage[dataset_store.STORAGE_KEY] = {
+        "version": dataset_store.STORAGE_VERSION_MAJOR,
+        "minor_version": 1,
+        "data": {
+            "datasets": [
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id1",
+                    "source": "source_1",
+                    "tlv": DATASET_1,
+                },
+                {
+                    "created": "2023-02-02T09:41:13.746514+00:00",
+                    "id": "id2",
+                    "source": "source_2",
+                    "tlv": DATASET_1_LARGER_TIMESTAMP,
+                },
+            ],
+            "preferred_dataset": "id1",
+        },
+    }
+
+    store = await dataset_store.async_get_store(hass)
+    assert len(store.datasets) == 1
+    assert list(store.datasets.values())[0].tlv == DATASET_1
+    assert store.preferred_dataset == "id1"
+
+    assert (
+        f"Dropped duplicated Thread dataset '{DATASET_1_LARGER_TIMESTAMP}' "
+        f"(duplicate of preferred dataset '{DATASET_1}')"
+    ) in caplog.text
diff --git a/tests/components/thread/test_websocket_api.py b/tests/components/thread/test_websocket_api.py
index c7bdd78188d170..0db16318db1f4b 100644
--- a/tests/components/thread/test_websocket_api.py
+++ b/tests/components/thread/test_websocket_api.py
@@ -166,7 +166,7 @@ async def test_list_get_dataset(
                 "channel": 15,
                 "created": dataset_2.created.isoformat(),
                 "dataset_id": dataset_2.id,
-                "extended_pan_id": "1111111122222222",
+                "extended_pan_id": "1111111122222233",
                 "network_name": "HomeAssistant!",
                 "pan_id": "1234",
                 "preferred": False,
@@ -176,7 +176,7 @@ async def test_list_get_dataset(
                 "channel": 15,
                 "created": dataset_3.created.isoformat(),
                 "dataset_id": dataset_3.id,
-                "extended_pan_id": "1111111122222222",
+                "extended_pan_id": "1111111122222244",
                 "network_name": "~🐣🐥🐤~",
                 "pan_id": "1234",
                 "preferred": False,
diff --git a/tests/components/threshold/test_binary_sensor.py b/tests/components/threshold/test_binary_sensor.py
index 9e11195d878f11..e26781029c5d7a 100644
--- a/tests/components/threshold/test_binary_sensor.py
+++ b/tests/components/threshold/test_binary_sensor.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from homeassistant.components.threshold.const import DOMAIN
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     STATE_UNAVAILABLE,
@@ -9,8 +10,11 @@
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 
+from tests.common import MockConfigEntry
+
 
 async def test_sensor_upper(hass: HomeAssistant) -> None:
     """Test if source is above threshold."""
@@ -585,3 +589,47 @@ async def test_sensor_no_lower_upper(
     await hass.async_block_till_done()
 
     assert "Lower or Upper thresholds not provided" in caplog.text
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Threshold."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "entity_id": "sensor.test_source",
+            "hysteresis": 0.0,
+            "lower": -2.0,
+            "name": "Threshold",
+            "upper": None,
+        },
+        title="Threshold",
+    )
+
+    utility_meter_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    utility_meter_entity = entity_registry.async_get("binary_sensor.threshold")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py
index a60e42eb76818e..eabc5e04e0bce5 100644
--- a/tests/components/timer/test_init.py
+++ b/tests/components/timer/test_init.py
@@ -47,11 +47,7 @@
 from homeassistant.core import Context, CoreState, HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
 from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.restore_state import (
-    DATA_RESTORE_STATE_TASK,
-    RestoreStateData,
-    StoredState,
-)
+from homeassistant.helpers.restore_state import StoredState, async_get
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 
@@ -237,7 +233,7 @@ def fake_event_listener(event):
             "call": SERVICE_CHANGE,
             "state": STATUS_ACTIVE,
             "event": EVENT_TIMER_CHANGED,
-            "data": {CONF_DURATION: 15},
+            "data": {CONF_DURATION: -5},
         },
         {
             "call": SERVICE_START,
@@ -269,6 +265,7 @@ def fake_event_listener(event):
             assert len(results) == expected_events
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_start_service(hass: HomeAssistant) -> None:
     """Test the start/stop service."""
     await async_setup_component(hass, DOMAIN, {DOMAIN: {"test1": {CONF_DURATION: 10}}})
@@ -320,31 +317,51 @@ async def test_start_service(hass: HomeAssistant) -> None:
     assert state.attributes[ATTR_DURATION] == "0:00:15"
     assert state.attributes[ATTR_REMAINING] == "0:00:15"
 
+    with pytest.raises(
+        HomeAssistantError,
+        match="Not possible to change timer timer.test1 beyond configured duration",
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_CHANGE,
+            {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 20},
+            blocking=True,
+        )
+
+    with pytest.raises(
+        HomeAssistantError,
+        match="Not possible to change timer timer.test1 to negative time remaining",
+    ):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_CHANGE,
+            {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: -20},
+            blocking=True,
+        )
+
     await hass.services.async_call(
         DOMAIN,
         SERVICE_CHANGE,
-        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 15},
+        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: -3},
         blocking=True,
     )
-    await hass.async_block_till_done()
     state = hass.states.get("timer.test1")
     assert state
     assert state.state == STATUS_ACTIVE
-    assert state.attributes[ATTR_DURATION] == "0:00:30"
-    assert state.attributes[ATTR_REMAINING] == "0:00:30"
+    assert state.attributes[ATTR_DURATION] == "0:00:15"
+    assert state.attributes[ATTR_REMAINING] == "0:00:12"
 
     await hass.services.async_call(
         DOMAIN,
         SERVICE_CHANGE,
-        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: -10},
+        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 2},
         blocking=True,
     )
-    await hass.async_block_till_done()
     state = hass.states.get("timer.test1")
     assert state
     assert state.state == STATUS_ACTIVE
-    assert state.attributes[ATTR_DURATION] == "0:00:20"
-    assert state.attributes[ATTR_REMAINING] == "0:00:20"
+    assert state.attributes[ATTR_DURATION] == "0:00:15"
+    assert state.attributes[ATTR_REMAINING] == "0:00:14"
 
     await hass.services.async_call(
         DOMAIN, SERVICE_CANCEL, {CONF_ENTITY_ID: "timer.test1"}, blocking=True
@@ -353,22 +370,24 @@ async def test_start_service(hass: HomeAssistant) -> None:
     state = hass.states.get("timer.test1")
     assert state
     assert state.state == STATUS_IDLE
-    assert state.attributes[ATTR_DURATION] == "0:00:20"
+    assert state.attributes[ATTR_DURATION] == "0:00:15"
     assert ATTR_REMAINING not in state.attributes
 
-    with pytest.raises(HomeAssistantError):
+    with pytest.raises(
+        HomeAssistantError,
+        match="Timer timer.test1 is not running, only active timers can be changed",
+    ):
         await hass.services.async_call(
             DOMAIN,
             SERVICE_CHANGE,
-            {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 10},
+            {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 2},
             blocking=True,
         )
-        await hass.async_block_till_done()
 
     state = hass.states.get("timer.test1")
     assert state
     assert state.state == STATUS_IDLE
-    assert state.attributes[ATTR_DURATION] == "0:00:20"
+    assert state.attributes[ATTR_DURATION] == "0:00:15"
     assert ATTR_REMAINING not in state.attributes
 
 
@@ -376,7 +395,7 @@ async def test_wait_till_timer_expires(hass: HomeAssistant) -> None:
     """Test for a timer to end."""
     hass.state = CoreState.starting
 
-    await async_setup_component(hass, DOMAIN, {DOMAIN: {"test1": {CONF_DURATION: 10}}})
+    await async_setup_component(hass, DOMAIN, {DOMAIN: {"test1": {CONF_DURATION: 20}}})
 
     state = hass.states.get("timer.test1")
     assert state
@@ -409,7 +428,7 @@ def fake_event_listener(event):
     await hass.services.async_call(
         DOMAIN,
         SERVICE_CHANGE,
-        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: 10},
+        {CONF_ENTITY_ID: "timer.test1", CONF_DURATION: -5},
         blocking=True,
     )
     await hass.async_block_till_done()
@@ -838,12 +857,9 @@ async def test_restore_idle(hass: HomeAssistant) -> None:
         utc_now,
     )
 
-    data = await RestoreStateData.async_get_instance(hass)
-    await hass.async_block_till_done()
+    data = async_get(hass)
     await data.store.async_save([stored_state.as_dict()])
-
-    # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    await data.async_load()
 
     entity = Timer.from_storage(
         {
@@ -865,6 +881,7 @@ async def test_restore_idle(hass: HomeAssistant) -> None:
     assert entity.extra_state_attributes[ATTR_RESTORE]
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_restore_paused(hass: HomeAssistant) -> None:
     """Test entity restore logic when timer is paused."""
     utc_now = utcnow()
@@ -878,12 +895,9 @@ async def test_restore_paused(hass: HomeAssistant) -> None:
         utc_now,
     )
 
-    data = await RestoreStateData.async_get_instance(hass)
-    await hass.async_block_till_done()
+    data = async_get(hass)
     await data.store.async_save([stored_state.as_dict()])
-
-    # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    await data.async_load()
 
     entity = Timer.from_storage(
         {
@@ -905,6 +919,7 @@ async def test_restore_paused(hass: HomeAssistant) -> None:
     assert entity.extra_state_attributes[ATTR_RESTORE]
 
 
+@pytest.mark.freeze_time("2023-06-05 17:47:50")
 async def test_restore_active_resume(hass: HomeAssistant) -> None:
     """Test entity restore logic when timer is active and end time is after startup."""
     events = async_capture_events(hass, EVENT_TIMER_RESTARTED)
@@ -922,12 +937,9 @@ async def test_restore_active_resume(hass: HomeAssistant) -> None:
         utc_now,
     )
 
-    data = await RestoreStateData.async_get_instance(hass)
-    await hass.async_block_till_done()
+    data = async_get(hass)
     await data.store.async_save([stored_state.as_dict()])
-
-    # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    await data.async_load()
 
     entity = Timer.from_storage(
         {
@@ -973,12 +985,9 @@ async def test_restore_active_finished_outside_grace(hass: HomeAssistant) -> Non
         utc_now,
     )
 
-    data = await RestoreStateData.async_get_instance(hass)
-    await hass.async_block_till_done()
+    data = async_get(hass)
     await data.store.async_save([stored_state.as_dict()])
-
-    # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    await data.async_load()
 
     entity = Timer.from_storage(
         {
diff --git a/tests/components/todoist/test_calendar.py b/tests/components/todoist/test_calendar.py
index 75c07be7ec380a..921439fab45533 100644
--- a/tests/components/todoist/test_calendar.py
+++ b/tests/components/todoist/test_calendar.py
@@ -1,8 +1,10 @@
 """Unit tests for the Todoist calendar platform."""
+from datetime import timedelta
 from http import HTTPStatus
 from typing import Any
 from unittest.mock import AsyncMock, patch
 import urllib
+import zoneinfo
 
 import pytest
 from todoist_api_python.models import Collaborator, Due, Label, Project, Task
@@ -20,25 +22,29 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.typing import ClientSessionGenerator
 
 SUMMARY = "A task"
+# Set our timezone to CST/Regina so we can check calculations
+# This keeps UTC-6 all year round
+TZ_NAME = "America/Regina"
+TIMEZONE = zoneinfo.ZoneInfo(TZ_NAME)
 
 
 @pytest.fixture(autouse=True)
 def set_time_zone(hass: HomeAssistant):
     """Set the time zone for the tests."""
-    # Set our timezone to CST/Regina so we can check calculations
-    # This keeps UTC-6 all year round
-    hass.config.set_time_zone("America/Regina")
+    hass.config.set_time_zone(TZ_NAME)
 
 
 @pytest.fixture(name="due")
 def mock_due() -> Due:
     """Mock a todoist Task Due date/time."""
-    return Due(is_recurring=False, date=dt.now().strftime("%Y-%m-%d"), string="today")
+    return Due(
+        is_recurring=False, date=dt_util.now().strftime("%Y-%m-%d"), string="today"
+    )
 
 
 @pytest.fixture(name="task")
@@ -182,6 +188,33 @@ async def test_update_entity_for_custom_project_no_due_date_on(
     assert state.state == "on"
 
 
+@pytest.mark.parametrize(
+    "due",
+    [
+        Due(
+            # Note: This runs before the test fixture that sets the timezone
+            date=(dt_util.now(TIMEZONE) + timedelta(days=3)).strftime("%Y-%m-%d"),
+            is_recurring=False,
+            string="3 days from today",
+        )
+    ],
+)
+async def test_update_entity_for_calendar_with_due_date_in_the_future(
+    hass: HomeAssistant,
+    api: AsyncMock,
+) -> None:
+    """Test that a task with a due date in the future has on state and correct end_time."""
+    await async_update_entity(hass, "calendar.name")
+    state = hass.states.get("calendar.name")
+    assert state.state == "on"
+
+    # The end time should be in the user's timezone
+    expected_end_time = (dt_util.now() + timedelta(days=3)).strftime(
+        "%Y-%m-%d 00:00:00"
+    )
+    assert state.attributes["end_time"] == expected_end_time
+
+
 @pytest.mark.parametrize("setup_integration", [None])
 async def test_failed_coordinator_update(hass: HomeAssistant, api: AsyncMock) -> None:
     """Test a failed data coordinator update is handled correctly."""
@@ -216,9 +249,6 @@ async def test_calendar_custom_project_unique_id(
     entity = entity_registry.async_get("calendar.all_projects")
     assert entity is None
 
-    state = hass.states.get("calendar.all_projects")
-    assert state.state == "off"
-
 
 @pytest.mark.parametrize(
     ("due", "start", "end", "expected_response"),
diff --git a/tests/components/tomato/test_device_tracker.py b/tests/components/tomato/test_device_tracker.py
index c23ee28ac7cba3..7c187c7b4bbf0f 100644
--- a/tests/components/tomato/test_device_tracker.py
+++ b/tests/components/tomato/test_device_tracker.py
@@ -381,7 +381,7 @@ def test_bad_connection(hass: HomeAssistant, mock_exception_logger) -> None:
             "POST",
             "http://tomato-router:80/update.cgi",
             exc=requests.exceptions.ConnectionError,
-        ),
+        )
         tomato.get_scanner(hass, config)
     assert mock_exception_logger.call_count == 1
     assert mock_exception_logger.mock_calls[0] == mock.call(
@@ -409,7 +409,7 @@ def test_router_timeout(hass: HomeAssistant, mock_exception_logger) -> None:
             "POST",
             "http://tomato-router:80/update.cgi",
             exc=requests.exceptions.Timeout,
-        ),
+        )
         tomato.get_scanner(hass, config)
     assert mock_exception_logger.call_count == 1
     assert mock_exception_logger.mock_calls[0] == mock.call(
diff --git a/tests/components/totalconnect/common.py b/tests/components/totalconnect/common.py
index 54f321c677030c..ccee4c43781943 100644
--- a/tests/components/totalconnect/common.py
+++ b/tests/components/totalconnect/common.py
@@ -189,14 +189,23 @@
 # 99 is an unknown ZoneType
 ZONE_6 = {
     "ZoneID": "6",
-    "ZoneDescription": "Medical",
+    "ZoneDescription": "Unknown",
     "ZoneStatus": ZoneStatus.NORMAL,
     "ZoneTypeId": 99,
     "PartitionId": "1",
     "CanBeBypassed": 0,
 }
 
-ZONE_INFO = [ZONE_NORMAL, ZONE_2, ZONE_3, ZONE_4, ZONE_5, ZONE_6]
+ZONE_7 = {
+    "ZoneID": 7,
+    "ZoneDescription": "Temperature",
+    "ZoneStatus": ZoneStatus.NORMAL,
+    "ZoneTypeId": ZoneType.MONITOR,
+    "PartitionId": "1",
+    "CanBeBypassed": 0,
+}
+
+ZONE_INFO = [ZONE_NORMAL, ZONE_2, ZONE_3, ZONE_4, ZONE_5, ZONE_6, ZONE_7]
 ZONES = {"ZoneInfo": ZONE_INFO}
 
 METADATA_DISARMED = {
diff --git a/tests/components/totalconnect/test_alarm_control_panel.py b/tests/components/totalconnect/test_alarm_control_panel.py
index e52da526d3d534..6161b793610208 100644
--- a/tests/components/totalconnect/test_alarm_control_panel.py
+++ b/tests/components/totalconnect/test_alarm_control_panel.py
@@ -32,7 +32,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import (
     LOCATION_ID,
@@ -107,7 +107,7 @@ async def test_arm_home_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_HOME
@@ -163,7 +163,7 @@ async def test_arm_home_instant_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_HOME
@@ -220,7 +220,7 @@ async def test_arm_away_instant_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
@@ -276,7 +276,7 @@ async def test_arm_away_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_AWAY
@@ -329,7 +329,7 @@ async def test_disarm_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
@@ -386,7 +386,7 @@ async def test_arm_night_success(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMED_NIGHT
@@ -439,7 +439,7 @@ async def test_arming(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_ARMING
@@ -460,7 +460,7 @@ async def test_disarming(hass: HomeAssistant) -> None:
         )
         assert mock_request.call_count == 2
 
-        async_fire_time_changed(hass, dt.utcnow() + DELAY)
+        async_fire_time_changed(hass, dt_util.utcnow() + DELAY)
         await hass.async_block_till_done()
         assert mock_request.call_count == 3
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMING
@@ -546,31 +546,31 @@ async def test_other_update_failures(hass: HomeAssistant) -> None:
         assert mock_request.call_count == 1
 
         # then an error: ServiceUnavailable --> UpdateFailed
-        async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL)
         await hass.async_block_till_done()
         assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
         assert mock_request.call_count == 2
 
         # works again
-        async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL * 2)
+        async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL * 2)
         await hass.async_block_till_done()
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 3
 
         # then an error: TotalConnectError --> UpdateFailed
-        async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL * 3)
+        async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL * 3)
         await hass.async_block_till_done()
         assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
         assert mock_request.call_count == 4
 
         # works again
-        async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL * 4)
+        async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL * 4)
         await hass.async_block_till_done()
         assert hass.states.get(ENTITY_ID).state == STATE_ALARM_DISARMED
         assert mock_request.call_count == 5
 
         # unknown TotalConnect status via ValueError
-        async_fire_time_changed(hass, dt.utcnow() + SCAN_INTERVAL * 5)
+        async_fire_time_changed(hass, dt_util.utcnow() + SCAN_INTERVAL * 5)
         await hass.async_block_till_done()
         assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
         assert mock_request.call_count == 6
diff --git a/tests/components/totalconnect/test_binary_sensor.py b/tests/components/totalconnect/test_binary_sensor.py
index 966daeb5a63ed0..8f9cabe670c9af 100644
--- a/tests/components/totalconnect/test_binary_sensor.py
+++ b/tests/components/totalconnect/test_binary_sensor.py
@@ -84,3 +84,21 @@ async def test_state_and_attributes(hass: HomeAssistant) -> None:
         assert state.state == STATE_OFF
         state = hass.states.get("binary_sensor.gas_tamper")
         assert state.state == STATE_ON
+
+        # Zone 6 is unknown type, assume it is a security (door) sensor
+        state = hass.states.get("binary_sensor.unknown")
+        assert state.state == STATE_OFF
+        assert state.attributes.get("device_class") == BinarySensorDeviceClass.DOOR
+        state = hass.states.get("binary_sensor.unknown_low_battery")
+        assert state.state == STATE_OFF
+        state = hass.states.get("binary_sensor.unknown_tamper")
+        assert state.state == STATE_OFF
+
+        # Zone 7 is temperature
+        state = hass.states.get("binary_sensor.temperature")
+        assert state.state == STATE_OFF
+        assert state.attributes.get("device_class") == BinarySensorDeviceClass.PROBLEM
+        state = hass.states.get("binary_sensor.temperature_low_battery")
+        assert state.state == STATE_OFF
+        state = hass.states.get("binary_sensor.temperature_tamper")
+        assert state.state == STATE_OFF
diff --git a/tests/components/trace/conftest.py b/tests/components/trace/conftest.py
index f84f60e38fb050..01dc57a9948280 100644
--- a/tests/components/trace/conftest.py
+++ b/tests/components/trace/conftest.py
@@ -1,3 +1,8 @@
 """Conftest for trace tests."""
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+import pytest
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
diff --git a/tests/components/trace/test_websocket_api.py b/tests/components/trace/test_websocket_api.py
index 5dbd78268e2fcf..1041208fa6112a 100644
--- a/tests/components/trace/test_websocket_api.py
+++ b/tests/components/trace/test_websocket_api.py
@@ -6,6 +6,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components.trace.const import DEFAULT_STORED_TRACES
@@ -14,7 +15,7 @@
 from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.util.uuid import random_uuid_hex
 
-from tests.common import assert_lists_same, load_fixture
+from tests.common import load_fixture
 from tests.typing import WebSocketGenerator
 
 
@@ -156,7 +157,6 @@ def next_id():
     }
 
     sun_action = {
-        "limit": 10,
         "params": {
             "domain": "test",
             "service": "automation",
@@ -1087,8 +1087,7 @@ async def assert_last_step(item_id, expected_action, expected_state):
     await client.send_json({"id": next_id(), "type": "trace/debug/breakpoint/list"})
     response = await client.receive_json()
     assert response["success"]
-    assert_lists_same(
-        response["result"],
+    assert response["result"] == unordered(
         [
             {"node": f"{prefix}/1", "run_id": "*", "domain": domain, "item_id": "sun"},
             {"node": f"{prefix}/5", "run_id": "*", "domain": domain, "item_id": "sun"},
@@ -1594,7 +1593,6 @@ def next_id():
         },
     }
     sun_action = {
-        "limit": 10,
         "params": {
             "domain": "test",
             "service": "automation",
diff --git a/tests/components/trafikverket_ferry/conftest.py b/tests/components/trafikverket_ferry/conftest.py
index 452c351ee5df06..beeca9bd9f3675 100644
--- a/tests/components/trafikverket_ferry/conftest.py
+++ b/tests/components/trafikverket_ferry/conftest.py
@@ -10,7 +10,7 @@
 from homeassistant.components.trafikverket_ferry.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import ENTRY_CONFIG
 
@@ -49,30 +49,32 @@ def fixture_get_ferries() -> list[FerryStop]:
     depart1 = FerryStop(
         "13",
         False,
-        datetime(dt.now().year + 1, 5, 1, 12, 0, tzinfo=dt.UTC),
+        datetime(dt_util.now().year + 1, 5, 1, 12, 0, tzinfo=dt_util.UTC),
         [""],
         "0",
-        datetime(dt.now().year, 5, 1, 12, 0, tzinfo=dt.UTC),
+        datetime(dt_util.now().year, 5, 1, 12, 0, tzinfo=dt_util.UTC),
         "Harbor 1",
         "Harbor 2",
     )
     depart2 = FerryStop(
         "14",
         False,
-        datetime(dt.now().year + 1, 5, 1, 12, 0, tzinfo=dt.UTC) + timedelta(minutes=15),
+        datetime(dt_util.now().year + 1, 5, 1, 12, 0, tzinfo=dt_util.UTC)
+        + timedelta(minutes=15),
         [""],
         "0",
-        datetime(dt.now().year, 5, 1, 12, 0, tzinfo=dt.UTC),
+        datetime(dt_util.now().year, 5, 1, 12, 0, tzinfo=dt_util.UTC),
         "Harbor 1",
         "Harbor 2",
     )
     depart3 = FerryStop(
         "15",
         False,
-        datetime(dt.now().year + 1, 5, 1, 12, 0, tzinfo=dt.UTC) + timedelta(minutes=30),
+        datetime(dt_util.now().year + 1, 5, 1, 12, 0, tzinfo=dt_util.UTC)
+        + timedelta(minutes=30),
         [""],
         "0",
-        datetime(dt.now().year, 5, 1, 12, 0, tzinfo=dt.UTC),
+        datetime(dt_util.now().year, 5, 1, 12, 0, tzinfo=dt_util.UTC),
         "Harbor 1",
         "Harbor 2",
     )
diff --git a/tests/components/trafikverket_ferry/test_coordinator.py b/tests/components/trafikverket_ferry/test_coordinator.py
index 61c72b82a3f750..591486474d3634 100644
--- a/tests/components/trafikverket_ferry/test_coordinator.py
+++ b/tests/components/trafikverket_ferry/test_coordinator.py
@@ -14,7 +14,7 @@
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import STATE_UNAVAILABLE, WEEKDAYS
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import ENTRY_CONFIG
 
@@ -50,16 +50,16 @@ async def test_coordinator(
         state3 = hass.states.get("sensor.harbor1_departure_time")
         assert state1.state == "Harbor 1"
         assert state2.state == "Harbor 2"
-        assert state3.state == str(dt.now().year + 1) + "-05-01T12:00:00+00:00"
+        assert state3.state == str(dt_util.now().year + 1) + "-05-01T12:00:00+00:00"
         mock_data.reset_mock()
 
         monkeypatch.setattr(
             get_ferries[0],
             "departure_time",
-            datetime(dt.now().year + 2, 5, 1, 12, 0, tzinfo=dt.UTC),
+            datetime(dt_util.now().year + 2, 5, 1, 12, 0, tzinfo=dt_util.UTC),
         )
 
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=6))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=6))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state1 = hass.states.get("sensor.harbor1_departure_from")
@@ -67,11 +67,11 @@ async def test_coordinator(
         state3 = hass.states.get("sensor.harbor1_departure_time")
         assert state1.state == "Harbor 1"
         assert state2.state == "Harbor 2"
-        assert state3.state == str(dt.now().year + 2) + "-05-01T12:00:00+00:00"
+        assert state3.state == str(dt_util.now().year + 2) + "-05-01T12:00:00+00:00"
         mock_data.reset_mock()
 
         mock_data.side_effect = NoFerryFound()
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=6))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=6))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state1 = hass.states.get("sensor.harbor1_departure_from")
@@ -80,7 +80,7 @@ async def test_coordinator(
 
         mock_data.return_value = get_ferries
         mock_data.side_effect = None
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=6))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=6))
         await hass.async_block_till_done()
         # mock_data.assert_called_once()
         state1 = hass.states.get("sensor.harbor1_departure_from")
@@ -88,7 +88,7 @@ async def test_coordinator(
         mock_data.reset_mock()
 
         mock_data.side_effect = InvalidAuthentication()
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(minutes=6))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=6))
         await hass.async_block_till_done()
         mock_data.assert_called_once()
         state1 = hass.states.get("sensor.harbor1_departure_from")
diff --git a/tests/components/trafikverket_ferry/test_sensor.py b/tests/components/trafikverket_ferry/test_sensor.py
index e0527d4b9e4541..84cb856a82d248 100644
--- a/tests/components/trafikverket_ferry/test_sensor.py
+++ b/tests/components/trafikverket_ferry/test_sensor.py
@@ -9,7 +9,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
@@ -26,7 +26,7 @@ async def test_sensor(
     state3 = hass.states.get("sensor.harbor1_departure_time")
     assert state1.state == "Harbor 1"
     assert state2.state == "Harbor 2"
-    assert state3.state == str(dt.now().year + 1) + "-05-01T12:00:00+00:00"
+    assert state3.state == str(dt_util.now().year + 1) + "-05-01T12:00:00+00:00"
     assert state1.attributes["icon"] == "mdi:ferry"
     assert state1.attributes["other_information"] == [""]
     assert state2.attributes["icon"] == "mdi:ferry"
@@ -39,7 +39,7 @@ async def test_sensor(
     ):
         async_fire_time_changed(
             hass,
-            dt.utcnow() + timedelta(minutes=6),
+            dt_util.utcnow() + timedelta(minutes=6),
         )
         await hass.async_block_till_done()
 
diff --git a/tests/components/transmission/test_init.py b/tests/components/transmission/test_init.py
index 89ad0dd241037a..84bbf6be6efc6b 100644
--- a/tests/components/transmission/test_init.py
+++ b/tests/components/transmission/test_init.py
@@ -9,9 +9,12 @@
     TransmissionError,
 )
 
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.components.transmission.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 
 from . import MOCK_CONFIG_DATA
 
@@ -91,3 +94,68 @@ async def test_unload_entry(hass: HomeAssistant) -> None:
 
     assert entry.state is ConfigEntryState.NOT_LOADED
     assert not hass.data[DOMAIN]
+
+
+@pytest.mark.parametrize(
+    ("domain", "old_unique_id", "new_unique_id"),
+    [
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Down Speed", "1234-download"),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Up Speed", "1234-upload"),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Status", "1234-status"),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Active Torrents",
+            "1234-active_torrents",
+        ),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Paused Torrents",
+            "1234-paused_torrents",
+        ),
+        (SENSOR_DOMAIN, "0.0.0.0-Transmission Total Torrents", "1234-total_torrents"),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Completed Torrents",
+            "1234-completed_torrents",
+        ),
+        (
+            SENSOR_DOMAIN,
+            "0.0.0.0-Transmission Started Torrents",
+            "1234-started_torrents",
+        ),
+        # no change on correct sensor unique id
+        (SENSOR_DOMAIN, "1234-started_torrents", "1234-started_torrents"),
+        (SWITCH_DOMAIN, "0.0.0.0-Transmission Switch", "1234-on_off"),
+        (SWITCH_DOMAIN, "0.0.0.0-Transmission Turtle Mode", "1234-turtle_mode"),
+        # no change on correct switch unique id
+        (SWITCH_DOMAIN, "1234-turtle_mode", "1234-turtle_mode"),
+    ],
+)
+async def test_migrate_unique_id(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    domain: str,
+    old_unique_id: str,
+    new_unique_id: str,
+) -> None:
+    """Test unique id migration."""
+    entry = MockConfigEntry(domain=DOMAIN, data=MOCK_CONFIG_DATA, entry_id="1234")
+    entry.add_to_hass(hass)
+
+    entity: er.RegistryEntry = entity_registry.async_get_or_create(
+        suggested_object_id=f"my_{domain}",
+        disabled_by=None,
+        domain=domain,
+        platform=DOMAIN,
+        unique_id=old_unique_id,
+        config_entry=entry,
+    )
+    assert entity.unique_id == old_unique_id
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    migrated_entity = entity_registry.async_get(entity.entity_id)
+
+    assert migrated_entity
+    assert migrated_entity.unique_id == new_unique_id
diff --git a/tests/components/tts/common.py b/tests/components/tts/common.py
index 1866273b627c06..a9a95eae2f45c7 100644
--- a/tests/components/tts/common.py
+++ b/tests/components/tts/common.py
@@ -1,8 +1,11 @@
 """Provide common tests tools for tts."""
 from __future__ import annotations
 
+from collections.abc import Generator
 from typing import Any
+from unittest.mock import MagicMock, patch
 
+import pytest
 import voluptuous as vol
 
 from homeassistant.components import media_source
@@ -14,6 +17,7 @@
     TextToSpeechEntity,
     TtsAudioType,
     Voice,
+    _get_cache_files,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
@@ -34,6 +38,62 @@
 TEST_DOMAIN = "test"
 
 
+def mock_tts_get_cache_files_fixture_helper():
+    """Mock the list TTS cache function."""
+    with patch(
+        "homeassistant.components.tts._get_cache_files", return_value={}
+    ) as mock_cache_files:
+        yield mock_cache_files
+
+
+def mock_tts_init_cache_dir_fixture_helper(
+    init_tts_cache_dir_side_effect: Any,
+) -> Generator[MagicMock, None, None]:
+    """Mock the TTS cache dir in memory."""
+    with patch(
+        "homeassistant.components.tts._init_tts_cache_dir",
+        side_effect=init_tts_cache_dir_side_effect,
+    ) as mock_cache_dir:
+        yield mock_cache_dir
+
+
+def init_tts_cache_dir_side_effect_fixture_helper() -> Any:
+    """Return the cache dir."""
+    return None
+
+
+def mock_tts_cache_dir_fixture_helper(
+    tmp_path, mock_tts_init_cache_dir, mock_tts_get_cache_files, request
+):
+    """Mock the TTS cache dir with empty dir."""
+    mock_tts_init_cache_dir.return_value = str(tmp_path)
+
+    # Restore original get cache files behavior, we're working with a real dir.
+    mock_tts_get_cache_files.side_effect = _get_cache_files
+
+    yield tmp_path
+
+    if not hasattr(request.node, "rep_call") or request.node.rep_call.passed:
+        return
+
+    # Print contents of dir if failed
+    print("Content of dir for", request.node.nodeid)  # noqa: T201
+    for fil in tmp_path.iterdir():
+        print(fil.relative_to(tmp_path))  # noqa: T201
+
+    # To show the log.
+    pytest.fail("Test failed, see log for details")
+
+
+def tts_mutagen_mock_fixture_helper():
+    """Mock writing tags."""
+    with patch(
+        "homeassistant.components.tts.SpeechManager.write_tags",
+        side_effect=lambda *args: args[1],
+    ) as mock_write_tags:
+        yield mock_write_tags
+
+
 async def get_media_source_url(hass: HomeAssistant, media_content_id: str) -> str:
     """Get the media source url."""
     if media_source.DOMAIN not in hass.config.components:
@@ -76,7 +136,7 @@ def supported_options(self) -> list[str]:
         return ["voice", "age"]
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> TtsAudioType:
         """Load TTS dat."""
         return ("mp3", b"")
@@ -151,7 +211,7 @@ async def async_setup_entry_init(
     async def async_unload_entry_init(
         hass: HomeAssistant, config_entry: ConfigEntry
     ) -> bool:
-        """Unload up test config entry."""
+        """Unload test config entry."""
         await hass.config_entries.async_forward_entry_unload(config_entry, TTS_DOMAIN)
         return True
 
diff --git a/tests/components/tts/conftest.py b/tests/components/tts/conftest.py
index 43488808693f8e..753c90e158d27b 100644
--- a/tests/components/tts/conftest.py
+++ b/tests/components/tts/conftest.py
@@ -3,12 +3,9 @@
 From http://doc.pytest.org/en/latest/example/simple.html#making-test-result-information-available-in-fixtures
 """
 from collections.abc import Generator
-from typing import Any
-from unittest.mock import MagicMock, patch
 
 import pytest
 
-from homeassistant.components.tts import _get_cache_files
 from homeassistant.config import async_process_ha_core_config
 from homeassistant.config_entries import ConfigFlow
 from homeassistant.core import HomeAssistant
@@ -38,63 +35,15 @@ def pytest_runtest_makereport(item, call):
     setattr(item, f"rep_{rep.when}", rep)
 
 
-@pytest.fixture(autouse=True)
-def mock_get_cache_files():
-    """Mock the list TTS cache function."""
-    with patch(
-        "homeassistant.components.tts._get_cache_files", return_value={}
-    ) as mock_cache_files:
-        yield mock_cache_files
-
-
-@pytest.fixture(autouse=True)
-def mock_init_cache_dir(
-    init_cache_dir_side_effect: Any,
-) -> Generator[MagicMock, None, None]:
-    """Mock the TTS cache dir in memory."""
-    with patch(
-        "homeassistant.components.tts._init_tts_cache_dir",
-        side_effect=init_cache_dir_side_effect,
-    ) as mock_cache_dir:
-        yield mock_cache_dir
-
-
-@pytest.fixture
-def init_cache_dir_side_effect() -> Any:
-    """Return the cache dir."""
-    return None
-
-
-@pytest.fixture(autouse=True)
-def empty_cache_dir(tmp_path, mock_init_cache_dir, mock_get_cache_files, request):
+@pytest.fixture(autouse=True, name="mock_tts_cache_dir")
+def mock_tts_cache_dir_fixture_autouse(mock_tts_cache_dir):
     """Mock the TTS cache dir with empty dir."""
-    mock_init_cache_dir.return_value = str(tmp_path)
-
-    # Restore original get cache files behavior, we're working with a real dir.
-    mock_get_cache_files.side_effect = _get_cache_files
-
-    yield tmp_path
-
-    if request.node.rep_call.passed:
-        return
-
-    # Print contents of dir if failed
-    print("Content of dir for", request.node.nodeid)  # noqa: T201
-    for fil in tmp_path.iterdir():
-        print(fil.relative_to(tmp_path))  # noqa: T201
-
-    # To show the log.
-    pytest.fail("Test failed, see log for details")
+    return mock_tts_cache_dir
 
 
 @pytest.fixture(autouse=True)
-def mutagen_mock():
+def tts_mutagen_mock_fixture_autouse(tts_mutagen_mock):
     """Mock writing tags."""
-    with patch(
-        "homeassistant.components.tts.SpeechManager.write_tags",
-        side_effect=lambda *args: args[1],
-    ) as mock_write_tags:
-        yield mock_write_tags
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index b43687ba931aec..2656beba2367d5 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -5,7 +5,6 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-import voluptuous as vol
 
 from homeassistant.components import tts
 from homeassistant.components.media_player import (
@@ -17,14 +16,13 @@
     MediaType,
 )
 from homeassistant.components.media_source import Unresolvable
-from homeassistant.components.tts.legacy import _valid_base_url
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
-from homeassistant.util.network import normalize_url
 
 from .common import (
     DEFAULT_LANG,
@@ -68,7 +66,7 @@ async def test_default_entity_attributes() -> None:
     entity = DefaultEntity()
 
     assert entity.hass is None
-    assert entity.name is None
+    assert entity.name is UNDEFINED
     assert entity.default_language == DEFAULT_LANG
     assert entity.supported_languages == SUPPORT_LANGUAGES
     assert entity.supported_options is None
@@ -148,12 +146,12 @@ async def test_setup_component(hass: HomeAssistant, setup: str) -> None:
     assert f"{tts.DOMAIN}.test" in hass.config.components
 
 
-@pytest.mark.parametrize("init_cache_dir_side_effect", [OSError(2, "No access")])
+@pytest.mark.parametrize("init_tts_cache_dir_side_effect", [OSError(2, "No access")])
 @pytest.mark.parametrize(
     "setup", ["mock_setup", "mock_config_entry_setup"], indirect=True
 )
 async def test_setup_component_no_access_cache_folder(
-    hass: HomeAssistant, mock_init_cache_dir: MagicMock, setup: str
+    hass: HomeAssistant, mock_tts_init_cache_dir: MagicMock, setup: str
 ) -> None:
     """Set up a TTS platform with defaults."""
     assert not hass.services.has_service(tts.DOMAIN, "test_say")
@@ -187,7 +185,7 @@ async def test_setup_component_no_access_cache_folder(
 )
 async def test_service(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -212,7 +210,7 @@ async def test_service(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -248,7 +246,7 @@ async def test_service(
 )
 async def test_service_default_language(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -271,7 +269,7 @@ async def test_service_default_language(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / (
             f"42f18378fd4393d18c8dd11d03fa9563c1e54491_de-de_-_{expected_url_suffix}.mp3"
         )
@@ -309,7 +307,7 @@ async def test_service_default_language(
 )
 async def test_service_default_special_language(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -332,7 +330,7 @@ async def test_service_default_special_language(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -366,7 +364,7 @@ async def test_service_default_special_language(
 )
 async def test_service_language(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -389,7 +387,7 @@ async def test_service_language(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_de-de_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -423,7 +421,7 @@ async def test_service_language(
 )
 async def test_service_wrong_language(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -441,7 +439,7 @@ async def test_service_wrong_language(
         )
     assert len(calls) == 0
     assert not (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_lang_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -477,7 +475,7 @@ async def test_service_wrong_language(
 )
 async def test_service_options(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -502,7 +500,7 @@ async def test_service_options(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / (
             "42f18378fd4393d18c8dd11d03fa9563c1e54491"
             f"_de-de_{opt_hash}_{expected_url_suffix}.mp3"
@@ -561,7 +559,7 @@ def default_options(self):
 )
 async def test_service_default_options(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -586,7 +584,7 @@ async def test_service_default_options(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / (
             "42f18378fd4393d18c8dd11d03fa9563c1e54491"
             f"_de-de_{opt_hash}_{expected_url_suffix}.mp3"
@@ -629,7 +627,7 @@ async def test_service_default_options(
 )
 async def test_merge_default_service_options(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -657,7 +655,7 @@ async def test_merge_default_service_options(
     )
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / (
             "42f18378fd4393d18c8dd11d03fa9563c1e54491"
             f"_de-de_{opt_hash}_{expected_url_suffix}.mp3"
@@ -696,7 +694,7 @@ async def test_merge_default_service_options(
 )
 async def test_service_wrong_options(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -717,7 +715,7 @@ async def test_service_wrong_options(
     assert len(calls) == 0
     await hass.async_block_till_done()
     assert not (
-        empty_cache_dir
+        mock_tts_cache_dir
         / (
             "42f18378fd4393d18c8dd11d03fa9563c1e54491"
             f"_de-de_{opt_hash}_{expected_url_suffix}.mp3"
@@ -752,7 +750,7 @@ async def test_service_wrong_options(
 )
 async def test_service_clear_cache(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -772,7 +770,7 @@ async def test_service_clear_cache(
     await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
     await hass.async_block_till_done()
     assert (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -781,7 +779,7 @@ async def test_service_clear_cache(
     )
 
     assert not (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -814,7 +812,7 @@ async def test_service_clear_cache(
 async def test_service_receive_voice(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -886,7 +884,7 @@ async def test_service_receive_voice(
 async def test_service_receive_voice_german(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -994,7 +992,7 @@ async def test_web_view_wrong_filename(
 )
 async def test_service_without_cache(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     setup: str,
     tts_service: str,
     service_data: dict[str, Any],
@@ -1012,7 +1010,7 @@ async def test_service_without_cache(
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert not (
-        empty_cache_dir
+        mock_tts_cache_dir
         / f"42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_{expected_url_suffix}.mp3"
     ).is_file()
 
@@ -1021,7 +1019,7 @@ class MockProviderBoom(MockProvider):
     """Mock provider that blows up."""
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> tts.TtsAudioType:
         """Load TTS dat."""
         # This should not be called, data should be fetched from cache
@@ -1032,7 +1030,7 @@ class MockEntityBoom(MockTTSEntity):
     """Mock entity that blows up."""
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> tts.TtsAudioType:
         """Load TTS dat."""
         # This should not be called, data should be fetched from cache
@@ -1042,7 +1040,7 @@ def get_tts_audio(
 @pytest.mark.parametrize("mock_provider", [MockProviderBoom(DEFAULT_LANG)])
 async def test_setup_legacy_cache_dir(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     mock_provider: MockProvider,
 ) -> None:
     """Set up a TTS platform with cache and call service without cache."""
@@ -1050,7 +1048,7 @@ async def test_setup_legacy_cache_dir(
 
     tts_data = b""
     cache_file = (
-        empty_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_test.mp3"
+        mock_tts_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_test.mp3"
     )
 
     with open(cache_file, "wb") as voice_file:
@@ -1078,14 +1076,14 @@ async def test_setup_legacy_cache_dir(
 @pytest.mark.parametrize("mock_tts_entity", [MockEntityBoom(DEFAULT_LANG)])
 async def test_setup_cache_dir(
     hass: HomeAssistant,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     mock_tts_entity: MockTTSEntity,
 ) -> None:
     """Set up a TTS platform with cache and call service without cache."""
     calls = async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
 
     tts_data = b""
-    cache_file = empty_cache_dir / (
+    cache_file = mock_tts_cache_dir / (
         "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_tts.test.mp3"
     )
 
@@ -1116,7 +1114,7 @@ class MockProviderEmpty(MockProvider):
     """Mock provider with empty get_tts_audio."""
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> tts.TtsAudioType:
         """Load TTS dat."""
         return (None, None)
@@ -1126,7 +1124,7 @@ class MockEntityEmpty(MockTTSEntity):
     """Mock entity with empty get_tts_audio."""
 
     def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any] | None = None
+        self, message: str, language: str, options: dict[str, Any]
     ) -> tts.TtsAudioType:
         """Load TTS dat."""
         return (None, None)
@@ -1182,13 +1180,13 @@ async def test_service_get_tts_error(
 async def test_load_cache_legacy_retrieve_without_mem_cache(
     hass: HomeAssistant,
     mock_provider: MockProvider,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Set up component and load cache and get without mem cache."""
     tts_data = b""
     cache_file = (
-        empty_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en_-_test.mp3"
+        mock_tts_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en_-_test.mp3"
     )
 
     with open(cache_file, "wb") as voice_file:
@@ -1208,12 +1206,12 @@ async def test_load_cache_legacy_retrieve_without_mem_cache(
 async def test_load_cache_retrieve_without_mem_cache(
     hass: HomeAssistant,
     mock_tts_entity: MockTTSEntity,
-    empty_cache_dir,
+    mock_tts_cache_dir,
     hass_client: ClientSessionGenerator,
 ) -> None:
     """Set up component and load cache and get without mem cache."""
     tts_data = b""
-    cache_file = empty_cache_dir / (
+    cache_file = mock_tts_cache_dir / (
         "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_tts.test.mp3"
     )
 
@@ -1314,44 +1312,6 @@ async def test_tags_with_wave() -> None:
     assert tagged_data != tts_data
 
 
-@pytest.mark.parametrize(
-    "value",
-    (
-        "http://example.local:8123",
-        "http://example.local",
-        "http://example.local:80",
-        "https://example.com",
-        "https://example.com:443",
-        "https://example.com:8123",
-    ),
-)
-def test_valid_base_url(value) -> None:
-    """Test we validate base urls."""
-    assert _valid_base_url(value) == normalize_url(value)
-    # Test we strip trailing `/`
-    assert _valid_base_url(value + "/") == normalize_url(value)
-
-
-@pytest.mark.parametrize(
-    "value",
-    (
-        "http://example.local:8123/sub-path",
-        "http://example.local/sub-path",
-        "https://example.com/sub-path",
-        "https://example.com:8123/sub-path",
-        "mailto:some@email",
-        "http:example.com",
-        "http:/example.com",
-        "http//example.com",
-        "example.com",
-    ),
-)
-def test_invalid_base_url(value) -> None:
-    """Test we catch bad base urls."""
-    with pytest.raises(vol.Invalid):
-        _valid_base_url(value)
-
-
 @pytest.mark.parametrize(
     ("setup", "result_engine"),
     [
@@ -1486,7 +1446,7 @@ def default_options(self) -> dict[str, str]:
             return {tts.ATTR_AUDIO_OUTPUT: "mp3"}
 
         async def async_get_tts_audio(
-            self, message: str, language: str, options: dict[str, Any] | None = None
+            self, message: str, language: str, options: dict[str, Any]
         ) -> tts.TtsAudioType:
             return ("mp3", await tts_audio)
 
@@ -1559,7 +1519,7 @@ def default_options(self) -> dict[str, str]:
             return {tts.ATTR_AUDIO_OUTPUT: "mp3"}
 
         async def async_get_tts_audio(
-            self, message: str, language: str, options: dict[str, Any] | None = None
+            self, message: str, language: str, options: dict[str, Any]
         ) -> tts.TtsAudioType:
             return ("mp3", await tts_audio)
 
diff --git a/tests/components/tts/test_legacy.py b/tests/components/tts/test_legacy.py
index 0880fcf125a11f..5a8321e2ae44d2 100644
--- a/tests/components/tts/test_legacy.py
+++ b/tests/components/tts/test_legacy.py
@@ -4,11 +4,8 @@
 import pytest
 
 from homeassistant.components.media_player import (
-    ATTR_MEDIA_CONTENT_ID,
-    ATTR_MEDIA_CONTENT_TYPE,
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
-    MediaType,
 )
 from homeassistant.components.tts import ATTR_MESSAGE, DOMAIN, Provider
 from homeassistant.const import ATTR_ENTITY_ID
@@ -17,7 +14,7 @@
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import async_setup_component
 
-from .common import SUPPORT_LANGUAGES, MockProvider, MockTTS, get_media_source_url
+from .common import SUPPORT_LANGUAGES, MockProvider, MockTTS
 
 from tests.common import (
     MockModule,
@@ -71,7 +68,7 @@ async def test_invalid_platform(
     )
     await hass.async_block_till_done()
 
-    assert "Unknown text to speech platform specified" in caplog.text
+    assert "Unknown text-to-speech platform specified" in caplog.text
 
 
 async def test_platform_setup_without_provider(
@@ -140,36 +137,8 @@ async def async_get_engine(
     assert "Error setting up platform: bad_tts" in caplog.text
 
 
-async def test_service_base_url_set(hass: HomeAssistant, mock_tts) -> None:
-    """Set up a TTS platform with ``base_url`` set and call service."""
-    calls = async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
-
-    config = {DOMAIN: {"platform": "test", "base_url": "http://fnord"}}
-
-    with assert_setup_component(1, DOMAIN):
-        assert await async_setup_component(hass, DOMAIN, config)
-
-    await hass.services.async_call(
-        DOMAIN,
-        "test_say",
-        {
-            ATTR_ENTITY_ID: "media_player.something",
-            ATTR_MESSAGE: "There is someone at the door.",
-        },
-        blocking=True,
-    )
-    assert len(calls) == 1
-    assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MediaType.MUSIC
-    assert (
-        await get_media_source_url(hass, calls[0].data[ATTR_MEDIA_CONTENT_ID])
-        == "http://fnord"
-        "/api/tts_proxy/42f18378fd4393d18c8dd11d03fa9563c1e54491"
-        "_en-us_-_test.mp3"
-    )
-
-
 async def test_service_without_cache_config(
-    hass: HomeAssistant, empty_cache_dir, mock_tts
+    hass: HomeAssistant, mock_tts_cache_dir, mock_tts
 ) -> None:
     """Set up a TTS platform without cache."""
     calls = async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
@@ -191,5 +160,5 @@ async def test_service_without_cache_config(
     assert len(calls) == 1
     await hass.async_block_till_done()
     assert not (
-        empty_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_test.mp3"
+        mock_tts_cache_dir / "42f18378fd4393d18c8dd11d03fa9563c1e54491_en-us_-_test.mp3"
     ).is_file()
diff --git a/tests/components/tts/test_media_source.py b/tests/components/tts/test_media_source.py
index ef2cbb651e8f76..86f1a3bcf3e201 100644
--- a/tests/components/tts/test_media_source.py
+++ b/tests/components/tts/test_media_source.py
@@ -52,7 +52,7 @@ async def test_browsing(hass: HomeAssistant, setup: str) -> None:
     item = await media_source.async_browse_media(hass, "media-source://tts")
 
     assert item is not None
-    assert item.title == "Text to Speech"
+    assert item.title == "Text-to-speech"
     assert item.children is not None
     assert len(item.children) == 1
     assert item.can_play is False
@@ -103,7 +103,7 @@ async def test_legacy_resolving(hass: HomeAssistant, mock_provider: MSProvider)
     message, language = mock_get_tts_audio.mock_calls[0][1]
     assert message == "Hello World"
     assert language == "en_US"
-    assert mock_get_tts_audio.mock_calls[0][2]["options"] is None
+    assert mock_get_tts_audio.mock_calls[0][2]["options"] == {}
 
     # Pass language and options
     mock_get_tts_audio.reset_mock()
@@ -138,7 +138,7 @@ async def test_resolving(hass: HomeAssistant, mock_tts_entity: MSEntity) -> None
     message, language = mock_get_tts_audio.mock_calls[0][1]
     assert message == "Hello World"
     assert language == "en_US"
-    assert mock_get_tts_audio.mock_calls[0][2]["options"] is None
+    assert mock_get_tts_audio.mock_calls[0][2]["options"] == {}
 
     # Pass language and options
     mock_get_tts_audio.reset_mock()
diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py
index be528459a7051f..22ab151b86457d 100644
--- a/tests/components/tts/test_notify.py
+++ b/tests/components/tts/test_notify.py
@@ -1,7 +1,9 @@
 """The tests for the TTS component."""
+from unittest.mock import patch
+
 import pytest
 
-from homeassistant.components import media_player, notify, tts
+from homeassistant.components import notify, tts
 from homeassistant.components.media_player import (
     DOMAIN as DOMAIN_MP,
     SERVICE_PLAY_MEDIA,
@@ -24,6 +26,16 @@ async def internal_url_mock(hass: HomeAssistant) -> None:
     )
 
 
+@pytest.fixture(autouse=True)
+async def disable_platforms() -> None:
+    """Disable demo platforms."""
+    with patch(
+        "homeassistant.components.demo.COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM",
+        [],
+    ):
+        yield
+
+
 async def test_setup_legacy_platform(hass: HomeAssistant) -> None:
     """Set up the tts notify platform ."""
     config = {
@@ -62,7 +74,6 @@ async def test_setup_legacy_service(hass: HomeAssistant) -> None:
 
     config = {
         tts.DOMAIN: {"platform": "demo"},
-        media_player.DOMAIN: {"platform": "demo"},
         notify.DOMAIN: {
             "platform": "tts",
             "name": "tts_test",
diff --git a/tests/components/unifi/test_switch.py b/tests/components/unifi/test_switch.py
index 6b7ee2cd0a7fb9..f93abc291b8d93 100644
--- a/tests/components/unifi/test_switch.py
+++ b/tests/components/unifi/test_switch.py
@@ -31,7 +31,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .test_controller import (
     CONTROLLER_HOST,
@@ -1129,7 +1129,7 @@ async def test_poe_port_switches(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
diff --git a/tests/components/unifiprotect/test_sensor.py b/tests/components/unifiprotect/test_sensor.py
index db7cdc801bf96b..89a153caed28c2 100644
--- a/tests/components/unifiprotect/test_sensor.py
+++ b/tests/components/unifiprotect/test_sensor.py
@@ -537,7 +537,9 @@ async def test_camera_update_licenseplate(
 
     new_camera = camera.copy()
     new_camera.is_smart_detected = True
-    new_camera.last_smart_detect_event_id = event.id
+    new_camera.last_smart_detect_event_ids[
+        SmartDetectObjectType.LICENSE_PLATE
+    ] = event.id
 
     mock_msg = Mock()
     mock_msg.changed_data = {}
diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py
index a6cf342eeb39bd..e31cab59358e89 100644
--- a/tests/components/universal/test_media_player.py
+++ b/tests/components/universal/test_media_player.py
@@ -1278,6 +1278,56 @@ async def test_master_state_with_template(hass: HomeAssistant) -> None:
     assert events[0].context == context
 
 
+async def test_invalid_active_child_template(hass: HomeAssistant) -> None:
+    """Test invalid active child template."""
+    hass.states.async_set("media_player.mock1", STATE_PLAYING)
+    hass.states.async_set("media_player.mock2", STATE_PAUSED)
+
+    await async_setup_component(
+        hass,
+        "media_player",
+        {
+            "media_player": {
+                "platform": "universal",
+                "name": "tv",
+                "children": ["media_player.mock1", "media_player.mock2"],
+                "active_child_template": "{{invalid.invalid}}!invalid",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    await hass.async_block_till_done()
+    assert hass.states.get("media_player.tv").state == STATE_PLAYING
+
+
+async def test_active_child_template(hass: HomeAssistant) -> None:
+    """Test override active child with template."""
+    hass.states.async_set("media_player.mock1", STATE_PLAYING)
+    hass.states.async_set("media_player.mock2", STATE_PAUSED)
+
+    await async_setup_component(
+        hass,
+        "media_player",
+        {
+            "media_player": {
+                "platform": "universal",
+                "name": "tv",
+                "children": ["media_player.mock1", "media_player.mock2"],
+                "active_child_template": "{{ 'media_player.mock2' }}",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    hass.states.async_set("media_player.mock2", STATE_ON)
+
+    await hass.async_block_till_done()
+    assert hass.states.get("media_player.tv").state == STATE_ON
+
+
 async def test_reload(hass: HomeAssistant) -> None:
     """Test reloading the media player from yaml."""
     hass.states.async_set("input_boolean.test", STATE_OFF)
diff --git a/tests/components/update/test_device_trigger.py b/tests/components/update/test_device_trigger.py
index 9f55e85dbe9ec8..b2d06a642a881a 100644
--- a/tests/components/update/test_device_trigger.py
+++ b/tests/components/update/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -14,13 +15,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -41,7 +45,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -50,7 +54,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -58,7 +62,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -84,7 +88,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -98,7 +102,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["changed_states", "turned_off", "turned_on"]
@@ -106,7 +110,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -139,8 +143,42 @@ async def test_get_trigger_capabilities(
         assert capabilities == expected_capabilities
 
 
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a update trigger."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+    expected_capabilities = {
+        "extra_fields": [
+            {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+        ]
+    }
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == expected_capabilities
+
+
 async def test_if_fires_on_state_change(
-    hass: HomeAssistant, calls: list[ServiceCall], enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
 ) -> None:
     """Test for turn_on and turn_off triggers firing."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -149,6 +187,8 @@ async def test_if_fires_on_state_change(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get("update.update_available")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -159,7 +199,7 @@ async def test_if_fires_on_state_change(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "update.update_available",
+                        "entity_id": entry.id,
                         "type": "turned_on",
                     },
                     "action": {
@@ -228,8 +268,73 @@ async def test_if_fires_on_state_change(
     )
 
 
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    platform = getattr(hass.components, f"test.{DOMAIN}")
+
+    platform.init()
+    assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
+    await hass.async_block_till_done()
+
+    entry = entity_registry.async_get("update.update_available")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "turned_off",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "no_update {{ trigger.%s }}"
+                            % "}} - {{ trigger.".join(
+                                (
+                                    "platform",
+                                    "entity_id",
+                                    "from_state.state",
+                                    "to_state.state",
+                                    "for",
+                                )
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("update.update_available")
+    assert state
+    assert state.state == STATE_ON
+    assert not calls
+
+    hass.states.async_set("update.update_available", STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == "no_update device - update.update_available - on - off - None"
+    )
+
+
 async def test_if_fires_on_state_change_with_for(
-    hass: HomeAssistant, calls: list[ServiceCall], enable_custom_integrations: None
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    calls: list[ServiceCall],
+    enable_custom_integrations: None,
 ) -> None:
     """Test for triggers firing with delay."""
     platform = getattr(hass.components, f"test.{DOMAIN}")
@@ -238,6 +343,8 @@ async def test_if_fires_on_state_change_with_for(
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "test"}})
     await hass.async_block_till_done()
 
+    entry = entity_registry.async_get("update.update_available")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -248,7 +355,7 @@ async def test_if_fires_on_state_change_with_for(
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "update.update_available",
+                        "entity_id": entry.id,
                         "type": "turned_off",
                         "for": {"seconds": 5},
                     },
diff --git a/tests/components/update/test_init.py b/tests/components/update/test_init.py
index d0546b6a2efd44..a7780f54f70b0e 100644
--- a/tests/components/update/test_init.py
+++ b/tests/components/update/test_init.py
@@ -49,6 +49,7 @@ async def test_update(hass: HomeAssistant) -> None:
     """Test getting data from the mocked update entity."""
     update = MockUpdateEntity()
     update.hass = hass
+    update.platform = MockEntityPlatform(hass)
 
     update._attr_installed_version = "1.0.0"
     update._attr_latest_version = "1.0.1"
@@ -57,7 +58,10 @@ async def test_update(hass: HomeAssistant) -> None:
     update._attr_title = "Title"
 
     assert update.entity_category is EntityCategory.DIAGNOSTIC
-    assert update.entity_picture is None
+    assert (
+        update.entity_picture
+        == "https://brands.home-assistant.io/_/test_platform/icon.png"
+    )
     assert update.installed_version == "1.0.0"
     assert update.latest_version == "1.0.1"
     assert update.release_summary == "Summary"
@@ -76,13 +80,6 @@ async def test_update(hass: HomeAssistant) -> None:
         ATTR_TITLE: "Title",
     }
 
-    # Test with platform
-    update.platform = MockEntityPlatform(hass)
-    assert (
-        update.entity_picture
-        == "https://brands.home-assistant.io/_/test_platform/icon.png"
-    )
-
     # Test no update available
     update._attr_installed_version = "1.0.0"
     update._attr_latest_version = "1.0.0"
diff --git a/tests/components/uptimerobot/test_binary_sensor.py b/tests/components/uptimerobot/test_binary_sensor.py
index 0cf0c3a6fbe912..4b27ab5ff0590d 100644
--- a/tests/components/uptimerobot/test_binary_sensor.py
+++ b/tests/components/uptimerobot/test_binary_sensor.py
@@ -11,7 +11,7 @@
 )
 from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import (
     MOCK_UPTIMEROBOT_MONITOR,
@@ -45,7 +45,7 @@ async def test_unaviable_on_update_failure(hass: HomeAssistant) -> None:
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         side_effect=UptimeRobotAuthenticationException,
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
 
     entity = hass.states.get(UPTIMEROBOT_BINARY_SENSOR_TEST_ENTITY)
diff --git a/tests/components/uptimerobot/test_init.py b/tests/components/uptimerobot/test_init.py
index 42685880dc0cc1..bba5af07be3fb5 100644
--- a/tests/components/uptimerobot/test_init.py
+++ b/tests/components/uptimerobot/test_init.py
@@ -12,7 +12,7 @@
 from homeassistant.const import STATE_ON, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import (
     MOCK_UPTIMEROBOT_CONFIG_ENTRY_DATA,
@@ -106,7 +106,7 @@ async def test_reauthentication_trigger_after_setup(
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         side_effect=UptimeRobotAuthenticationException,
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
 
     flows = hass.config_entries.flow.async_progress()
@@ -134,7 +134,7 @@ async def test_integration_reload(hass: HomeAssistant) -> None:
         return_value=mock_uptimerobot_api_response(),
     ):
         assert await hass.config_entries.async_reload(mock_entry.entry_id)
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
 
     entry = hass.config_entries.async_get_entry(mock_entry.entry_id)
@@ -152,7 +152,7 @@ async def test_update_errors(
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         side_effect=UptimeRobotException,
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
         assert (
             hass.states.get(UPTIMEROBOT_BINARY_SENSOR_TEST_ENTITY).state
@@ -163,7 +163,7 @@ async def test_update_errors(
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         return_value=mock_uptimerobot_api_response(),
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
         assert hass.states.get(UPTIMEROBOT_BINARY_SENSOR_TEST_ENTITY).state == STATE_ON
 
@@ -171,7 +171,7 @@ async def test_update_errors(
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         return_value=mock_uptimerobot_api_response(key=MockApiResponseKey.ERROR),
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
         assert (
             hass.states.get(UPTIMEROBOT_BINARY_SENSOR_TEST_ENTITY).state
@@ -201,7 +201,7 @@ async def test_device_management(hass: HomeAssistant) -> None:
             data=[MOCK_UPTIMEROBOT_MONITOR, {**MOCK_UPTIMEROBOT_MONITOR, "id": 12345}]
         ),
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
 
     devices = dr.async_entries_for_config_entry(dev_reg, mock_entry.entry_id)
@@ -218,7 +218,7 @@ async def test_device_management(hass: HomeAssistant) -> None:
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         return_value=mock_uptimerobot_api_response(),
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
         await hass.async_block_till_done()
 
diff --git a/tests/components/uptimerobot/test_sensor.py b/tests/components/uptimerobot/test_sensor.py
index 68b64f70e5a2ae..110ea07c202b3f 100644
--- a/tests/components/uptimerobot/test_sensor.py
+++ b/tests/components/uptimerobot/test_sensor.py
@@ -8,7 +8,7 @@
 from homeassistant.components.uptimerobot.const import COORDINATOR_UPDATE_INTERVAL
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import (
     MOCK_UPTIMEROBOT_MONITOR,
@@ -52,7 +52,7 @@ async def test_unaviable_on_update_failure(hass: HomeAssistant) -> None:
         "pyuptimerobot.UptimeRobot.async_get_monitors",
         side_effect=UptimeRobotAuthenticationException,
     ):
-        async_fire_time_changed(hass, dt.utcnow() + COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(hass, dt_util.utcnow() + COORDINATOR_UPDATE_INTERVAL)
         await hass.async_block_till_done()
 
     entity = hass.states.get(UPTIMEROBOT_SENSOR_TEST_ENTITY)
diff --git a/tests/components/usb/test_init.py b/tests/components/usb/test_init.py
index 0d4625fe7fb202..e7c878b6f40173 100644
--- a/tests/components/usb/test_init.py
+++ b/tests/components/usb/test_init.py
@@ -1021,3 +1021,45 @@ async def test_cancel_initial_scan_callback(
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
         assert len(mock_callback.mock_calls) == 0
+
+
+async def test_resolve_serial_by_id(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test the discovery data resolves to serial/by-id."""
+    new_usb = [{"domain": "test1", "vid": "3039", "pid": "3039"}]
+
+    mock_comports = [
+        MagicMock(
+            device=slae_sh_device.device,
+            vid=12345,
+            pid=12345,
+            serial_number=slae_sh_device.serial_number,
+            manufacturer=slae_sh_device.manufacturer,
+            description=slae_sh_device.description,
+        )
+    ]
+
+    with patch("pyudev.Context", side_effect=ImportError), patch(
+        "homeassistant.components.usb.async_get_usb", return_value=new_usb
+    ), patch(
+        "homeassistant.components.usb.comports", return_value=mock_comports
+    ), patch(
+        "homeassistant.components.usb.get_serial_by_id",
+        return_value="/dev/serial/by-id/bla",
+    ), patch.object(
+        hass.config_entries.flow, "async_init"
+    ) as mock_config_flow:
+        assert await async_setup_component(hass, "usb", {"usb": {}})
+        await hass.async_block_till_done()
+        hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
+        await hass.async_block_till_done()
+        ws_client = await hass_ws_client(hass)
+        await ws_client.send_json({"id": 1, "type": "usb/scan"})
+        response = await ws_client.receive_json()
+        assert response["success"]
+        await hass.async_block_till_done()
+
+    assert len(mock_config_flow.mock_calls) == 1
+    assert mock_config_flow.mock_calls[0][1][0] == "test1"
+    assert mock_config_flow.mock_calls[0][2]["data"].device == "/dev/serial/by-id/bla"
diff --git a/tests/components/utility_meter/test_config_flow.py b/tests/components/utility_meter/test_config_flow.py
index 302d3879a04b1f..88a77407c07ff6 100644
--- a/tests/components/utility_meter/test_config_flow.py
+++ b/tests/components/utility_meter/test_config_flow.py
@@ -7,6 +7,7 @@
 from homeassistant.components.utility_meter.const import DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from tests.common import MockConfigEntry
 
@@ -266,3 +267,173 @@ async def test_options(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     state = hass.states.get("sensor.electricity_meter")
     assert state.attributes["source"] == input_sensor2_entity_id
+
+
+async def test_change_device_source(hass: HomeAssistant) -> None:
+    """Test remove the device registry configuration entry when the source entity changes."""
+
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    # Configure source entity 1 (with a linked device)
+    source_config_entry_1 = MockConfigEntry()
+    source_device_entry_1 = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry_1.entry_id,
+        identifiers={("sensor", "identifier_test1")},
+        connections={("mac", "20:31:32:33:34:35")},
+    )
+    source_entity_1 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source1",
+        config_entry=source_config_entry_1,
+        device_id=source_device_entry_1.id,
+    )
+
+    # Configure source entity 2 (with a linked device)
+    source_config_entry_2 = MockConfigEntry()
+    source_device_entry_2 = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry_2.entry_id,
+        identifiers={("sensor", "identifier_test2")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity_2 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source2",
+        config_entry=source_config_entry_2,
+        device_id=source_device_entry_2.id,
+    )
+
+    # Configure source entity 3 (without a device)
+    source_config_entry_3 = MockConfigEntry()
+    source_entity_3 = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source3",
+        config_entry=source_config_entry_3,
+    )
+
+    await hass.async_block_till_done()
+
+    input_sensor_entity_id_1 = "sensor.test_source1"
+    input_sensor_entity_id_2 = "sensor.test_source2"
+    input_sensor_entity_id_3 = "sensor.test_source3"
+
+    # Test the existence of configured source entities
+    assert entity_registry.async_get(input_sensor_entity_id_1) is not None
+    assert entity_registry.async_get(input_sensor_entity_id_2) is not None
+    assert entity_registry.async_get(input_sensor_entity_id_3) is not None
+
+    # Setup the config entry with source entity 1 (with a linked device)
+    current_entity_source = source_entity_1
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+            "tariffs": [],
+        },
+        title="Energy",
+    )
+    utility_meter_config_entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been added to the source entity 1 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
+
+    # Change configuration options to use source entity 2 (with a linked device) and reload the integration
+    previous_entity_source = source_entity_1
+    current_entity_source = source_entity_2
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been removed from the source entity 1 (previous) device registry
+    previous_device = device_registry.async_get(
+        device_id=previous_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id not in previous_device.config_entries
+
+    # Confirm that the configuration entry has been added to the source entity 2 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
+
+    # Change configuration options to use source entity 3 (without a device) and reload the integration
+    previous_entity_source = source_entity_2
+    current_entity_source = source_entity_3
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been removed from the source entity 2 (previous) device registry
+    previous_device = device_registry.async_get(
+        device_id=previous_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id not in previous_device.config_entries
+
+    # Confirm that there is no device with the helper configuration entry
+    assert (
+        dr.async_entries_for_config_entry(
+            device_registry, utility_meter_config_entry.entry_id
+        )
+        == []
+    )
+
+    # Change configuration options to use source entity 2 (with a linked device) and reload the integration
+    previous_entity_source = source_entity_3
+    current_entity_source = source_entity_2
+
+    result = await hass.config_entries.options.async_init(
+        utility_meter_config_entry.entry_id
+    )
+    assert result["type"] == FlowResultType.FORM
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "periodically_resetting": True,
+            "source": current_entity_source.entity_id,
+        },
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    await hass.async_block_till_done()
+
+    # Confirm that the configuration entry has been added to the source entity 2 (current) device registry
+    current_device = device_registry.async_get(
+        device_id=current_entity_source.device_id
+    )
+    assert utility_meter_config_entry.entry_id in current_device.config_entries
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 65892ae376aec8..5cb9e594cb211c 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -41,7 +41,7 @@
     UnitOfEnergy,
 )
 from homeassistant.core import CoreState, HomeAssistant, State
-from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
@@ -1458,3 +1458,81 @@ def test_calculate_adjustment_invalid_new_state(
     new_state: State = State(entity_id="sensor.test", state="unknown")
     assert mock_sensor.calculate_adjustment(None, new_state) is None
     assert "Invalid state unknown" in caplog.text
+
+
+async def test_device_id(hass: HomeAssistant) -> None:
+    """Test for source entity device for Utility Meter."""
+    device_registry = dr.async_get(hass)
+    entity_registry = er.async_get(hass)
+
+    source_config_entry = MockConfigEntry()
+    source_device_entry = device_registry.async_get_or_create(
+        config_entry_id=source_config_entry.entry_id,
+        identifiers={("sensor", "identifier_test")},
+        connections={("mac", "30:31:32:33:34:35")},
+    )
+    source_entity = entity_registry.async_get_or_create(
+        "sensor",
+        "test",
+        "source",
+        config_entry=source_config_entry,
+        device_id=source_device_entry.id,
+    )
+    await hass.async_block_till_done()
+    assert entity_registry.async_get("sensor.test_source") is not None
+
+    utility_meter_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": "sensor.test_source",
+            "tariffs": ["peak", "offpeak"],
+        },
+        title="Energy",
+    )
+
+    utility_meter_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(utility_meter_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    utility_meter_entity = entity_registry.async_get("sensor.energy_peak")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
+
+    utility_meter_entity = entity_registry.async_get("sensor.energy_offpeak")
+    assert utility_meter_entity is not None
+    assert utility_meter_entity.device_id == source_entity.device_id
+
+    utility_meter_no_tariffs_config_entry = MockConfigEntry(
+        data={},
+        domain=DOMAIN,
+        options={
+            "cycle": "monthly",
+            "delta_values": False,
+            "name": "Energy",
+            "net_consumption": False,
+            "offset": 0,
+            "periodically_resetting": True,
+            "source": "sensor.test_source",
+            "tariffs": [],
+        },
+        title="Energy",
+    )
+
+    utility_meter_no_tariffs_config_entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(
+        utility_meter_no_tariffs_config_entry.entry_id
+    )
+    await hass.async_block_till_done()
+
+    utility_meter_no_tariffs_entity = entity_registry.async_get("sensor.energy")
+    assert utility_meter_no_tariffs_entity is not None
+    assert utility_meter_no_tariffs_entity.device_id == source_entity.device_id
diff --git a/tests/components/vacuum/test_device_action.py b/tests/components/vacuum/test_device_action.py
index 82ebab62155e64..617b8d41609967 100644
--- a/tests/components/vacuum/test_device_action.py
+++ b/tests/components/vacuum/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Vacuum device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 async def test_get_actions(
@@ -31,16 +35,15 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": "vacuum.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["clean", "dock"]
@@ -48,7 +51,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -74,7 +77,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -88,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["clean", "dock"]
@@ -96,11 +99,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -111,7 +116,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "dock",
                     },
                 },
@@ -120,7 +125,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "clean",
                     },
                 },
@@ -140,3 +145,39 @@ async def test_action(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     assert len(dock_calls) == 1
     assert len(clean_calls) == 1
+
+    assert dock_calls[-1].data == {"entity_id": entry.entity_id}
+    assert clean_calls[-1].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event_dock"},
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "dock",
+                    },
+                },
+            ]
+        },
+    )
+
+    dock_calls = async_mock_service(hass, "vacuum", "return_to_base")
+
+    hass.bus.async_fire("test_event_dock")
+    await hass.async_block_till_done()
+    assert len(dock_calls) == 1
+
+    assert dock_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/vacuum/test_device_condition.py b/tests/components/vacuum/test_device_condition.py
index 51715fec52f906..694f4b644170a4 100644
--- a/tests/components/vacuum/test_device_condition.py
+++ b/tests/components/vacuum/test_device_condition.py
@@ -1,5 +1,6 @@
 """The tests for Vacuum device conditions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -17,11 +18,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_conditions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_conditions = [
@@ -51,7 +55,7 @@ async def test_get_conditions(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for condition in ["is_cleaning", "is_docked"]
@@ -59,7 +63,7 @@ async def test_get_conditions(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": condition,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for condition in ["is_cleaning", "is_docked"]
@@ -107,12 +111,16 @@ async def test_get_conditions_hidden_auxiliary(
     conditions = await async_get_device_automations(
         hass, DeviceAutomationType.CONDITION, device_entry.id
     )
-    assert_lists_same(conditions, expected_conditions)
+    assert conditions == unordered(expected_conditions)
 
 
-async def test_if_state(hass: HomeAssistant, calls) -> None:
+async def test_if_state(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off conditions."""
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -126,7 +134,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "vacuum.entity",
+                            "entity_id": entry.id,
                             "type": "is_cleaning",
                         }
                     ],
@@ -144,7 +152,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
                             "condition": "device",
                             "domain": DOMAIN,
                             "device_id": "",
-                            "entity_id": "vacuum.entity",
+                            "entity_id": entry.id,
                             "type": "is_docked",
                         }
                     ],
@@ -164,7 +172,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert len(calls) == 1
     assert calls[0].data["some"] == "is_docked - event - test_event2"
 
-    hass.states.async_set("vacuum.entity", STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
@@ -172,9 +180,49 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
     assert calls[1].data["some"] == "is_cleaning - event - test_event1"
 
     # Returning means it's still cleaning
-    hass.states.async_set("vacuum.entity", STATE_RETURNING)
+    hass.states.async_set(entry.entity_id, STATE_RETURNING)
     hass.bus.async_fire("test_event1")
     hass.bus.async_fire("test_event2")
     await hass.async_block_till_done()
     assert len(calls) == 3
     assert calls[2].data["some"] == "is_cleaning - event - test_event1"
+
+
+async def test_if_state_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off conditions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {"platform": "event", "event_type": "test_event1"},
+                    "condition": [
+                        {
+                            "condition": "device",
+                            "domain": DOMAIN,
+                            "device_id": "",
+                            "entity_id": entry.entity_id,
+                            "type": "is_cleaning",
+                        }
+                    ],
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": "is_cleaning - {{ trigger.platform }} - {{ trigger.event.event_type }}"
+                        },
+                    },
+                },
+            ]
+        },
+    )
+    hass.bus.async_fire("test_event1")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "is_cleaning - event - test_event1"
diff --git a/tests/components/vacuum/test_device_trigger.py b/tests/components/vacuum/test_device_trigger.py
index a9cd377b6ebe19..2f27d299d7eb97 100644
--- a/tests/components/vacuum/test_device_trigger.py
+++ b/tests/components/vacuum/test_device_trigger.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -15,13 +16,16 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_fire_time_changed,
     async_get_device_automation_capabilities,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
@@ -42,7 +46,7 @@ async def test_get_triggers(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
     expected_triggers = [
@@ -51,7 +55,7 @@ async def test_get_triggers(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for trigger in ["cleaning", "docked"]
@@ -59,7 +63,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 @pytest.mark.parametrize(
@@ -85,7 +89,7 @@ async def test_get_triggers_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -99,7 +103,7 @@ async def test_get_triggers_hidden_auxiliary(
             "domain": DOMAIN,
             "type": trigger,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for trigger in ["cleaning", "docked"]
@@ -107,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_trigger_capabilities(
@@ -141,9 +145,45 @@ async def test_get_trigger_capabilities(
         }
 
 
-async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
+async def test_get_trigger_capabilities_legacy(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test we get the expected capabilities from a vacuum device."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_registry.async_get_or_create(
+        DOMAIN, "test", "5678", device_id=device_entry.id
+    )
+
+    triggers = await async_get_device_automations(
+        hass, DeviceAutomationType.TRIGGER, device_entry.id
+    )
+    assert len(triggers) == 2
+    for trigger in triggers:
+        trigger["entity_id"] = entity_registry.async_get(trigger["entity_id"]).entity_id
+        capabilities = await async_get_device_automation_capabilities(
+            hass, DeviceAutomationType.TRIGGER, trigger
+        )
+        assert capabilities == {
+            "extra_fields": [
+                {"name": "for", "optional": True, "type": "positive_time_period_dict"}
+            ]
+        }
+
+
+async def test_if_fires_on_state_change(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for turn_on and turn_off triggers firing."""
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -155,7 +195,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "cleaning",
                     },
                     "action": {
@@ -174,7 +214,7 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": "vacuum.entity",
+                        "entity_id": entry.id,
                         "type": "docked",
                     },
                     "action": {
@@ -193,26 +233,77 @@ async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None:
     )
 
     # Fake that the entity is cleaning
-    hass.states.async_set("vacuum.entity", STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     await hass.async_block_till_done()
     assert len(calls) == 1
     assert (
-        calls[0].data["some"] == "cleaning - device - vacuum.entity - docked - cleaning"
+        calls[0].data["some"]
+        == f"cleaning - device - {entry.entity_id} - docked - cleaning"
     )
 
     # Fake that the entity is docked
-    hass.states.async_set("vacuum.entity", STATE_DOCKED)
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
     await hass.async_block_till_done()
     assert len(calls) == 2
     assert (
-        calls[1].data["some"] == "docked - device - vacuum.entity - cleaning - docked"
+        calls[1].data["some"]
+        == f"docked - device - {entry.entity_id} - cleaning - docked"
+    )
+
+
+async def test_if_fires_on_state_change_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
+    """Test for turn_on and turn_off triggers firing."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": "",
+                        "entity_id": entry.entity_id,
+                        "type": "cleaning",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {
+                            "some": (
+                                "cleaning - {{ trigger.platform}} - "
+                                "{{ trigger.entity_id}} - {{ trigger.from_state.state}} - "
+                                "{{ trigger.to_state.state}}"
+                            )
+                        },
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake that the entity is cleaning
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert (
+        calls[0].data["some"]
+        == f"cleaning - device - {entry.entity_id} - docked - cleaning"
     )
 
 
-async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) -> None:
+async def test_if_fires_on_state_change_with_for(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
+) -> None:
     """Test for triggers firing with delay."""
-    entity_id = f"{DOMAIN}.entity"
-    hass.states.async_set(entity_id, STATE_DOCKED)
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    hass.states.async_set(entry.entity_id, STATE_DOCKED)
 
     assert await async_setup_component(
         hass,
@@ -224,7 +315,7 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
                         "platform": "device",
                         "domain": DOMAIN,
                         "device_id": "",
-                        "entity_id": entity_id,
+                        "entity_id": entry.id,
                         "type": "cleaning",
                         "for": {"seconds": 5},
                     },
@@ -248,10 +339,9 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
         },
     )
     await hass.async_block_till_done()
-    assert hass.states.get(entity_id).state == STATE_DOCKED
     assert len(calls) == 0
 
-    hass.states.async_set(entity_id, STATE_CLEANING)
+    hass.states.async_set(entry.entity_id, STATE_CLEANING)
     await hass.async_block_till_done()
     assert len(calls) == 0
     async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
@@ -260,5 +350,5 @@ async def test_if_fires_on_state_change_with_for(hass: HomeAssistant, calls) ->
     await hass.async_block_till_done()
     assert (
         calls[0].data["some"]
-        == f"turn_off device - {entity_id} - docked - cleaning - 0:00:05"
+        == f"turn_off device - {entry.entity_id} - docked - cleaning - 0:00:05"
     )
diff --git a/tests/components/vallox/test_sensor.py b/tests/components/vallox/test_sensor.py
index 6cdf76d1227fab..c086719cbc3236 100644
--- a/tests/components/vallox/test_sensor.py
+++ b/tests/components/vallox/test_sensor.py
@@ -6,7 +6,7 @@
 import pytest
 
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import patch_metrics
 
@@ -42,7 +42,7 @@ def _sensor_to_datetime(sensor):
 
 
 def _now_at_13():
-    return dt.now().timetz().replace(hour=13, minute=0, second=0, microsecond=0)
+    return dt_util.now().timetz().replace(hour=13, minute=0, second=0, microsecond=0)
 
 
 async def test_remaining_filter_returns_timestamp(
@@ -52,7 +52,7 @@ async def test_remaining_filter_returns_timestamp(
     # Act
     with patch(
         "homeassistant.components.vallox._api_get_next_filter_change_date",
-        return_value=dt.now().date(),
+        return_value=dt_util.now().date(),
     ), patch_metrics(metrics={}):
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
@@ -94,7 +94,7 @@ async def test_remaining_time_for_filter_in_the_future(
     """Test remaining time for filter when Vallox returns a date in the future."""
     # Arrange
     remaining_days = 112
-    mocked_filter_end_date = dt.now().date() + timedelta(days=remaining_days)
+    mocked_filter_end_date = dt_util.now().date() + timedelta(days=remaining_days)
 
     # Act
     with patch(
@@ -118,7 +118,7 @@ async def test_remaining_time_for_filter_today(
     """Test remaining time for filter when Vallox returns today."""
     # Arrange
     remaining_days = 0
-    mocked_filter_end_date = dt.now().date() + timedelta(days=remaining_days)
+    mocked_filter_end_date = dt_util.now().date() + timedelta(days=remaining_days)
 
     # Act
     with patch(
@@ -142,7 +142,7 @@ async def test_remaining_time_for_filter_in_the_past(
     """Test remaining time for filter when Vallox returns a date in the past."""
     # Arrange
     remaining_days = -3
-    mocked_filter_end_date = dt.now().date() + timedelta(days=remaining_days)
+    mocked_filter_end_date = dt_util.now().date() + timedelta(days=remaining_days)
 
     # Act
     with patch(
diff --git a/tests/components/verisure/test_config_flow.py b/tests/components/verisure/test_config_flow.py
index b1e67766df8be9..af102cced987b2 100644
--- a/tests/components/verisure/test_config_flow.py
+++ b/tests/components/verisure/test_config_flow.py
@@ -583,6 +583,15 @@ async def test_reauth_flow_errors(
                 CONF_LOCK_CODE_DIGITS: DEFAULT_LOCK_CODE_DIGITS,
             },
         ),
+        (
+            {
+                CONF_LOCK_CODE_DIGITS: 5,
+            },
+            {
+                CONF_LOCK_CODE_DIGITS: 5,
+                CONF_LOCK_DEFAULT_CODE: "",
+            },
+        ),
     ],
 )
 async def test_options_flow(
diff --git a/tests/components/version/common.py b/tests/components/version/common.py
index a6b554d780df96..3e3ae6c3970913 100644
--- a/tests/components/version/common.py
+++ b/tests/components/version/common.py
@@ -14,7 +14,7 @@
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
@@ -47,7 +47,9 @@ async def mock_get_version_update(
         return_value=(version, data),
         side_effect=side_effect,
     ):
-        async_fire_time_changed(hass, dt.utcnow() + UPDATE_COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + UPDATE_COORDINATOR_UPDATE_INTERVAL
+        )
         await hass.async_block_till_done()
 
 
diff --git a/tests/components/version/test_config_flow.py b/tests/components/version/test_config_flow.py
index f110dc857480f6..8de4afff92e1b0 100644
--- a/tests/components/version/test_config_flow.py
+++ b/tests/components/version/test_config_flow.py
@@ -20,7 +20,7 @@
 from homeassistant.const import CONF_SOURCE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .common import MOCK_VERSION, MOCK_VERSION_DATA, setup_version_integration
 
@@ -37,7 +37,9 @@ async def test_reload_config_entry(hass: HomeAssistant) -> None:
         return_value=(MOCK_VERSION, MOCK_VERSION_DATA),
     ):
         assert await hass.config_entries.async_reload(config_entry.entry_id)
-        async_fire_time_changed(hass, dt.utcnow() + UPDATE_COORDINATOR_UPDATE_INTERVAL)
+        async_fire_time_changed(
+            hass, dt_util.utcnow() + UPDATE_COORDINATOR_UPDATE_INTERVAL
+        )
         await hass.async_block_till_done()
 
     entry = hass.config_entries.async_get_entry(config_entry.entry_id)
diff --git a/tests/components/vesync/test_init.py b/tests/components/vesync/test_init.py
index 0f77c9cbf35e55..c643e2bda1980b 100644
--- a/tests/components/vesync/test_init.py
+++ b/tests/components/vesync/test_init.py
@@ -33,15 +33,12 @@ async def test_async_setup_entry__not_login(
         hass.config_entries, "async_forward_entry_setup"
     ) as setup_mock, patch(
         "homeassistant.components.vesync.async_process_devices"
-    ) as process_mock, patch.object(
-        hass.services, "async_register"
-    ) as register_mock:
+    ) as process_mock:
         assert not await async_setup_entry(hass, config_entry)
         await hass.async_block_till_done()
         assert setups_mock.call_count == 0
         assert setup_mock.call_count == 0
         assert process_mock.call_count == 0
-        assert register_mock.call_count == 0
 
     assert manager.login.call_count == 1
     assert DOMAIN not in hass.data
diff --git a/tests/components/vicare/conftest.py b/tests/components/vicare/conftest.py
index 1137abbc54e7c7..5085ff6661da5f 100644
--- a/tests/components/vicare/conftest.py
+++ b/tests/components/vicare/conftest.py
@@ -4,8 +4,8 @@
 from collections.abc import AsyncGenerator, Generator
 from unittest.mock import AsyncMock, Mock, patch
 
-from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
 import pytest
+from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
 
 from homeassistant.components.vicare.const import DOMAIN
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/vicare/test_config_flow.py b/tests/components/vicare/test_config_flow.py
index 72fb8d0d0b63b1..0774848ef1164a 100644
--- a/tests/components/vicare/test_config_flow.py
+++ b/tests/components/vicare/test_config_flow.py
@@ -1,8 +1,8 @@
 """Test the ViCare config flow."""
 from unittest.mock import AsyncMock, patch
 
-from PyViCare.PyViCareUtils import PyViCareInvalidCredentialsError
 import pytest
+from PyViCare.PyViCareUtils import PyViCareInvalidCredentialsError
 from syrupy.assertion import SnapshotAssertion
 
 from homeassistant.components import dhcp
diff --git a/tests/components/vilfo/test_config_flow.py b/tests/components/vilfo/test_config_flow.py
index c180f154a27240..0aa59c9271f4cc 100644
--- a/tests/components/vilfo/test_config_flow.py
+++ b/tests/components/vilfo/test_config_flow.py
@@ -13,6 +13,7 @@ async def test_form(hass: HomeAssistant) -> None:
     """Test we get the form."""
 
     mock_mac = "FF-00-00-00-00-00"
+    firmware_version = "1.1.0"
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
@@ -21,7 +22,11 @@ async def test_form(hass: HomeAssistant) -> None:
 
     with patch("vilfo.Client.ping", return_value=None), patch(
         "vilfo.Client.get_board_information", return_value=None
-    ), patch("vilfo.Client.resolve_mac_address", return_value=mock_mac), patch(
+    ), patch(
+        "vilfo.Client.resolve_firmware_version", return_value=firmware_version
+    ), patch(
+        "vilfo.Client.resolve_mac_address", return_value=mock_mac
+    ), patch(
         "homeassistant.components.vilfo.async_setup_entry"
     ) as mock_setup_entry:
         result2 = await hass.config_entries.flow.async_configure(
@@ -106,11 +111,15 @@ async def test_form_already_configured(hass: HomeAssistant) -> None:
     first_flow_result1 = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
-
+    firmware_version = "1.1.0"
     with patch("vilfo.Client.ping", return_value=None), patch(
         "vilfo.Client.get_board_information",
         return_value=None,
-    ), patch("vilfo.Client.resolve_mac_address", return_value=None):
+    ), patch(
+        "vilfo.Client.resolve_firmware_version", return_value=firmware_version
+    ), patch(
+        "vilfo.Client.resolve_mac_address", return_value=None
+    ):
         first_flow_result2 = await hass.config_entries.flow.async_configure(
             first_flow_result1["flow_id"],
             {CONF_HOST: "testadmin.vilfo.com", CONF_ACCESS_TOKEN: "test-token"},
@@ -123,7 +132,11 @@ async def test_form_already_configured(hass: HomeAssistant) -> None:
     with patch("vilfo.Client.ping", return_value=None), patch(
         "vilfo.Client.get_board_information",
         return_value=None,
-    ), patch("vilfo.Client.resolve_mac_address", return_value=None):
+    ), patch(
+        "vilfo.Client.resolve_firmware_version", return_value=firmware_version
+    ), patch(
+        "vilfo.Client.resolve_mac_address", return_value=None
+    ):
         second_flow_result2 = await hass.config_entries.flow.async_configure(
             second_flow_result1["flow_id"],
             {CONF_HOST: "testadmin.vilfo.com", CONF_ACCESS_TOKEN: "test-token"},
@@ -158,10 +171,15 @@ async def test_validate_input_returns_data(hass: HomeAssistant) -> None:
     mock_data_with_ip = {"host": "192.168.0.1", "access_token": "test-token"}
     mock_data_with_ipv6 = {"host": "2001:db8::1428:57ab", "access_token": "test-token"}
     mock_mac = "FF-00-00-00-00-00"
+    firmware_version = "1.1.0"
 
     with patch("vilfo.Client.ping", return_value=None), patch(
         "vilfo.Client.get_board_information", return_value=None
-    ), patch("vilfo.Client.resolve_mac_address", return_value=None):
+    ), patch(
+        "vilfo.Client.resolve_firmware_version", return_value=firmware_version
+    ), patch(
+        "vilfo.Client.resolve_mac_address", return_value=None
+    ):
         result = await hass.components.vilfo.config_flow.validate_input(
             hass, data=mock_data
         )
@@ -173,7 +191,11 @@ async def test_validate_input_returns_data(hass: HomeAssistant) -> None:
 
     with patch("vilfo.Client.ping", return_value=None), patch(
         "vilfo.Client.get_board_information", return_value=None
-    ), patch("vilfo.Client.resolve_mac_address", return_value=mock_mac):
+    ), patch(
+        "vilfo.Client.resolve_firmware_version", return_value=firmware_version
+    ), patch(
+        "vilfo.Client.resolve_mac_address", return_value=mock_mac
+    ):
         result2 = await hass.components.vilfo.config_flow.validate_input(
             hass, data=mock_data
         )
diff --git a/tests/components/vizio/test_media_player.py b/tests/components/vizio/test_media_player.py
index 69e4e4d5b0408d..86733d83f15268 100644
--- a/tests/components/vizio/test_media_player.py
+++ b/tests/components/vizio/test_media_player.py
@@ -746,6 +746,8 @@ async def test_apps_update(
                 "homeassistant.components.vizio.gen_apps_list_from_url",
                 return_value=APP_LIST,
             ):
+                async_fire_time_changed(hass, dt_util.now() + timedelta(days=2))
+                await hass.async_block_till_done()
                 async_fire_time_changed(hass, dt_util.now() + timedelta(days=2))
                 await hass.async_block_till_done()
                 # Check source list, remove TV inputs, and verify that the integration is
diff --git a/tests/components/voicerss/test_tts.py b/tests/components/voicerss/test_tts.py
index 7d89c36843c9ee..57a5b298162ada 100644
--- a/tests/components/voicerss/test_tts.py
+++ b/tests/components/voicerss/test_tts.py
@@ -1,8 +1,6 @@
 """The tests for the VoiceRSS speech platform."""
 import asyncio
 from http import HTTPStatus
-import os
-import shutil
 
 import pytest
 
@@ -17,7 +15,6 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import assert_setup_component, async_mock_service
-from tests.components.tts.conftest import mutagen_mock  # noqa: F401
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 URL = "https://api.voicerss.org/"
@@ -30,6 +27,17 @@
 }
 
 
+@pytest.fixture(autouse=True)
+def tts_mutagen_mock_fixture_autouse(tts_mutagen_mock):
+    """Mock writing tags."""
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
+
+
 async def get_media_source_url(hass, media_content_id):
     """Get the media source url."""
     if media_source.DOMAIN not in hass.config.components:
@@ -39,15 +47,6 @@ async def get_media_source_url(hass, media_content_id):
     return resolved.url
 
 
-@pytest.fixture(autouse=True)
-def cleanup_cache(hass):
-    """Prevent TTS writing."""
-    yield
-    default_tts = hass.config.path(tts.DEFAULT_CACHE_DIR)
-    if os.path.isdir(default_tts):
-        shutil.rmtree(default_tts)
-
-
 async def test_setup_component(hass: HomeAssistant) -> None:
     """Test setup component."""
     config = {tts.DOMAIN: {"platform": "voicerss", "api_key": "1234567xx"}}
diff --git a/tests/components/voip/test_select.py b/tests/components/voip/test_select.py
index 19c3202576a922..7dd041a68668f1 100644
--- a/tests/components/voip/test_select.py
+++ b/tests/components/voip/test_select.py
@@ -17,3 +17,18 @@ async def test_pipeline_select(
     state = hass.states.get("select.192_168_1_210_assist_pipeline")
     assert state is not None
     assert state.state == "preferred"
+
+
+async def test_vad_sensitivity_select(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    voip_device: VoIPDevice,
+) -> None:
+    """Test VAD sensitivity select.
+
+    Functionality is tested in assist_pipeline/test_select.py.
+    This test is only to ensure it is set up.
+    """
+    state = hass.states.get("select.192_168_1_210_finished_speaking_detection")
+    assert state is not None
+    assert state.state == "default"
diff --git a/tests/components/voip/test_voip.py b/tests/components/voip/test_voip.py
index bd9a3587a9a364..9b3f5d963dc18a 100644
--- a/tests/components/voip/test_voip.py
+++ b/tests/components/voip/test_voip.py
@@ -31,7 +31,9 @@ def is_speech(self, chunk, sample_rate):
     # Used to test that audio queue is cleared before pipeline starts
     bad_chunk = bytes([1, 2, 3, 4])
 
-    async def async_pipeline_from_audio_stream(*args, **kwargs):
+    async def async_pipeline_from_audio_stream(*args, device_id, **kwargs):
+        assert device_id == voip_device.device_id
+
         stt_stream = kwargs["stt_stream"]
         event_callback = kwargs["event_callback"]
         async for _chunk in stt_stream:
@@ -93,6 +95,7 @@ async def async_get_media_source_audio(
             listening_tone_enabled=False,
             processing_tone_enabled=False,
             error_tone_enabled=False,
+            silence_seconds=assist_pipeline.vad.VadSensitivity.to_seconds("aggressive"),
         )
         rtp_protocol.transport = Mock()
 
@@ -111,7 +114,7 @@ def send_audio(*args, **kwargs):
         # "speech"
         rtp_protocol.on_chunk(bytes([255] * _ONE_SECOND * 2))
 
-        # silence
+        # silence (assumes aggressive VAD sensitivity)
         rtp_protocol.on_chunk(bytes(_ONE_SECOND))
 
         # Wait for mock pipeline to exhaust the audio stream
@@ -286,6 +289,7 @@ async def async_get_media_source_audio(
             listening_tone_enabled=True,
             processing_tone_enabled=True,
             error_tone_enabled=True,
+            silence_seconds=assist_pipeline.vad.VadSensitivity.to_seconds("relaxed"),
         )
         rtp_protocol._tone_bytes = tone_bytes
         rtp_protocol._processing_bytes = tone_bytes
@@ -311,8 +315,8 @@ async def send_tts(*args, **kwargs):
         # "speech"
         rtp_protocol.on_chunk(bytes([255] * _ONE_SECOND * 2))
 
-        # silence
-        rtp_protocol.on_chunk(bytes(_ONE_SECOND))
+        # silence (assumes relaxed VAD sensitivity)
+        rtp_protocol.on_chunk(bytes(_ONE_SECOND * 4))
 
         # Wait for mock pipeline to exhaust the audio stream
         async with async_timeout.timeout(1):
diff --git a/tests/components/water_heater/test_device_action.py b/tests/components/water_heater/test_device_action.py
index ecf719fdc41f67..a8ca41905d6827 100644
--- a/tests/components/water_heater/test_device_action.py
+++ b/tests/components/water_heater/test_device_action.py
@@ -1,5 +1,6 @@
 """The tests for Water Heater device actions."""
 import pytest
+from pytest_unordered import unordered
 
 import homeassistant.components.automation as automation
 from homeassistant.components.device_automation import DeviceAutomationType
@@ -12,11 +13,14 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 async def test_get_actions(
@@ -31,16 +35,15 @@ async def test_get_actions(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN, "test", "5678", device_id=device_entry.id
     )
-    expected_actions = []
-    expected_actions += [
+    expected_actions = [
         {
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": False},
         }
         for action in ["turn_on", "turn_off"]
@@ -48,7 +51,7 @@ async def test_get_actions(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 @pytest.mark.parametrize(
@@ -74,7 +77,7 @@ async def test_get_actions_hidden_auxiliary(
         config_entry_id=config_entry.entry_id,
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
     )
-    entity_registry.async_get_or_create(
+    entity_entry = entity_registry.async_get_or_create(
         DOMAIN,
         "test",
         "5678",
@@ -88,7 +91,7 @@ async def test_get_actions_hidden_auxiliary(
             "domain": DOMAIN,
             "type": action,
             "device_id": device_entry.id,
-            "entity_id": f"{DOMAIN}.test_5678",
+            "entity_id": entity_entry.id,
             "metadata": {"secondary": True},
         }
         for action in ["turn_on", "turn_off"]
@@ -96,11 +99,13 @@ async def test_get_actions_hidden_auxiliary(
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, device_entry.id
     )
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
-async def test_action(hass: HomeAssistant) -> None:
+async def test_action(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
     """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -114,7 +119,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "water_heater.entity",
+                        "entity_id": entry.id,
                         "type": "turn_off",
                     },
                 },
@@ -126,7 +131,7 @@ async def test_action(hass: HomeAssistant) -> None:
                     "action": {
                         "domain": DOMAIN,
                         "device_id": "abcdefgh",
-                        "entity_id": "water_heater.entity",
+                        "entity_id": entry.id,
                         "type": "turn_on",
                     },
                 },
@@ -146,3 +151,42 @@ async def test_action(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
     assert len(turn_off_calls) == 1
     assert len(turn_on_calls) == 1
+
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
+    assert turn_on_calls[-1].data == {"entity_id": entry.entity_id}
+
+
+async def test_action_legacy(
+    hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
+    """Test for turn_on and turn_off actions."""
+    entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_off",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": entry.entity_id,
+                        "type": "turn_off",
+                    },
+                },
+            ]
+        },
+    )
+
+    turn_off_calls = async_mock_service(hass, "water_heater", "turn_off")
+
+    hass.bus.async_fire("test_event_turn_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+
+    assert turn_off_calls[-1].data == {"entity_id": entry.entity_id}
diff --git a/tests/components/waze_travel_time/conftest.py b/tests/components/waze_travel_time/conftest.py
index 4d964d9f08ada8..65c2616d1dc095 100644
--- a/tests/components/waze_travel_time/conftest.py
+++ b/tests/components/waze_travel_time/conftest.py
@@ -1,8 +1,8 @@
 """Fixtures for Waze Travel Time tests."""
 from unittest.mock import patch
 
-from WazeRouteCalculator import WRCError
 import pytest
+from WazeRouteCalculator import WRCError
 
 
 @pytest.fixture(name="mock_wrc", autouse=True)
diff --git a/tests/components/waze_travel_time/test_sensor.py b/tests/components/waze_travel_time/test_sensor.py
index 5b23d8a369aa10..a3367a48d2ab55 100644
--- a/tests/components/waze_travel_time/test_sensor.py
+++ b/tests/components/waze_travel_time/test_sensor.py
@@ -1,6 +1,6 @@
 """Test Waze Travel Time sensors."""
-from WazeRouteCalculator import WRCError
 import pytest
+from WazeRouteCalculator import WRCError
 
 from homeassistant.components.waze_travel_time.const import (
     CONF_AVOID_FERRIES,
diff --git a/tests/components/weather/test_init.py b/tests/components/weather/test_init.py
index 76483491bf8b79..5ed6a02f24b9d9 100644
--- a/tests/components/weather/test_init.py
+++ b/tests/components/weather/test_init.py
@@ -6,12 +6,17 @@
 from homeassistant.components.weather import (
     ATTR_CONDITION_SUNNY,
     ATTR_FORECAST,
+    ATTR_FORECAST_APPARENT_TEMP,
+    ATTR_FORECAST_DEW_POINT,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
     ATTR_FORECAST_TEMP,
     ATTR_FORECAST_TEMP_LOW,
     ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_WIND_GUST_SPEED,
     ATTR_FORECAST_WIND_SPEED,
+    ATTR_WEATHER_APPARENT_TEMPERATURE,
     ATTR_WEATHER_OZONE,
     ATTR_WEATHER_PRECIPITATION_UNIT,
     ATTR_WEATHER_PRESSURE,
@@ -21,6 +26,7 @@
     ATTR_WEATHER_VISIBILITY,
     ATTR_WEATHER_VISIBILITY_UNIT,
     ATTR_WEATHER_WIND_BEARING,
+    ATTR_WEATHER_WIND_GUST_SPEED,
     ATTR_WEATHER_WIND_SPEED,
     ATTR_WEATHER_WIND_SPEED_UNIT,
     ROUNDING_PRECISION,
@@ -28,6 +34,11 @@
     WeatherEntity,
     round_temperature,
 )
+from homeassistant.components.weather.const import (
+    ATTR_WEATHER_CLOUD_COVERAGE,
+    ATTR_WEATHER_DEW_POINT,
+    ATTR_WEATHER_HUMIDITY,
+)
 from homeassistant.const import (
     ATTR_FRIENDLY_NAME,
     PRECISION_HALVES,
@@ -63,9 +74,12 @@ def __init__(self) -> None:
         self._attr_native_pressure = 10
         self._attr_native_pressure_unit = UnitOfPressure.HPA
         self._attr_native_temperature = 20
+        self._attr_native_apparent_temperature = 25
+        self._attr_native_dew_point = 2
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
         self._attr_native_visibility = 30
         self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
+        self._attr_native_wind_gust_speed = 10
         self._attr_native_wind_speed = 3
         self._attr_native_wind_speed_unit = UnitOfSpeed.METERS_PER_SECOND
         self._attr_forecast = [
@@ -73,6 +87,7 @@ def __init__(self) -> None:
                 datetime=datetime(2022, 6, 20, 20, 00, 00),
                 native_precipitation=1,
                 native_temperature=20,
+                native_dew_point=2,
             )
         ]
 
@@ -85,6 +100,8 @@ def __init__(self) -> None:
         super().__init__()
         self._attr_condition = ATTR_CONDITION_SUNNY
         self._attr_native_temperature = 20.3
+        self._attr_native_apparent_temperature = 25.3
+        self._attr_native_dew_point = 2.3
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
         self._attr_precision = PRECISION_HALVES
 
@@ -153,21 +170,48 @@ async def test_temperature(
     """Test temperature."""
     hass.config.units = unit_system
     native_value = 38
+    apparent_native_value = 45
+    dew_point_native_value = 32
     state_value = TemperatureConverter.convert(native_value, native_unit, state_unit)
+    apparent_state_value = TemperatureConverter.convert(
+        apparent_native_value, native_unit, state_unit
+    )
 
+    state_value = TemperatureConverter.convert(native_value, native_unit, state_unit)
+    dew_point_state_value = TemperatureConverter.convert(
+        dew_point_native_value, native_unit, state_unit
+    )
     entity0 = await create_entity(
-        hass, native_temperature=native_value, native_temperature_unit=native_unit
+        hass,
+        native_temperature=native_value,
+        native_temperature_unit=native_unit,
+        native_apparent_temperature=apparent_native_value,
+        native_dew_point=dew_point_native_value,
     )
 
     state = hass.states.get(entity0.entity_id)
     forecast = state.attributes[ATTR_FORECAST][0]
 
     expected = state_value
+    apparent_expected = apparent_state_value
+    dew_point_expected = dew_point_state_value
     assert float(state.attributes[ATTR_WEATHER_TEMPERATURE]) == pytest.approx(
         expected, rel=0.1
     )
+    assert float(state.attributes[ATTR_WEATHER_APPARENT_TEMPERATURE]) == pytest.approx(
+        apparent_expected, rel=0.1
+    )
+    assert float(state.attributes[ATTR_WEATHER_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert state.attributes[ATTR_WEATHER_TEMPERATURE_UNIT] == state_unit
     assert float(forecast[ATTR_FORECAST_TEMP]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_APPARENT_TEMP]) == pytest.approx(
+        apparent_expected, rel=0.1
+    )
+    assert float(forecast[ATTR_FORECAST_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert float(forecast[ATTR_FORECAST_TEMP_LOW]) == pytest.approx(expected, rel=0.1)
 
 
@@ -189,22 +233,44 @@ async def test_temperature_no_unit(
     """Test temperature when the entity does not declare a native unit."""
     hass.config.units = unit_system
     native_value = 38
+    dew_point_native_value = 32
+    apparent_temp_native_value = 45
     state_value = native_value
+    dew_point_state_value = dew_point_native_value
+    apparent_temp_state_value = apparent_temp_native_value
 
     entity0 = await create_entity(
-        hass, native_temperature=native_value, native_temperature_unit=native_unit
+        hass,
+        native_temperature=native_value,
+        native_temperature_unit=native_unit,
+        native_dew_point=dew_point_native_value,
+        native_apparent_temperature=apparent_temp_native_value,
     )
 
     state = hass.states.get(entity0.entity_id)
     forecast = state.attributes[ATTR_FORECAST][0]
 
     expected = state_value
+    dew_point_expected = dew_point_state_value
+    expected_apparent_temp = apparent_temp_state_value
     assert float(state.attributes[ATTR_WEATHER_TEMPERATURE]) == pytest.approx(
         expected, rel=0.1
     )
+    assert float(state.attributes[ATTR_WEATHER_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
+    assert float(state.attributes[ATTR_WEATHER_APPARENT_TEMPERATURE]) == pytest.approx(
+        expected_apparent_temp, rel=0.1
+    )
     assert state.attributes[ATTR_WEATHER_TEMPERATURE_UNIT] == state_unit
     assert float(forecast[ATTR_FORECAST_TEMP]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_DEW_POINT]) == pytest.approx(
+        dew_point_expected, rel=0.1
+    )
     assert float(forecast[ATTR_FORECAST_TEMP_LOW]) == pytest.approx(expected, rel=0.1)
+    assert float(forecast[ATTR_FORECAST_APPARENT_TEMP]) == pytest.approx(
+        expected_apparent_temp, rel=0.1
+    )
 
 
 @pytest.mark.parametrize("native_unit", (UnitOfPressure.INHG, UnitOfPressure.INHG))
@@ -310,6 +376,49 @@ async def test_wind_speed(
     )
 
 
+@pytest.mark.parametrize(
+    "native_unit",
+    (
+        UnitOfSpeed.MILES_PER_HOUR,
+        UnitOfSpeed.KILOMETERS_PER_HOUR,
+        UnitOfSpeed.METERS_PER_SECOND,
+    ),
+)
+@pytest.mark.parametrize(
+    ("state_unit", "unit_system"),
+    (
+        (UnitOfSpeed.KILOMETERS_PER_HOUR, METRIC_SYSTEM),
+        (UnitOfSpeed.MILES_PER_HOUR, US_CUSTOMARY_SYSTEM),
+    ),
+)
+async def test_wind_gust_speed(
+    hass: HomeAssistant,
+    enable_custom_integrations: None,
+    native_unit: str,
+    state_unit: str,
+    unit_system,
+) -> None:
+    """Test wind speed."""
+    hass.config.units = unit_system
+    native_value = 10
+    state_value = SpeedConverter.convert(native_value, native_unit, state_unit)
+
+    entity0 = await create_entity(
+        hass, native_wind_gust_speed=native_value, native_wind_speed_unit=native_unit
+    )
+
+    state = hass.states.get(entity0.entity_id)
+    forecast = state.attributes[ATTR_FORECAST][0]
+
+    expected = state_value
+    assert float(state.attributes[ATTR_WEATHER_WIND_GUST_SPEED]) == pytest.approx(
+        expected, rel=1e-2
+    )
+    assert float(forecast[ATTR_FORECAST_WIND_GUST_SPEED]) == pytest.approx(
+        expected, rel=1e-2
+    )
+
+
 @pytest.mark.parametrize("native_unit", (None,))
 @pytest.mark.parametrize(
     ("state_unit", "unit_system"),
@@ -474,21 +583,41 @@ async def test_precipitation_no_unit(
     )
 
 
-async def test_wind_bearing_and_ozone(
+async def test_wind_bearing_ozone_and_cloud_coverage(
     hass: HomeAssistant,
     enable_custom_integrations: None,
 ) -> None:
-    """Test wind bearing."""
+    """Test wind bearing, ozone and cloud coverage."""
     wind_bearing_value = 180
     ozone_value = 10
+    cloud_coverage = 75
 
     entity0 = await create_entity(
-        hass, wind_bearing=wind_bearing_value, ozone=ozone_value
+        hass,
+        wind_bearing=wind_bearing_value,
+        ozone=ozone_value,
+        cloud_coverage=cloud_coverage,
     )
 
     state = hass.states.get(entity0.entity_id)
     assert float(state.attributes[ATTR_WEATHER_WIND_BEARING]) == 180
     assert float(state.attributes[ATTR_WEATHER_OZONE]) == 10
+    assert float(state.attributes[ATTR_WEATHER_CLOUD_COVERAGE]) == 75
+
+
+async def test_humidity(
+    hass: HomeAssistant,
+    enable_custom_integrations: None,
+) -> None:
+    """Test humidity."""
+    humidity_value = 80.2
+
+    entity0 = await create_entity(hass, humidity=humidity_value)
+
+    state = hass.states.get(entity0.entity_id)
+    forecast = state.attributes[ATTR_FORECAST][0]
+    assert float(state.attributes[ATTR_WEATHER_HUMIDITY]) == 80
+    assert float(forecast[ATTR_FORECAST_HUMIDITY]) == 80
 
 
 async def test_none_forecast(
@@ -925,7 +1054,9 @@ async def test_precision_for_temperature(hass: HomeAssistant) -> None:
 
     assert weather.condition == ATTR_CONDITION_SUNNY
     assert weather.native_temperature == 20.3
+    assert weather.native_dew_point == 2.3
     assert weather._temperature_unit == UnitOfTemperature.CELSIUS
     assert weather.precision == PRECISION_HALVES
 
     assert weather.state_attributes[ATTR_WEATHER_TEMPERATURE] == 20.5
+    assert weather.state_attributes[ATTR_WEATHER_DEW_POINT] == 2.5
diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py
index a10b77eb105bea..392ab58a30fb3d 100644
--- a/tests/components/webhook/test_trigger.py
+++ b/tests/components/webhook/test_trigger.py
@@ -7,10 +7,14 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.setup import async_setup_component
 
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
 @pytest.fixture(autouse=True)
 async def setup_http(hass):
     """Set up http."""
@@ -133,7 +137,7 @@ def store_event(event):
                     "platform": "webhook",
                     "webhook_id": "post_webhook",
                     "allowed_methods": "PUT",
-                    # Enable after 2023.4.0: "local_only": False,
+                    # Enable after 2023.11.0: "local_only": False,
                 },
                 "action": {
                     "event": "test_success",
diff --git a/tests/components/webostv/test_media_player.py b/tests/components/webostv/test_media_player.py
index afc7bca513c2c3..fec1bf7a04a852 100644
--- a/tests/components/webostv/test_media_player.py
+++ b/tests/components/webostv/test_media_player.py
@@ -63,7 +63,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from . import setup_webostv
 from .const import CHANNEL_2, ENTITY_ID, TV_NAME
@@ -90,7 +90,7 @@ async def test_services_with_parameters(
     await setup_webostv(hass)
 
     data = {ATTR_ENTITY_ID: ENTITY_ID, **attr_data}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_called_once_with(client_call[1])
 
@@ -111,7 +111,7 @@ async def test_services(hass: HomeAssistant, client, service, client_call) -> No
     await setup_webostv(hass)
 
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call).assert_called_once()
 
@@ -123,17 +123,13 @@ async def test_media_play_pause(hass: HomeAssistant, client) -> None:
     data = {ATTR_ENTITY_ID: ENTITY_ID}
 
     # After init state is playing - check pause call
-    assert await hass.services.async_call(
-        MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True
-    )
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True)
 
     client.pause.assert_called_once()
     client.play.assert_not_called()
 
     # After pause state is paused - check play call
-    assert await hass.services.async_call(
-        MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True
-    )
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data, True)
 
     client.play.assert_called_once()
     client.pause.assert_called_once()
@@ -154,7 +150,7 @@ async def test_media_next_previous_track(
 
     # check channel up/down for live TV channels
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_not_called()
     getattr(client, client_call[1]).assert_called_once()
@@ -162,7 +158,7 @@ async def test_media_next_previous_track(
     # check next/previous for not Live TV channels
     monkeypatch.setattr(client, "current_app_id", "in1")
     data = {ATTR_ENTITY_ID: ENTITY_ID}
-    assert await hass.services.async_call(MP_DOMAIN, service, data, True)
+    await hass.services.async_call(MP_DOMAIN, service, data, True)
 
     getattr(client, client_call[0]).assert_called_once()
     getattr(client, client_call[1]).assert_called_once()
@@ -179,7 +175,7 @@ async def test_select_source_with_empty_source_list(
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "nonexistent",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_not_called()
     client.set_input.assert_not_called()
@@ -195,7 +191,7 @@ async def test_select_app_source(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "Live TV",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_called_once_with(LIVE_TV_APP_ID)
     client.set_input.assert_not_called()
@@ -210,7 +206,7 @@ async def test_select_input_source(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_INPUT_SOURCE: "Input01",
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_SELECT_SOURCE, data, True)
 
     client.launch_app.assert_not_called()
     client.set_input.assert_called_once_with("in1")
@@ -224,8 +220,8 @@ async def test_button(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_BUTTON: "test",
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_BUTTON, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_BUTTON, data, True)
+    await hass.async_block_till_done()
     client.button.assert_called_once()
     client.button.assert_called_with("test")
 
@@ -238,8 +234,8 @@ async def test_command(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_COMMAND: "test",
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
+    await hass.async_block_till_done()
     client.request.assert_called_with("test", payload=None)
 
 
@@ -252,8 +248,8 @@ async def test_command_with_optional_arg(hass: HomeAssistant, client) -> None:
         ATTR_COMMAND: "test",
         ATTR_PAYLOAD: {"target": "https://www.google.com"},
     }
-    assert await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
-
+    await hass.services.async_call(DOMAIN, SERVICE_COMMAND, data, True)
+    await hass.async_block_till_done()
     client.request.assert_called_with(
         "test", payload={"target": "https://www.google.com"}
     )
@@ -267,10 +263,8 @@ async def test_select_sound_output(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_ID,
         ATTR_SOUND_OUTPUT: "external_speaker",
     }
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True
-    )
-
+    await hass.services.async_call(DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True)
+    await hass.async_block_till_done()
     client.change_sound_output.assert_called_once_with("external_speaker")
 
 
@@ -359,9 +353,7 @@ async def test_service_entity_id_none(hass: HomeAssistant, client) -> None:
         ATTR_ENTITY_ID: ENTITY_MATCH_NONE,
         ATTR_SOUND_OUTPUT: "external_speaker",
     }
-    assert await hass.services.async_call(
-        DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True
-    )
+    await hass.services.async_call(DOMAIN, SERVICE_SELECT_SOUND_OUTPUT, data, True)
 
     client.change_sound_output.assert_not_called()
 
@@ -384,7 +376,7 @@ async def test_play_media(hass: HomeAssistant, client, media_id, ch_id) -> None:
         ATTR_MEDIA_CONTENT_TYPE: MediaType.CHANNEL,
         ATTR_MEDIA_CONTENT_ID: media_id,
     }
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_PLAY_MEDIA, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_PLAY_MEDIA, data, True)
 
     client.set_channel.assert_called_once_with(ch_id)
 
@@ -479,7 +471,7 @@ async def test_client_disconnected(hass: HomeAssistant, client, monkeypatch) ->
     monkeypatch.setattr(client, "is_connected", Mock(return_value=False))
     monkeypatch.setattr(client, "connect", Mock(side_effect=asyncio.TimeoutError))
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=20))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=20))
     await hass.async_block_till_done()
 
 
@@ -493,7 +485,7 @@ async def test_control_error_handling(
 
     # Device on, raise HomeAssistantError
     with pytest.raises(HomeAssistantError) as exc:
-        assert await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
+        await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
 
     assert (
         str(exc.value)
@@ -505,7 +497,7 @@ async def test_control_error_handling(
     monkeypatch.setattr(client, "is_on", False)
     monkeypatch.setattr(client, "play", Mock(side_effect=asyncio.TimeoutError))
     await client.mock_state_update()
-    assert await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
+    await hass.services.async_call(MP_DOMAIN, SERVICE_MEDIA_PLAY, data, True)
 
     assert client.play.call_count == 1
     assert (
@@ -804,7 +796,7 @@ async def test_reauth_reconnect(hass: HomeAssistant, client, monkeypatch) -> Non
 
     assert entry.state == ConfigEntryState.LOADED
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=20))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=20))
     await hass.async_block_till_done()
 
     assert entry.state == ConfigEntryState.LOADED
diff --git a/tests/components/websocket_api/conftest.py b/tests/components/websocket_api/conftest.py
index 53569c3fa6a252..69adf890584464 100644
--- a/tests/components/websocket_api/conftest.py
+++ b/tests/components/websocket_api/conftest.py
@@ -3,11 +3,19 @@
 
 from homeassistant.components.websocket_api.auth import TYPE_AUTH_REQUIRED
 from homeassistant.components.websocket_api.http import URL
+from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from tests.typing import (
+    MockHAClientWebSocket,
+    WebSocketGenerator,
+)
+
 
 @pytest.fixture
-async def websocket_client(hass, hass_ws_client):
+async def websocket_client(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> MockHAClientWebSocket:
     """Create a websocket client."""
     return await hass_ws_client(hass)
 
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index 070bd68d44a874..51bff1af0d70ab 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import aiohttp
+from aiohttp import WSMsgType
 import pytest
 
 from homeassistant.auth.providers.legacy_api_password import (
@@ -223,3 +224,79 @@ async def test_auth_close_after_revoke(
     msg = await websocket_client.receive()
     assert msg.type == aiohttp.WSMsgType.CLOSE
     assert websocket_client.closed
+
+
+async def test_auth_sending_invalid_json_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending invalid json during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.send_str("[--INVALID--JSON--]")
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
+
+
+async def test_auth_sending_binary_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending bytes during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.send_bytes(b"[INVALID]")
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
+
+
+async def test_auth_close_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test closing during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        await ws.close()
+
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.CLOSED
+
+
+async def test_auth_sending_unknown_type_disconnects(
+    hass: HomeAssistant, hass_client_no_auth: ClientSessionGenerator
+) -> None:
+    """Test sending unknown type during auth."""
+    assert await async_setup_component(hass, "websocket_api", {})
+    await hass.async_block_till_done()
+
+    client = await hass_client_no_auth()
+
+    async with client.ws_connect(URL) as ws:
+        auth_msg = await ws.receive_json()
+        assert auth_msg["type"] == TYPE_AUTH_REQUIRED
+
+        # pylint: disable-next=protected-access
+        await ws._writer._send_frame(b"1" * 130, 0x30)
+        auth_msg = await ws.receive()
+        assert auth_msg.type == WSMsgType.close
diff --git a/tests/components/websocket_api/test_commands.py b/tests/components/websocket_api/test_commands.py
index 9c2a05e96ca8bf..232362ce96f280 100644
--- a/tests/components/websocket_api/test_commands.py
+++ b/tests/components/websocket_api/test_commands.py
@@ -1,12 +1,14 @@
 """Tests for WebSocket API commands."""
 from copy import deepcopy
 import datetime
-from unittest.mock import ANY, patch
+from unittest.mock import ANY, AsyncMock, Mock, patch
 
 from async_timeout import timeout
 import pytest
 import voluptuous as vol
 
+from homeassistant import config_entries, loader
+from homeassistant.components.device_automation import toggle_entity
 from homeassistant.components.websocket_api import const
 from homeassistant.components.websocket_api.auth import (
     TYPE_AUTH,
@@ -17,14 +19,24 @@
 from homeassistant.const import SIGNAL_BOOTSTRAP_INTEGRATIONS
 from homeassistant.core import Context, HomeAssistant, State, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity
+from homeassistant.helpers import device_registry as dr, entity
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.loader import async_get_integration
 from homeassistant.setup import DATA_SETUP_TIME, async_setup_component
 from homeassistant.util.json import json_loads
 
-from tests.common import MockEntity, MockEntityPlatform, MockUser, async_mock_service
-from tests.typing import ClientSessionGenerator, WebSocketGenerator
+from tests.common import (
+    MockConfigEntry,
+    MockEntity,
+    MockEntityPlatform,
+    MockUser,
+    async_mock_service,
+    mock_platform,
+)
+from tests.typing import (
+    ClientSessionGenerator,
+    WebSocketGenerator,
+)
 
 STATE_KEY_SHORT_NAMES = {
     "entity_id": "e",
@@ -37,6 +49,25 @@
 STATE_KEY_LONG_NAMES = {v: k for k, v in STATE_KEY_SHORT_NAMES.items()}
 
 
+@pytest.fixture
+def fake_integration(hass: HomeAssistant):
+    """Set up a mock integration with device automation support."""
+    DOMAIN = "fake_integration"
+
+    hass.config.components.add(DOMAIN)
+
+    mock_platform(
+        hass,
+        f"{DOMAIN}.device_action",
+        Mock(
+            ACTION_SCHEMA=toggle_entity.ACTION_SCHEMA.extend(
+                {vol.Required("domain"): DOMAIN}
+            ),
+            spec=["ACTION_SCHEMA"],
+        ),
+    )
+
+
 def _apply_entities_changes(state_dict: dict, change_dict: dict) -> None:
     """Apply a diff set to a dict.
 
@@ -1672,7 +1703,9 @@ async def test_test_condition(hass: HomeAssistant, websocket_client) -> None:
 
 async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     """Test testing a condition."""
-    calls = async_mock_service(hass, "domain_test", "test_service")
+    calls = async_mock_service(
+        hass, "domain_test", "test_service", response={"hello": "world"}
+    )
 
     await websocket_client.send_json(
         {
@@ -1682,7 +1715,9 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
                 {
                     "service": "domain_test.test_service",
                     "data": {"hello": "world"},
-                }
+                    "response_variable": "service_result",
+                },
+                {"stop": "done", "response_variable": "service_result"},
             ],
         }
     )
@@ -1691,6 +1726,7 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     assert msg_no_var["id"] == 5
     assert msg_no_var["type"] == const.TYPE_RESULT
     assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] == {"hello": "world"}
 
     await websocket_client.send_json(
         {
@@ -1727,6 +1763,92 @@ async def test_execute_script(hass: HomeAssistant, websocket_client) -> None:
     assert call.context.as_dict() == msg_var["result"]["context"]
 
 
+async def test_execute_script_complex_response(
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test testing a condition."""
+    await async_setup_component(hass, "homeassistant", {})
+    await async_setup_component(hass, "calendar", {"calendar": {"platform": "demo"}})
+    await hass.async_block_till_done()
+    ws_client = await hass_ws_client(hass)
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "execute_script",
+            "sequence": [
+                {
+                    "service": "calendar.list_events",
+                    "data": {"duration": {"hours": 24, "minutes": 0, "seconds": 0}},
+                    "target": {"entity_id": "calendar.calendar_1"},
+                    "response_variable": "service_result",
+                },
+                {"stop": "done", "response_variable": "service_result"},
+            ],
+        }
+    )
+
+    msg_no_var = await ws_client.receive_json()
+    assert msg_no_var["type"] == const.TYPE_RESULT
+    assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] == {
+        "events": [
+            {
+                "start": ANY,
+                "end": ANY,
+                "summary": "Future Event",
+                "description": "Future Description",
+                "location": "Future Location",
+            }
+        ]
+    }
+
+
+async def test_execute_script_with_dynamically_validated_action(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    device_registry: dr.DeviceRegistry,
+    fake_integration,
+) -> None:
+    """Test executing a script with an action which is dynamically validated."""
+
+    ws_client = await hass_ws_client(hass)
+
+    module_cache = hass.data.setdefault(loader.DATA_COMPONENTS, {})
+    module = module_cache["fake_integration.device_action"]
+    module.async_call_action_from_config = AsyncMock()
+    module.async_validate_action_config = AsyncMock(
+        side_effect=lambda hass, config: config
+    )
+
+    config_entry = MockConfigEntry(domain="fake_integration", data={})
+    config_entry.state = config_entries.ConfigEntryState.LOADED
+    config_entry.add_to_hass(hass)
+    device_entry = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+
+    await ws_client.send_json_auto_id(
+        {
+            "type": "execute_script",
+            "sequence": [
+                {
+                    "device_id": device_entry.id,
+                    "domain": "fake_integration",
+                },
+            ],
+        }
+    )
+
+    msg_no_var = await ws_client.receive_json()
+    assert msg_no_var["type"] == const.TYPE_RESULT
+    assert msg_no_var["success"]
+    assert msg_no_var["result"]["response"] is None
+
+    module.async_validate_action_config.assert_awaited_once()
+    module.async_call_action_from_config.assert_awaited_once()
+
+
 async def test_subscribe_unsubscribe_bootstrap_integrations(
     hass: HomeAssistant, websocket_client, hass_admin_user: MockUser
 ) -> None:
@@ -1773,11 +1895,17 @@ async def test_integration_setup_info(
     ("key", "config"),
     (
         ("trigger", {"platform": "event", "event_type": "hello"}),
+        ("trigger", [{"platform": "event", "event_type": "hello"}]),
         (
             "condition",
             {"condition": "state", "entity_id": "hello.world", "state": "paulus"},
         ),
+        (
+            "condition",
+            [{"condition": "state", "entity_id": "hello.world", "state": "paulus"}],
+        ),
         ("action", {"service": "domain_test.test_service"}),
+        ("action", [{"service": "domain_test.test_service"}]),
     ),
 )
 async def test_validate_config_works(websocket_client, key, config) -> None:
@@ -1808,7 +1936,8 @@ async def test_validate_config_works(websocket_client, key, config) -> None:
             },
             (
                 "Unexpected value for condition: 'non_existing'. Expected and, device,"
-                " not, numeric_state, or, state, sun, template, time, trigger, zone"
+                " not, numeric_state, or, state, sun, template, time, trigger, zone "
+                "@ data[0]"
             ),
         ),
         (
diff --git a/tests/components/websocket_api/test_http.py b/tests/components/websocket_api/test_http.py
index 02384aace89d29..b94df47213e010 100644
--- a/tests/components/websocket_api/test_http.py
+++ b/tests/components/websocket_api/test_http.py
@@ -18,7 +18,10 @@
 from homeassistant.util.dt import utcnow
 
 from tests.common import async_fire_time_changed
-from tests.typing import WebSocketGenerator
+from tests.typing import (
+    MockHAClientWebSocket,
+    WebSocketGenerator,
+)
 
 
 @pytest.fixture
@@ -36,15 +39,186 @@ def mock_low_peak():
 
 
 async def test_pending_msg_overflow(
-    hass: HomeAssistant, mock_low_queue, websocket_client
+    hass: HomeAssistant, mock_low_queue, websocket_client: MockHAClientWebSocket
 ) -> None:
-    """Test get_panels command."""
+    """Test pending messages overflows."""
     for idx in range(10):
         await websocket_client.send_json({"id": idx + 1, "type": "ping"})
     msg = await websocket_client.receive()
     assert msg.type == WSMsgType.close
 
 
+async def test_cleanup_on_cancellation(
+    hass: HomeAssistant, websocket_client: MockHAClientWebSocket
+) -> None:
+    """Test cleanup on cancellation."""
+
+    subscriptions = None
+
+    # Register a handler that registers a subscription
+    @callback
+    @websocket_command(
+        {
+            "type": "fake_subscription",
+        }
+    )
+    def fake_subscription(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        nonlocal subscriptions
+        msg_id: int = msg["id"]
+        connection.subscriptions[msg_id] = callback(lambda: None)
+        connection.send_result(msg_id)
+        subscriptions = connection.subscriptions
+
+    async_register_command(hass, fake_subscription)
+
+    # Register a handler that raises on cancel
+    @callback
+    @websocket_command(
+        {
+            "type": "subscription_that_raises_on_cancel",
+        }
+    )
+    def subscription_that_raises_on_cancel(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        nonlocal subscriptions
+        msg_id: int = msg["id"]
+
+        @callback
+        def _raise():
+            raise ValueError()
+
+        connection.subscriptions[msg_id] = _raise
+        connection.send_result(msg_id)
+        subscriptions = connection.subscriptions
+
+    async_register_command(hass, subscription_that_raises_on_cancel)
+
+    # Register a handler that cancels in handler
+    @callback
+    @websocket_command(
+        {
+            "type": "cancel_in_handler",
+        }
+    )
+    def cancel_in_handler(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        raise asyncio.CancelledError()
+
+    async_register_command(hass, cancel_in_handler)
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    assert not subscriptions
+    await websocket_client.send_json({"id": 2, "type": "fake_subscription"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 2
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    assert len(subscriptions) == 2
+    await websocket_client.send_json(
+        {"id": 3, "type": "subscription_that_raises_on_cancel"}
+    )
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 3
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    assert len(subscriptions) == 3
+    await websocket_client.send_json({"id": 4, "type": "cancel_in_handler"})
+    await hass.async_block_till_done()
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.close
+    assert len(subscriptions) == 0
+
+
+async def test_delayed_response_handler(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test a handler that responds after a connection has already been closed."""
+
+    subscriptions = None
+
+    # Register a handler that responds after it returns
+    @callback
+    @websocket_command(
+        {
+            "type": "late_responder",
+        }
+    )
+    def async_late_responder(
+        hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+    ) -> None:
+        msg_id: int = msg["id"]
+        nonlocal subscriptions
+        subscriptions = connection.subscriptions
+        connection.subscriptions[msg_id] = lambda: None
+        connection.send_result(msg_id)
+
+        async def _async_late_send_message():
+            await asyncio.sleep(0.05)
+            connection.send_event(msg_id, {"event": "any"})
+
+        hass.async_create_task(_async_late_send_message())
+
+    async_register_command(hass, async_late_responder)
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    assert not subscriptions
+    await websocket_client.send_json({"id": 2, "type": "late_responder"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 2
+    assert msg["type"] == "result"
+    assert len(subscriptions) == 2
+    assert await websocket_client.close()
+    await hass.async_block_till_done()
+    assert len(subscriptions) == 0
+
+    assert "Tried to send message" in caplog.text
+    assert "on closed connection" in caplog.text
+
+
+async def test_ensure_disconnect_invalid_json(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test we get disconnected when sending invalid JSON."""
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    await websocket_client.send_str("[--INVALID-JSON--]")
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.CLOSE
+
+
+async def test_ensure_disconnect_invalid_binary(
+    hass: HomeAssistant,
+    websocket_client: MockHAClientWebSocket,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test we get disconnected when sending invalid bytes."""
+
+    await websocket_client.send_json({"id": 1, "type": "ping"})
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["type"] == "pong"
+    await websocket_client.send_bytes(b"")
+    msg = await websocket_client.receive()
+    assert msg.type == WSMsgType.CLOSE
+
+
 async def test_pending_msg_peak(
     hass: HomeAssistant,
     mock_low_peak,
@@ -208,6 +382,58 @@ async def test_prepare_fail(
     assert "Timeout preparing request" in caplog.text
 
 
+async def test_enable_coalesce(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test enabling coalesce."""
+    websocket_client = await hass_ws_client(hass)
+
+    await websocket_client.send_json(
+        {
+            "id": 1,
+            "type": "supported_features",
+            "features": {const.FEATURE_COALESCE_MESSAGES: 1},
+        }
+    )
+    msg = await websocket_client.receive_json()
+    assert msg["id"] == 1
+    assert msg["success"] is True
+    send_tasks: list[asyncio.Future] = []
+    ids: set[int] = set()
+    start_id = 2
+
+    for idx in range(10):
+        id_ = idx + start_id
+        ids.add(id_)
+        send_tasks.append(websocket_client.send_json({"id": id_, "type": "ping"}))
+
+    await asyncio.gather(*send_tasks)
+    returned_ids: set[int] = set()
+    for _ in range(10):
+        msg = await websocket_client.receive_json()
+        assert msg["type"] == "pong"
+        returned_ids.add(msg["id"])
+
+    assert ids == returned_ids
+
+    # Now close
+    send_tasks_with_close: list[asyncio.Future] = []
+    start_id = 12
+    for idx in range(10):
+        id_ = idx + start_id
+        send_tasks_with_close.append(
+            websocket_client.send_json({"id": id_, "type": "ping"})
+        )
+
+    send_tasks_with_close.append(websocket_client.close())
+    send_tasks_with_close.append(websocket_client.send_json({"id": 50, "type": "ping"}))
+
+    with pytest.raises(ConnectionResetError):
+        await asyncio.gather(*send_tasks_with_close)
+
+
 async def test_binary_message(
     hass: HomeAssistant, websocket_client, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/components/wemo/conftest.py b/tests/components/wemo/conftest.py
index 6dc7b1e5d2c986..5fe798004dadd4 100644
--- a/tests/components/wemo/conftest.py
+++ b/tests/components/wemo/conftest.py
@@ -61,9 +61,9 @@ def create_pywemo_device(pywemo_registry, pywemo_model):
     device.host = MOCK_HOST
     device.port = MOCK_PORT
     device.name = MOCK_NAME
-    device.serialnumber = MOCK_SERIAL_NUMBER
+    device.serial_number = MOCK_SERIAL_NUMBER
     device.model_name = pywemo_model.replace("LongPress", "")
-    device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
+    device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
     device.firmware_version = MOCK_FIRMWARE_VERSION
     device.get_state.return_value = 0  # Default to Off
     device.supports_long_press.return_value = cls.supports_long_press()
@@ -102,7 +102,7 @@ def pywemo_dli_device_fixture(pywemo_registry, pywemo_model):
     """Fixture for Digital Loggers emulated instances."""
     with create_pywemo_device(pywemo_registry, pywemo_model) as pywemo_dli_device:
         pywemo_dli_device.model_name = "DLI emulated Belkin Socket"
-        pywemo_dli_device.serialnumber = "1234567891"
+        pywemo_dli_device.serial_number = "1234567891"
         yield pywemo_dli_device
 
 
diff --git a/tests/components/wemo/test_config_flow.py b/tests/components/wemo/test_config_flow.py
index 0ffcb9d7f5effa..71f3a378b74a38 100644
--- a/tests/components/wemo/test_config_flow.py
+++ b/tests/components/wemo/test_config_flow.py
@@ -1,11 +1,14 @@
 """Tests for Wemo config flow."""
 
+from dataclasses import asdict
+
 from homeassistant import data_entry_flow
 from homeassistant.components.wemo.const import DOMAIN
+from homeassistant.components.wemo.wemo_device import Options
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.core import HomeAssistant
 
-from tests.common import patch
+from tests.common import MockConfigEntry, patch
 
 
 async def test_not_discovered(hass: HomeAssistant) -> None:
@@ -20,3 +23,41 @@ async def test_not_discovered(hass: HomeAssistant) -> None:
         result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
     assert result["type"] == data_entry_flow.FlowResultType.ABORT
     assert result["reason"] == "no_devices_found"
+
+
+async def test_options(hass: HomeAssistant) -> None:
+    """Test updating options."""
+    options = Options(enable_subscription=False, enable_long_press=False)
+    entry = MockConfigEntry(domain=DOMAIN, title="Wemo")
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input=asdict(options)
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert Options(**result["data"]) == options
+
+
+async def test_invalid_options(hass: HomeAssistant) -> None:
+    """Test invalid option combinations."""
+    entry = MockConfigEntry(domain=DOMAIN, title="Wemo")
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    # enable_subscription must be True if enable_long_press is True (default).
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"enable_subscription": False}
+    )
+    assert result["errors"] == {
+        "enable_subscription": "long_press_requires_subscription"
+    }
diff --git a/tests/components/wemo/test_device_trigger.py b/tests/components/wemo/test_device_trigger.py
index ad649fb3a244c1..fd5db46e6c6d73 100644
--- a/tests/components/wemo/test_device_trigger.py
+++ b/tests/components/wemo/test_device_trigger.py
@@ -1,5 +1,6 @@
 """Verify that WeMo device triggers work as expected."""
 import pytest
+from pytest_unordered import unordered
 from pywemo.subscribe import EVENT_TYPE_LONG_PRESS
 
 from homeassistant.components.automation import DOMAIN as AUTOMATION_DOMAIN
@@ -17,7 +18,6 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -71,7 +71,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "changed_states",
             "metadata": {"secondary": False},
@@ -79,7 +79,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "turned_off",
             "metadata": {"secondary": False},
@@ -87,7 +87,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
         {
             CONF_DEVICE_ID: wemo_entity.device_id,
             CONF_DOMAIN: Platform.SWITCH,
-            CONF_ENTITY_ID: wemo_entity.entity_id,
+            CONF_ENTITY_ID: wemo_entity.id,
             CONF_PLATFORM: "device",
             CONF_TYPE: "turned_on",
             "metadata": {"secondary": False},
@@ -96,7 +96,7 @@ async def test_get_triggers(hass: HomeAssistant, wemo_entity) -> None:
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, wemo_entity.device_id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_fires_on_long_press(hass: HomeAssistant) -> None:
diff --git a/tests/components/wemo/test_fan.py b/tests/components/wemo/test_fan.py
index 738b15f77c19f4..48ad5774b0a842 100644
--- a/tests/components/wemo/test_fan.py
+++ b/tests/components/wemo/test_fan.py
@@ -106,7 +106,7 @@ async def test_fan_reset_filter_service(
     hass: HomeAssistant, pywemo_device, wemo_entity
 ) -> None:
     """Verify that SERVICE_RESET_FILTER_LIFE is registered and works."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         fan.SERVICE_RESET_FILTER_LIFE,
         {ATTR_ENTITY_ID: wemo_entity.entity_id},
@@ -130,7 +130,7 @@ async def test_fan_set_humidity_service(
     hass: HomeAssistant, pywemo_device, wemo_entity, test_input, expected
 ) -> None:
     """Verify that SERVICE_SET_HUMIDITY is registered and works."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         DOMAIN,
         fan.SERVICE_SET_HUMIDITY,
         {
@@ -157,7 +157,7 @@ async def test_fan_set_percentage(
     hass: HomeAssistant, pywemo_device, wemo_entity, percentage, expected_fan_mode
 ) -> None:
     """Verify set_percentage works properly through the entire range of FanModes."""
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_SET_PERCENTAGE,
         {ATTR_ENTITY_ID: [wemo_entity.entity_id], ATTR_PERCENTAGE: percentage},
@@ -170,7 +170,7 @@ async def test_fan_mode_high_initially(hass: HomeAssistant, pywemo_device) -> No
     """Verify the FanMode is set to High when turned on."""
     pywemo_device.fan_mode = FanMode.Off
     wemo_entity = await async_create_wemo_entity(hass, pywemo_device, "")
-    assert await hass.services.async_call(
+    await hass.services.async_call(
         FAN_DOMAIN,
         SERVICE_TURN_ON,
         {ATTR_ENTITY_ID: [wemo_entity.entity_id]},
diff --git a/tests/components/wemo/test_init.py b/tests/components/wemo/test_init.py
index 7e3e0b2dce8e07..0e9ba19af4295b 100644
--- a/tests/components/wemo/test_init.py
+++ b/tests/components/wemo/test_init.py
@@ -9,7 +9,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     MOCK_FIRMWARE_VERSION,
@@ -138,9 +138,9 @@ def create_device(counter):
         device.host = f"{MOCK_HOST}_{counter}"
         device.port = MOCK_PORT + counter
         device.name = f"{MOCK_NAME}_{counter}"
-        device.serialnumber = f"{MOCK_SERIAL_NUMBER}_{counter}"
+        device.serial_number = f"{MOCK_SERIAL_NUMBER}_{counter}"
         device.model_name = "Motion"
-        device.udn = f"uuid:{device.model_name}-1_0-{device.serialnumber}"
+        device.udn = f"uuid:{device.model_name}-1_0-{device.serial_number}"
         device.firmware_version = MOCK_FIRMWARE_VERSION
         device.get_state.return_value = 0  # Default to Off
         device.supports_long_press.return_value = False
@@ -164,7 +164,7 @@ def create_device(counter):
         # Test that discovery runs periodically and the async_dispatcher_send code works.
         async_fire_time_changed(
             hass,
-            dt.utcnow()
+            dt_util.utcnow()
             + timedelta(seconds=WemoDiscovery.ADDITIONAL_SECONDS_BETWEEN_SCANS + 1),
         )
         await hass.async_block_till_done()
diff --git a/tests/components/wemo/test_light_bridge.py b/tests/components/wemo/test_light_bridge.py
index 62e68b2ea391ca..6f4180626b22d8 100644
--- a/tests/components/wemo/test_light_bridge.py
+++ b/tests/components/wemo/test_light_bridge.py
@@ -35,12 +35,12 @@ def pywemo_model():
 def pywemo_bridge_light_fixture(pywemo_device):
     """Fixture for Bridge.Light WeMoDevice instances."""
     light = create_autospec(pywemo.ouimeaux_device.bridge.Light, instance=True)
-    light.uniqueID = pywemo_device.serialnumber
+    light.uniqueID = pywemo_device.serial_number
     light.name = pywemo_device.name
     light.bridge = pywemo_device
     light.state = {"onoff": 0, "available": True}
     light.capabilities = ["onoff", "levelcontrol", "colortemperature"]
-    pywemo_device.Lights = {pywemo_device.serialnumber: light}
+    pywemo_device.Lights = {pywemo_device.serial_number: light}
     return light
 
 
diff --git a/tests/components/wemo/test_wemo_device.py b/tests/components/wemo/test_wemo_device.py
index 49c6664f7bb497..b715dd4ba724b4 100644
--- a/tests/components/wemo/test_wemo_device.py
+++ b/tests/components/wemo/test_wemo_device.py
@@ -1,5 +1,6 @@
 """Tests for wemo_device.py."""
 import asyncio
+from dataclasses import asdict
 from datetime import timedelta
 from unittest.mock import call, patch
 
@@ -84,7 +85,7 @@ def async_event_received(event):
         "name": device.wemo.name,
         "params": "testing_params",
         "type": EVENT_TYPE_LONG_PRESS,
-        "unique_id": device.wemo.serialnumber,
+        "unique_id": device.wemo.serial_number,
     }
 
 
@@ -188,6 +189,31 @@ async def test_dli_device_info(
     assert device_entries[0].identifiers == {(DOMAIN, "123456789")}
 
 
+async def test_options_enable_subscription_false(
+    hass, pywemo_registry, pywemo_device, wemo_entity
+):
+    """Test setting Options.enable_subscription = False."""
+    config_entry = hass.config_entries.async_get_entry(wemo_entity.config_entry_id)
+    assert hass.config_entries.async_update_entry(
+        config_entry,
+        options=asdict(
+            wemo_device.Options(enable_subscription=False, enable_long_press=False)
+        ),
+    )
+    await hass.async_block_till_done()
+    pywemo_registry.unregister.assert_called_once_with(pywemo_device)
+
+
+async def test_options_enable_long_press_false(hass, pywemo_device, wemo_entity):
+    """Test setting Options.enable_long_press = False."""
+    config_entry = hass.config_entries.async_get_entry(wemo_entity.config_entry_id)
+    assert hass.config_entries.async_update_entry(
+        config_entry, options=asdict(wemo_device.Options(enable_long_press=False))
+    )
+    await hass.async_block_till_done()
+    pywemo_device.remove_long_press_virtual_device.assert_called_once_with()
+
+
 class TestInsight:
     """Tests specific to the WeMo Insight device."""
 
diff --git a/tests/components/whirlpool/test_sensor.py b/tests/components/whirlpool/test_sensor.py
index 429e8895ad8514..be78b0e2df8c1c 100644
--- a/tests/components/whirlpool/test_sensor.py
+++ b/tests/components/whirlpool/test_sensor.py
@@ -17,7 +17,7 @@ async def update_sensor_state(
     hass: HomeAssistant,
     entity_id: str,
     mock_sensor_api_instance: MagicMock,
-) -> None:
+) -> State:
     """Simulate an update trigger from the API."""
 
     for call in mock_sensor_api_instance.register_attr_callback.call_args_list:
@@ -300,6 +300,24 @@ async def test_restore_state(
     assert state.state == thetimestamp.isoformat()
 
 
+async def test_no_restore_state(
+    hass: HomeAssistant,
+    mock_sensor_api_instances: MagicMock,
+    mock_sensor1_api: MagicMock,
+) -> None:
+    """Test sensor restore state with no restore."""
+    # create and add entry
+    entity_id = "sensor.washer_end_time"
+    await init_integration(hass)
+    # restore from cache
+    state = hass.states.get(entity_id)
+    assert state.state == "unknown"
+
+    mock_sensor1_api.get_machine_state.return_value = MachineState.RunningMainCycle
+    state = await update_sensor_state(hass, entity_id, mock_sensor1_api)
+    assert state.state != "unknown"
+
+
 async def test_callback(
     hass: HomeAssistant,
     mock_sensor_api_instances: MagicMock,
diff --git a/tests/components/wyoming/test_tts.py b/tests/components/wyoming/test_tts.py
index f2a10710c26ca3..8767660ca08795 100644
--- a/tests/components/wyoming/test_tts.py
+++ b/tests/components/wyoming/test_tts.py
@@ -15,11 +15,11 @@
 
 from . import MockAsyncTcpClient
 
-from tests.components.tts.conftest import (  # noqa: F401, pylint: disable=unused-import
-    init_cache_dir_side_effect,
-    mock_get_cache_files,
-    mock_init_cache_dir,
-)
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
 
 
 async def test_support(hass: HomeAssistant, init_wyoming_tts) -> None:
diff --git a/tests/components/xbox/test_config_flow.py b/tests/components/xbox/test_config_flow.py
index 2eb91f225bd624..9738dc7014859a 100644
--- a/tests/components/xbox/test_config_flow.py
+++ b/tests/components/xbox/test_config_flow.py
@@ -3,6 +3,10 @@
 from unittest.mock import patch
 
 from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.components.xbox.const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
@@ -33,13 +37,9 @@ async def test_full_flow(
     current_request_with_host: None,
 ) -> None:
     """Check full flow."""
-    assert await setup.async_setup_component(
-        hass,
-        "xbox",
-        {
-            "xbox": {"client_id": CLIENT_ID, "client_secret": CLIENT_SECRET},
-            "http": {"base_url": "https://example.com"},
-        },
+    assert await setup.async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass, DOMAIN, ClientCredential(CLIENT_ID, CLIENT_SECRET), "imported-cred"
     )
 
     result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/xiaomi_ble/test_binary_sensor.py b/tests/components/xiaomi_ble/test_binary_sensor.py
index 9345660f21c247..424f6e22b26dd6 100644
--- a/tests/components/xiaomi_ble/test_binary_sensor.py
+++ b/tests/components/xiaomi_ble/test_binary_sensor.py
@@ -247,16 +247,16 @@ async def test_smoke(hass: HomeAssistant) -> None:
         hass,
         make_advertisement(
             "54:EF:44:E3:9C:BC",
-            b"XY\x97\tf\xbc\x9c\xe3D\xefT\x01" b"\x08\x12\x05\x00\x00\x00q^\xbe\x90",
+            b"XY\x97\tf\xbc\x9c\xe3D\xefT\x01\x08\x12\x05\x00\x00\x00q^\xbe\x90",
         ),
     )
     await hass.async_block_till_done()
     assert len(hass.states.async_all()) == 1
 
-    smoke_sensor = hass.states.get("binary_sensor.thermometer_9cbc_smoke")
+    smoke_sensor = hass.states.get("binary_sensor.smoke_detector_9cbc_smoke")
     smoke_sensor_attribtes = smoke_sensor.attributes
     assert smoke_sensor.state == STATE_ON
-    assert smoke_sensor_attribtes[ATTR_FRIENDLY_NAME] == "Thermometer 9CBC Smoke"
+    assert smoke_sensor_attribtes[ATTR_FRIENDLY_NAME] == "Smoke Detector 9CBC Smoke"
 
     assert await hass.config_entries.async_unload(entry.entry_id)
     await hass.async_block_till_done()
diff --git a/tests/components/xiaomi_ble/test_config_flow.py b/tests/components/xiaomi_ble/test_config_flow.py
index 3f537c2afa0d68..97aa878e1fb031 100644
--- a/tests/components/xiaomi_ble/test_config_flow.py
+++ b/tests/components/xiaomi_ble/test_config_flow.py
@@ -248,7 +248,7 @@ async def test_async_step_bluetooth_valid_device_v4_encryption(
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
@@ -284,7 +284,7 @@ async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key(
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
@@ -320,7 +320,7 @@ async def test_async_step_bluetooth_valid_device_v4_encryption_wrong_key_length(
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
@@ -501,7 +501,7 @@ async def test_async_step_user_with_found_devices_v4_encryption(
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
@@ -549,7 +549,7 @@ async def test_async_step_user_with_found_devices_v4_encryption_wrong_key(
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
@@ -599,7 +599,7 @@ async def test_async_step_user_with_found_devices_v4_encryption_wrong_key_length
         )
 
     assert result2["type"] == FlowResultType.CREATE_ENTRY
-    assert result2["title"] == "Thermometer 9CBC (JTYJGD03MI)"
+    assert result2["title"] == "Smoke Detector 9CBC (JTYJGD03MI)"
     assert result2["data"] == {"bindkey": "5b51a7c91cde6707c9ef18dfda143a58"}
     assert result2["result"].unique_id == "54:EF:44:E3:9C:BC"
 
diff --git a/tests/components/xiaomi_miio/test_button.py b/tests/components/xiaomi_miio/test_button.py
new file mode 100644
index 00000000000000..995c5ae034cb0f
--- /dev/null
+++ b/tests/components/xiaomi_miio/test_button.py
@@ -0,0 +1,99 @@
+"""The tests for the xiaomi_miio button component."""
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from homeassistant.components.button import DOMAIN, SERVICE_PRESS
+from homeassistant.components.xiaomi_miio.const import (
+    CONF_DEVICE,
+    CONF_FLOW_TYPE,
+    CONF_MAC,
+    DOMAIN as XIAOMI_DOMAIN,
+    MODELS_VACUUM,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_HOST,
+    CONF_MODEL,
+    CONF_TOKEN,
+    Platform,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from . import TEST_MAC
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(autouse=True)
+async def setup_test(hass: HomeAssistant):
+    """Initialize test xiaomi_miio for button entity."""
+
+    mock_vacuum = MagicMock()
+
+    with patch(
+        "homeassistant.components.xiaomi_miio.get_platforms",
+        return_value=[
+            Platform.BUTTON,
+        ],
+    ), patch("homeassistant.components.xiaomi_miio.RoborockVacuum") as mock_vacuum_cls:
+        mock_vacuum_cls.return_value = mock_vacuum
+        yield mock_vacuum
+
+
+async def test_vacuum_button_params(hass: HomeAssistant) -> None:
+    """Test the initial parameters of a vacuum button."""
+
+    entity_id = await setup_component(hass, "test_vacuum")
+
+    state = hass.states.get(f"{entity_id}_reset_main_brush")
+    assert state
+    assert state.state == "unknown"
+
+
+@pytest.mark.freeze_time("2023-06-28 00:00:00+00:00")
+async def test_vacuum_button_press(hass: HomeAssistant) -> None:
+    """Test pressing a vacuum button."""
+
+    entity_id = await setup_component(hass, "test_vacuum")
+
+    state = hass.states.get(f"{entity_id}_reset_side_brush")
+    assert state
+    assert state.state == "unknown"
+
+    pressed_at = dt_util.utcnow()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id + "_reset_side_brush"},
+        blocking=True,
+    )
+
+    state = hass.states.get(f"{entity_id}_reset_side_brush")
+    assert state
+    assert state.state == pressed_at.isoformat()
+
+
+async def setup_component(hass: HomeAssistant, entity_name: str) -> str:
+    """Set up vacuum component."""
+    entity_id = f"{DOMAIN}.{entity_name}"
+
+    config_entry = MockConfigEntry(
+        domain=XIAOMI_DOMAIN,
+        unique_id="123456",
+        title=entity_name,
+        data={
+            CONF_FLOW_TYPE: CONF_DEVICE,
+            CONF_HOST: "192.168.1.100",
+            CONF_TOKEN: "12345678901234567890123456789012",
+            CONF_MODEL: MODELS_VACUUM[0],
+            CONF_MAC: TEST_MAC,
+        },
+    )
+
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    return entity_id
diff --git a/tests/components/yandextts/test_tts.py b/tests/components/yandextts/test_tts.py
index ed140041605fbc..d04aef6b16b8f9 100644
--- a/tests/components/yandextts/test_tts.py
+++ b/tests/components/yandextts/test_tts.py
@@ -1,8 +1,6 @@
 """The tests for the Yandex SpeechKit speech platform."""
 import asyncio
 from http import HTTPStatus
-import os
-import shutil
 
 import pytest
 
@@ -16,14 +14,22 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import assert_setup_component, async_mock_service
-from tests.components.tts.conftest import (  # noqa: F401, pylint: disable=unused-import
-    mutagen_mock,
-)
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 URL = "https://tts.voicetech.yandex.net/generate?"
 
 
+@pytest.fixture(autouse=True)
+def tts_mutagen_mock_fixture_autouse(tts_mutagen_mock):
+    """Mock writing tags."""
+
+
+@pytest.fixture(autouse=True)
+def mock_tts_cache_dir_autouse(mock_tts_cache_dir):
+    """Mock the TTS cache dir with empty dir."""
+    return mock_tts_cache_dir
+
+
 async def get_media_source_url(hass, media_content_id):
     """Get the media source url."""
     if media_source.DOMAIN not in hass.config.components:
@@ -33,15 +39,6 @@ async def get_media_source_url(hass, media_content_id):
     return resolved.url
 
 
-@pytest.fixture(autouse=True)
-def cleanup_cache(hass):
-    """Prevent TTS writing."""
-    yield
-    default_tts = hass.config.path(tts.DEFAULT_CACHE_DIR)
-    if os.path.isdir(default_tts):
-        shutil.rmtree(default_tts)
-
-
 async def test_setup_component(hass: HomeAssistant) -> None:
     """Test setup component."""
     config = {tts.DOMAIN: {"platform": "yandextts", "api_key": "1234567xx"}}
diff --git a/tests/components/yolink/test_device_trigger.py b/tests/components/yolink/test_device_trigger.py
index f5679ca19c9052..e0ef37c1b75bd6 100644
--- a/tests/components/yolink/test_device_trigger.py
+++ b/tests/components/yolink/test_device_trigger.py
@@ -1,5 +1,6 @@
 """The tests for YoLink device triggers."""
 import pytest
+from pytest_unordered import unordered
 from yolink.const import ATTR_DEVICE_DIMMER, ATTR_DEVICE_SMART_REMOTER
 
 from homeassistant.components import automation
@@ -11,7 +12,6 @@
 
 from tests.common import (
     MockConfigEntry,
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
@@ -96,7 +96,7 @@ async def test_get_triggers(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entry.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_get_triggers_exception(
@@ -115,7 +115,7 @@ async def test_get_triggers_exception(
     triggers = await async_get_device_automations(
         hass, DeviceAutomationType.TRIGGER, device_entity.id
     )
-    assert_lists_same(triggers, expected_triggers)
+    assert triggers == unordered(expected_triggers)
 
 
 async def test_if_fires_on_event(
diff --git a/tests/components/youtube/__init__.py b/tests/components/youtube/__init__.py
new file mode 100644
index 00000000000000..15a43d7a62fcd3
--- /dev/null
+++ b/tests/components/youtube/__init__.py
@@ -0,0 +1,97 @@
+"""Tests for the YouTube integration."""
+from dataclasses import dataclass
+import json
+from typing import Any
+
+from tests.common import load_fixture
+
+
+@dataclass
+class MockRequest:
+    """Mock object for a request."""
+
+    fixture: str
+
+    def execute(self) -> dict[str, Any]:
+        """Return a fixture."""
+        return json.loads(load_fixture(self.fixture))
+
+
+class MockChannels:
+    """Mock object for channels."""
+
+    def __init__(self, fixture: str):
+        """Initialize mock channels."""
+        self._fixture = fixture
+
+    def list(
+        self,
+        part: str,
+        id: str | None = None,
+        mine: bool | None = None,
+        maxResults: int | None = None,
+    ) -> MockRequest:
+        """Return a fixture."""
+        return MockRequest(fixture=self._fixture)
+
+
+class MockPlaylistItems:
+    """Mock object for playlist items."""
+
+    def __init__(self, fixture: str):
+        """Initialize mock playlist items."""
+        self._fixture = fixture
+
+    def list(
+        self,
+        part: str,
+        playlistId: str,
+        maxResults: int | None = None,
+    ) -> MockRequest:
+        """Return a fixture."""
+        return MockRequest(fixture=self._fixture)
+
+
+class MockSubscriptions:
+    """Mock object for subscriptions."""
+
+    def __init__(self, fixture: str):
+        """Initialize mock subscriptions."""
+        self._fixture = fixture
+
+    def list(
+        self,
+        part: str,
+        mine: bool,
+        maxResults: int | None = None,
+        pageToken: str | None = None,
+    ) -> MockRequest:
+        """Return a fixture."""
+        return MockRequest(fixture=self._fixture)
+
+
+class MockService:
+    """Service which returns mock objects."""
+
+    def __init__(
+        self,
+        channel_fixture: str = "youtube/get_channel.json",
+        playlist_items_fixture: str = "youtube/get_playlist_items.json",
+        subscriptions_fixture: str = "youtube/get_subscriptions.json",
+    ):
+        """Initialize mock service."""
+        self._channel_fixture = channel_fixture
+        self._playlist_items_fixture = playlist_items_fixture
+        self._subscriptions_fixture = subscriptions_fixture
+
+    def channels(self) -> MockChannels:
+        """Return a mock object."""
+        return MockChannels(self._channel_fixture)
+
+    def playlistItems(self) -> MockPlaylistItems:
+        """Return a mock object."""
+        return MockPlaylistItems(self._playlist_items_fixture)
+
+    def subscriptions(self) -> MockSubscriptions:
+        """Return a mock object."""
+        return MockSubscriptions(self._subscriptions_fixture)
diff --git a/tests/components/youtube/conftest.py b/tests/components/youtube/conftest.py
new file mode 100644
index 00000000000000..d87a3c07679c46
--- /dev/null
+++ b/tests/components/youtube/conftest.py
@@ -0,0 +1,114 @@
+"""Configure tests for the YouTube integration."""
+from collections.abc import Awaitable, Callable, Coroutine
+import time
+from typing import Any
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
+from homeassistant.components.youtube.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+from tests.components.youtube import MockService
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+ComponentSetup = Callable[[], Awaitable[None]]
+
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+GOOGLE_AUTH_URI = "https://accounts.google.com/o/oauth2/v2/auth"
+GOOGLE_TOKEN_URI = "https://oauth2.googleapis.com/token"
+SCOPES = [
+    "https://www.googleapis.com/auth/youtube.readonly",
+]
+TITLE = "Google for Developers"
+TOKEN = "homeassistant.components.youtube.api.config_entry_oauth2_flow.OAuth2Session.async_ensure_token_valid"
+
+
+@pytest.fixture(name="scopes")
+def mock_scopes() -> list[str]:
+    """Fixture to set the scopes present in the OAuth token."""
+    return SCOPES
+
+
+@pytest.fixture(autouse=True)
+async def setup_credentials(hass: HomeAssistant) -> None:
+    """Fixture to setup credentials."""
+    assert await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(CLIENT_ID, CLIENT_SECRET),
+        DOMAIN,
+    )
+
+
+@pytest.fixture(name="expires_at")
+def mock_expires_at() -> int:
+    """Fixture to set the oauth token expiration time."""
+    return time.time() + 3600
+
+
+@pytest.fixture(name="config_entry")
+def mock_config_entry(expires_at: int, scopes: list[str]) -> MockConfigEntry:
+    """Create YouTube entry in Home Assistant."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title=TITLE,
+        unique_id="UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        data={
+            "auth_implementation": DOMAIN,
+            "token": {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": expires_at,
+                "scope": " ".join(scopes),
+            },
+        },
+        options={"channels": ["UC_x5XG1OV2P6uZZ5FSM9Ttw"]},
+    )
+
+
+@pytest.fixture(autouse=True)
+def mock_connection(aioclient_mock: AiohttpClientMocker) -> None:
+    """Mock YouTube connection."""
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+
+@pytest.fixture(name="setup_integration")
+async def mock_setup_integration(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> Callable[[], Coroutine[Any, Any, None]]:
+    """Fixture for setting up the component."""
+    config_entry.add_to_hass(hass)
+
+    assert await async_setup_component(hass, "application_credentials", {})
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(CLIENT_ID, CLIENT_SECRET),
+        DOMAIN,
+    )
+
+    async def func() -> None:
+        with patch(
+            "homeassistant.components.youtube.api.build", return_value=MockService()
+        ):
+            assert await async_setup_component(hass, DOMAIN, {})
+            await hass.async_block_till_done()
+
+    return func
diff --git a/tests/components/youtube/fixtures/get_channel.json b/tests/components/youtube/fixtures/get_channel.json
new file mode 100644
index 00000000000000..6ab17e119df151
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_channel.json
@@ -0,0 +1,55 @@
+{
+  "kind": "youtube#channelListResponse",
+  "etag": "8HTiiXpKCq-GJvDVOd88e5o_KGc",
+  "pageInfo": {
+    "totalResults": 1,
+    "resultsPerPage": 5
+  },
+  "items": [
+    {
+      "kind": "youtube#channel",
+      "etag": "CG3vwkqpnD2Bj_MaPXmy9puO4Kc",
+      "id": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+      "snippet": {
+        "title": "Google for Developers",
+        "description": "Subscribe to join a community of creative developers and learn the latest in Google technology — from AI and cloud, to mobile and web.\n\nExplore more at developers.google.com\n\n",
+        "customUrl": "@googledevelopers",
+        "publishedAt": "2007-08-23T00:34:43Z",
+        "thumbnails": {
+          "default": {
+            "url": "https://yt3.ggpht.com/fca_HuJ99xUxflWdex0XViC3NfctBFreIl8y4i9z411asnGTWY-Ql3MeH_ybA4kNaOjY7kyA=s88-c-k-c0x00ffffff-no-rj",
+            "width": 88,
+            "height": 88
+          },
+          "medium": {
+            "url": "https://yt3.ggpht.com/fca_HuJ99xUxflWdex0XViC3NfctBFreIl8y4i9z411asnGTWY-Ql3MeH_ybA4kNaOjY7kyA=s240-c-k-c0x00ffffff-no-rj",
+            "width": 240,
+            "height": 240
+          },
+          "high": {
+            "url": "https://yt3.ggpht.com/fca_HuJ99xUxflWdex0XViC3NfctBFreIl8y4i9z411asnGTWY-Ql3MeH_ybA4kNaOjY7kyA=s800-c-k-c0x00ffffff-no-rj",
+            "width": 800,
+            "height": 800
+          }
+        },
+        "localized": {
+          "title": "Google for Developers",
+          "description": "Subscribe to join a community of creative developers and learn the latest in Google technology — from AI and cloud, to mobile and web.\n\nExplore more at developers.google.com\n\n"
+        },
+        "country": "US"
+      },
+      "contentDetails": {
+        "relatedPlaylists": {
+          "likes": "",
+          "uploads": "UU_x5XG1OV2P6uZZ5FSM9Ttw"
+        }
+      },
+      "statistics": {
+        "viewCount": "214141263",
+        "subscriberCount": "2290000",
+        "hiddenSubscriberCount": false,
+        "videoCount": "5798"
+      }
+    }
+  ]
+}
diff --git a/tests/components/youtube/fixtures/get_channel_2.json b/tests/components/youtube/fixtures/get_channel_2.json
new file mode 100644
index 00000000000000..24e71ad91abd59
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_channel_2.json
@@ -0,0 +1,48 @@
+{
+  "kind": "youtube#SubscriptionListResponse",
+  "etag": "6C9iFE7CzKQqPrEoJlE0H2U27xI",
+  "nextPageToken": "CAEQAA",
+  "pageInfo": {
+    "totalResults": 525,
+    "resultsPerPage": 1
+  },
+  "items": [
+    {
+      "kind": "youtube#subscription",
+      "etag": "4Hr8w5f03mLak3fZID0aXypQRDg",
+      "id": "l6YW-siEBx2rtBlTJ_ip10UA2t_d09UYkgtJsqbYblE",
+      "snippet": {
+        "publishedAt": "2015-08-09T21:37:44Z",
+        "title": "Linus Tech Tips",
+        "description": "Linus Tech Tips is a passionate team of \"professionally curious\" experts in consumer technology and video production who aim to educate and entertain.",
+        "resourceId": {
+          "kind": "youtube#channel",
+          "channelId": "UCXuqSBlHAE6Xw-yeJA0Tunw"
+        },
+        "channelId": "UCXuqSBlHAE6Xw-yeJA0Tunw",
+        "thumbnails": {
+          "default": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s88-c-k-c0x00ffffff-no-rj"
+          },
+          "medium": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s240-c-k-c0x00ffffff-no-rj"
+          },
+          "high": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s800-c-k-c0x00ffffff-no-rj"
+          }
+        }
+      },
+      "contentDetails": {
+        "totalItemCount": 6178,
+        "newItemCount": 0,
+        "activityType": "all"
+      },
+      "statistics": {
+        "viewCount": "214141263",
+        "subscriberCount": "2290000",
+        "hiddenSubscriberCount": false,
+        "videoCount": "5798"
+      }
+    }
+  ]
+}
diff --git a/tests/components/youtube/fixtures/get_no_channel.json b/tests/components/youtube/fixtures/get_no_channel.json
new file mode 100644
index 00000000000000..7ec03c0461a442
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_no_channel.json
@@ -0,0 +1,9 @@
+{
+  "kind": "youtube#channelListResponse",
+  "etag": "8HTiiXpKCq-GJvDVOd88e5o_KGc",
+  "pageInfo": {
+    "totalResults": 0,
+    "resultsPerPage": 5
+  },
+  "items": []
+}
diff --git a/tests/components/youtube/fixtures/get_playlist_items.json b/tests/components/youtube/fixtures/get_playlist_items.json
new file mode 100644
index 00000000000000..790c606cfa701c
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_playlist_items.json
@@ -0,0 +1,266 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "pU0v49jXONlQfIJEX7ldINttRYM",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmhsZUxsY0h3UUxN",
+      "snippet": {
+        "publishedAt": "2023-05-10T22:30:48Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "Google I/O 2023 Developer Keynote in 5 minutes",
+        "description": "Discover what’s new from Google, including top takeaways and highlights announced at Google I/O 2023. From deep investments in the largest mobile platform, to breakthroughs in AI, learn about the latest capabilities in mobile, web, Cloud, AI, and more. \n\nCatch the full Developer Keynote →https://goo.gle/dev-keynote-23 \nWatch all the Keynotes from Google I/O 2023→ https://goo.gle/IO23_keynotes\nWatch all the Google I/O 2023 Sessions → https://goo.gle/IO23_all \n\n0:00 - Welcome\n0:25 - MakerSuite\n0:49 - Android Studio Bot\n1:38 - Large screens\n2:04 - Wear OS\n2:34  - WebGPU\n2:58 - Baseline\n3:27 - MediaPipe\n3:57 - Duet AI for Google Cloud\n4:59 - Closing\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO #developers",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 1,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "hleLlcHwQLM"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "hleLlcHwQLM",
+        "videoPublishedAt": "2023-05-10T22:30:48Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "fht9mKDuIBXcO75k21ZB_gC_4vM",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmxNS2p0U0Z1amN3",
+      "snippet": {
+        "publishedAt": "2023-05-10T21:25:47Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Pay and Wallet in less than 1 minute",
+        "description": "A quick recap on the latest updates to Google Pay and Wallet from Google I/O 2023.\n\nTo learn more about what's new in Google Pay and Wallet, check out the keynote → https://goo.gle/IO23_paywallet\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 2,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "lMKjtSFujcw"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "lMKjtSFujcw",
+        "videoPublishedAt": "2023-05-10T21:25:47Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "nYKXoKd8eePAZ_xFa3dL5ZmvM5c",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmMwbXFCdVhQcnBB",
+      "snippet": {
+        "publishedAt": "2023-05-10T20:47:57Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "Developers guide to BigQuery export for Google Analytics 4",
+        "description": "With Google Analytics 4 (GA4), anyone can set up export of granular measurement data to BigQuery.\n\nIn this session, you will learn how to use the BigQuery export for solving business problems, doing complex reporting, implementing advanced use cases with ML models, and creating custom audiences by joining with first-party data. You can use this framework for detailed or large-scale data analysis. We will also share some best practices to get you started.\n\nResources:\nDevelopers guide to BigQuery export for Google Analytics 4 → https://goo.gle/ga-io23\n\nSpeaker: Minhaz Kazi\n\nWatch more:\nWatch all the Technical Sessions from Google I/O 2023 → https://goo.gle/IO23_sessions\nWatch more Mobile Sessions → https://goo.gle/IO23_mobile\nWatch more Web Sessions → https://goo.gle/IO23_web\nAll Google I/O 2023 Sessions → https://goo.gle/IO23_all\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 3,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "c0mqBuXPrpA"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "c0mqBuXPrpA",
+        "videoPublishedAt": "2023-05-10T20:47:57Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "--gb8pSHDwp9c-fyjhZ0K2DklLE",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Ll9uOXh3dVRPUmFz",
+      "snippet": {
+        "publishedAt": "2023-05-10T20:46:29Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home - American Sign Language",
+        "description": "To watch this Session without American Sign Language (ASL) interpretation, please click here → https://goo.gle/IO23_homekey\n\nDiscover how your connected devices can do more with Google Home using Matter and Automations.\n\nResources:\nGoogle Home Developer Center → https://goo.gle/3KcD5xr\n\nDiscover how your connected devices can do more with Google Home using Matter and Automations\nGoogle Home APIs Developer Preview → https://goo.gle/3UakRl0\nAutomations Developer Preview → https://goo.gle/3KgEcMy\n\nSpeakers: Taylor Lehman, Indu Ramamurthi\n\nWatch more:\nWatch more Mobile Sessions → https://goo.gle/IO23_mobile\nAll Google I/O 2023 Sessions → https://goo.gle/IO23_all\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 4,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "_n9xwuTORas"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "_n9xwuTORas",
+        "videoPublishedAt": "2023-05-10T20:46:29Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 5
+  }
+}
diff --git a/tests/components/youtube/fixtures/get_playlist_items_2.json b/tests/components/youtube/fixtures/get_playlist_items_2.json
new file mode 100644
index 00000000000000..2311d7219c23df
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_playlist_items_2.json
@@ -0,0 +1,215 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "pU0v49jXONlQfIJEX7ldINttRYM",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmhsZUxsY0h3UUxN",
+      "snippet": {
+        "publishedAt": "2023-05-10T22:30:48Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "Google I/O 2023 Developer Keynote in 5 minutes",
+        "description": "Discover what’s new from Google, including top takeaways and highlights announced at Google I/O 2023. From deep investments in the largest mobile platform, to breakthroughs in AI, learn about the latest capabilities in mobile, web, Cloud, AI, and more. \n\nCatch the full Developer Keynote →https://goo.gle/dev-keynote-23 \nWatch all the Keynotes from Google I/O 2023→ https://goo.gle/IO23_keynotes\nWatch all the Google I/O 2023 Sessions → https://goo.gle/IO23_all \n\n0:00 - Welcome\n0:25 - MakerSuite\n0:49 - Android Studio Bot\n1:38 - Large screens\n2:04 - Wear OS\n2:34  - WebGPU\n2:58 - Baseline\n3:27 - MediaPipe\n3:57 - Duet AI for Google Cloud\n4:59 - Closing\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO #developers",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/hleLlcHwQLM/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 1,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "hleLlcHwQLM"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "hleLlcHwQLM",
+        "videoPublishedAt": "2023-05-10T22:30:48Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "fht9mKDuIBXcO75k21ZB_gC_4vM",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmxNS2p0U0Z1amN3",
+      "snippet": {
+        "publishedAt": "2023-05-10T21:25:47Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Pay and Wallet in less than 1 minute",
+        "description": "A quick recap on the latest updates to Google Pay and Wallet from Google I/O 2023.\n\nTo learn more about what's new in Google Pay and Wallet, check out the keynote → https://goo.gle/IO23_paywallet\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/lMKjtSFujcw/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 2,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "lMKjtSFujcw"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "lMKjtSFujcw",
+        "videoPublishedAt": "2023-05-10T21:25:47Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "nYKXoKd8eePAZ_xFa3dL5ZmvM5c",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3LmMwbXFCdVhQcnBB",
+      "snippet": {
+        "publishedAt": "2023-05-10T20:47:57Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "Developers guide to BigQuery export for Google Analytics 4",
+        "description": "With Google Analytics 4 (GA4), anyone can set up export of granular measurement data to BigQuery.\n\nIn this session, you will learn how to use the BigQuery export for solving business problems, doing complex reporting, implementing advanced use cases with ML models, and creating custom audiences by joining with first-party data. You can use this framework for detailed or large-scale data analysis. We will also share some best practices to get you started.\n\nResources:\nDevelopers guide to BigQuery export for Google Analytics 4 → https://goo.gle/ga-io23\n\nSpeaker: Minhaz Kazi\n\nWatch more:\nWatch all the Technical Sessions from Google I/O 2023 → https://goo.gle/IO23_sessions\nWatch more Mobile Sessions → https://goo.gle/IO23_mobile\nWatch more Web Sessions → https://goo.gle/IO23_web\nAll Google I/O 2023 Sessions → https://goo.gle/IO23_all\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/c0mqBuXPrpA/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 3,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "c0mqBuXPrpA"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "c0mqBuXPrpA",
+        "videoPublishedAt": "2023-05-10T20:47:57Z"
+      }
+    },
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "--gb8pSHDwp9c-fyjhZ0K2DklLE",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Ll9uOXh3dVRPUmFz",
+      "snippet": {
+        "publishedAt": "2023-05-10T20:46:29Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home - American Sign Language",
+        "description": "To watch this Session without American Sign Language (ASL) interpretation, please click here → https://goo.gle/IO23_homekey\n\nDiscover how your connected devices can do more with Google Home using Matter and Automations.\n\nResources:\nGoogle Home Developer Center → https://goo.gle/3KcD5xr\n\nDiscover how your connected devices can do more with Google Home using Matter and Automations\nGoogle Home APIs Developer Preview → https://goo.gle/3UakRl0\nAutomations Developer Preview → https://goo.gle/3KgEcMy\n\nSpeakers: Taylor Lehman, Indu Ramamurthi\n\nWatch more:\nWatch more Mobile Sessions → https://goo.gle/IO23_mobile\nAll Google I/O 2023 Sessions → https://goo.gle/IO23_all\n\nSubscribe to Google Developers → https://goo.gle/developers\n\n#GoogleIO",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          },
+          "maxres": {
+            "url": "https://i.ytimg.com/vi/_n9xwuTORas/maxresdefault.jpg",
+            "width": 1280,
+            "height": 720
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 4,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "_n9xwuTORas"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "_n9xwuTORas",
+        "videoPublishedAt": "2023-05-10T20:46:29Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 5
+  }
+}
diff --git a/tests/components/youtube/fixtures/get_subscriptions.json b/tests/components/youtube/fixtures/get_subscriptions.json
new file mode 100644
index 00000000000000..adc605adcfe2e8
--- /dev/null
+++ b/tests/components/youtube/fixtures/get_subscriptions.json
@@ -0,0 +1,37 @@
+{
+  "kind": "youtube#SubscriptionListResponse",
+  "etag": "6C9iFE7CzKQqPrEoJlE0H2U27xI",
+  "nextPageToken": "CAEQAA",
+  "pageInfo": {
+    "totalResults": 525,
+    "resultsPerPage": 1
+  },
+  "items": [
+    {
+      "kind": "youtube#subscription",
+      "etag": "4Hr8w5f03mLak3fZID0aXypQRDg",
+      "id": "l6YW-siEBx2rtBlTJ_ip10UA2t_d09UYkgtJsqbYblE",
+      "snippet": {
+        "publishedAt": "2015-08-09T21:37:44Z",
+        "title": "Linus Tech Tips",
+        "description": "Linus Tech Tips is a passionate team of \"professionally curious\" experts in consumer technology and video production who aim to educate and entertain.",
+        "resourceId": {
+          "kind": "youtube#channel",
+          "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+        },
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "thumbnails": {
+          "default": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s88-c-k-c0x00ffffff-no-rj"
+          },
+          "medium": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s240-c-k-c0x00ffffff-no-rj"
+          },
+          "high": {
+            "url": "https://yt3.ggpht.com/Vy6KL7EM_apxPSxF0pPy5w_c87YDTOlBQo3MADDF0Wl51kwxmt9wmRotnt2xQXwlrcyO0Xe56w=s800-c-k-c0x00ffffff-no-rj"
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/tests/components/youtube/fixtures/thumbnail/default.json b/tests/components/youtube/fixtures/thumbnail/default.json
new file mode 100644
index 00000000000000..6b5d66d6501cce
--- /dev/null
+++ b/tests/components/youtube/fixtures/thumbnail/default.json
@@ -0,0 +1,42 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg",
+            "width": 120,
+            "height": 90
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 1
+  }
+}
diff --git a/tests/components/youtube/fixtures/thumbnail/high.json b/tests/components/youtube/fixtures/thumbnail/high.json
new file mode 100644
index 00000000000000..430ad3715cc3da
--- /dev/null
+++ b/tests/components/youtube/fixtures/thumbnail/high.json
@@ -0,0 +1,52 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 1
+  }
+}
diff --git a/tests/components/youtube/fixtures/thumbnail/medium.json b/tests/components/youtube/fixtures/thumbnail/medium.json
new file mode 100644
index 00000000000000..21cb09bd886a5a
--- /dev/null
+++ b/tests/components/youtube/fixtures/thumbnail/medium.json
@@ -0,0 +1,47 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 1
+  }
+}
diff --git a/tests/components/youtube/fixtures/thumbnail/none.json b/tests/components/youtube/fixtures/thumbnail/none.json
new file mode 100644
index 00000000000000..d4c28730cabb04
--- /dev/null
+++ b/tests/components/youtube/fixtures/thumbnail/none.json
@@ -0,0 +1,36 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {},
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 1
+  }
+}
diff --git a/tests/components/youtube/fixtures/thumbnail/standard.json b/tests/components/youtube/fixtures/thumbnail/standard.json
new file mode 100644
index 00000000000000..bdbedfcf4c9a21
--- /dev/null
+++ b/tests/components/youtube/fixtures/thumbnail/standard.json
@@ -0,0 +1,57 @@
+{
+  "kind": "youtube#playlistItemListResponse",
+  "etag": "O0Ah8Wd5pUD2Gsv-n0A42RDRcX8",
+  "nextPageToken": "EAAaBlBUOkNBVQ",
+  "items": [
+    {
+      "kind": "youtube#playlistItem",
+      "etag": "qgpoAJRNskzLhD99njC8e2kPB0M",
+      "id": "VVVfeDVYRzFPVjJQNnVaWjVGU005VHR3Lnd5c3VrRHJNZHFV",
+      "snippet": {
+        "publishedAt": "2023-05-11T00:20:46Z",
+        "channelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw",
+        "title": "What's new in Google Home in less than 1 minute",
+        "description": "Discover how your connected devices can do more with Google Home using Matter and Automations at Google I/O 2023.\n\nTo learn more about what's new in Google Home, check out the keynote → https://goo.gle/IO23_homekey\n\nSubscribe to Google Developers → https://goo.gle/developers \n\n#GoogleIO #GoogleHome",
+        "thumbnails": {
+          "default": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg",
+            "width": 120,
+            "height": 90
+          },
+          "medium": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/mqdefault.jpg",
+            "width": 320,
+            "height": 180
+          },
+          "high": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/hqdefault.jpg",
+            "width": 480,
+            "height": 360
+          },
+          "standard": {
+            "url": "https://i.ytimg.com/vi/wysukDrMdqU/sddefault.jpg",
+            "width": 640,
+            "height": 480
+          }
+        },
+        "channelTitle": "Google for Developers",
+        "playlistId": "UU_x5XG1OV2P6uZZ5FSM9Ttw",
+        "position": 0,
+        "resourceId": {
+          "kind": "youtube#video",
+          "videoId": "wysukDrMdqU"
+        },
+        "videoOwnerChannelTitle": "Google for Developers",
+        "videoOwnerChannelId": "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+      },
+      "contentDetails": {
+        "videoId": "wysukDrMdqU",
+        "videoPublishedAt": "2023-05-11T00:20:46Z"
+      }
+    }
+  ],
+  "pageInfo": {
+    "totalResults": 5798,
+    "resultsPerPage": 1
+  }
+}
diff --git a/tests/components/youtube/test_config_flow.py b/tests/components/youtube/test_config_flow.py
new file mode 100644
index 00000000000000..5b91ff958f80b1
--- /dev/null
+++ b/tests/components/youtube/test_config_flow.py
@@ -0,0 +1,341 @@
+"""Test the YouTube config flow."""
+from unittest.mock import patch
+
+from googleapiclient.errors import HttpError
+from httplib2 import Response
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.youtube.const import CONF_CHANNELS, DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from . import MockService
+from .conftest import (
+    CLIENT_ID,
+    GOOGLE_AUTH_URI,
+    GOOGLE_TOKEN_URI,
+    SCOPES,
+    TITLE,
+    ComponentSetup,
+)
+
+from tests.common import MockConfigEntry, load_fixture
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+
+async def test_full_flow(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    current_request_with_host: None,
+) -> None:
+    """Check full flow."""
+    result = await hass.config_entries.flow.async_init(
+        "youtube", context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={'+'.join(SCOPES)}"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    with patch(
+        "homeassistant.components.youtube.async_setup_entry", return_value=True
+    ) as mock_setup, patch(
+        "homeassistant.components.youtube.api.build", return_value=MockService()
+    ), patch(
+        "homeassistant.components.youtube.config_flow.build", return_value=MockService()
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] == FlowResultType.FORM
+        assert result["step_id"] == "channels"
+
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={CONF_CHANNELS: ["UC_x5XG1OV2P6uZZ5FSM9Ttw"]}
+        )
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup.mock_calls) == 1
+
+    assert result["type"] == "create_entry"
+    assert result["title"] == TITLE
+    assert "result" in result
+    assert result["result"].unique_id == "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+    assert "token" in result["result"].data
+    assert result["result"].data["token"]["access_token"] == "mock-access-token"
+    assert result["result"].data["token"]["refresh_token"] == "mock-refresh-token"
+    assert result["options"] == {CONF_CHANNELS: ["UC_x5XG1OV2P6uZZ5FSM9Ttw"]}
+
+
+async def test_flow_abort_without_channel(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    current_request_with_host: None,
+) -> None:
+    """Check abort flow if user has no channel."""
+    result = await hass.config_entries.flow.async_init(
+        "youtube", context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={'+'.join(SCOPES)}"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    service = MockService(channel_fixture="youtube/get_no_channel.json")
+    with patch(
+        "homeassistant.components.youtube.async_setup_entry", return_value=True
+    ), patch("homeassistant.components.youtube.api.build", return_value=service), patch(
+        "homeassistant.components.youtube.config_flow.build", return_value=service
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] == FlowResultType.ABORT
+        assert result["reason"] == "no_channel"
+
+
+async def test_flow_http_error(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    current_request_with_host: None,
+) -> None:
+    """Check full flow."""
+    result = await hass.config_entries.flow.async_init(
+        "youtube", context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={'+'.join(SCOPES)}"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    with patch(
+        "homeassistant.components.youtube.config_flow.build",
+        side_effect=HttpError(
+            Response(
+                {
+                    "vary": "Origin, X-Origin, Referer",
+                    "content-type": "application/json; charset=UTF-8",
+                    "date": "Mon, 15 May 2023 21:25:42 GMT",
+                    "server": "scaffolding on HTTPServer2",
+                    "cache-control": "private",
+                    "x-xss-protection": "0",
+                    "x-frame-options": "SAMEORIGIN",
+                    "x-content-type-options": "nosniff",
+                    "alt-svc": 'h3=":443"; ma=2592000,h3-29=":443"; ma=2592000',
+                    "transfer-encoding": "chunked",
+                    "status": "403",
+                    "content-length": "947",
+                    "-content-encoding": "gzip",
+                }
+            ),
+            b'{"error": {"code": 403,"message": "YouTube Data API v3 has not been used in project 0 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/youtube.googleapis.com/overview?project=0 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.","errors": [  {    "message": "YouTube Data API v3 has not been used in project 0 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/youtube.googleapis.com/overview?project=0 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry.",    "domain": "usageLimits",    "reason": "accessNotConfigured",    "extendedHelp": "https://console.developers.google.com"  }],"status": "PERMISSION_DENIED"\n  }\n}\n',
+        ),
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] == FlowResultType.ABORT
+        assert result["reason"] == "access_not_configured"
+        assert (
+            result["description_placeholders"]["message"]
+            == "YouTube Data API v3 has not been used in project 0 before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/youtube.googleapis.com/overview?project=0 then retry. If you enabled this API recently, wait a few minutes for the action to propagate to our systems and retry."
+        )
+
+
+@pytest.mark.parametrize(
+    ("fixture", "abort_reason", "placeholders", "calls", "access_token"),
+    [
+        ("get_channel", "reauth_successful", None, 1, "updated-access-token"),
+        (
+            "get_channel_2",
+            "wrong_account",
+            {"title": "Linus Tech Tips"},
+            0,
+            "mock-access-token",
+        ),
+    ],
+)
+async def test_reauth(
+    hass: HomeAssistant,
+    hass_client_no_auth,
+    aioclient_mock: AiohttpClientMocker,
+    current_request_with_host,
+    config_entry: MockConfigEntry,
+    fixture: str,
+    abort_reason: str,
+    placeholders: dict[str, str],
+    calls: int,
+    access_token: str,
+) -> None:
+    """Test the re-authentication case updates the correct config entry.
+
+    Make sure we abort if the user selects the
+    wrong account on the consent screen.
+    """
+    config_entry.add_to_hass(hass)
+
+    config_entry.async_start_reauth(hass)
+    await hass.async_block_till_done()
+
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+    result = flows[0]
+    assert result["step_id"] == "reauth_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={'+'.join(SCOPES)}"
+        "&access_type=offline&prompt=consent"
+    )
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "updated-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.youtube.async_setup_entry", return_value=True
+    ) as mock_setup, patch(
+        "httplib2.Http.request",
+        return_value=(
+            Response({}),
+            bytes(load_fixture(f"youtube/{fixture}.json"), encoding="UTF-8"),
+        ),
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+
+    assert result["type"] == "abort"
+    assert result["reason"] == abort_reason
+    assert result["description_placeholders"] == placeholders
+    assert len(mock_setup.mock_calls) == calls
+
+    assert config_entry.unique_id == "UC_x5XG1OV2P6uZZ5FSM9Ttw"
+    assert "token" in config_entry.data
+    # Verify access token is refreshed
+    assert config_entry.data["token"]["access_token"] == access_token
+    assert config_entry.data["token"]["refresh_token"] == "mock-refresh-token"
+
+
+async def test_flow_exception(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    current_request_with_host: None,
+) -> None:
+    """Check full flow."""
+    result = await hass.config_entries.flow.async_init(
+        "youtube", context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(
+        hass,
+        {
+            "flow_id": result["flow_id"],
+            "redirect_uri": "https://example.com/auth/external/callback",
+        },
+    )
+
+    assert result["url"] == (
+        f"{GOOGLE_AUTH_URI}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={'+'.join(SCOPES)}"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await hass_client_no_auth()
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    with patch(
+        "homeassistant.components.youtube.config_flow.build", side_effect=Exception
+    ):
+        result = await hass.config_entries.flow.async_configure(result["flow_id"])
+        assert result["type"] == FlowResultType.ABORT
+        assert result["reason"] == "unknown"
+
+
+async def test_options_flow(
+    hass: HomeAssistant, setup_integration: ComponentSetup
+) -> None:
+    """Test the full options flow."""
+    await setup_integration()
+    with patch(
+        "homeassistant.components.youtube.config_flow.build", return_value=MockService()
+    ):
+        entry = hass.config_entries.async_entries(DOMAIN)[0]
+        result = await hass.config_entries.options.async_init(entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert result["type"] == FlowResultType.FORM
+        assert result["step_id"] == "init"
+
+        result = await hass.config_entries.options.async_configure(
+            result["flow_id"],
+            user_input={CONF_CHANNELS: ["UC_x5XG1OV2P6uZZ5FSM9Ttw"]},
+        )
+        await hass.async_block_till_done()
+
+        assert result["type"] == FlowResultType.CREATE_ENTRY
+        assert result["data"] == {CONF_CHANNELS: ["UC_x5XG1OV2P6uZZ5FSM9Ttw"]}
diff --git a/tests/components/youtube/test_init.py b/tests/components/youtube/test_init.py
new file mode 100644
index 00000000000000..02df1b0e32e2e2
--- /dev/null
+++ b/tests/components/youtube/test_init.py
@@ -0,0 +1,135 @@
+"""Tests for YouTube."""
+import http
+import time
+from unittest.mock import patch
+
+from aiohttp.client_exceptions import ClientError
+import pytest
+
+from homeassistant.components.youtube import DOMAIN
+from homeassistant.components.youtube.const import CONF_CHANNELS
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from .conftest import GOOGLE_TOKEN_URI, ComponentSetup
+
+from tests.test_util.aiohttp import AiohttpClientMocker
+
+
+async def test_setup_success(
+    hass: HomeAssistant, setup_integration: ComponentSetup
+) -> None:
+    """Test successful setup and unload."""
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(entries[0].entry_id)
+    await hass.async_block_till_done()
+
+    assert not hass.services.async_services().get(DOMAIN)
+
+
+@pytest.mark.parametrize("expires_at", [time.time() - 3600], ids=["expired"])
+async def test_expired_token_refresh_success(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    aioclient_mock: AiohttpClientMocker,
+) -> None:
+    """Test expired token is refreshed."""
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        json={
+            "access_token": "updated-access-token",
+            "refresh_token": "updated-refresh-token",
+            "expires_at": time.time() + 3600,
+            "expires_in": 3600,
+        },
+    )
+
+    await setup_integration()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 1
+    assert entries[0].state is ConfigEntryState.LOADED
+    assert entries[0].data["token"]["access_token"] == "updated-access-token"
+    assert entries[0].data["token"]["expires_in"] == 3600
+
+
+@pytest.mark.parametrize(
+    ("expires_at", "status", "expected_state"),
+    [
+        (
+            time.time() - 3600,
+            http.HTTPStatus.UNAUTHORIZED,
+            ConfigEntryState.SETUP_ERROR,
+        ),
+        (
+            time.time() - 3600,
+            http.HTTPStatus.INTERNAL_SERVER_ERROR,
+            ConfigEntryState.SETUP_RETRY,
+        ),
+    ],
+    ids=["failure_requires_reauth", "transient_failure"],
+)
+async def test_expired_token_refresh_failure(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    aioclient_mock: AiohttpClientMocker,
+    status: http.HTTPStatus,
+    expected_state: ConfigEntryState,
+) -> None:
+    """Test failure while refreshing token with a transient error."""
+
+    aioclient_mock.clear_requests()
+    aioclient_mock.post(
+        GOOGLE_TOKEN_URI,
+        status=status,
+    )
+
+    await setup_integration()
+
+    # Verify a transient failure has occurred
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries[0].state is expected_state
+
+
+async def test_expired_token_refresh_client_error(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+) -> None:
+    """Test failure while refreshing token with a client error."""
+
+    with patch(
+        "homeassistant.components.youtube.OAuth2Session.async_ensure_token_valid",
+        side_effect=ClientError,
+    ):
+        await setup_integration()
+
+    # Verify a transient failure has occurred
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert entries[0].state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_device_info(
+    hass: HomeAssistant, setup_integration: ComponentSetup
+) -> None:
+    """Test device info."""
+    await setup_integration()
+    device_registry = dr.async_get(hass)
+
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+    channel_id = entry.options[CONF_CHANNELS][0]
+    device = device_registry.async_get_device(
+        {(DOMAIN, f"{entry.entry_id}_{channel_id}")}
+    )
+
+    assert device.entry_type is dr.DeviceEntryType.SERVICE
+    assert device.identifiers == {(DOMAIN, f"{entry.entry_id}_{channel_id}")}
+    assert device.manufacturer == "Google, Inc."
+    assert device.name == "Google for Developers"
diff --git a/tests/components/youtube/test_sensor.py b/tests/components/youtube/test_sensor.py
new file mode 100644
index 00000000000000..6bd993999527a2
--- /dev/null
+++ b/tests/components/youtube/test_sensor.py
@@ -0,0 +1,125 @@
+"""Sensor tests for the YouTube integration."""
+from datetime import timedelta
+from unittest.mock import patch
+
+from google.auth.exceptions import RefreshError
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.youtube import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.util import dt as dt_util
+
+from . import MockService
+from .conftest import TOKEN, ComponentSetup
+
+from tests.common import async_fire_time_changed
+
+
+async def test_sensor(hass: HomeAssistant, setup_integration: ComponentSetup) -> None:
+    """Test sensor."""
+    await setup_integration()
+
+    state = hass.states.get("sensor.google_for_developers_latest_upload")
+    assert state
+    assert state.name == "Google for Developers Latest upload"
+    assert state.state == "What's new in Google Home in less than 1 minute"
+    assert (
+        state.attributes["entity_picture"]
+        == "https://i.ytimg.com/vi/wysukDrMdqU/sddefault.jpg"
+    )
+    assert state.attributes["video_id"] == "wysukDrMdqU"
+
+    state = hass.states.get("sensor.google_for_developers_subscribers")
+    assert state
+    assert state.name == "Google for Developers Subscribers"
+    assert state.state == "2290000"
+    assert (
+        state.attributes["entity_picture"]
+        == "https://yt3.ggpht.com/fca_HuJ99xUxflWdex0XViC3NfctBFreIl8y4i9z411asnGTWY-Ql3MeH_ybA4kNaOjY7kyA=s800-c-k-c0x00ffffff-no-rj"
+    )
+
+
+async def test_sensor_updating(
+    hass: HomeAssistant, setup_integration: ComponentSetup
+) -> None:
+    """Test updating sensor."""
+    await setup_integration()
+
+    state = hass.states.get("sensor.google_for_developers_latest_upload")
+    assert state
+    assert state.attributes["video_id"] == "wysukDrMdqU"
+
+    with patch(
+        "homeassistant.components.youtube.api.build",
+        return_value=MockService(
+            playlist_items_fixture="youtube/get_playlist_items_2.json"
+        ),
+    ):
+        future = dt_util.utcnow() + timedelta(minutes=15)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+    state = hass.states.get("sensor.google_for_developers_latest_upload")
+    assert state
+    assert state.name == "Google for Developers Latest upload"
+    assert state.state == "Google I/O 2023 Developer Keynote in 5 minutes"
+    assert (
+        state.attributes["entity_picture"]
+        == "https://i.ytimg.com/vi/hleLlcHwQLM/sddefault.jpg"
+    )
+    assert state.attributes["video_id"] == "hleLlcHwQLM"
+
+
+async def test_sensor_reauth_trigger(
+    hass: HomeAssistant, setup_integration: ComponentSetup
+) -> None:
+    """Test reauth is triggered after a refresh error."""
+    await setup_integration()
+
+    with patch(TOKEN, side_effect=RefreshError):
+        future = dt_util.utcnow() + timedelta(minutes=15)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    flows = hass.config_entries.flow.async_progress()
+
+    assert len(flows) == 1
+    flow = flows[0]
+    assert flow["step_id"] == "reauth_confirm"
+    assert flow["handler"] == DOMAIN
+    assert flow["context"]["source"] == config_entries.SOURCE_REAUTH
+
+
+@pytest.mark.parametrize(
+    ("fixture", "url", "has_entity_picture"),
+    [
+        ("standard", "https://i.ytimg.com/vi/wysukDrMdqU/sddefault.jpg", True),
+        ("high", "https://i.ytimg.com/vi/wysukDrMdqU/hqdefault.jpg", True),
+        ("medium", "https://i.ytimg.com/vi/wysukDrMdqU/mqdefault.jpg", True),
+        ("default", "https://i.ytimg.com/vi/wysukDrMdqU/default.jpg", True),
+        ("none", None, False),
+    ],
+)
+async def test_thumbnail(
+    hass: HomeAssistant,
+    setup_integration: ComponentSetup,
+    fixture: str,
+    url: str | None,
+    has_entity_picture: bool,
+) -> None:
+    """Test if right thumbnail is selected."""
+    await setup_integration()
+
+    with patch(
+        "homeassistant.components.youtube.api.build",
+        return_value=MockService(
+            playlist_items_fixture=f"youtube/thumbnail/{fixture}.json"
+        ),
+    ):
+        future = dt_util.utcnow() + timedelta(minutes=15)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+    state = hass.states.get("sensor.google_for_developers_latest_upload")
+    assert state
+    assert ("entity_picture" in state.attributes) is has_entity_picture
+    assert state.attributes.get("entity_picture") == url
diff --git a/tests/components/zeroconf/test_init.py b/tests/components/zeroconf/test_init.py
index fea6b27e208eda..5740abef789b41 100644
--- a/tests/components/zeroconf/test_init.py
+++ b/tests/components/zeroconf/test_init.py
@@ -1,5 +1,4 @@
 """Test Zeroconf component setup process."""
-from ipaddress import ip_address
 from typing import Any
 from unittest.mock import call, patch
 
@@ -13,11 +12,7 @@
 from zeroconf.asyncio import AsyncServiceInfo
 
 from homeassistant.components import zeroconf
-from homeassistant.components.zeroconf import (
-    CONF_DEFAULT_INTERFACE,
-    CONF_IPV6,
-    _get_announced_addresses,
-)
+from homeassistant.components.zeroconf import CONF_DEFAULT_INTERFACE, CONF_IPV6
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
     EVENT_HOMEASSISTANT_START,
@@ -910,13 +905,11 @@ async def test_info_from_service_non_utf8(hass: HomeAssistant) -> None:
     info = zeroconf.info_from_service(
         get_service_info_mock(service_type, f"test.{service_type}")
     )
-    raw_info = info.properties.pop("_raw", False)
-    assert raw_info
-    assert len(raw_info) == len(PROPERTIES) - 1
-    assert NON_ASCII_KEY not in raw_info
-    assert len(info.properties) <= len(raw_info)
-    assert "non-utf8-value" not in info.properties
-    assert raw_info["non-utf8-value"] is NON_UTF8_VALUE
+    assert NON_ASCII_KEY.decode("ascii", "replace") in info.properties
+    assert "non-utf8-value" in info.properties
+    assert info.properties["non-utf8-value"] == NON_UTF8_VALUE.decode(
+        "utf-8", "replace"
+    )
 
 
 async def test_info_from_service_with_addresses(hass: HomeAssistant) -> None:
@@ -1204,29 +1197,6 @@ async def test_async_detect_interfaces_setting_empty_route_freebsd(
     )
 
 
-async def test_get_announced_addresses(
-    hass: HomeAssistant, mock_async_zeroconf: None
-) -> None:
-    """Test addresses for mDNS announcement."""
-    expected = {
-        ip_address(ip).packed
-        for ip in [
-            "fe80::1234:5678:9abc:def0",
-            "2001:db8::",
-            "192.168.1.5",
-            "fe80::dead:beef:dead:beef",
-            "172.16.1.5",
-        ]
-    }
-    first_ip = ip_address("172.16.1.5").packed
-    actual = _get_announced_addresses(_ADAPTERS_WITH_MANUAL_CONFIG, first_ip)
-    assert actual[0] == first_ip and set(actual) == expected
-
-    first_ip = ip_address("192.168.1.5").packed
-    actual = _get_announced_addresses(_ADAPTERS_WITH_MANUAL_CONFIG, first_ip)
-    assert actual[0] == first_ip and set(actual) == expected
-
-
 _ADAPTER_WITH_DEFAULT_ENABLED_AND_IPV6 = [
     {
         "auto": True,
diff --git a/tests/components/zerproc/test_config_flow.py b/tests/components/zerproc/test_config_flow.py
index 439888364167b9..0a493929b67f9a 100644
--- a/tests/components/zerproc/test_config_flow.py
+++ b/tests/components/zerproc/test_config_flow.py
@@ -21,8 +21,6 @@ async def test_flow_success(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         return_value=["Light1", "Light2"],
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -36,7 +34,6 @@ async def test_flow_success(hass: HomeAssistant) -> None:
     assert result2["title"] == "Zerproc"
     assert result2["data"] == {}
 
-    assert len(mock_setup.mock_calls) == 1
     assert len(mock_setup_entry.mock_calls) == 1
 
 
@@ -53,8 +50,6 @@ async def test_flow_no_devices_found(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         return_value=[],
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -66,7 +61,6 @@ async def test_flow_no_devices_found(hass: HomeAssistant) -> None:
     assert result2["type"] == "abort"
     assert result2["reason"] == "no_devices_found"
     await hass.async_block_till_done()
-    assert len(mock_setup.mock_calls) == 0
     assert len(mock_setup_entry.mock_calls) == 0
 
 
@@ -83,8 +77,6 @@ async def test_flow_exceptions_caught(hass: HomeAssistant) -> None:
         "homeassistant.components.zerproc.config_flow.pyzerproc.discover",
         side_effect=pyzerproc.ZerprocException("TEST"),
     ), patch(
-        "homeassistant.components.zerproc.async_setup", return_value=True
-    ) as mock_setup, patch(
         "homeassistant.components.zerproc.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -96,5 +88,4 @@ async def test_flow_exceptions_caught(hass: HomeAssistant) -> None:
     assert result2["type"] == "abort"
     assert result2["reason"] == "no_devices_found"
     await hass.async_block_till_done()
-    assert len(mock_setup.mock_calls) == 0
     assert len(mock_setup_entry.mock_calls) == 0
diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py
index d3f3bf9b6544c7..79c319398f074e 100644
--- a/tests/components/zha/common.py
+++ b/tests/components/zha/common.py
@@ -133,7 +133,7 @@ async def send_attributes_report(hass, cluster: zigpy.zcl.Cluster, attributes: d
     await hass.async_block_till_done()
 
 
-async def find_entity_id(domain, zha_device, hass, qualifier=None):
+def find_entity_id(domain, zha_device, hass, qualifier=None):
     """Find the entity id under the testing.
 
     This is used to get the entity id in order to get the state from the state
diff --git a/tests/components/zha/conftest.py b/tests/components/zha/conftest.py
index 271108496b218d..e3a12703640fa7 100644
--- a/tests/components/zha/conftest.py
+++ b/tests/components/zha/conftest.py
@@ -332,8 +332,8 @@ def _zha_device(
 
 @pytest.fixture
 def hass_disable_services(hass):
-    """Mock service register."""
-    with patch.object(hass.services, "async_register"), patch.object(
-        hass.services, "has_service", return_value=True
+    """Mock services."""
+    with patch.object(
+        hass, "services", MagicMock(has_service=MagicMock(return_value=True))
     ):
         yield hass
diff --git a/tests/components/zha/test_alarm_control_panel.py b/tests/components/zha/test_alarm_control_panel.py
index 319301cf7dc32c..49ad1b81e3b48c 100644
--- a/tests/components/zha/test_alarm_control_panel.py
+++ b/tests/components/zha/test_alarm_control_panel.py
@@ -65,7 +65,7 @@ async def test_alarm_control_panel(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).ias_ace
-    entity_id = await find_entity_id(Platform.ALARM_CONTROL_PANEL, zha_device, hass)
+    entity_id = find_entity_id(Platform.ALARM_CONTROL_PANEL, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
     await async_enable_traffic(hass, [zha_device], enabled=False)
diff --git a/tests/components/zha/test_binary_sensor.py b/tests/components/zha/test_binary_sensor.py
index 2c0461a3c7c11f..1b4f5b569245b7 100644
--- a/tests/components/zha/test_binary_sensor.py
+++ b/tests/components/zha/test_binary_sensor.py
@@ -21,6 +21,8 @@
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
+from tests.common import async_mock_load_restore_state_from_storage
+
 DEVICE_IAS = {
     1: {
         SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID,
@@ -114,7 +116,7 @@ async def test_binary_sensor(
     """Test ZHA binary_sensor platform."""
     zigpy_device = zigpy_device_mock(device)
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -186,10 +188,11 @@ async def test_binary_sensor_migration_not_migrated(
 
     entity_id = "binary_sensor.fakemanufacturer_fakemodel_iaszone"
     core_rs(entity_id, state=restored_state, attributes={})  # migration sensor state
+    await async_mock_load_restore_state_from_storage(hass)
 
     zigpy_device = zigpy_device_mock(DEVICE_IAS)
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == restored_state
@@ -208,6 +211,7 @@ async def test_binary_sensor_migration_already_migrated(
 
     entity_id = "binary_sensor.fakemanufacturer_fakemodel_iaszone"
     core_rs(entity_id, state=STATE_OFF, attributes={"migrated_to_cache": True})
+    await async_mock_load_restore_state_from_storage(hass)
 
     zigpy_device = zigpy_device_mock(DEVICE_IAS)
 
@@ -218,7 +222,7 @@ async def test_binary_sensor_migration_already_migrated(
     update_attribute_cache(cluster)
 
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_ON  # matches attribute cache
@@ -243,10 +247,11 @@ async def test_onoff_binary_sensor_restore_state(
 
     entity_id = "binary_sensor.fakemanufacturer_fakemodel_opening"
     core_rs(entity_id, state=restored_state, attributes={})
+    await async_mock_load_restore_state_from_storage(hass)
 
     zigpy_device = zigpy_device_mock(DEVICE_ONOFF)
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.BINARY_SENSOR, zha_device, hass)
 
     assert entity_id is not None
     assert hass.states.get(entity_id).state == restored_state
diff --git a/tests/components/zha/test_button.py b/tests/components/zha/test_button.py
index e0a825cc87468f..2a2fbc92ace5ef 100644
--- a/tests/components/zha/test_button.py
+++ b/tests/components/zha/test_button.py
@@ -10,6 +10,7 @@
     OUTPUT_CLUSTERS,
     PROFILE_ID,
 )
+from zhaquirks.tuya.ts0601_valve import ParksideTuyaValveManufCluster
 from zigpy.const import SIG_EP_PROFILE
 from zigpy.exceptions import ZigbeeException
 import zigpy.profiles.zha as zha
@@ -49,6 +50,7 @@ def button_platform_only():
             Platform.NUMBER,
             Platform.SELECT,
             Platform.SENSOR,
+            Platform.SWITCH,
         ),
     ):
         yield
@@ -107,13 +109,21 @@ async def tuya_water_valve(hass, zigpy_device_mock, zha_device_joined_restored):
     zigpy_device = zigpy_device_mock(
         {
             1: {
-                SIG_EP_INPUT: [general.Basic.cluster_id],
-                SIG_EP_OUTPUT: [],
-                SIG_EP_TYPE: zha.DeviceType.ON_OFF_SWITCH,
-            }
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.ON_OFF_SWITCH,
+                INPUT_CLUSTERS: [
+                    general.Basic.cluster_id,
+                    general.Identify.cluster_id,
+                    general.Groups.cluster_id,
+                    general.Scenes.cluster_id,
+                    general.OnOff.cluster_id,
+                    ParksideTuyaValveManufCluster.cluster_id,
+                ],
+                OUTPUT_CLUSTERS: [general.Time.cluster_id, general.Ota.cluster_id],
+            },
         },
         manufacturer="_TZE200_htnnfasr",
-        quirk=FrostLockQuirk,
+        model="TS0601",
     )
 
     zha_device = await zha_device_joined_restored(zigpy_device)
@@ -127,13 +137,13 @@ async def test_button(hass: HomeAssistant, contact_sensor) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = contact_sensor
     assert cluster is not None
-    entity_id = await find_entity_id(DOMAIN, zha_device, hass)
+    entity_id = find_entity_id(DOMAIN, zha_device, hass)
     assert entity_id is not None
 
     state = hass.states.get(entity_id)
     assert state
     assert state.state == STATE_UNKNOWN
-    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.UPDATE
+    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.IDENTIFY
 
     entry = entity_registry.async_get(entity_id)
     assert entry
@@ -158,7 +168,7 @@ async def test_button(hass: HomeAssistant, contact_sensor) -> None:
     state = hass.states.get(entity_id)
     assert state
     assert state.state == "2021-11-04T16:37:00+00:00"
-    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.UPDATE
+    assert state.attributes[ATTR_DEVICE_CLASS] == ButtonDeviceClass.IDENTIFY
 
 
 async def test_frost_unlock(hass: HomeAssistant, tuya_water_valve) -> None:
@@ -167,7 +177,7 @@ async def test_frost_unlock(hass: HomeAssistant, tuya_water_valve) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = tuya_water_valve
     assert cluster is not None
-    entity_id = await find_entity_id(DOMAIN, zha_device, hass)
+    entity_id = find_entity_id(DOMAIN, zha_device, hass, qualifier="frost_lock_reset")
     assert entity_id is not None
 
     state = hass.states.get(entity_id)
diff --git a/tests/components/zha/test_climate.py b/tests/components/zha/test_climate.py
index 79777dc0c7b994..fd8bcaa1085d34 100644
--- a/tests/components/zha/test_climate.py
+++ b/tests/components/zha/test_climate.py
@@ -281,7 +281,7 @@ async def test_climate_local_temperature(hass: HomeAssistant, device_climate) ->
     """Test local temperature."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.attributes[ATTR_CURRENT_TEMPERATURE] is None
@@ -297,8 +297,8 @@ async def test_climate_hvac_action_running_state(
     """Test hvac action via running state."""
 
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
-    sensor_entity_id = await find_entity_id(
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    sensor_entity_id = find_entity_id(
         Platform.SENSOR, device_climate_sinope, hass, "hvac"
     )
 
@@ -362,8 +362,8 @@ async def test_climate_hvac_action_running_state_zen(
     """Test Zen hvac action via running state."""
 
     thrm_cluster = device_climate_zen.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zen, hass)
-    sensor_entity_id = await find_entity_id(Platform.SENSOR, device_climate_zen, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zen, hass)
+    sensor_entity_id = find_entity_id(Platform.SENSOR, device_climate_zen, hass)
 
     state = hass.states.get(entity_id)
     assert ATTR_HVAC_ACTION not in state.attributes
@@ -449,7 +449,7 @@ async def test_climate_hvac_action_pi_demand(
     """Test hvac action based on pi_heating/cooling_demand attrs."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert ATTR_HVAC_ACTION not in state.attributes
@@ -498,7 +498,7 @@ async def test_hvac_mode(
     """Test HVAC mode."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.state == HVACMode.OFF
@@ -538,7 +538,7 @@ async def test_hvac_modes(
     device_climate = await device_climate_mock(
         CLIMATE, {"ctrl_sequence_of_oper": seq_of_op}
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     state = hass.states.get(entity_id)
     assert set(state.attributes[ATTR_HVAC_MODES]) == modes
 
@@ -569,7 +569,7 @@ async def test_target_temperature(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -605,7 +605,7 @@ async def test_target_temperature_high(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -641,7 +641,7 @@ async def test_target_temperature_low(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     if preset:
         await hass.services.async_call(
             CLIMATE_DOMAIN,
@@ -671,7 +671,7 @@ async def test_set_hvac_mode(
     """Test setting hvac mode."""
 
     thrm_cluster = device_climate.device.endpoints[1].thermostat
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
 
     state = hass.states.get(entity_id)
     assert state.state == HVACMode.OFF
@@ -712,7 +712,7 @@ async def test_set_hvac_mode(
 async def test_preset_setting(hass: HomeAssistant, device_climate_sinope) -> None:
     """Test preset setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -792,7 +792,7 @@ async def test_preset_setting_invalid(
 ) -> None:
     """Test invalid preset setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -813,7 +813,7 @@ async def test_preset_setting_invalid(
 async def test_set_temperature_hvac_mode(hass: HomeAssistant, device_climate) -> None:
     """Test setting HVAC mode in temperature service call."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -855,7 +855,7 @@ async def test_set_temperature_heat_cool(
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -941,7 +941,7 @@ async def test_set_temperature_heat(hass: HomeAssistant, device_climate_mock) ->
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1020,7 +1020,7 @@ async def test_set_temperature_cool(hass: HomeAssistant, device_climate_mock) ->
         manuf=MANUF_SINOPE,
         quirk=zhaquirks.sinope.thermostat.SinopeTechnologiesThermostat,
     )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1105,7 +1105,7 @@ async def test_set_temperature_wrong_mode(
             },
             manuf=MANUF_SINOPE,
         )
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate, hass)
     thrm_cluster = device_climate.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1128,7 +1128,7 @@ async def test_set_temperature_wrong_mode(
 async def test_occupancy_reset(hass: HomeAssistant, device_climate_sinope) -> None:
     """Test away preset reset."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_sinope, hass)
     thrm_cluster = device_climate_sinope.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1155,7 +1155,7 @@ async def test_occupancy_reset(hass: HomeAssistant, device_climate_sinope) -> No
 async def test_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
     """Test fan mode."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     thrm_cluster = device_climate_fan.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1186,7 +1186,7 @@ async def test_set_fan_mode_not_supported(
 ) -> None:
     """Test fan setting unsupported mode."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     fan_cluster = device_climate_fan.device.endpoints[1].fan
 
     await hass.services.async_call(
@@ -1201,7 +1201,7 @@ async def test_set_fan_mode_not_supported(
 async def test_set_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
     """Test fan mode setting."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_fan, hass)
     fan_cluster = device_climate_fan.device.endpoints[1].fan
 
     state = hass.states.get(entity_id)
@@ -1230,7 +1230,7 @@ async def test_set_fan_mode(hass: HomeAssistant, device_climate_fan) -> None:
 async def test_set_moes_preset(hass: HomeAssistant, device_climate_moes) -> None:
     """Test setting preset for moes trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
     thrm_cluster = device_climate_moes.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1347,7 +1347,7 @@ async def test_set_moes_operation_mode(
 ) -> None:
     """Test setting preset for moes trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_moes, hass)
     thrm_cluster = device_climate_moes.device.endpoints[1].thermostat
 
     await send_attributes_report(hass, thrm_cluster, {"operation_preset": 0})
@@ -1391,7 +1391,7 @@ async def test_set_zonnsmart_preset(
 ) -> None:
     """Test setting preset from homeassistant for zonnsmart trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
     thrm_cluster = device_climate_zonnsmart.device.endpoints[1].thermostat
 
     state = hass.states.get(entity_id)
@@ -1460,7 +1460,7 @@ async def test_set_zonnsmart_operation_mode(
 ) -> None:
     """Test setting preset from trv for zonnsmart trv."""
 
-    entity_id = await find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
+    entity_id = find_entity_id(Platform.CLIMATE, device_climate_zonnsmart, hass)
     thrm_cluster = device_climate_zonnsmart.device.endpoints[1].thermostat
 
     await send_attributes_report(hass, thrm_cluster, {"operation_preset": 0})
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index 7c0d3eac2a9d8c..17665994806887 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -48,6 +48,19 @@ def disable_platform_only():
         yield
 
 
+@pytest.fixture(autouse=True)
+def mock_multipan_platform():
+    """Mock the multipan platform."""
+    with patch(
+        "homeassistant.components.zha.silabs_multiprotocol.async_get_channel",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.zha.silabs_multiprotocol.async_using_multipan",
+        return_value=False,
+    ):
+        yield
+
+
 @pytest.fixture(autouse=True)
 def reduce_reconnect_timeout():
     """Reduces reconnect timeout to speed up tests."""
@@ -61,6 +74,12 @@ def mock_app():
     mock_app = AsyncMock()
     mock_app.backups = create_autospec(BackupManager, instance=True)
     mock_app.backups.backups = []
+    mock_app.state.network_info.metadata = {
+        "ezsp": {
+            "can_burn_userdata_custom_eui64": True,
+            "can_rewrite_custom_eui64": False,
+        }
+    }
 
     with patch(
         "zigpy.application.ControllerApplication.new", AsyncMock(return_value=mock_app)
@@ -1504,6 +1523,7 @@ async def test_ezsp_restore_without_settings_change_ieee(
     mock_app.state.node_info = backup.node_info
     mock_app.state.network_info = copy.deepcopy(backup.network_info)
     mock_app.state.network_info.network_key.tx_counter += 10000
+    mock_app.state.network_info.metadata["ezsp"] = {}
 
     # Include the overwrite option, just in case someone uploads a backup with it
     backup.network_info.metadata["ezsp"] = {EZSP_OVERWRITE_EUI64: True}
diff --git a/tests/components/zha/test_cover.py b/tests/components/zha/test_cover.py
index b9d64dda317acf..d10034184874bf 100644
--- a/tests/components/zha/test_cover.py
+++ b/tests/components/zha/test_cover.py
@@ -1,6 +1,6 @@
 """Test ZHA cover."""
 import asyncio
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
 
 import pytest
 import zigpy.profiles.zha
@@ -36,7 +36,7 @@
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
-from tests.common import async_capture_events, mock_coro, mock_restore_cache
+from tests.common import async_capture_events, mock_restore_cache
 
 
 @pytest.fixture(autouse=True)
@@ -132,7 +132,7 @@ async def test_cover(
     assert cluster.read_attributes.call_count == 1
     assert "current_position_lift_percentage" in cluster.read_attributes.call_args[0][0]
 
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -152,9 +152,7 @@ async def test_cover(
     assert hass.states.get(entity_id).state == STATE_OPEN
 
     # close from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x1, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -165,9 +163,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # open from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x0, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -178,9 +174,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # set position UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x5, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
@@ -195,9 +189,7 @@ async def test_cover(
         assert cluster.request.call_args[1]["expect_reply"] is True
 
     # stop from UI
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([0x2, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x2, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_STOP_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -223,7 +215,7 @@ async def test_shade(
 
     cluster_on_off = zigpy_shade_device.endpoints.get(1).on_off
     cluster_level = zigpy_shade_device.endpoints.get(1).level
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -244,17 +236,19 @@ async def test_shade(
 
     # close from UI command fails
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_CLOSE_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0000
         assert hass.states.get(entity_id).state == STATE_OPEN
 
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x1, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x1, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -267,18 +261,20 @@ async def test_shade(
     assert ATTR_CURRENT_POSITION not in hass.states.get(entity_id).attributes
     await send_attributes_report(hass, cluster_level, {0: 0})
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_OPEN_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0001
         assert hass.states.get(entity_id).state == STATE_CLOSED
 
     # open from UI succeeds
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x0, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x0, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
         )
@@ -289,22 +285,21 @@ async def test_shade(
 
     # set position UI command fails
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN,
-            SERVICE_SET_COVER_POSITION,
-            {"entity_id": entity_id, "position": 47},
-            blocking=True,
-        )
-        assert cluster_level.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_SET_COVER_POSITION,
+                {"entity_id": entity_id, "position": 47},
+                blocking=True,
+            )
+        assert cluster_level.request.call_count == 3
         assert cluster_level.request.call_args[0][0] is False
         assert cluster_level.request.call_args[0][1] == 0x0004
         assert int(cluster_level.request.call_args[0][3] * 100 / 255) == 47
         assert hass.states.get(entity_id).attributes[ATTR_CURRENT_POSITION] == 0
 
     # set position UI success
-    with patch(
-        "zigpy.zcl.Cluster.request", AsyncMock(return_value=[0x5, zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[0x5, zcl_f.Status.SUCCESS]):
         await hass.services.async_call(
             COVER_DOMAIN,
             SERVICE_SET_COVER_POSITION,
@@ -331,13 +326,14 @@ async def test_shade(
 
     # test cover stop
     with patch("zigpy.zcl.Cluster.request", side_effect=asyncio.TimeoutError):
-        await hass.services.async_call(
-            COVER_DOMAIN,
-            SERVICE_STOP_COVER,
-            {"entity_id": entity_id},
-            blocking=True,
-        )
-        assert cluster_level.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_STOP_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_level.request.call_count == 3
         assert cluster_level.request.call_args[0][0] is False
         assert cluster_level.request.call_args[0][1] in (0x0003, 0x0007)
 
@@ -361,7 +357,7 @@ async def test_restore_state(
     hass.state = CoreState.starting
 
     zha_device = await zha_device_restored(zigpy_shade_device)
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     # test that the cover was created and that it is unavailable
@@ -379,7 +375,7 @@ async def test_keen_vent(
 
     cluster_on_off = zigpy_keen_vent.endpoints.get(1).on_off
     cluster_level = zigpy_keen_vent.endpoints.get(1).level
-    entity_id = await find_entity_id(Platform.COVER, zha_device, hass)
+    entity_id = find_entity_id(Platform.COVER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -396,21 +392,25 @@ async def test_keen_vent(
 
     # open from UI command fails
     p1 = patch.object(cluster_on_off, "request", side_effect=asyncio.TimeoutError)
-    p2 = patch.object(cluster_level, "request", AsyncMock(return_value=[4, 0]))
+    p2 = patch.object(cluster_level, "request", return_value=[4, 0])
 
     with p1, p2:
-        await hass.services.async_call(
-            COVER_DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True
-        )
-        assert cluster_on_off.request.call_count == 1
+        with pytest.raises(asyncio.TimeoutError):
+            await hass.services.async_call(
+                COVER_DOMAIN,
+                SERVICE_OPEN_COVER,
+                {"entity_id": entity_id},
+                blocking=True,
+            )
+        assert cluster_on_off.request.call_count == 3
         assert cluster_on_off.request.call_args[0][0] is False
         assert cluster_on_off.request.call_args[0][1] == 0x0001
         assert cluster_level.request.call_count == 1
         assert hass.states.get(entity_id).state == STATE_CLOSED
 
     # open from UI command success
-    p1 = patch.object(cluster_on_off, "request", AsyncMock(return_value=[1, 0]))
-    p2 = patch.object(cluster_level, "request", AsyncMock(return_value=[4, 0]))
+    p1 = patch.object(cluster_on_off, "request", return_value=[1, 0])
+    p2 = patch.object(cluster_level, "request", return_value=[4, 0])
 
     with p1, p2:
         await hass.services.async_call(
diff --git a/tests/components/zha/test_device_action.py b/tests/components/zha/test_device_action.py
index 6db138ebcded87..d938512981fdcd 100644
--- a/tests/components/zha/test_device_action.py
+++ b/tests/components/zha/test_device_action.py
@@ -2,6 +2,7 @@
 from unittest.mock import call, patch
 
 import pytest
+from pytest_unordered import unordered
 from zhaquirks.inovelli.VZM31SN import InovelliVZM31SNv11
 import zigpy.profiles.zha
 import zigpy.zcl.clusters.general as general
@@ -13,18 +14,22 @@
 from homeassistant.components.zha import DOMAIN
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
 
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
     mock_coro,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
 
 SHORT_PRESS = "remote_button_short_press"
 COMMAND = "command"
@@ -109,6 +114,19 @@ async def test_get_actions(hass: HomeAssistant, device_ias) -> None:
 
     ha_device_registry = dr.async_get(hass)
     reg_device = ha_device_registry.async_get_device({(DOMAIN, ieee_address)})
+    ha_entity_registry = er.async_get(hass)
+    siren_level_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_siren_level"
+    )
+    siren_tone_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_siren_tone"
+    )
+    strobe_level_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_strobe_level"
+    )
+    strobe_select = ha_entity_registry.async_get(
+        "select.fakemanufacturer_fakemodel_default_strobe"
+    )
 
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, reg_device.id
@@ -140,15 +158,15 @@ async def test_get_actions(hass: HomeAssistant, device_ias) -> None:
                 "select_previous",
             ]
             for entity_id in [
-                "select.fakemanufacturer_fakemodel_default_siren_level",
-                "select.fakemanufacturer_fakemodel_default_siren_tone",
-                "select.fakemanufacturer_fakemodel_default_strobe_level",
-                "select.fakemanufacturer_fakemodel_default_strobe",
+                siren_level_select.id,
+                siren_tone_select.id,
+                strobe_level_select.id,
+                strobe_select.id,
             ]
         ]
     )
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> None:
@@ -159,6 +177,9 @@ async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> Non
     inovelli_reg_device = ha_device_registry.async_get_device(
         {(DOMAIN, inovelli_ieee_address)}
     )
+    ha_entity_registry = er.async_get(hass)
+    inovelli_button = ha_entity_registry.async_get("button.inovelli_vzm31_sn_identify")
+    inovelli_light = ha_entity_registry.async_get("light.inovelli_vzm31_sn_light")
 
     actions = await async_get_device_automations(
         hass, DeviceAutomationType.ACTION, inovelli_reg_device.id
@@ -180,55 +201,55 @@ async def test_get_inovelli_actions(hass: HomeAssistant, device_inovelli) -> Non
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.BUTTON,
-            "entity_id": "button.inovelli_vzm31_sn_identify",
+            "entity_id": inovelli_button.id,
             "metadata": {"secondary": True},
             "type": "press",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "turn_off",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "turn_on",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "toggle",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "brightness_increase",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "brightness_decrease",
         },
         {
             "device_id": inovelli_reg_device.id,
             "domain": Platform.LIGHT,
-            "entity_id": "light.inovelli_vzm31_sn_light",
+            "entity_id": inovelli_light.id,
             "metadata": {"secondary": False},
             "type": "flash",
         },
     ]
 
-    assert_lists_same(actions, expected_actions)
+    assert actions == unordered(expected_actions)
 
 
 async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
@@ -323,7 +344,6 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
                 tsn=None,
             )
             in cluster.request.call_args_list
@@ -340,7 +360,6 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
                 tsn=None,
             )
             in cluster.request.call_args_list
diff --git a/tests/components/zha/test_device_tracker.py b/tests/components/zha/test_device_tracker.py
index 70f76ae54f37a9..aa3c6b7d1468d9 100644
--- a/tests/components/zha/test_device_tracker.py
+++ b/tests/components/zha/test_device_tracker.py
@@ -70,7 +70,7 @@ async def test_device_tracker(
 
     zha_device = await zha_device_joined_restored(zigpy_device_dt)
     cluster = zigpy_device_dt.endpoints.get(1).power
-    entity_id = await find_entity_id(Platform.DEVICE_TRACKER, zha_device, hass)
+    entity_id = find_entity_id(Platform.DEVICE_TRACKER, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_NOT_HOME
diff --git a/tests/components/zha/test_device_trigger.py b/tests/components/zha/test_device_trigger.py
index 29920eab8369ff..85e012c5bfb24b 100644
--- a/tests/components/zha/test_device_trigger.py
+++ b/tests/components/zha/test_device_trigger.py
@@ -24,7 +24,12 @@
     async_get_device_automations,
     async_mock_service,
 )
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
 
 ON = 1
 OFF = 0
diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py
index 236a3c4ad86a26..e0785601b4f4c4 100644
--- a/tests/components/zha/test_discover.py
+++ b/tests/components/zha/test_discover.py
@@ -15,20 +15,12 @@
 import zigpy.zcl.clusters.security
 import zigpy.zcl.foundation as zcl_f
 
-import homeassistant.components.zha.binary_sensor
 import homeassistant.components.zha.core.cluster_handlers as cluster_handlers
 import homeassistant.components.zha.core.const as zha_const
 from homeassistant.components.zha.core.device import ZHADevice
 import homeassistant.components.zha.core.discovery as disc
 from homeassistant.components.zha.core.endpoint import Endpoint
 import homeassistant.components.zha.core.registries as zha_regs
-import homeassistant.components.zha.cover
-import homeassistant.components.zha.device_tracker
-import homeassistant.components.zha.fan
-import homeassistant.components.zha.light
-import homeassistant.components.zha.lock
-import homeassistant.components.zha.sensor
-import homeassistant.components.zha.switch
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.entity_registry as er
@@ -131,7 +123,6 @@ async def test_devices(
                     ),
                     expect_reply=True,
                     manufacturer=None,
-                    tries=1,
                     tsn=None,
                 )
             ]
@@ -493,35 +484,3 @@ async def test_group_probe_cleanup_called(
     await config_entry.async_unload(hass_disable_services)
     await hass_disable_services.async_block_till_done()
     disc.GROUP_PROBE.cleanup.assert_called()
-
-
-@patch(
-    "zigpy.zcl.clusters.general.Identify.request",
-    new=AsyncMock(return_value=[mock.sentinel.data, zcl_f.Status.SUCCESS]),
-)
-@patch(
-    "homeassistant.components.zha.entity.ZhaEntity.entity_registry_enabled_default",
-    new=Mock(return_value=True),
-)
-async def test_cluster_handler_with_empty_ep_attribute_cluster(
-    hass_disable_services,
-    zigpy_device_mock,
-    zha_device_joined_restored,
-) -> None:
-    """Test device discovery for cluster which does not have em_attribute."""
-    entity_registry = homeassistant.helpers.entity_registry.async_get(
-        hass_disable_services
-    )
-
-    zigpy_device = zigpy_device_mock(
-        {1: {SIG_EP_INPUT: [0x042E], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}},
-        "00:11:22:33:44:55:66:77",
-        "test manufacturer",
-        "test model",
-        patch_cluster=False,
-    )
-    zha_dev = await zha_device_joined_restored(zigpy_device)
-    ha_entity_id = entity_registry.async_get_entity_id(
-        "sensor", "zha", f"{zha_dev.ieee}-1-1070"
-    )
-    assert ha_entity_id is not None
diff --git a/tests/components/zha/test_fan.py b/tests/components/zha/test_fan.py
index 5ad8966c547478..f93467ed3e12ff 100644
--- a/tests/components/zha/test_fan.py
+++ b/tests/components/zha/test_fan.py
@@ -167,7 +167,7 @@ async def test_fan(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).fan
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -475,7 +475,7 @@ async def test_fan_init(
     cluster.PLUGGED_ATTR_READS = plug_read
 
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == expected_state
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == expected_percentage
@@ -493,7 +493,7 @@ async def test_fan_update_entity(
     cluster.PLUGGED_ATTR_READS = {"fan_mode": 0}
 
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_OFF
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == 0
@@ -562,7 +562,7 @@ async def test_fan_ikea(
     """Test ZHA fan Ikea platform."""
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
     cluster = zigpy_device_ikea.endpoints.get(1).ikea_airpurifier
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -656,7 +656,7 @@ async def test_fan_ikea_init(
     cluster.PLUGGED_ATTR_READS = ikea_plug_read
 
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == ikea_expected_state
     assert (
@@ -676,7 +676,7 @@ async def test_fan_ikea_update_entity(
     cluster.PLUGGED_ATTR_READS = {"fan_mode": 0}
 
     zha_device = await zha_device_joined_restored(zigpy_device_ikea)
-    entity_id = await find_entity_id(Platform.FAN, zha_device, hass)
+    entity_id = find_entity_id(Platform.FAN, zha_device, hass)
     assert entity_id is not None
     assert hass.states.get(entity_id).state == STATE_OFF
     assert hass.states.get(entity_id).attributes[ATTR_PERCENTAGE] == 0
diff --git a/tests/components/zha/test_init.py b/tests/components/zha/test_init.py
index 23a76de4c2504a..24ee63fb3d5064 100644
--- a/tests/components/zha/test_init.py
+++ b/tests/components/zha/test_init.py
@@ -114,19 +114,27 @@ async def test_config_depreciation(hass: HomeAssistant, zha_config) -> None:
 @pytest.mark.parametrize(
     ("path", "cleaned_path"),
     [
+        # No corrections
         ("/dev/path1", "/dev/path1"),
+        ("/dev/path1[asd]", "/dev/path1[asd]"),
         ("/dev/path1 ", "/dev/path1 "),
+        ("socket://1.2.3.4:5678", "socket://1.2.3.4:5678"),
+        # Brackets around URI
+        ("socket://[1.2.3.4]:5678", "socket://1.2.3.4:5678"),
+        # Spaces
         ("socket://dev/path1 ", "socket://dev/path1"),
+        # Both
+        ("socket://[1.2.3.4]:5678 ", "socket://1.2.3.4:5678"),
     ],
 )
 @patch("homeassistant.components.zha.setup_quirks", Mock(return_value=True))
 @patch(
     "homeassistant.components.zha.websocket_api.async_load_api", Mock(return_value=True)
 )
-async def test_setup_with_v3_spaces_in_uri(
+async def test_setup_with_v3_cleaning_uri(
     hass: HomeAssistant, path: str, cleaned_path: str
 ) -> None:
-    """Test migration of config entry from v3 with spaces after `socket://` URI."""
+    """Test migration of config entry from v3, applying corrections to the port path."""
     config_entry_v3 = MockConfigEntry(
         domain=DOMAIN,
         data={
diff --git a/tests/components/zha/test_light.py b/tests/components/zha/test_light.py
index c4751f7e7f6ee0..3abfd0e4f9ca05 100644
--- a/tests/components/zha/test_light.py
+++ b/tests/components/zha/test_light.py
@@ -264,7 +264,7 @@ async def test_light_refresh(
     on_off_cluster = zigpy_device.endpoints[1].on_off
     on_off_cluster.PLUGGED_ATTR_READS = {"on_off": 0}
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+    entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     # allow traffic to flow through the gateway and device
     await async_enable_traffic(hass, [zha_device])
@@ -326,7 +326,7 @@ async def test_light(
     # create zigpy devices
     zigpy_device = zigpy_device_mock(device)
     zha_device = await zha_device_joined_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+    entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     assert entity_id is not None
 
@@ -446,7 +446,7 @@ async def test_light_initialization(
 
     with patch_zha_config("light", config_override):
         zha_device = await zha_device_joined_restored(zigpy_device)
-        entity_id = await find_entity_id(Platform.LIGHT, zha_device, hass)
+        entity_id = find_entity_id(Platform.LIGHT, zha_device, hass)
 
     assert entity_id is not None
 
@@ -495,9 +495,9 @@ async def test_transitions(
         assert member.group == zha_group
         assert member.endpoint is not None
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-    device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
-    eWeLink_light_entity_id = await find_entity_id(Platform.LIGHT, eWeLink_light, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
+    eWeLink_light_entity_id = find_entity_id(Platform.LIGHT, eWeLink_light, hass)
     assert device_1_entity_id != device_2_entity_id
 
     group_entity_id = async_find_group_entity_id(hass, Platform.LIGHT, zha_group)
@@ -553,7 +553,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -589,7 +588,6 @@ async def test_transitions(
         transition_time=35,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -600,7 +598,6 @@ async def test_transitions(
         transition_time=35,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -637,7 +634,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -674,7 +670,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -685,7 +680,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -696,7 +690,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -758,7 +751,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -769,7 +761,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -780,7 +771,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -838,7 +828,6 @@ async def test_transitions(
         dev1_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -850,7 +839,6 @@ async def test_transitions(
         transition_time=0,  # no transition when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -910,7 +898,6 @@ async def test_transitions(
         transition_time=1,  # transition time - sengled light uses default minimum
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -968,7 +955,6 @@ async def test_transitions(
         transition_time=1,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev2_cluster_color.request.call_args == call(
@@ -979,7 +965,6 @@ async def test_transitions(
         transition_time=1,  # sengled transition == 1 when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev2_cluster_level.request.call_args_list[1] == call(
@@ -990,7 +975,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1055,7 +1039,6 @@ async def test_transitions(
         transition_time=10,  # sengled transition == 1 when new_color_provided_while_off
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert group_level_cluster_handler.request.call_args == call(
@@ -1066,7 +1049,6 @@ async def test_transitions(
         transition_time=10,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1121,7 +1103,6 @@ async def test_transitions(
         transition_time=20,  # transition time
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1151,7 +1132,6 @@ async def test_transitions(
         transition_time=1,  # transition time - sengled light uses default minimum
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1184,7 +1164,6 @@ async def test_transitions(
         eWeLink_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1195,7 +1174,6 @@ async def test_transitions(
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1222,7 +1200,7 @@ async def test_transitions(
 async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
     """Test turning on the light and sending color commands before on/level commands for supporting lights."""
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
     dev1_cluster_on_off = device_light_1.device.endpoints[1].on_off
     dev1_cluster_level = device_light_1.device.endpoints[1].level
     dev1_cluster_color = device_light_1.device.endpoints[1].light_color
@@ -1261,7 +1239,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         dev1_cluster_on_off.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1272,7 +1249,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1319,7 +1295,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_color.request.call_args == call(
@@ -1330,7 +1305,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert dev1_cluster_level.request.call_args_list[1] == call(
@@ -1341,7 +1315,6 @@ async def test_on_with_off_color(hass: HomeAssistant, device_light_1) -> None:
         transition_time=0,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1388,7 +1361,6 @@ async def async_test_on_off_from_hass(hass, cluster, entity_id):
         cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1411,7 +1383,6 @@ async def async_test_off_from_hass(hass, cluster, entity_id):
         cluster.commands_by_name["off"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1439,7 +1410,6 @@ async def async_test_level_on_off_from_hass(
         on_off_cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1463,7 +1433,6 @@ async def async_test_level_on_off_from_hass(
         on_off_cluster.commands_by_name["on"].schema,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     assert level_cluster.request.call_args == call(
@@ -1474,7 +1443,6 @@ async def async_test_level_on_off_from_hass(
         transition_time=100,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1499,7 +1467,6 @@ async def async_test_level_on_off_from_hass(
         transition_time=int(expected_default_transition),
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
     on_off_cluster.request.reset_mock()
@@ -1542,7 +1509,6 @@ async def async_test_flash_from_hass(hass, cluster, entity_id, flash):
         effect_variant=general.Identify.EffectVariant.Default,
         expect_reply=True,
         manufacturer=None,
-        tries=1,
         tsn=None,
     )
 
@@ -1593,9 +1559,9 @@ async def test_zha_group_light_entity(
         assert member.group == zha_group
         assert member.endpoint is not None
 
-    device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-    device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
-    device_3_entity_id = await find_entity_id(Platform.LIGHT, device_light_3, hass)
+    device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+    device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
+    device_3_entity_id = find_entity_id(Platform.LIGHT, device_light_3, hass)
 
     assert (
         device_1_entity_id != device_2_entity_id
@@ -1833,8 +1799,8 @@ async def test_group_member_assume_state(
             assert member.group == zha_group
             assert member.endpoint is not None
 
-        device_1_entity_id = await find_entity_id(Platform.LIGHT, device_light_1, hass)
-        device_2_entity_id = await find_entity_id(Platform.LIGHT, device_light_2, hass)
+        device_1_entity_id = find_entity_id(Platform.LIGHT, device_light_1, hass)
+        device_2_entity_id = find_entity_id(Platform.LIGHT, device_light_2, hass)
 
         assert device_1_entity_id != device_2_entity_id
 
diff --git a/tests/components/zha/test_lock.py b/tests/components/zha/test_lock.py
index a3ce29bd630ce6..2f1ecb6983da46 100644
--- a/tests/components/zha/test_lock.py
+++ b/tests/components/zha/test_lock.py
@@ -19,8 +19,6 @@
 from .common import async_enable_traffic, find_entity_id, send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
-from tests.common import mock_coro
-
 LOCK_DOOR = 0
 UNLOCK_DOOR = 1
 SET_PIN_CODE = 5
@@ -64,7 +62,7 @@ async def test_lock(hass: HomeAssistant, lock) -> None:
     """Test ZHA lock platform."""
 
     zha_device, cluster = lock
-    entity_id = await find_entity_id(Platform.LOCK, zha_device, hass)
+    entity_id = find_entity_id(Platform.LOCK, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_UNLOCKED
@@ -107,9 +105,7 @@ async def test_lock(hass: HomeAssistant, lock) -> None:
 
 async def async_lock(hass, cluster, entity_id):
     """Test lock functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # lock via UI
         await hass.services.async_call(
             LOCK_DOMAIN, "lock", {"entity_id": entity_id}, blocking=True
@@ -121,9 +117,7 @@ async def async_lock(hass, cluster, entity_id):
 
 async def async_unlock(hass, cluster, entity_id):
     """Test lock functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # lock via UI
         await hass.services.async_call(
             LOCK_DOMAIN, "unlock", {"entity_id": entity_id}, blocking=True
@@ -135,9 +129,7 @@ async def async_unlock(hass, cluster, entity_id):
 
 async def async_set_user_code(hass, cluster, entity_id):
     """Test set lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -158,9 +150,7 @@ async def async_set_user_code(hass, cluster, entity_id):
 
 async def async_clear_user_code(hass, cluster, entity_id):
     """Test clear lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -179,9 +169,7 @@ async def async_clear_user_code(hass, cluster, entity_id):
 
 async def async_enable_user_code(hass, cluster, entity_id):
     """Test enable lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
@@ -201,9 +189,7 @@ async def async_enable_user_code(hass, cluster, entity_id):
 
 async def async_disable_user_code(hass, cluster, entity_id):
     """Test disable lock code functionality from hass."""
-    with patch(
-        "zigpy.zcl.Cluster.request", return_value=mock_coro([zcl_f.Status.SUCCESS])
-    ):
+    with patch("zigpy.zcl.Cluster.request", return_value=[zcl_f.Status.SUCCESS]):
         # set lock code via service call
         await hass.services.async_call(
             "zha",
diff --git a/tests/components/zha/test_number.py b/tests/components/zha/test_number.py
index 584a7318383ad9..60aa355af5ff3b 100644
--- a/tests/components/zha/test_number.py
+++ b/tests/components/zha/test_number.py
@@ -114,7 +114,7 @@ async def test_number(
     assert "engineering_units" in attr_reads
     assert "application_type" in attr_reads
 
-    entity_id = await find_entity_id(Platform.NUMBER, zha_device, hass)
+    entity_id = find_entity_id(Platform.NUMBER, zha_device, hass)
     assert entity_id is not None
 
     await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -211,7 +211,7 @@ async def test_level_control_number(
     }
     zha_device = await zha_device_joined(light)
 
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.NUMBER,
         zha_device,
         hass,
@@ -344,7 +344,7 @@ async def test_color_number(
     }
     zha_device = await zha_device_joined(light)
 
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.NUMBER,
         zha_device,
         hass,
diff --git a/tests/components/zha/test_select.py b/tests/components/zha/test_select.py
index 714e27147bb368..d2d1b79c92fad3 100644
--- a/tests/components/zha/test_select.py
+++ b/tests/components/zha/test_select.py
@@ -26,6 +26,8 @@
 from .common import async_enable_traffic, find_entity_id, send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
+from tests.common import async_mock_load_restore_state_from_storage
+
 
 @pytest.fixture(autouse=True)
 def select_select_only():
@@ -114,7 +116,6 @@ def _storage(entity_id, state):
                 }
             ],
         }
-        return
 
     return _storage
 
@@ -125,7 +126,7 @@ async def test_select(hass: HomeAssistant, siren) -> None:
     entity_registry = er.async_get(hass)
     zha_device, cluster = siren
     assert cluster is not None
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -176,6 +177,7 @@ async def test_select_restore_state(
 
     entity_id = "select.fakemanufacturer_fakemodel_default_siren_tone"
     core_rs(entity_id, state="Burglar")
+    await async_mock_load_restore_state_from_storage(hass)
 
     zigpy_device = zigpy_device_mock(
         {
@@ -191,7 +193,7 @@ async def test_select_restore_state(
     zha_device = await zha_device_restored(zigpy_device)
     cluster = zigpy_device.endpoints[1].ias_wd
     assert cluster is not None
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -216,7 +218,7 @@ async def test_on_off_select_new_join(
     }
     zha_device = await zha_device_joined(light)
     select_name = "start_up_behavior"
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -301,7 +303,7 @@ async def test_on_off_select_restored(
     )
 
     select_name = "start_up_behavior"
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -328,7 +330,7 @@ async def test_on_off_select_unsupported(
     on_off_cluster.add_unsupported_attribute("start_up_on_off")
     zha_device = await zha_device_joined_restored(light)
     select_name = general.OnOff.StartUpOnOff.__name__
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SELECT,
         zha_device,
         hass,
@@ -397,7 +399,7 @@ async def test_on_off_select_attribute_report(
 
     zha_device = await zha_device_restored(zigpy_device_aqara_sensor)
     cluster = zigpy_device_aqara_sensor.endpoints.get(1).opple_cluster
-    entity_id = await find_entity_id(Platform.SELECT, zha_device, hass)
+    entity_id = find_entity_id(Platform.SELECT, zha_device, hass)
     assert entity_id is not None
 
     # allow traffic to flow through the gateway and device
diff --git a/tests/components/zha/test_sensor.py b/tests/components/zha/test_sensor.py
index 83799147bbe520..b9d9511a6d1fbe 100644
--- a/tests/components/zha/test_sensor.py
+++ b/tests/components/zha/test_sensor.py
@@ -47,6 +47,8 @@
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 
+from tests.common import async_mock_load_restore_state_from_storage
+
 ENTITY_ID_PREFIX = "sensor.fakemanufacturer_fakemodel_{}"
 
 
@@ -530,6 +532,7 @@ def _storage(entity_id, uom, state):
     ],
 )
 async def test_temp_uom(
+    hass: HomeAssistant,
     uom,
     raw_temp,
     expected,
@@ -544,6 +547,7 @@ async def test_temp_uom(
     entity_id = "sensor.fake1026_fakemodel1026_004f3202_temperature"
     if restore:
         core_rs(entity_id, uom, state=(expected - 2))
+        await async_mock_load_restore_state_from_storage(hass)
 
     hass = await hass_ms(
         CONF_UNIT_SYSTEM_METRIC
@@ -565,7 +569,7 @@ async def test_temp_uom(
     )
     cluster = zigpy_device.endpoints[1].temperature
     zha_device = await zha_device_restored(zigpy_device)
-    entity_id = await find_entity_id(Platform.SENSOR, zha_device, hass)
+    entity_id = find_entity_id(Platform.SENSOR, zha_device, hass)
 
     if not restore:
         await async_enable_traffic(hass, [zha_device], enabled=False)
@@ -609,7 +613,7 @@ async def test_electrical_measurement_init(
     )
     cluster = zigpy_device.endpoints[1].in_clusters[cluster_id]
     zha_device = await zha_device_joined(zigpy_device)
-    entity_id = await find_entity_id(
+    entity_id = find_entity_id(
         Platform.SENSOR, zha_device, hass, qualifier="active_power"
     )
 
diff --git a/tests/components/zha/test_silabs_multiprotocol.py b/tests/components/zha/test_silabs_multiprotocol.py
new file mode 100644
index 00000000000000..beae0230901e59
--- /dev/null
+++ b/tests/components/zha/test_silabs_multiprotocol.py
@@ -0,0 +1,118 @@
+"""Test ZHA Silicon Labs Multiprotocol support."""
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+from unittest.mock import call, patch
+
+import pytest
+import zigpy.backups
+import zigpy.state
+
+from homeassistant.components import zha
+from homeassistant.components.zha import api, silabs_multiprotocol
+from homeassistant.core import HomeAssistant
+
+if TYPE_CHECKING:
+    from zigpy.application import ControllerApplication
+
+
+@pytest.fixture(autouse=True)
+def required_platform_only():
+    """Only set up the required and required base platforms to speed up tests."""
+    with patch("homeassistant.components.zha.PLATFORMS", ()):
+        yield
+
+
+async def test_async_get_channel_active(hass: HomeAssistant, setup_zha) -> None:
+    """Test reading channel with an active ZHA installation."""
+    await setup_zha()
+
+    assert await silabs_multiprotocol.async_get_channel(hass) == 15
+
+
+async def test_async_get_channel_missing(
+    hass: HomeAssistant, setup_zha, zigpy_app_controller: ControllerApplication
+) -> None:
+    """Test reading channel with an inactive ZHA installation, no valid channel."""
+    await setup_zha()
+
+    gateway = api._get_gateway(hass)
+    await zha.async_unload_entry(hass, gateway.config_entry)
+
+    # Network settings were never loaded for whatever reason
+    zigpy_app_controller.state.network_info = zigpy.state.NetworkInfo()
+    zigpy_app_controller.state.node_info = zigpy.state.NodeInfo()
+
+    with patch(
+        "bellows.zigbee.application.ControllerApplication.__new__",
+        return_value=zigpy_app_controller,
+    ):
+        assert await silabs_multiprotocol.async_get_channel(hass) is None
+
+
+async def test_async_get_channel_no_zha(hass: HomeAssistant) -> None:
+    """Test reading channel with no ZHA config entries and no database."""
+    assert await silabs_multiprotocol.async_get_channel(hass) is None
+
+
+async def test_async_using_multipan_active(hass: HomeAssistant, setup_zha) -> None:
+    """Test async_using_multipan with an active ZHA installation."""
+    await setup_zha()
+
+    assert await silabs_multiprotocol.async_using_multipan(hass) is False
+
+
+async def test_async_using_multipan_no_zha(hass: HomeAssistant) -> None:
+    """Test async_using_multipan with no ZHA config entries and no database."""
+    assert await silabs_multiprotocol.async_using_multipan(hass) is False
+
+
+async def test_change_channel(
+    hass: HomeAssistant, setup_zha, zigpy_app_controller: ControllerApplication
+) -> None:
+    """Test changing the channel."""
+    await setup_zha()
+
+    with patch.object(
+        zigpy_app_controller, "move_network_to_channel", autospec=True
+    ) as mock_move_network_to_channel:
+        task = await silabs_multiprotocol.async_change_channel(hass, 20)
+        await task
+
+    assert mock_move_network_to_channel.mock_calls == [call(20)]
+
+
+async def test_change_channel_no_zha(
+    hass: HomeAssistant, zigpy_app_controller: ControllerApplication
+) -> None:
+    """Test changing the channel with no ZHA config entries and no database."""
+    with patch.object(
+        zigpy_app_controller, "move_network_to_channel", autospec=True
+    ) as mock_move_network_to_channel:
+        task = await silabs_multiprotocol.async_change_channel(hass, 20)
+    assert task is None
+
+    assert mock_move_network_to_channel.mock_calls == []
+
+
+@pytest.mark.parametrize(("delay", "sleep"), [(0, 0), (5, 0), (15, 15 - 10.27)])
+async def test_change_channel_delay(
+    hass: HomeAssistant,
+    setup_zha,
+    zigpy_app_controller: ControllerApplication,
+    delay: float,
+    sleep: float,
+) -> None:
+    """Test changing the channel with a delay."""
+    await setup_zha()
+
+    with patch.object(
+        zigpy_app_controller, "move_network_to_channel", autospec=True
+    ) as mock_move_network_to_channel, patch(
+        "homeassistant.components.zha.silabs_multiprotocol.asyncio.sleep", autospec=True
+    ) as mock_sleep:
+        task = await silabs_multiprotocol.async_change_channel(hass, 20, delay=delay)
+        await task
+
+    assert mock_move_network_to_channel.mock_calls == [call(20)]
+    assert mock_sleep.mock_calls == [call(sleep)]
diff --git a/tests/components/zha/test_siren.py b/tests/components/zha/test_siren.py
index a6b3059f0938a3..7346f1e5bcbe27 100644
--- a/tests/components/zha/test_siren.py
+++ b/tests/components/zha/test_siren.py
@@ -69,7 +69,7 @@ async def test_siren(hass: HomeAssistant, siren) -> None:
 
     zha_device, cluster = siren
     assert cluster is not None
-    entity_id = await find_entity_id(Platform.SIREN, zha_device, hass)
+    entity_id = find_entity_id(Platform.SIREN, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
diff --git a/tests/components/zha/test_switch.py b/tests/components/zha/test_switch.py
index 9f98acb935976a..bee7ec409ca2bd 100644
--- a/tests/components/zha/test_switch.py
+++ b/tests/components/zha/test_switch.py
@@ -34,8 +34,6 @@
 )
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_TYPE
 
-from tests.common import mock_coro
-
 ON = 1
 OFF = 0
 IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8"
@@ -138,7 +136,7 @@ async def test_switch(
 
     zha_device = await zha_device_joined_restored(zigpy_device)
     cluster = zigpy_device.endpoints.get(1).on_off
-    entity_id = await find_entity_id(Platform.SWITCH, zha_device, hass)
+    entity_id = find_entity_id(Platform.SWITCH, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -163,7 +161,7 @@ async def test_switch(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x00, zcl_f.Status.SUCCESS]),
+        return_value=[0x00, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -176,14 +174,13 @@ async def test_switch(
             cluster.commands_by_name["on"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
 
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x01, zcl_f.Status.SUCCESS]),
+        return_value=[0x01, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
@@ -196,7 +193,6 @@ async def test_switch(
             cluster.commands_by_name["off"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
 
@@ -313,7 +309,7 @@ async def test_zha_group_switch_entity(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x00, zcl_f.Status.SUCCESS]),
+        return_value=[0x00, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -326,7 +322,6 @@ async def test_zha_group_switch_entity(
             group_cluster_on_off.commands_by_name["on"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
     assert hass.states.get(entity_id).state == STATE_ON
@@ -334,7 +329,7 @@ async def test_zha_group_switch_entity(
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.request",
-        return_value=mock_coro([0x01, zcl_f.Status.SUCCESS]),
+        return_value=[0x01, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
@@ -347,7 +342,6 @@ async def test_zha_group_switch_entity(
             group_cluster_on_off.commands_by_name["off"].schema,
             expect_reply=True,
             manufacturer=None,
-            tries=1,
             tsn=None,
         )
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -386,7 +380,7 @@ async def test_switch_configurable(
 
     zha_device = await zha_device_joined_restored(zigpy_device_tuya)
     cluster = zigpy_device_tuya.endpoints.get(1).tuya_manufacturer
-    entity_id = await find_entity_id(Platform.SWITCH, zha_device, hass)
+    entity_id = find_entity_id(Platform.SWITCH, zha_device, hass)
     assert entity_id is not None
 
     assert hass.states.get(entity_id).state == STATE_OFF
@@ -411,7 +405,7 @@ async def test_switch_configurable(
     # turn on from HA
     with patch(
         "zigpy.zcl.Cluster.write_attributes",
-        return_value=mock_coro([zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS]),
+        return_value=[zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS],
     ):
         # turn on via UI
         await hass.services.async_call(
@@ -425,7 +419,7 @@ async def test_switch_configurable(
     # turn off from HA
     with patch(
         "zigpy.zcl.Cluster.write_attributes",
-        return_value=mock_coro([zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS]),
+        return_value=[zcl_f.Status.SUCCESS, zcl_f.Status.SUCCESS],
     ):
         # turn off via UI
         await hass.services.async_call(
diff --git a/tests/components/zha/test_websocket_api.py b/tests/components/zha/test_websocket_api.py
index 720cfaaac9b26d..0904fc1f685bf9 100644
--- a/tests/components/zha/test_websocket_api.py
+++ b/tests/components/zha/test_websocket_api.py
@@ -4,15 +4,17 @@
 from binascii import unhexlify
 from copy import deepcopy
 from typing import TYPE_CHECKING
-from unittest.mock import ANY, AsyncMock, call, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, call, patch
 
 import pytest
 import voluptuous as vol
 import zigpy.backups
 import zigpy.profiles.zha
 import zigpy.types
+from zigpy.types.named import EUI64
 import zigpy.zcl.clusters.general as general
 import zigpy.zcl.clusters.security as security
+import zigpy.zdo.types as zdo_types
 
 from homeassistant.components.websocket_api import const
 from homeassistant.components.zha import DOMAIN
@@ -26,6 +28,8 @@
     ATTR_MODEL,
     ATTR_NEIGHBORS,
     ATTR_QUIRK_APPLIED,
+    ATTR_TYPE,
+    BINDINGS,
     CLUSTER_TYPE_IN,
     EZSP_OVERWRITE_EUI64,
     GROUP_ID,
@@ -37,6 +41,7 @@
     ATTR_INSTALL_CODE,
     ATTR_QR_CODE,
     ATTR_SOURCE_IEEE,
+    ATTR_TARGET_IEEE,
     ID,
     SERVICE_PERMIT,
     TYPE,
@@ -744,6 +749,7 @@ async def test_get_network_settings(
     assert msg["success"]
     assert "radio_type" in msg["result"]
     assert "network_info" in msg["result"]["settings"]
+    assert "path" in msg["result"]["device"]
 
 
 async def test_list_network_backups(
@@ -883,3 +889,90 @@ async def test_websocket_change_channel(
     assert msg["success"]
 
     change_channel_mock.mock_calls == [call(ANY, new_channel)]
+
+
+@pytest.mark.parametrize(
+    "operation",
+    [("bind", zdo_types.ZDOCmd.Bind_req), ("unbind", zdo_types.ZDOCmd.Unbind_req)],
+)
+async def test_websocket_bind_unbind_devices(
+    operation: tuple[str, zdo_types.ZDOCmd],
+    app_controller: ControllerApplication,
+    zha_client,
+) -> None:
+    """Test websocket API for binding and unbinding devices to devices."""
+
+    command_type, req = operation
+    with patch(
+        "homeassistant.components.zha.websocket_api.async_binding_operation",
+        autospec=True,
+    ) as binding_operation_mock:
+        await zha_client.send_json(
+            {
+                ID: 27,
+                TYPE: f"zha/devices/{command_type}",
+                ATTR_SOURCE_IEEE: IEEE_SWITCH_DEVICE,
+                ATTR_TARGET_IEEE: IEEE_GROUPABLE_DEVICE,
+            }
+        )
+        msg = await zha_client.receive_json()
+
+    assert msg["id"] == 27
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    assert binding_operation_mock.mock_calls == [
+        call(
+            ANY,
+            EUI64.convert(IEEE_SWITCH_DEVICE),
+            EUI64.convert(IEEE_GROUPABLE_DEVICE),
+            req,
+        )
+    ]
+
+
+@pytest.mark.parametrize("command_type", ["bind", "unbind"])
+async def test_websocket_bind_unbind_group(
+    command_type: str,
+    app_controller: ControllerApplication,
+    zha_client,
+) -> None:
+    """Test websocket API for binding and unbinding devices to groups."""
+
+    test_group_id = 0x0001
+    gateway_mock = MagicMock()
+    with patch(
+        "homeassistant.components.zha.websocket_api.get_gateway",
+        return_value=gateway_mock,
+    ):
+        device_mock = MagicMock()
+        bind_mock = AsyncMock()
+        unbind_mock = AsyncMock()
+        device_mock.async_bind_to_group = bind_mock
+        device_mock.async_unbind_from_group = unbind_mock
+        gateway_mock.get_device = MagicMock()
+        gateway_mock.get_device.return_value = device_mock
+        await zha_client.send_json(
+            {
+                ID: 27,
+                TYPE: f"zha/groups/{command_type}",
+                ATTR_SOURCE_IEEE: IEEE_SWITCH_DEVICE,
+                GROUP_ID: test_group_id,
+                BINDINGS: [
+                    {
+                        ATTR_ENDPOINT_ID: 1,
+                        ID: 6,
+                        ATTR_NAME: "OnOff",
+                        ATTR_TYPE: "out",
+                    },
+                ],
+            }
+        )
+        msg = await zha_client.receive_json()
+
+    assert msg["id"] == 27
+    assert msg["type"] == const.TYPE_RESULT
+    assert msg["success"]
+    if command_type == "bind":
+        assert bind_mock.mock_calls == [call(test_group_id, ANY)]
+    elif command_type == "unbind":
+        assert unbind_mock.mock_calls == [call(test_group_id, ANY)]
diff --git a/tests/components/zodiac/test_config_flow.py b/tests/components/zodiac/test_config_flow.py
new file mode 100644
index 00000000000000..18a512e0b455d0
--- /dev/null
+++ b/tests/components/zodiac/test_config_flow.py
@@ -0,0 +1,70 @@
+"""Tests for the Zodiac config flow."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.components.zodiac.const import DOMAIN
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from tests.common import MockConfigEntry
+
+
+async def test_full_user_flow(hass: HomeAssistant) -> None:
+    """Test the full user configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    assert result.get("type") == FlowResultType.FORM
+    assert result.get("step_id") == "user"
+
+    with patch(
+        "homeassistant.components.zodiac.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={},
+        )
+
+    assert result.get("type") == FlowResultType.CREATE_ENTRY
+    assert result.get("title") == "Zodiac"
+    assert result.get("data") == {}
+    assert result.get("options") == {}
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+@pytest.mark.parametrize("source", [SOURCE_USER, SOURCE_IMPORT])
+async def test_single_instance_allowed(
+    hass: HomeAssistant,
+    source: str,
+) -> None:
+    """Test we abort if already setup."""
+    mock_config_entry = MockConfigEntry(domain=DOMAIN)
+
+    mock_config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": source}
+    )
+
+    assert result.get("type") == FlowResultType.ABORT
+    assert result.get("reason") == "single_instance_allowed"
+
+
+async def test_import_flow(
+    hass: HomeAssistant,
+) -> None:
+    """Test the import configuration flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data={},
+    )
+
+    assert result.get("type") == FlowResultType.CREATE_ENTRY
+    assert result.get("title") == "Zodiac"
+    assert result.get("data") == {}
+    assert result.get("options") == {}
diff --git a/tests/components/zodiac/test_sensor.py b/tests/components/zodiac/test_sensor.py
index dbb1d2739a5da6..9fa151c87d567d 100644
--- a/tests/components/zodiac/test_sensor.py
+++ b/tests/components/zodiac/test_sensor.py
@@ -24,6 +24,8 @@
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
+from tests.common import MockConfigEntry
+
 DAY1 = datetime(2020, 11, 15, tzinfo=dt_util.UTC)
 DAY2 = datetime(2020, 4, 20, tzinfo=dt_util.UTC)
 DAY3 = datetime(2020, 4, 21, tzinfo=dt_util.UTC)
@@ -37,13 +39,17 @@
         (DAY3, SIGN_TAURUS, ELEMENT_EARTH, MODALITY_FIXED),
     ],
 )
-async def test_zodiac_day(hass: HomeAssistant, now, sign, element, modality) -> None:
+async def test_zodiac_day(
+    hass: HomeAssistant, now: datetime, sign: str, element: str, modality: str
+) -> None:
     """Test the zodiac sensor."""
     hass.config.set_time_zone("UTC")
-    config = {DOMAIN: {}}
+    MockConfigEntry(
+        domain=DOMAIN,
+    ).add_to_hass(hass)
 
     with patch("homeassistant.components.zodiac.sensor.utcnow", return_value=now):
-        assert await async_setup_component(hass, DOMAIN, config)
+        assert await async_setup_component(hass, DOMAIN, {})
         await hass.async_block_till_done()
 
     state = hass.states.get("sensor.zodiac")
diff --git a/tests/components/zone/test_trigger.py b/tests/components/zone/test_trigger.py
index 6a7e07cc998d8e..7f44cecefe1cce 100644
--- a/tests/components/zone/test_trigger.py
+++ b/tests/components/zone/test_trigger.py
@@ -8,7 +8,11 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import async_mock_service, mock_component
-from tests.components.blueprint.conftest import stub_blueprint_populate  # noqa: F401
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
 
 
 @pytest.fixture
diff --git a/tests/components/zwave_js/common.py b/tests/components/zwave_js/common.py
index 49fbe96f1623ae..606dda30b243c0 100644
--- a/tests/components/zwave_js/common.py
+++ b/tests/components/zwave_js/common.py
@@ -24,7 +24,7 @@
 ENABLED_LEGACY_BINARY_SENSOR = "binary_sensor.z_wave_door_window_sensor_any"
 DISABLED_LEGACY_BINARY_SENSOR = "binary_sensor.multisensor_6_any"
 NOTIFICATION_MOTION_BINARY_SENSOR = "binary_sensor.multisensor_6_motion_detection"
-NOTIFICATION_MOTION_SENSOR = "sensor.multisensor_6_motion_sensor_status"
+NOTIFICATION_MOTION_SENSOR = "sensor.multisensor_6_home_security_motion_sensor_status"
 INDICATOR_SENSOR = "sensor.z_wave_thermostat_indicator_value"
 BASIC_NUMBER_ENTITY = "number.livingroomlight_basic"
 PROPERTY_DOOR_STATUS_BINARY_SENSOR = (
@@ -35,13 +35,11 @@
 CLIMATE_EUROTRONICS_SPIRIT_Z_ENTITY = "climate.thermostatic_valve"
 CLIMATE_FLOOR_THERMOSTAT_ENTITY = "climate.floor_thermostat"
 CLIMATE_MAIN_HEAT_ACTIONNER = "climate.main_heat_actionner"
+CLIMATE_AIDOO_HVAC_UNIT_ENTITY = "climate.aidoo_control_hvac_unit"
 BULB_6_MULTI_COLOR_LIGHT_ENTITY = "light.bulb_6_multi_color"
 EATON_RF9640_ENTITY = "light.allloaddimmer"
 AEON_SMART_SWITCH_LIGHT_ENTITY = "light.smart_switch_6"
 SCHLAGE_BE469_LOCK_ENTITY = "lock.touchscreen_deadbolt"
-ID_LOCK_CONFIG_PARAMETER_SENSOR = (
-    "sensor.z_wave_module_for_id_lock_150_and_101_config_parameter_door_lock_mode"
-)
 ZEN_31_ENTITY = "light.kitchen_under_cabinet_lights"
 METER_ENERGY_SENSOR = "sensor.smart_switch_6_electric_consumed_kwh"
 METER_VOLTAGE_SENSOR = "sensor.smart_switch_6_electric_consumed_v"
diff --git a/tests/components/zwave_js/conftest.py b/tests/components/zwave_js/conftest.py
index 32082a0bb85861..0eb4ec775f932a 100644
--- a/tests/components/zwave_js/conftest.py
+++ b/tests/components/zwave_js/conftest.py
@@ -11,6 +11,8 @@
 from zwave_js_server.model.node import Node
 from zwave_js_server.version import VersionInfo
 
+from homeassistant.core import HomeAssistant
+
 from tests.common import MockConfigEntry, load_fixture
 
 # Add-on fixtures
@@ -109,7 +111,7 @@ def mock_addon_options(addon_info):
 def set_addon_options_side_effect_fixture(addon_options):
     """Return the set add-on options side effect."""
 
-    async def set_addon_options(hass, slug, options):
+    async def set_addon_options(hass: HomeAssistant, slug, options):
         """Mock set add-on options."""
         addon_options.update(options["options"])
 
@@ -130,7 +132,7 @@ def mock_set_addon_options(set_addon_options_side_effect):
 def install_addon_side_effect_fixture(addon_store_info, addon_info):
     """Return the install add-on side effect."""
 
-    async def install_addon(hass, slug):
+    async def install_addon(hass: HomeAssistant, slug):
         """Mock install add-on."""
         addon_store_info.return_value = {
             "available": True,
@@ -168,7 +170,7 @@ def mock_update_addon():
 def start_addon_side_effect_fixture(addon_store_info, addon_info):
     """Return the start add-on options side effect."""
 
-    async def start_addon(hass, slug):
+    async def start_addon(hass: HomeAssistant, slug):
         """Mock start add-on."""
         addon_store_info.return_value = {
             "available": True,
@@ -363,9 +365,17 @@ def climate_adc_t3000_state_fixture():
     return json.loads(load_fixture("zwave_js/climate_adc_t3000_state.json"))
 
 
+@pytest.fixture(name="climate_airzone_aidoo_control_hvac_unit_state", scope="session")
+def climate_airzone_aidoo_control_hvac_unit_state_fixture():
+    """Load the climate Airzone Aidoo Control HVAC Unit state fixture data."""
+    return json.loads(
+        load_fixture("zwave_js/climate_airzone_aidoo_control_hvac_unit_state.json")
+    )
+
+
 @pytest.fixture(name="climate_danfoss_lc_13_state", scope="session")
 def climate_danfoss_lc_13_state_fixture():
-    """Load the climate Danfoss (LC-13) electronic radiator thermostat node state fixture data."""
+    """Load Danfoss (LC-13) electronic radiator thermostat node state fixture data."""
     return json.loads(load_fixture("zwave_js/climate_danfoss_lc_13_state.json"))
 
 
@@ -431,6 +441,12 @@ def leviton_zw4sf_state_fixture():
     return json.loads(load_fixture("zwave_js/leviton_zw4sf_state.json"))
 
 
+@pytest.fixture(name="fan_honeywell_39358_state", scope="session")
+def fan_honeywell_39358_state_fixture():
+    """Load the fan node state fixture data."""
+    return json.loads(load_fixture("zwave_js/fan_honeywell_39358_state.json"))
+
+
 @pytest.fixture(name="gdc_zw062_state", scope="session")
 def motorized_barrier_cover_state_fixture():
     """Load the motorized barrier cover node state fixture data."""
@@ -443,6 +459,12 @@ def iblinds_v2_state_fixture():
     return json.loads(load_fixture("zwave_js/cover_iblinds_v2_state.json"))
 
 
+@pytest.fixture(name="iblinds_v3_state", scope="session")
+def iblinds_v3_state_fixture():
+    """Load the iBlinds v3 node state fixture data."""
+    return json.loads(load_fixture("zwave_js/cover_iblinds_v3_state.json"))
+
+
 @pytest.fixture(name="qubino_shutter_state", scope="session")
 def qubino_shutter_state_fixture():
     """Load the Qubino Shutter node state fixture data."""
@@ -522,7 +544,7 @@ def climate_radio_thermostat_ct101_multiple_temp_units_state_fixture():
     scope="session",
 )
 def climate_radio_thermostat_ct100_mode_and_setpoint_on_different_endpoints_state_fixture():
-    """Load the climate device with mode and setpoint on different endpoints node state fixture data."""
+    """Load climate device w/ mode+setpoint on diff endpoints node state fixture data."""
     return json.loads(
         load_fixture(
             "zwave_js/climate_radio_thermostat_ct100_mode_and_setpoint_on_different_endpoints_state.json"
@@ -604,6 +626,30 @@ def lock_home_connect_620_state_fixture():
     return json.loads(load_fixture("zwave_js/lock_home_connect_620_state.json"))
 
 
+@pytest.fixture(name="switch_zooz_zen72_state", scope="session")
+def switch_zooz_zen72_state_fixture():
+    """Load the Zooz Zen72 switch node state fixture data."""
+    return json.loads(load_fixture("zwave_js/switch_zooz_zen72_state.json"))
+
+
+@pytest.fixture(name="indicator_test_state", scope="session")
+def indicator_test_state_fixture():
+    """Load the indicator CC test node state fixture data."""
+    return json.loads(load_fixture("zwave_js/indicator_test_state.json"))
+
+
+@pytest.fixture(name="energy_production_state", scope="session")
+def energy_production_state_fixture():
+    """Load a mock node with energy production CC state fixture data."""
+    return json.loads(load_fixture("zwave_js/energy_production_state.json"))
+
+
+@pytest.fixture(name="nice_ibt4zwave_state", scope="session")
+def nice_ibt4zwave_state_fixture():
+    """Load a Nice IBT4ZWAVE cover node state fixture data."""
+    return json.loads(load_fixture("zwave_js/cover_nice_ibt4zwave_state.json"))
+
+
 # model fixtures
 
 
@@ -612,7 +658,6 @@ def mock_client_fixture(
     controller_state, controller_node_state, version_state, log_config_state
 ):
     """Mock a client."""
-
     with patch(
         "homeassistant.components.zwave_js.ZwaveClient", autospec=True
     ) as client_class:
@@ -634,7 +679,9 @@ async def disconnect():
         client.connect = AsyncMock(side_effect=connect)
         client.listen = AsyncMock(side_effect=listen)
         client.disconnect = AsyncMock(side_effect=disconnect)
-        client.driver = Driver(client, controller_state, log_config_state)
+        client.driver = Driver(
+            client, copy.deepcopy(controller_state), copy.deepcopy(log_config_state)
+        )
         node = Node(client, copy.deepcopy(controller_node_state))
         client.driver.controller.nodes[node.node_id] = node
 
@@ -722,7 +769,7 @@ def climate_radio_thermostat_ct100_plus_fixture(
 def climate_radio_thermostat_ct100_plus_different_endpoints_fixture(
     client, climate_radio_thermostat_ct100_plus_different_endpoints_state
 ):
-    """Mock a climate radio thermostat ct100 plus node with values on different endpoints."""
+    """Mock climate radio thermostat ct100 plus node w/ values on diff endpoints."""
     node = Node(
         client,
         copy.deepcopy(climate_radio_thermostat_ct100_plus_different_endpoints_state),
@@ -773,7 +820,7 @@ def climate_adc_t3000_missing_mode_fixture(client, climate_adc_t3000_state):
 
 @pytest.fixture(name="climate_adc_t3000_missing_fan_mode_states")
 def climate_adc_t3000_missing_fan_mode_states_fixture(client, climate_adc_t3000_state):
-    """Mock a climate ADC-T3000 node with missing 'states' metadata on Thermostat Fan Mode."""
+    """Mock ADC-T3000 node w/ missing 'states' metadata on Thermostat Fan Mode."""
     data = copy.deepcopy(climate_adc_t3000_state)
     data["name"] = f"{data['name']} missing fan mode states"
     for value in data["values"]:
@@ -787,6 +834,16 @@ def climate_adc_t3000_missing_fan_mode_states_fixture(client, climate_adc_t3000_
     return node
 
 
+@pytest.fixture(name="climate_airzone_aidoo_control_hvac_unit")
+def climate_airzone_aidoo_control_hvac_unit_fixture(
+    client, climate_airzone_aidoo_control_hvac_unit_state
+):
+    """Mock a climate Airzone Aidoo Control HVAC node."""
+    node = Node(client, copy.deepcopy(climate_airzone_aidoo_control_hvac_unit_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
 @pytest.fixture(name="climate_danfoss_lc_13")
 def climate_danfoss_lc_13_fixture(client, climate_danfoss_lc_13_state):
     """Mock a climate radio danfoss LC-13 node."""
@@ -872,7 +929,7 @@ def nortek_thermostat_removed_event_fixture(client):
 
 
 @pytest.fixture(name="integration")
-async def integration_fixture(hass, client):
+async def integration_fixture(hass: HomeAssistant, client):
     """Set up the zwave_js integration."""
     entry = MockConfigEntry(domain="zwave_js", data={"url": "ws://test.org"})
     entry.add_to_hass(hass)
@@ -916,6 +973,14 @@ def leviton_zw4sf_fixture(client, leviton_zw4sf_state):
     return node
 
 
+@pytest.fixture(name="fan_honeywell_39358")
+def fan_honeywell_39358_fixture(client, fan_honeywell_39358_state):
+    """Mock a fan node."""
+    node = Node(client, copy.deepcopy(fan_honeywell_39358_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
 @pytest.fixture(name="null_name_check")
 def null_name_check_fixture(client, null_name_check_state):
     """Mock a node with no name."""
@@ -933,13 +998,21 @@ def motorized_barrier_cover_fixture(client, gdc_zw062_state):
 
 
 @pytest.fixture(name="iblinds_v2")
-def iblinds_cover_fixture(client, iblinds_v2_state):
+def iblinds_v2_cover_fixture(client, iblinds_v2_state):
     """Mock an iBlinds v2.0 window cover node."""
     node = Node(client, copy.deepcopy(iblinds_v2_state))
     client.driver.controller.nodes[node.node_id] = node
     return node
 
 
+@pytest.fixture(name="iblinds_v3")
+def iblinds_v3_cover_fixture(client, iblinds_v3_state):
+    """Mock an iBlinds v3 window cover node."""
+    node = Node(client, copy.deepcopy(iblinds_v3_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
 @pytest.fixture(name="qubino_shutter")
 def qubino_shutter_cover_fixture(client, qubino_shutter_state):
     """Mock a Qubino flush shutter node."""
@@ -1146,3 +1219,35 @@ def lock_home_connect_620_fixture(client, lock_home_connect_620_state):
     node = Node(client, copy.deepcopy(lock_home_connect_620_state))
     client.driver.controller.nodes[node.node_id] = node
     return node
+
+
+@pytest.fixture(name="switch_zooz_zen72")
+def switch_zooz_zen72_fixture(client, switch_zooz_zen72_state):
+    """Mock a Zooz Zen72 switch node."""
+    node = Node(client, copy.deepcopy(switch_zooz_zen72_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
+@pytest.fixture(name="indicator_test")
+def indicator_test_fixture(client, indicator_test_state):
+    """Mock a indicator CC test node."""
+    node = Node(client, copy.deepcopy(indicator_test_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
+@pytest.fixture(name="energy_production")
+def energy_production_fixture(client, energy_production_state):
+    """Mock a mock node with Energy Production CC."""
+    node = Node(client, copy.deepcopy(energy_production_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
+
+
+@pytest.fixture(name="nice_ibt4zwave")
+def nice_ibt4zwave_fixture(client, nice_ibt4zwave_state):
+    """Mock a Nice IBT4ZWAVE cover node."""
+    node = Node(client, copy.deepcopy(nice_ibt4zwave_state))
+    client.driver.controller.nodes[node.node_id] = node
+    return node
diff --git a/tests/components/zwave_js/fixtures/climate_airzone_aidoo_control_hvac_unit_state.json b/tests/components/zwave_js/fixtures/climate_airzone_aidoo_control_hvac_unit_state.json
new file mode 100644
index 00000000000000..b5afa1131a8754
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/climate_airzone_aidoo_control_hvac_unit_state.json
@@ -0,0 +1,818 @@
+{
+  "nodeId": 12,
+  "index": 0,
+  "installerIcon": 4608,
+  "userIcon": 4608,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": false,
+  "manufacturerId": 1102,
+  "productId": 1,
+  "productType": 4,
+  "firmwareVersion": "10.20.1",
+  "zwavePlusVersion": 2,
+  "deviceConfig": {
+    "filename": "/data/db/devices/0x044e/AZAI6WSPFU2.json",
+    "isEmbedded": true,
+    "manufacturer": "Airzone",
+    "manufacturerId": 1102,
+    "label": "AZAI6WSPFU2",
+    "description": "Aidoo Control HVAC unit",
+    "devices": [
+      {
+        "productType": 4,
+        "productId": 1
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "preferred": false,
+    "compat": {
+      "overrideFloatEncoding": {
+        "precision": 1
+      }
+    }
+  },
+  "label": "AZAI6WSPFU2",
+  "interviewAttempts": 0,
+  "endpoints": [
+    {
+      "nodeId": 12,
+      "index": 0,
+      "installerIcon": 4608,
+      "userIcon": 4608,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 8,
+          "label": "Thermostat"
+        },
+        "specific": {
+          "key": 6,
+          "label": "General Thermostat V2"
+        },
+        "mandatorySupportedCCs": [32, 114, 64, 67, 134],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 64,
+          "name": "Thermostat Mode",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 67,
+          "name": "Thermostat Setpoint",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 68,
+          "name": "Thermostat Fan Mode",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 49,
+          "name": "Multilevel Sensor",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 113,
+          "name": "Notification",
+          "version": 8,
+          "isSecure": false
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 142,
+          "name": "Multi Channel Association",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 85,
+          "name": "Transport Service",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 135,
+          "name": "Indicator",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 152,
+          "name": "Security",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 108,
+          "name": "Supervision",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 5,
+          "isSecure": false
+        },
+        {
+          "id": 159,
+          "name": "Security 2",
+          "version": 1,
+          "isSecure": true
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 49,
+      "commandClassName": "Multilevel Sensor",
+      "property": "Air temperature",
+      "propertyName": "Air temperature",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Air temperature",
+        "ccSpecific": {
+          "sensorType": 1,
+          "scale": 0
+        },
+        "unit": "\u00b0C",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 29
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 64,
+      "commandClassName": "Thermostat Mode",
+      "property": "mode",
+      "propertyName": "mode",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Thermostat mode",
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Off",
+          "1": "Heat",
+          "2": "Cool",
+          "6": "Fan",
+          "8": "Dry",
+          "10": "Auto changeover"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 64,
+      "commandClassName": "Thermostat Mode",
+      "property": "manufacturerData",
+      "propertyName": "manufacturerData",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "buffer",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer data",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 67,
+      "commandClassName": "Thermostat Setpoint",
+      "property": "setpoint",
+      "propertyKey": 1,
+      "propertyName": "setpoint",
+      "propertyKeyName": "Heating",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Setpoint (Heating)",
+        "ccSpecific": {
+          "setpointType": 1
+        },
+        "unit": "\u00b0C",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 67,
+      "commandClassName": "Thermostat Setpoint",
+      "property": "setpoint",
+      "propertyKey": 2,
+      "propertyName": "setpoint",
+      "propertyKeyName": "Cooling",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Setpoint (Cooling)",
+        "ccSpecific": {
+          "setpointType": 2
+        },
+        "unit": "\u00b0C",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 23
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 67,
+      "commandClassName": "Thermostat Setpoint",
+      "property": "setpoint",
+      "propertyKey": 8,
+      "propertyName": "setpoint",
+      "propertyKeyName": "Dry Air",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Setpoint (Dry Air)",
+        "ccSpecific": {
+          "setpointType": 8
+        },
+        "unit": "\u00b0C",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 23
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 67,
+      "commandClassName": "Thermostat Setpoint",
+      "property": "setpoint",
+      "propertyKey": 10,
+      "propertyName": "setpoint",
+      "propertyKeyName": "Auto Changeover",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Setpoint (Auto Changeover)",
+        "ccSpecific": {
+          "setpointType": 10
+        },
+        "unit": "\u00b0C",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 32
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 68,
+      "commandClassName": "Thermostat Fan Mode",
+      "property": "mode",
+      "propertyName": "mode",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Thermostat fan mode",
+        "min": 0,
+        "max": 255,
+        "states": {
+          "1": "Low",
+          "3": "High",
+          "4": "Auto medium",
+          "5": "Medium"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 5
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "System",
+      "propertyKey": "Hardware status",
+      "propertyName": "System",
+      "propertyKeyName": "Hardware status",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Hardware status",
+        "ccSpecific": {
+          "notificationType": 9
+        },
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "idle",
+          "3": "System hardware failure (with failure code)"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "alarmType",
+      "propertyName": "alarmType",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Alarm Type",
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "alarmLevel",
+      "propertyName": "alarmLevel",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Alarm Level",
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 1102
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 4
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.16"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions",
+        "stateful": true,
+        "secret": false
+      },
+      "value": ["10.20"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "sdkVersion",
+      "propertyName": "sdkVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "SDK version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.16.3"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkAPIVersion",
+      "propertyName": "applicationFrameworkAPIVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "10.16.3"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkBuildNumber",
+      "propertyName": "applicationFrameworkBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 297
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceVersion",
+      "propertyName": "hostInterfaceVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "unused"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceBuildNumber",
+      "propertyName": "hostInterfaceBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolVersion",
+      "propertyName": "zWaveProtocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.16.3"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolBuildNumber",
+      "propertyName": "zWaveProtocolBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 297
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationVersion",
+      "propertyName": "applicationVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "10.20.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationBuildNumber",
+      "propertyName": "applicationBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 43707
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "value",
+      "propertyName": "value",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Indicator value",
+        "ccSpecific": {
+          "indicatorId": 0
+        },
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "identify",
+      "propertyName": "identify",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Identify",
+        "states": {
+          "true": "Identify"
+        },
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "timeout",
+      "propertyName": "timeout",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": true,
+        "label": "Timeout",
+        "stateful": true,
+        "secret": false
+      }
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 8,
+      "label": "Thermostat"
+    },
+    "specific": {
+      "key": 6,
+      "label": "General Thermostat V2"
+    },
+    "mandatorySupportedCCs": [32, 114, 64, 67, 134],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x044e:0x0004:0x0001:10.20.1",
+  "statistics": {
+    "commandsTX": 69,
+    "commandsRX": 497,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 2,
+    "timeoutResponse": 0,
+    "rtt": 81
+  },
+  "highestSecurityClass": -1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/cover_iblinds_v3_state.json b/tests/components/zwave_js/fixtures/cover_iblinds_v3_state.json
new file mode 100644
index 00000000000000..f0da41e4b6ff3c
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/cover_iblinds_v3_state.json
@@ -0,0 +1,1236 @@
+{
+  "nodeId": 12,
+  "index": 0,
+  "installerIcon": 6656,
+  "userIcon": 6656,
+  "status": 4,
+  "ready": true,
+  "isListening": false,
+  "isRouting": true,
+  "isSecure": true,
+  "manufacturerId": 647,
+  "productId": 114,
+  "productType": 4,
+  "firmwareVersion": "3.12.1",
+  "zwavePlusVersion": 2,
+  "deviceConfig": {
+    "filename": "/data/db/devices/0x0287/iblindsv3.json",
+    "isEmbedded": true,
+    "manufacturer": "HAB Home Intelligence LLC",
+    "manufacturerId": 647,
+    "label": "iblinds V3",
+    "description": "Window Blind Controller",
+    "devices": [
+      {
+        "productType": 4,
+        "productId": 113
+      },
+      {
+        "productType": 4,
+        "productId": 114
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "preferred": false,
+    "associations": {},
+    "paramInformation": {
+      "_map": {}
+    }
+  },
+  "label": "iblinds V3",
+  "interviewAttempts": 1,
+  "endpoints": [
+    {
+      "nodeId": 12,
+      "index": 0,
+      "installerIcon": 6656,
+      "userIcon": 6656,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 7,
+          "label": "Motor Control Class C"
+        },
+        "mandatorySupportedCCs": [32, 38, 37, 114, 134],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 38,
+          "name": "Multilevel Switch",
+          "version": 4,
+          "isSecure": true
+        },
+        {
+          "id": 37,
+          "name": "Binary Switch",
+          "version": 2,
+          "isSecure": true
+        },
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": true
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 2,
+          "isSecure": true
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 85,
+          "name": "Transport Service",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 159,
+          "name": "Security 2",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 108,
+          "name": "Supervision",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 5,
+          "isSecure": true
+        },
+        {
+          "id": 128,
+          "name": "Battery",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 112,
+          "name": "Configuration",
+          "version": 4,
+          "isSecure": true
+        },
+        {
+          "id": 135,
+          "name": "Indicator",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 142,
+          "name": "Multi Channel Association",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 106,
+          "name": "Window Covering",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 152,
+          "name": "Security",
+          "version": 1,
+          "isSecure": true
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 37,
+      "commandClassName": "Binary Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "stateful": true,
+        "secret": false
+      },
+      "value": false
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 37,
+      "commandClassName": "Binary Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      },
+      "value": false
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 37,
+      "commandClassName": "Binary Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      },
+      "value": {
+        "value": 0,
+        "unit": "seconds"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      },
+      "value": {
+        "value": 0,
+        "unit": "seconds"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Up",
+      "propertyName": "Up",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Perform a level change (Up)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Down",
+      "propertyName": "Down",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Perform a level change (Down)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "currentValue",
+      "propertyKey": 23,
+      "propertyName": "currentValue",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "min": 0,
+        "max": 99,
+        "states": {
+          "0": "Closed (up)",
+          "50": "Open",
+          "99": "Closed (down)"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "targetValue",
+      "propertyKey": 23,
+      "propertyName": "targetValue",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99,
+        "states": {
+          "0": "Closed (up)",
+          "50": "Open",
+          "99": "Closed (down)"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 99
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "duration",
+      "propertyKey": 23,
+      "propertyName": "duration",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": {
+        "value": 0,
+        "unit": "seconds"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "open",
+      "propertyKey": 23,
+      "propertyName": "open",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Open - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      },
+      "nodeId": 12,
+      "value": true
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "close0",
+      "propertyKey": 23,
+      "propertyName": "close0",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Close Up - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 106,
+      "commandClassName": "Window Covering",
+      "property": "close99",
+      "propertyKey": 23,
+      "propertyName": "close99",
+      "propertyKeyName": "Horizontal Slats Angle",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Close Down - Horizontal Slats Angle",
+        "ccSpecific": {
+          "parameter": 23
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      },
+      "nodeId": 12,
+      "value": true
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 1,
+      "propertyName": "Close Interval",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Auto Calibration Tightness. Lower value = tighter, Higher value = looser (MUST BE RECALIBRATED).",
+        "label": "Close Interval",
+        "default": 22,
+        "min": 16,
+        "max": 32,
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 15
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 2,
+      "propertyName": "Reverse Direction",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Reverse Direction",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "No",
+          "1": "Yes"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 3,
+      "propertyName": "Send Reports",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Used to disable Z-Wave Reports. This is useful for systems that poll iblinds immediately after sending a position command. Disable this if an immediate report is causing iblinds motor to function improperly.",
+        "label": "Send Reports",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Enable",
+          "1": "Disable"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 4,
+      "propertyName": "Default ON Value",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Value that iblinds will open to by default",
+        "label": "Default ON Value",
+        "default": 50,
+        "min": 0,
+        "max": 99,
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 50
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 5,
+      "propertyName": "Reset Button",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Disabling the reset button on the motor prevents it from accidentally being pressed",
+        "label": "Reset Button",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Enable",
+          "1": "Disable"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 6,
+      "propertyName": "Movement Duration",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Movement Duration",
+        "default": 0,
+        "min": 0,
+        "max": 100,
+        "unit": "seconds",
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 7,
+      "propertyName": "Remote Calibration",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": false,
+        "writeable": true,
+        "label": "Remote Calibration",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Idle",
+          "1": "Start calibration"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 8,
+      "propertyName": "Minimum Tilt Level",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": false,
+        "writeable": true,
+        "label": "Minimum Tilt Level",
+        "default": 0,
+        "min": 0,
+        "max": 25,
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 9,
+      "propertyName": "Maximum Tilt Level",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": false,
+        "writeable": true,
+        "label": "Maximum Tilt Level",
+        "default": 99,
+        "min": 75,
+        "max": 99,
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 10,
+      "propertyName": "Override Response to ON Command",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": false,
+        "writeable": true,
+        "description": "Overrides Set commands with a value of 99 to use the value defined in parameter 4 (Default ON Value) instead",
+        "label": "Override Response to ON Command",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Disable",
+          "1": "Enable"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 647
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 4
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 114
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 128,
+      "commandClassName": "Battery",
+      "property": "level",
+      "propertyName": "level",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Battery level",
+        "min": 0,
+        "max": 100,
+        "unit": "%",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 90
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 128,
+      "commandClassName": "Battery",
+      "property": "isLow",
+      "propertyName": "isLow",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": false,
+        "label": "Low battery level",
+        "stateful": true,
+        "secret": false
+      },
+      "value": false
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.12"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions",
+        "stateful": true,
+        "secret": false
+      },
+      "value": ["3.12"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 2
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "sdkVersion",
+      "propertyName": "sdkVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "SDK version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.12.2"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkAPIVersion",
+      "propertyName": "applicationFrameworkAPIVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "3.12.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkBuildNumber",
+      "propertyName": "applicationFrameworkBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 35
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceVersion",
+      "propertyName": "hostInterfaceVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "unused"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceBuildNumber",
+      "propertyName": "hostInterfaceBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolVersion",
+      "propertyName": "zWaveProtocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "7.12.2"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolBuildNumber",
+      "propertyName": "zWaveProtocolBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 35
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationVersion",
+      "propertyName": "applicationVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "3.12.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationBuildNumber",
+      "propertyName": "applicationBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application build number",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 43707
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 3,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: Duration",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the duration of an on/off period in 1/10th seconds. Must be set together with \"On/Off Cycle Count\"",
+        "label": "Node Identify - On/Off Period: Duration",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 3
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 4,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Cycle Count",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the number of on/off periods. 0xff means infinite. Must be set together with \"On/Off Period duration\"",
+        "label": "Node Identify - On/Off Cycle Count",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 4
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 5,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: On time",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "This property is used to set the length of the On time during an On/Off period. It allows asymmetric On/Off periods. The value 0x00 MUST represent symmetric On/Off period (On time equal to Off time)",
+        "label": "Node Identify - On/Off Period: On time",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 5
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "value",
+      "propertyName": "value",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Indicator value",
+        "ccSpecific": {
+          "indicatorId": 0
+        },
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "identify",
+      "propertyName": "identify",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Identify",
+        "stateful": true,
+        "secret": false
+      }
+    }
+  ],
+  "isFrequentListening": "1000ms",
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 7,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 7,
+      "label": "Motor Control Class C"
+    },
+    "mandatorySupportedCCs": [32, 38, 37, 114, 134],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x0287:0x0004:0x0072:3.12.1",
+  "statistics": {
+    "commandsTX": 109,
+    "commandsRX": 101,
+    "commandsDroppedRX": 2,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 8,
+    "rtt": 1217.2,
+    "rssi": -43,
+    "lwr": {
+      "protocolDataRate": 2,
+      "repeaters": [],
+      "rssi": -45,
+      "repeaterRSSI": []
+    }
+  },
+  "highestSecurityClass": 1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/cover_nice_ibt4zwave_state.json b/tests/components/zwave_js/fixtures/cover_nice_ibt4zwave_state.json
new file mode 100644
index 00000000000000..eab42c321fe14f
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/cover_nice_ibt4zwave_state.json
@@ -0,0 +1,1410 @@
+{
+  "nodeId": 72,
+  "index": 0,
+  "installerIcon": 7680,
+  "userIcon": 7680,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": false,
+  "manufacturerId": 1089,
+  "productId": 4096,
+  "productType": 9216,
+  "firmwareVersion": "7.0",
+  "zwavePlusVersion": 2,
+  "name": "Portail",
+  "location": "**REDACTED**",
+  "deviceConfig": {
+    "filename": "/data/db/devices/0x0441/ibt4zwave.json",
+    "isEmbedded": true,
+    "manufacturer": "NICE Spa",
+    "manufacturerId": 1089,
+    "label": "IBT4ZWAVE",
+    "description": "BusT4-Z-Wave interface",
+    "devices": [
+      {
+        "productType": 9216,
+        "productId": 4096
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "paramInformation": {
+      "_map": {}
+    },
+    "metadata": {
+      "inclusion": "Install the external antenna before powering the device and adding to the Z-Wave network for the device to automatically detect and enable it (use only antennas and cables compliant with technical specification).\n\n01. Set the Z-Wave gateway into adding mode (see the Z-Wave gateway\u2019s manual)\n02. On the IBT4ZWAVE press and release the S1 button 3 times x3 S1\n03. LEDs on the IBT4ZW AVE will start slow flashing alter nately\n04. If you are adding in Security S2 Authenticated, input the underlined part\nof the DSK (label on the box) DSK: XXXXX-XXXXX-XXXXX-XXXXX XXXXX-XXXXX-XXXXX-XXXXX\n05. When the adding process ends, the LEDs on the IBT4ZWAVE will show adding and antenna status (Table 1 in manual)",
+      "exclusion": "01. Set the Z-Wave gateway into remove mode (see the Z-Wave gateway\u2019s manual)\n02. On the IBT4ZWAVE press and release the S1 button 3 times x3 S1\n03. LEDs on the IBT4ZW AVE will start slow flashing alternately\n04. Wait for the removing process to end",
+      "reset": "01. Press and hold the S1 button\n03. Wait 3 seconds\n04. LEDs will show adding and antenna status (Table 1 in manual) for 3 seconds\n05. LEDs will turn off for 3 seconds\n06. LEDs will show selected antenna (Table 2 in manual) for 3 seconds\n07. When both LEDs light up simultaneously, release the button\n08. Press and release the S1 button\n09. Both LEDs will flash once at the end of the procedure",
+      "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=product_documents/3837/IBT4ZWAVE-T-v0.7.pdf"
+    }
+  },
+  "label": "IBT4ZWAVE",
+  "interviewAttempts": 2,
+  "endpoints": [
+    {
+      "nodeId": 72,
+      "index": 0,
+      "installerIcon": 7680,
+      "userIcon": 7680,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 0,
+          "label": "Unused"
+        },
+        "mandatorySupportedCCs": [32, 38],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 38,
+          "name": "Multilevel Switch",
+          "version": 4,
+          "isSecure": false
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 142,
+          "name": "Multi Channel Association",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 5,
+          "isSecure": false
+        },
+        {
+          "id": 135,
+          "name": "Indicator",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 152,
+          "name": "Security",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 159,
+          "name": "Security 2",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 108,
+          "name": "Supervision",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 85,
+          "name": "Transport Service",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 3,
+          "isSecure": false
+        },
+        {
+          "id": 113,
+          "name": "Notification",
+          "version": 8,
+          "isSecure": false
+        },
+        {
+          "id": 117,
+          "name": "Protection",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 112,
+          "name": "Configuration",
+          "version": 4,
+          "isSecure": false
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration"
+      },
+      "value": {
+        "value": 0,
+        "unit": "seconds"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Open",
+      "propertyName": "Open",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Open)",
+        "ccSpecific": {
+          "switchType": 3
+        },
+        "valueChangeOptions": ["transitionDuration"]
+      },
+      "value": false,
+      "nodeId": 72
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Close",
+      "propertyName": "Close",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Close)",
+        "ccSpecific": {
+          "switchType": 3
+        },
+        "valueChangeOptions": ["transitionDuration"]
+      },
+      "value": true,
+      "nodeId": 72
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 30,
+      "propertyKey": 4278190080,
+      "propertyName": "Alarm Configuration - 1st Slot Notification Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 1st Slot Notification Type",
+        "default": 0,
+        "min": 0,
+        "max": 22,
+        "states": {
+          "0": "Disabled",
+          "1": "Smoke Alarm",
+          "2": "CO Alarm",
+          "3": "CO2 Alarm",
+          "4": "Heat Alarm",
+          "5": "Water Alarm",
+          "6": "Access Control",
+          "7": "Home Security",
+          "8": "Power Management",
+          "9": "System",
+          "10": "Emergency Alarm",
+          "11": "Clock",
+          "12": "Appliance",
+          "13": "Home Health",
+          "14": "Siren",
+          "15": "Water Valve",
+          "16": "Weather Alarm",
+          "17": "Irrigation",
+          "18": "Gas Alarm",
+          "19": "Pest Control",
+          "20": "Light Sensor",
+          "21": "Water Quality Monitoring",
+          "22": "Home Monitoring"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 30,
+      "propertyKey": 16711680,
+      "propertyName": "Alarm Configuration - 1st Slot Notification Event",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 1st Slot Notification Event",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Disabled",
+          "255": "Any Notification,"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 30,
+      "propertyKey": 65280,
+      "propertyName": "Alarm Configuration - 1st Slot Notification Event Parameter",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 1st Slot Notification Event Parameter",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 30,
+      "propertyKey": 255,
+      "propertyName": "Alarm Configuration - 1st Slot Action",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 1st Slot Action",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "No Action",
+          "1": "Open",
+          "2": "Close"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 31,
+      "propertyKey": 4278190080,
+      "propertyName": "Alarm Configuration - 2nd Slot Notification Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 2nd Slot Notification Type",
+        "default": 5,
+        "min": 0,
+        "max": 22,
+        "states": {
+          "0": "Disabled",
+          "1": "Smoke Alarm",
+          "2": "CO Alarm",
+          "3": "CO2 Alarm",
+          "4": "Heat Alarm",
+          "5": "Water Alarm",
+          "6": "Access Control",
+          "7": "Home Security",
+          "8": "Power Management",
+          "9": "System",
+          "10": "Emergency Alarm",
+          "11": "Clock",
+          "12": "Appliance",
+          "13": "Home Health",
+          "14": "Siren",
+          "15": "Water Valve",
+          "16": "Weather Alarm",
+          "17": "Irrigation",
+          "18": "Gas Alarm",
+          "19": "Pest Control",
+          "20": "Light Sensor",
+          "21": "Water Quality Monitoring",
+          "22": "Home Monitoring"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 5
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 31,
+      "propertyKey": 16711680,
+      "propertyName": "Alarm Configuration - 2nd Slot Notification Event",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 2nd Slot Notification Event",
+        "default": 255,
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Disabled",
+          "255": "Any Notification,"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 255
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 31,
+      "propertyKey": 65280,
+      "propertyName": "Alarm Configuration - 2nd Slot Notification Event Parameter",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 2nd Slot Notification Event Parameter",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 31,
+      "propertyKey": 255,
+      "propertyName": "Alarm Configuration - 2nd Slot Action",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 2nd Slot Action",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "No Action",
+          "1": "Open",
+          "2": "Close"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 32,
+      "propertyKey": 4278190080,
+      "propertyName": "Alarm Configuration - 3rd Slot Notification Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 3rd Slot Notification Type",
+        "default": 1,
+        "min": 0,
+        "max": 22,
+        "states": {
+          "0": "Disabled",
+          "1": "Smoke Alarm",
+          "2": "CO Alarm",
+          "3": "CO2 Alarm",
+          "4": "Heat Alarm",
+          "5": "Water Alarm",
+          "6": "Access Control",
+          "7": "Home Security",
+          "8": "Power Management",
+          "9": "System",
+          "10": "Emergency Alarm",
+          "11": "Clock",
+          "12": "Appliance",
+          "13": "Home Health",
+          "14": "Siren",
+          "15": "Water Valve",
+          "16": "Weather Alarm",
+          "17": "Irrigation",
+          "18": "Gas Alarm",
+          "19": "Pest Control",
+          "20": "Light Sensor",
+          "21": "Water Quality Monitoring",
+          "22": "Home Monitoring"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 32,
+      "propertyKey": 16711680,
+      "propertyName": "Alarm Configuration - 3rd Slot Notification Event",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 3rd Slot Notification Event",
+        "default": 255,
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Disabled",
+          "255": "Any Notification,"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 255
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 32,
+      "propertyKey": 65280,
+      "propertyName": "Alarm Configuration - 3rd Slot Notification Event Parameter",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 3rd Slot Notification Event Parameter",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 32,
+      "propertyKey": 255,
+      "propertyName": "Alarm Configuration - 3rd Slot Action",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 3rd Slot Action",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "No Action",
+          "1": "Open",
+          "2": "Close"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 33,
+      "propertyKey": 4278190080,
+      "propertyName": "Alarm Configuration - 4th Slot Notification Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 4th Slot Notification Type",
+        "default": 2,
+        "min": 0,
+        "max": 22,
+        "states": {
+          "0": "Disabled",
+          "1": "Smoke Alarm",
+          "2": "CO Alarm",
+          "3": "CO2 Alarm",
+          "4": "Heat Alarm",
+          "5": "Water Alarm",
+          "6": "Access Control",
+          "7": "Home Security",
+          "8": "Power Management",
+          "9": "System",
+          "10": "Emergency Alarm",
+          "11": "Clock",
+          "12": "Appliance",
+          "13": "Home Health",
+          "14": "Siren",
+          "15": "Water Valve",
+          "16": "Weather Alarm",
+          "17": "Irrigation",
+          "18": "Gas Alarm",
+          "19": "Pest Control",
+          "20": "Light Sensor",
+          "21": "Water Quality Monitoring",
+          "22": "Home Monitoring"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 2
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 33,
+      "propertyKey": 16711680,
+      "propertyName": "Alarm Configuration - 4th Slot Notification Event",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 4th Slot Notification Event",
+        "default": 255,
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Disabled",
+          "255": "Any Notification,"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 255
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 33,
+      "propertyKey": 65280,
+      "propertyName": "Alarm Configuration - 4th Slot Notification Event Parameter",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 4th Slot Notification Event Parameter",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 33,
+      "propertyKey": 255,
+      "propertyName": "Alarm Configuration - 4th Slot Action",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 4th Slot Action",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "No Action",
+          "1": "Open",
+          "2": "Close"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 34,
+      "propertyKey": 4278190080,
+      "propertyName": "Alarm Configuration - 5th Slot Notification Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 5th Slot Notification Type",
+        "default": 4,
+        "min": 0,
+        "max": 22,
+        "states": {
+          "0": "Disabled",
+          "1": "Smoke Alarm",
+          "2": "CO Alarm",
+          "3": "CO2 Alarm",
+          "4": "Heat Alarm",
+          "5": "Water Alarm",
+          "6": "Access Control",
+          "7": "Home Security",
+          "8": "Power Management",
+          "9": "System",
+          "10": "Emergency Alarm",
+          "11": "Clock",
+          "12": "Appliance",
+          "13": "Home Health",
+          "14": "Siren",
+          "15": "Water Valve",
+          "16": "Weather Alarm",
+          "17": "Irrigation",
+          "18": "Gas Alarm",
+          "19": "Pest Control",
+          "20": "Light Sensor",
+          "21": "Water Quality Monitoring",
+          "22": "Home Monitoring"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 4
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 34,
+      "propertyKey": 16711680,
+      "propertyName": "Alarm Configuration - 5th Slot Notification Event",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 5th Slot Notification Event",
+        "default": 255,
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "Disabled",
+          "255": "Any Notification,"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 255
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 34,
+      "propertyKey": 65280,
+      "propertyName": "Alarm Configuration - 5th Slot Notification Event Parameter",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 5th Slot Notification Event Parameter",
+        "default": 0,
+        "min": 0,
+        "max": 255,
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 34,
+      "propertyKey": 255,
+      "propertyName": "Alarm Configuration - 5th Slot Action",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Alarm Configuration - 5th Slot Action",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "No Action",
+          "1": "Open",
+          "2": "Close"
+        },
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "Access Control",
+      "propertyKey": "Barrier control status",
+      "propertyName": "Access Control",
+      "propertyKeyName": "Barrier control status",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Barrier control status",
+        "ccSpecific": {
+          "notificationType": 6
+        },
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "idle",
+          "76": "Barrier associated with non Z-Wave remote control"
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "System",
+      "propertyKey": "Hardware status",
+      "propertyName": "System",
+      "propertyKeyName": "Hardware status",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Hardware status",
+        "ccSpecific": {
+          "notificationType": 9
+        },
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "idle",
+          "3": "System hardware failure (with failure code)"
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 113,
+      "commandClassName": "Notification",
+      "property": "Access Control",
+      "propertyKey": "Barrier safety beam obstacle status",
+      "propertyName": "Access Control",
+      "propertyKeyName": "Barrier safety beam obstacle status",
+      "ccVersion": 8,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Barrier safety beam obstacle status",
+        "ccSpecific": {
+          "notificationType": 6
+        },
+        "min": 0,
+        "max": 255,
+        "states": {
+          "72": "Barrier safety beam obstacle"
+        }
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 1089
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 9216
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 4096
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 117,
+      "commandClassName": "Protection",
+      "property": "local",
+      "propertyName": "local",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Local protection state",
+        "states": {
+          "0": "Unprotected",
+          "2": "NoOperationPossible"
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 117,
+      "commandClassName": "Protection",
+      "property": "rf",
+      "propertyName": "rf",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "RF protection state",
+        "states": {
+          "0": "Unprotected",
+          "1": "NoControl"
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 117,
+      "commandClassName": "Protection",
+      "property": "exclusiveControlNodeId",
+      "propertyName": "exclusiveControlNodeId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "any",
+        "readable": true,
+        "writeable": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 117,
+      "commandClassName": "Protection",
+      "property": "timeout",
+      "propertyName": "timeout",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "any",
+        "readable": true,
+        "writeable": true
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        }
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version"
+      },
+      "value": "7.13"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions"
+      },
+      "value": ["7.0"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version"
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "sdkVersion",
+      "propertyName": "sdkVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "SDK version"
+      },
+      "value": "7.13.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkAPIVersion",
+      "propertyName": "applicationFrameworkAPIVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API version"
+      },
+      "value": "10.13.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkBuildNumber",
+      "propertyName": "applicationFrameworkBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API build number"
+      },
+      "value": 175
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceVersion",
+      "propertyName": "hostInterfaceVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API version"
+      },
+      "value": "unused"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceBuildNumber",
+      "propertyName": "hostInterfaceBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API build number"
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolVersion",
+      "propertyName": "zWaveProtocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version"
+      },
+      "value": "7.13.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolBuildNumber",
+      "propertyName": "zWaveProtocolBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol build number"
+      },
+      "value": 175
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationVersion",
+      "propertyName": "applicationVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application version"
+      },
+      "value": "7.0.0"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationBuildNumber",
+      "propertyName": "applicationBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application build number"
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 3,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: Duration",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the duration of an on/off period in 1/10th seconds. Must be set together with \"On/Off Cycle Count\"",
+        "label": "Node Identify - On/Off Period: Duration",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 3
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 4,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Cycle Count",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the number of on/off periods. 0xff means infinite. Must be set together with \"On/Off Period duration\"",
+        "label": "Node Identify - On/Off Cycle Count",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 4
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 5,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: On time",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "This property is used to set the length of the On time during an On/Off period. It allows asymetic On/Off periods. The value 0x00 MUST represent symmetric On/Off period (On time equal to Off time)",
+        "label": "Node Identify - On/Off Period: On time",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 5
+        }
+      },
+      "value": 0
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 0,
+      "label": "Unused"
+    },
+    "mandatorySupportedCCs": [32, 38],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x0441:0x2400:0x1000:7.0",
+  "statistics": {
+    "commandsTX": 254,
+    "commandsRX": 224,
+    "commandsDroppedRX": 47,
+    "commandsDroppedTX": 85,
+    "timeoutResponse": 4,
+    "rtt": 18.7
+  },
+  "highestSecurityClass": -1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/energy_production_state.json b/tests/components/zwave_js/fixtures/energy_production_state.json
new file mode 100644
index 00000000000000..b074e51c499afb
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/energy_production_state.json
@@ -0,0 +1,241 @@
+{
+  "nodeId": 2,
+  "index": 0,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": false,
+  "interviewAttempts": 1,
+  "endpoints": [
+    {
+      "nodeId": 2,
+      "index": 0,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 6,
+          "label": "Appliance"
+        },
+        "specific": {
+          "key": 1,
+          "label": "General Appliance"
+        },
+        "mandatorySupportedCCs": [],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 144,
+          "name": "Energy Production",
+          "version": 1,
+          "isSecure": false
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        },
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 144,
+      "commandClassName": "Energy Production",
+      "property": "value",
+      "propertyKey": 0,
+      "propertyName": "value",
+      "propertyKeyName": "0",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Power",
+        "ccSpecific": {
+          "parameter": 0,
+          "scale": 0
+        },
+        "unit": "W",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 1.23
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 144,
+      "commandClassName": "Energy Production",
+      "property": "value",
+      "propertyKey": 1,
+      "propertyName": "value",
+      "propertyKeyName": "1",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Production Total",
+        "ccSpecific": {
+          "parameter": 1,
+          "scale": 0
+        },
+        "unit": "Wh",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 1234.56
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 144,
+      "commandClassName": "Energy Production",
+      "property": "value",
+      "propertyKey": 2,
+      "propertyName": "value",
+      "propertyKeyName": "2",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Production Today",
+        "ccSpecific": {
+          "parameter": 2,
+          "scale": 0
+        },
+        "unit": "Wh",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 123.45
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 144,
+      "commandClassName": "Energy Production",
+      "property": "value",
+      "propertyKey": 3,
+      "propertyName": "value",
+      "propertyKeyName": "3",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Total Time",
+        "ccSpecific": {
+          "parameter": 3,
+          "scale": 0
+        },
+        "unit": "seconds",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 123456
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 9600, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 6,
+      "label": "Appliance"
+    },
+    "specific": {
+      "key": 1,
+      "label": "General Appliance"
+    },
+    "mandatorySupportedCCs": [],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "statistics": {
+    "commandsTX": 10,
+    "commandsRX": 7,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 1,
+    "rtt": 84.8
+  },
+  "highestSecurityClass": -1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json b/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json
new file mode 100644
index 00000000000000..063eae25b0f4f8
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/fan_honeywell_39358_state.json
@@ -0,0 +1,10511 @@
+{
+  "nodeId": 61,
+  "index": 0,
+  "installerIcon": 1024,
+  "userIcon": 1024,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": false,
+  "manufacturerId": 57,
+  "productId": 12593,
+  "productType": 18756,
+  "firmwareVersion": "5.24",
+  "zwavePlusVersion": 1,
+  "name": "honeywell_in_wall_smart_fan_control",
+  "deviceConfig": {
+    "filename": "/srv/zwavejs2mqtt/node_modules/@zwave-js/config/config/devices/0x0039/39358_39465_zw4002.json",
+    "isEmbedded": true,
+    "manufacturer": "Honeywell",
+    "manufacturerId": 57,
+    "label": "39358 / 39465 / ZW4002",
+    "description": "In-Wall Fan Speed Control, 500S",
+    "devices": [
+      {
+        "productType": 18756,
+        "productId": 12593
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "preferred": false,
+    "associations": {},
+    "paramInformation": {
+      "_map": {}
+    },
+    "compat": {
+      "removeCCs": {},
+      "treatBasicSetAsEvent": true
+    },
+    "metadata": {
+      "inclusion": "1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network.\n2. Once the controller is ready to include your device, press and release the top or bottom of the smart fan control switch (rocker) to include it in the network.\n3. Once your controller has confirmed the device has been included, refresh the Z-Wave network to optimize performance",
+      "exclusion": "1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. \n2. Once the controller is ready to Exclude your device, press and release the top or bottom of the wireless smart switch (rocker) to exclude it from the network",
+      "reset": "1. Quickly press ON (Top) button three (3) times then immediately press the OFF (Bottom) button three (3) times. The LED will flash ON/OFF 5 times when completed successfully.\nNote: This should only be used in the event your network\u2019s primary controller is missing or otherwise inoperable",
+      "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/2725/39358-HQSG-v1-para.pdf"
+    }
+  },
+  "label": "39358 / 39465 / ZW4002",
+  "interviewAttempts": 0,
+  "endpoints": [
+    {
+      "nodeId": 61,
+      "index": 0,
+      "installerIcon": 1024,
+      "userIcon": 1024,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 8,
+          "label": "Fan Switch"
+        },
+        "mandatorySupportedCCs": [32, 38, 133, 89, 114, 115, 134, 94],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 32,
+          "name": "Basic",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 38,
+          "name": "Multilevel Switch",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 112,
+          "name": "Configuration",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 86,
+          "name": "CRC-16 Encapsulation",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 44,
+          "name": "Scene Actuator Configuration",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 43,
+          "name": "Scene Activation",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 2,
+          "isSecure": false
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "event",
+      "propertyName": "event",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Event value",
+        "min": 0,
+        "max": 255,
+        "stateful": false,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 32,
+      "commandClassName": "Basic",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Up",
+      "propertyName": "Up",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Up)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Down",
+      "propertyName": "Down",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "label": "Perform a level change (Down)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"],
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 1,
+      "propertyName": "level",
+      "propertyKeyName": "1",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (1)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 1,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "1",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (1)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 2,
+      "propertyName": "level",
+      "propertyKeyName": "2",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (2)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 2,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "2",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (2)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 3,
+      "propertyName": "level",
+      "propertyKeyName": "3",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (3)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 3,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "3",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (3)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 4,
+      "propertyName": "level",
+      "propertyKeyName": "4",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (4)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 4,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "4",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (4)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 5,
+      "propertyName": "level",
+      "propertyKeyName": "5",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (5)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 5,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "5",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (5)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 6,
+      "propertyName": "level",
+      "propertyKeyName": "6",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (6)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 6,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "6",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (6)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 7,
+      "propertyName": "level",
+      "propertyKeyName": "7",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (7)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 7,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "7",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (7)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 8,
+      "propertyName": "level",
+      "propertyKeyName": "8",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (8)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 8,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "8",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (8)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 9,
+      "propertyName": "level",
+      "propertyKeyName": "9",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (9)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 9,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "9",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (9)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 10,
+      "propertyName": "level",
+      "propertyKeyName": "10",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (10)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 10,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "10",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (10)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 11,
+      "propertyName": "level",
+      "propertyKeyName": "11",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (11)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 11,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "11",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (11)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 12,
+      "propertyName": "level",
+      "propertyKeyName": "12",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (12)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 12,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "12",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (12)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 13,
+      "propertyName": "level",
+      "propertyKeyName": "13",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (13)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 13,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "13",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (13)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 14,
+      "propertyName": "level",
+      "propertyKeyName": "14",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (14)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 14,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "14",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (14)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 15,
+      "propertyName": "level",
+      "propertyKeyName": "15",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (15)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 15,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "15",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (15)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 16,
+      "propertyName": "level",
+      "propertyKeyName": "16",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (16)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 16,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "16",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (16)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 17,
+      "propertyName": "level",
+      "propertyKeyName": "17",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (17)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 17,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "17",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (17)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 18,
+      "propertyName": "level",
+      "propertyKeyName": "18",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (18)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 18,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "18",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (18)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 19,
+      "propertyName": "level",
+      "propertyKeyName": "19",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (19)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 19,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "19",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (19)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 20,
+      "propertyName": "level",
+      "propertyKeyName": "20",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (20)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 20,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "20",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (20)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 21,
+      "propertyName": "level",
+      "propertyKeyName": "21",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (21)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 21,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "21",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (21)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 22,
+      "propertyName": "level",
+      "propertyKeyName": "22",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (22)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 22,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "22",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (22)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 23,
+      "propertyName": "level",
+      "propertyKeyName": "23",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (23)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 23,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "23",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (23)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 24,
+      "propertyName": "level",
+      "propertyKeyName": "24",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (24)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 24,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "24",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (24)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 25,
+      "propertyName": "level",
+      "propertyKeyName": "25",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (25)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 25,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "25",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (25)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 26,
+      "propertyName": "level",
+      "propertyKeyName": "26",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (26)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 26,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "26",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (26)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 27,
+      "propertyName": "level",
+      "propertyKeyName": "27",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (27)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 27,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "27",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (27)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 28,
+      "propertyName": "level",
+      "propertyKeyName": "28",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (28)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 28,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "28",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (28)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 29,
+      "propertyName": "level",
+      "propertyKeyName": "29",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (29)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 29,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "29",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (29)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 30,
+      "propertyName": "level",
+      "propertyKeyName": "30",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (30)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 30,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "30",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (30)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 31,
+      "propertyName": "level",
+      "propertyKeyName": "31",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (31)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 31,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "31",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (31)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 32,
+      "propertyName": "level",
+      "propertyKeyName": "32",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (32)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 32,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "32",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (32)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 33,
+      "propertyName": "level",
+      "propertyKeyName": "33",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (33)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 33,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "33",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (33)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 34,
+      "propertyName": "level",
+      "propertyKeyName": "34",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (34)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 34,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "34",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (34)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 35,
+      "propertyName": "level",
+      "propertyKeyName": "35",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (35)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 35,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "35",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (35)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 36,
+      "propertyName": "level",
+      "propertyKeyName": "36",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (36)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 36,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "36",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (36)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 37,
+      "propertyName": "level",
+      "propertyKeyName": "37",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (37)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 37,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "37",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (37)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 38,
+      "propertyName": "level",
+      "propertyKeyName": "38",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (38)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 38,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "38",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (38)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 39,
+      "propertyName": "level",
+      "propertyKeyName": "39",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (39)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 39,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "39",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (39)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 40,
+      "propertyName": "level",
+      "propertyKeyName": "40",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (40)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 40,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "40",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (40)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 41,
+      "propertyName": "level",
+      "propertyKeyName": "41",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (41)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 41,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "41",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (41)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 42,
+      "propertyName": "level",
+      "propertyKeyName": "42",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (42)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 42,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "42",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (42)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 43,
+      "propertyName": "level",
+      "propertyKeyName": "43",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (43)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 43,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "43",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (43)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 44,
+      "propertyName": "level",
+      "propertyKeyName": "44",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (44)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 44,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "44",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (44)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 45,
+      "propertyName": "level",
+      "propertyKeyName": "45",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (45)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 45,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "45",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (45)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 46,
+      "propertyName": "level",
+      "propertyKeyName": "46",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (46)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 46,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "46",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (46)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 47,
+      "propertyName": "level",
+      "propertyKeyName": "47",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (47)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 47,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "47",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (47)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 48,
+      "propertyName": "level",
+      "propertyKeyName": "48",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (48)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 48,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "48",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (48)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 49,
+      "propertyName": "level",
+      "propertyKeyName": "49",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (49)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 49,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "49",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (49)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 50,
+      "propertyName": "level",
+      "propertyKeyName": "50",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (50)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 50,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "50",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (50)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 51,
+      "propertyName": "level",
+      "propertyKeyName": "51",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (51)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 51,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "51",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (51)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 52,
+      "propertyName": "level",
+      "propertyKeyName": "52",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (52)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 52,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "52",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (52)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 53,
+      "propertyName": "level",
+      "propertyKeyName": "53",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (53)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 53,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "53",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (53)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 54,
+      "propertyName": "level",
+      "propertyKeyName": "54",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (54)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 54,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "54",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (54)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 55,
+      "propertyName": "level",
+      "propertyKeyName": "55",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (55)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 55,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "55",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (55)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 56,
+      "propertyName": "level",
+      "propertyKeyName": "56",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (56)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 56,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "56",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (56)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 57,
+      "propertyName": "level",
+      "propertyKeyName": "57",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (57)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 57,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "57",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (57)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 58,
+      "propertyName": "level",
+      "propertyKeyName": "58",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (58)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 58,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "58",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (58)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 59,
+      "propertyName": "level",
+      "propertyKeyName": "59",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (59)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 59,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "59",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (59)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 60,
+      "propertyName": "level",
+      "propertyKeyName": "60",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (60)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 60,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "60",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (60)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 61,
+      "propertyName": "level",
+      "propertyKeyName": "61",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (61)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 61,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "61",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (61)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 62,
+      "propertyName": "level",
+      "propertyKeyName": "62",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (62)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 62,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "62",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (62)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 63,
+      "propertyName": "level",
+      "propertyKeyName": "63",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (63)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 63,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "63",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (63)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 64,
+      "propertyName": "level",
+      "propertyKeyName": "64",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (64)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 64,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "64",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (64)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 65,
+      "propertyName": "level",
+      "propertyKeyName": "65",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (65)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 65,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "65",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (65)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 66,
+      "propertyName": "level",
+      "propertyKeyName": "66",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (66)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 66,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "66",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (66)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 67,
+      "propertyName": "level",
+      "propertyKeyName": "67",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (67)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 67,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "67",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (67)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 68,
+      "propertyName": "level",
+      "propertyKeyName": "68",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (68)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 68,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "68",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (68)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 69,
+      "propertyName": "level",
+      "propertyKeyName": "69",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (69)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 69,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "69",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (69)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 70,
+      "propertyName": "level",
+      "propertyKeyName": "70",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (70)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 70,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "70",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (70)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 71,
+      "propertyName": "level",
+      "propertyKeyName": "71",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (71)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 71,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "71",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (71)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 72,
+      "propertyName": "level",
+      "propertyKeyName": "72",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (72)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 72,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "72",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (72)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 73,
+      "propertyName": "level",
+      "propertyKeyName": "73",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (73)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 73,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "73",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (73)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 74,
+      "propertyName": "level",
+      "propertyKeyName": "74",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (74)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 74,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "74",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (74)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 75,
+      "propertyName": "level",
+      "propertyKeyName": "75",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (75)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 75,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "75",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (75)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 76,
+      "propertyName": "level",
+      "propertyKeyName": "76",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (76)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 76,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "76",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (76)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 77,
+      "propertyName": "level",
+      "propertyKeyName": "77",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (77)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 77,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "77",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (77)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 78,
+      "propertyName": "level",
+      "propertyKeyName": "78",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (78)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 78,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "78",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (78)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 79,
+      "propertyName": "level",
+      "propertyKeyName": "79",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (79)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 79,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "79",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (79)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 80,
+      "propertyName": "level",
+      "propertyKeyName": "80",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (80)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 80,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "80",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (80)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 81,
+      "propertyName": "level",
+      "propertyKeyName": "81",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (81)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 81,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "81",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (81)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 82,
+      "propertyName": "level",
+      "propertyKeyName": "82",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (82)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 82,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "82",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (82)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 83,
+      "propertyName": "level",
+      "propertyKeyName": "83",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (83)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 83,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "83",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (83)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 84,
+      "propertyName": "level",
+      "propertyKeyName": "84",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (84)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 84,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "84",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (84)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 85,
+      "propertyName": "level",
+      "propertyKeyName": "85",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (85)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 85,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "85",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (85)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 86,
+      "propertyName": "level",
+      "propertyKeyName": "86",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (86)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 86,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "86",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (86)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 87,
+      "propertyName": "level",
+      "propertyKeyName": "87",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (87)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 87,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "87",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (87)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 88,
+      "propertyName": "level",
+      "propertyKeyName": "88",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (88)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 88,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "88",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (88)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 89,
+      "propertyName": "level",
+      "propertyKeyName": "89",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (89)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 89,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "89",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (89)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 90,
+      "propertyName": "level",
+      "propertyKeyName": "90",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (90)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 90,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "90",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (90)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 91,
+      "propertyName": "level",
+      "propertyKeyName": "91",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (91)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 91,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "91",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (91)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 92,
+      "propertyName": "level",
+      "propertyKeyName": "92",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (92)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 92,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "92",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (92)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 93,
+      "propertyName": "level",
+      "propertyKeyName": "93",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (93)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 93,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "93",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (93)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 94,
+      "propertyName": "level",
+      "propertyKeyName": "94",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (94)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 94,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "94",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (94)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 95,
+      "propertyName": "level",
+      "propertyKeyName": "95",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (95)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 95,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "95",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (95)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 96,
+      "propertyName": "level",
+      "propertyKeyName": "96",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (96)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 96,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "96",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (96)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 97,
+      "propertyName": "level",
+      "propertyKeyName": "97",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (97)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 97,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "97",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (97)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 98,
+      "propertyName": "level",
+      "propertyKeyName": "98",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (98)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 98,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "98",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (98)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 99,
+      "propertyName": "level",
+      "propertyKeyName": "99",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (99)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 99,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "99",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (99)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 100,
+      "propertyName": "level",
+      "propertyKeyName": "100",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (100)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 100,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "100",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (100)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 101,
+      "propertyName": "level",
+      "propertyKeyName": "101",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (101)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 101,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "101",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (101)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 102,
+      "propertyName": "level",
+      "propertyKeyName": "102",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (102)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 102,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "102",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (102)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 103,
+      "propertyName": "level",
+      "propertyKeyName": "103",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (103)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 103,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "103",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (103)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 104,
+      "propertyName": "level",
+      "propertyKeyName": "104",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (104)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 104,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "104",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (104)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 105,
+      "propertyName": "level",
+      "propertyKeyName": "105",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (105)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 105,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "105",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (105)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 106,
+      "propertyName": "level",
+      "propertyKeyName": "106",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (106)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 106,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "106",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (106)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 107,
+      "propertyName": "level",
+      "propertyKeyName": "107",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (107)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 107,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "107",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (107)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 108,
+      "propertyName": "level",
+      "propertyKeyName": "108",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (108)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 108,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "108",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (108)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 109,
+      "propertyName": "level",
+      "propertyKeyName": "109",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (109)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 109,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "109",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (109)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 110,
+      "propertyName": "level",
+      "propertyKeyName": "110",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (110)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 110,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "110",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (110)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 111,
+      "propertyName": "level",
+      "propertyKeyName": "111",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (111)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 111,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "111",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (111)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 112,
+      "propertyName": "level",
+      "propertyKeyName": "112",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (112)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 112,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "112",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (112)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 113,
+      "propertyName": "level",
+      "propertyKeyName": "113",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (113)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 113,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "113",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (113)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 114,
+      "propertyName": "level",
+      "propertyKeyName": "114",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (114)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 114,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "114",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (114)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 115,
+      "propertyName": "level",
+      "propertyKeyName": "115",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (115)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 115,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "115",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (115)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 116,
+      "propertyName": "level",
+      "propertyKeyName": "116",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (116)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 116,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "116",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (116)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 117,
+      "propertyName": "level",
+      "propertyKeyName": "117",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (117)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 117,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "117",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (117)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 118,
+      "propertyName": "level",
+      "propertyKeyName": "118",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (118)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 118,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "118",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (118)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 119,
+      "propertyName": "level",
+      "propertyKeyName": "119",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (119)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 119,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "119",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (119)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 120,
+      "propertyName": "level",
+      "propertyKeyName": "120",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (120)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 120,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "120",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (120)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 121,
+      "propertyName": "level",
+      "propertyKeyName": "121",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (121)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 121,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "121",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (121)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 122,
+      "propertyName": "level",
+      "propertyKeyName": "122",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (122)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 122,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "122",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (122)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 123,
+      "propertyName": "level",
+      "propertyKeyName": "123",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (123)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 123,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "123",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (123)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 124,
+      "propertyName": "level",
+      "propertyKeyName": "124",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (124)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 124,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "124",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (124)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 125,
+      "propertyName": "level",
+      "propertyKeyName": "125",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (125)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 125,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "125",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (125)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 126,
+      "propertyName": "level",
+      "propertyKeyName": "126",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (126)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 126,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "126",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (126)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 127,
+      "propertyName": "level",
+      "propertyKeyName": "127",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (127)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 127,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "127",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (127)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 128,
+      "propertyName": "level",
+      "propertyKeyName": "128",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (128)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 128,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "128",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (128)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 129,
+      "propertyName": "level",
+      "propertyKeyName": "129",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (129)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 129,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "129",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (129)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 130,
+      "propertyName": "level",
+      "propertyKeyName": "130",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (130)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 130,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "130",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (130)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 131,
+      "propertyName": "level",
+      "propertyKeyName": "131",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (131)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 131,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "131",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (131)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 132,
+      "propertyName": "level",
+      "propertyKeyName": "132",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (132)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 132,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "132",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (132)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 133,
+      "propertyName": "level",
+      "propertyKeyName": "133",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (133)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 133,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "133",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (133)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 134,
+      "propertyName": "level",
+      "propertyKeyName": "134",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (134)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 134,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "134",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (134)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 135,
+      "propertyName": "level",
+      "propertyKeyName": "135",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (135)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 135,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "135",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (135)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 136,
+      "propertyName": "level",
+      "propertyKeyName": "136",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (136)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 136,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "136",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (136)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 137,
+      "propertyName": "level",
+      "propertyKeyName": "137",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (137)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 137,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "137",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (137)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 138,
+      "propertyName": "level",
+      "propertyKeyName": "138",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (138)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 138,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "138",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (138)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 139,
+      "propertyName": "level",
+      "propertyKeyName": "139",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (139)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 139,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "139",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (139)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 140,
+      "propertyName": "level",
+      "propertyKeyName": "140",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (140)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 140,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "140",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (140)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 141,
+      "propertyName": "level",
+      "propertyKeyName": "141",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (141)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 141,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "141",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (141)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 142,
+      "propertyName": "level",
+      "propertyKeyName": "142",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (142)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 142,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "142",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (142)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 143,
+      "propertyName": "level",
+      "propertyKeyName": "143",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (143)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 143,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "143",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (143)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 144,
+      "propertyName": "level",
+      "propertyKeyName": "144",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (144)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 144,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "144",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (144)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 145,
+      "propertyName": "level",
+      "propertyKeyName": "145",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (145)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 145,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "145",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (145)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 146,
+      "propertyName": "level",
+      "propertyKeyName": "146",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (146)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 146,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "146",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (146)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 147,
+      "propertyName": "level",
+      "propertyKeyName": "147",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (147)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 147,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "147",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (147)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 148,
+      "propertyName": "level",
+      "propertyKeyName": "148",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (148)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 148,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "148",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (148)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 149,
+      "propertyName": "level",
+      "propertyKeyName": "149",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (149)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 149,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "149",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (149)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 150,
+      "propertyName": "level",
+      "propertyKeyName": "150",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (150)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 150,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "150",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (150)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 151,
+      "propertyName": "level",
+      "propertyKeyName": "151",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (151)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 151,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "151",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (151)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 152,
+      "propertyName": "level",
+      "propertyKeyName": "152",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (152)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 152,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "152",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (152)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 153,
+      "propertyName": "level",
+      "propertyKeyName": "153",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (153)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 153,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "153",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (153)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 154,
+      "propertyName": "level",
+      "propertyKeyName": "154",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (154)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 154,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "154",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (154)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 155,
+      "propertyName": "level",
+      "propertyKeyName": "155",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (155)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 155,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "155",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (155)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 156,
+      "propertyName": "level",
+      "propertyKeyName": "156",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (156)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 156,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "156",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (156)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 157,
+      "propertyName": "level",
+      "propertyKeyName": "157",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (157)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 157,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "157",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (157)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 158,
+      "propertyName": "level",
+      "propertyKeyName": "158",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (158)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 158,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "158",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (158)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 159,
+      "propertyName": "level",
+      "propertyKeyName": "159",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (159)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 159,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "159",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (159)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 160,
+      "propertyName": "level",
+      "propertyKeyName": "160",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (160)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 160,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "160",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (160)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 161,
+      "propertyName": "level",
+      "propertyKeyName": "161",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (161)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 161,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "161",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (161)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 162,
+      "propertyName": "level",
+      "propertyKeyName": "162",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (162)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 162,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "162",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (162)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 163,
+      "propertyName": "level",
+      "propertyKeyName": "163",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (163)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 163,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "163",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (163)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 164,
+      "propertyName": "level",
+      "propertyKeyName": "164",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (164)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 164,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "164",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (164)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 165,
+      "propertyName": "level",
+      "propertyKeyName": "165",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (165)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 165,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "165",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (165)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 166,
+      "propertyName": "level",
+      "propertyKeyName": "166",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (166)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 166,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "166",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (166)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 167,
+      "propertyName": "level",
+      "propertyKeyName": "167",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (167)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 167,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "167",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (167)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 168,
+      "propertyName": "level",
+      "propertyKeyName": "168",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (168)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 168,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "168",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (168)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 169,
+      "propertyName": "level",
+      "propertyKeyName": "169",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (169)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 169,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "169",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (169)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 170,
+      "propertyName": "level",
+      "propertyKeyName": "170",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (170)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 170,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "170",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (170)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 171,
+      "propertyName": "level",
+      "propertyKeyName": "171",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (171)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 171,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "171",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (171)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 172,
+      "propertyName": "level",
+      "propertyKeyName": "172",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (172)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 172,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "172",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (172)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 173,
+      "propertyName": "level",
+      "propertyKeyName": "173",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (173)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 173,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "173",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (173)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 174,
+      "propertyName": "level",
+      "propertyKeyName": "174",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (174)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 174,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "174",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (174)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 175,
+      "propertyName": "level",
+      "propertyKeyName": "175",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (175)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 175,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "175",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (175)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 176,
+      "propertyName": "level",
+      "propertyKeyName": "176",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (176)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 176,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "176",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (176)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 177,
+      "propertyName": "level",
+      "propertyKeyName": "177",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (177)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 177,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "177",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (177)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 178,
+      "propertyName": "level",
+      "propertyKeyName": "178",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (178)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 178,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "178",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (178)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 179,
+      "propertyName": "level",
+      "propertyKeyName": "179",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (179)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 179,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "179",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (179)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 180,
+      "propertyName": "level",
+      "propertyKeyName": "180",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (180)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 180,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "180",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (180)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 181,
+      "propertyName": "level",
+      "propertyKeyName": "181",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (181)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 181,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "181",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (181)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 182,
+      "propertyName": "level",
+      "propertyKeyName": "182",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (182)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 182,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "182",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (182)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 183,
+      "propertyName": "level",
+      "propertyKeyName": "183",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (183)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 183,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "183",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (183)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 184,
+      "propertyName": "level",
+      "propertyKeyName": "184",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (184)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 184,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "184",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (184)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 185,
+      "propertyName": "level",
+      "propertyKeyName": "185",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (185)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 185,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "185",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (185)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 186,
+      "propertyName": "level",
+      "propertyKeyName": "186",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (186)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 186,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "186",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (186)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 187,
+      "propertyName": "level",
+      "propertyKeyName": "187",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (187)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 187,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "187",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (187)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 188,
+      "propertyName": "level",
+      "propertyKeyName": "188",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (188)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 188,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "188",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (188)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 189,
+      "propertyName": "level",
+      "propertyKeyName": "189",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (189)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 189,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "189",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (189)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 190,
+      "propertyName": "level",
+      "propertyKeyName": "190",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (190)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 190,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "190",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (190)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 191,
+      "propertyName": "level",
+      "propertyKeyName": "191",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (191)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 191,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "191",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (191)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 192,
+      "propertyName": "level",
+      "propertyKeyName": "192",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (192)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 192,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "192",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (192)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 193,
+      "propertyName": "level",
+      "propertyKeyName": "193",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (193)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 193,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "193",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (193)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 194,
+      "propertyName": "level",
+      "propertyKeyName": "194",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (194)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 194,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "194",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (194)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 195,
+      "propertyName": "level",
+      "propertyKeyName": "195",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (195)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 195,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "195",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (195)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 196,
+      "propertyName": "level",
+      "propertyKeyName": "196",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (196)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 196,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "196",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (196)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 197,
+      "propertyName": "level",
+      "propertyKeyName": "197",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (197)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 197,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "197",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (197)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 198,
+      "propertyName": "level",
+      "propertyKeyName": "198",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (198)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 198,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "198",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (198)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 199,
+      "propertyName": "level",
+      "propertyKeyName": "199",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (199)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 199,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "199",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (199)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 200,
+      "propertyName": "level",
+      "propertyKeyName": "200",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (200)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 200,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "200",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (200)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 201,
+      "propertyName": "level",
+      "propertyKeyName": "201",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (201)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 201,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "201",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (201)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 202,
+      "propertyName": "level",
+      "propertyKeyName": "202",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (202)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 202,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "202",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (202)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 203,
+      "propertyName": "level",
+      "propertyKeyName": "203",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (203)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 203,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "203",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (203)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 204,
+      "propertyName": "level",
+      "propertyKeyName": "204",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (204)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 204,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "204",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (204)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 205,
+      "propertyName": "level",
+      "propertyKeyName": "205",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (205)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 205,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "205",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (205)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 206,
+      "propertyName": "level",
+      "propertyKeyName": "206",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (206)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 206,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "206",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (206)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 207,
+      "propertyName": "level",
+      "propertyKeyName": "207",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (207)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 207,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "207",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (207)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 208,
+      "propertyName": "level",
+      "propertyKeyName": "208",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (208)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 208,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "208",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (208)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 209,
+      "propertyName": "level",
+      "propertyKeyName": "209",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (209)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 209,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "209",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (209)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 210,
+      "propertyName": "level",
+      "propertyKeyName": "210",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (210)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 210,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "210",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (210)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 211,
+      "propertyName": "level",
+      "propertyKeyName": "211",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (211)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 211,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "211",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (211)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 212,
+      "propertyName": "level",
+      "propertyKeyName": "212",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (212)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 212,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "212",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (212)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 213,
+      "propertyName": "level",
+      "propertyKeyName": "213",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (213)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 213,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "213",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (213)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 214,
+      "propertyName": "level",
+      "propertyKeyName": "214",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (214)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 214,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "214",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (214)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 215,
+      "propertyName": "level",
+      "propertyKeyName": "215",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (215)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 215,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "215",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (215)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 216,
+      "propertyName": "level",
+      "propertyKeyName": "216",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (216)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 216,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "216",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (216)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 217,
+      "propertyName": "level",
+      "propertyKeyName": "217",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (217)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 217,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "217",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (217)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 218,
+      "propertyName": "level",
+      "propertyKeyName": "218",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (218)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 218,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "218",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (218)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 219,
+      "propertyName": "level",
+      "propertyKeyName": "219",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (219)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 219,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "219",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (219)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 220,
+      "propertyName": "level",
+      "propertyKeyName": "220",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (220)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 220,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "220",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (220)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 221,
+      "propertyName": "level",
+      "propertyKeyName": "221",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (221)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 221,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "221",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (221)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 222,
+      "propertyName": "level",
+      "propertyKeyName": "222",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (222)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 222,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "222",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (222)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 223,
+      "propertyName": "level",
+      "propertyKeyName": "223",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (223)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 223,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "223",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (223)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 224,
+      "propertyName": "level",
+      "propertyKeyName": "224",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (224)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 224,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "224",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (224)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 225,
+      "propertyName": "level",
+      "propertyKeyName": "225",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (225)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 225,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "225",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (225)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 226,
+      "propertyName": "level",
+      "propertyKeyName": "226",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (226)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 226,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "226",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (226)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 227,
+      "propertyName": "level",
+      "propertyKeyName": "227",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (227)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 227,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "227",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (227)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 228,
+      "propertyName": "level",
+      "propertyKeyName": "228",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (228)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 228,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "228",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (228)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 229,
+      "propertyName": "level",
+      "propertyKeyName": "229",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (229)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 229,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "229",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (229)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 230,
+      "propertyName": "level",
+      "propertyKeyName": "230",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (230)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 230,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "230",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (230)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 231,
+      "propertyName": "level",
+      "propertyKeyName": "231",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (231)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 231,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "231",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (231)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 232,
+      "propertyName": "level",
+      "propertyKeyName": "232",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (232)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 232,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "232",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (232)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 233,
+      "propertyName": "level",
+      "propertyKeyName": "233",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (233)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 233,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "233",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (233)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 234,
+      "propertyName": "level",
+      "propertyKeyName": "234",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (234)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 234,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "234",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (234)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 235,
+      "propertyName": "level",
+      "propertyKeyName": "235",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (235)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 235,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "235",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (235)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 236,
+      "propertyName": "level",
+      "propertyKeyName": "236",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (236)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 236,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "236",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (236)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 237,
+      "propertyName": "level",
+      "propertyKeyName": "237",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (237)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 237,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "237",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (237)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 238,
+      "propertyName": "level",
+      "propertyKeyName": "238",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (238)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 238,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "238",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (238)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 239,
+      "propertyName": "level",
+      "propertyKeyName": "239",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (239)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 239,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "239",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (239)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 240,
+      "propertyName": "level",
+      "propertyKeyName": "240",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (240)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 240,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "240",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (240)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 241,
+      "propertyName": "level",
+      "propertyKeyName": "241",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (241)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 241,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "241",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (241)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 242,
+      "propertyName": "level",
+      "propertyKeyName": "242",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (242)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 242,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "242",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (242)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 243,
+      "propertyName": "level",
+      "propertyKeyName": "243",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (243)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 243,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "243",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (243)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 244,
+      "propertyName": "level",
+      "propertyKeyName": "244",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (244)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 244,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "244",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (244)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 245,
+      "propertyName": "level",
+      "propertyKeyName": "245",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (245)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 245,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "245",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (245)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 246,
+      "propertyName": "level",
+      "propertyKeyName": "246",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (246)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 246,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "246",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (246)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 247,
+      "propertyName": "level",
+      "propertyKeyName": "247",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (247)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 247,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "247",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (247)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 248,
+      "propertyName": "level",
+      "propertyKeyName": "248",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (248)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 248,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "248",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (248)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 249,
+      "propertyName": "level",
+      "propertyKeyName": "249",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (249)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 249,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "249",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (249)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 250,
+      "propertyName": "level",
+      "propertyKeyName": "250",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (250)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 250,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "250",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (250)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 251,
+      "propertyName": "level",
+      "propertyKeyName": "251",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (251)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 251,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "251",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (251)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 252,
+      "propertyName": "level",
+      "propertyKeyName": "252",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (252)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 252,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "252",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (252)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 253,
+      "propertyName": "level",
+      "propertyKeyName": "253",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (253)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 253,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "253",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (253)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 254,
+      "propertyName": "level",
+      "propertyKeyName": "254",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (254)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 254,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "254",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (254)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "level",
+      "propertyKey": 255,
+      "propertyName": "level",
+      "propertyKeyName": "255",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Level (255)",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 255,
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 44,
+      "commandClassName": "Scene Actuator Configuration",
+      "property": "dimmingDuration",
+      "propertyKey": 255,
+      "propertyName": "dimmingDuration",
+      "propertyKeyName": "255",
+      "ccVersion": 0,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": true,
+        "label": "Dimming duration (255)",
+        "stateful": true,
+        "secret": false
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 4,
+      "propertyName": "Invert Switch",
+      "ccVersion": 1,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Invert Switch",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Default",
+          "1": "Invert"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 57
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 18756
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535,
+        "stateful": true,
+        "secret": false
+      },
+      "value": 12593
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        },
+        "stateful": true,
+        "secret": false
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": "4.54"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions",
+        "stateful": true,
+        "secret": false
+      },
+      "value": ["5.24"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version",
+        "stateful": true,
+        "secret": false
+      },
+      "value": 255
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 8,
+      "label": "Fan Switch"
+    },
+    "mandatorySupportedCCs": [32, 38, 133, 89, 114, 115, 134, 94],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x0039:0x4944:0x3131:5.24",
+  "statistics": {
+    "commandsTX": 40,
+    "commandsRX": 39,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 0,
+    "rtt": 35.8
+  },
+  "highestSecurityClass": -1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/indicator_test_state.json b/tests/components/zwave_js/fixtures/indicator_test_state.json
new file mode 100644
index 00000000000000..9e823b79109f9d
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/indicator_test_state.json
@@ -0,0 +1,190 @@
+{
+  "nodeId": 43,
+  "index": 0,
+  "installerIcon": 1536,
+  "userIcon": 1540,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": true,
+  "manufacturerId": 634,
+  "productId": 40962,
+  "productType": 28672,
+  "firmwareVersion": "10.0.1",
+  "zwavePlusVersion": 2,
+  "location": "**REDACTED**",
+  "deviceConfig": {
+    "filename": "/usr/src/app/store/.config-db/devices/0x027a/zen72.json",
+    "isEmbedded": true,
+    "manufacturer": "Fake",
+    "manufacturerId": 634,
+    "label": "Device",
+    "description": "This is a fake device",
+    "devices": [
+      {
+        "productType": 28672,
+        "productId": 40962
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "associations": {},
+    "paramInformation": {
+      "_map": {}
+    },
+    "compat": {
+      "skipConfigurationNameQuery": true,
+      "skipConfigurationInfoQuery": true
+    },
+    "metadata": {
+      "inclusion": "1. Initiate inclusion (pairing) in the app (or web interface).\n2. TAP UP 3 TIMES QUICKLY if using traditional Z-Wave inclusion.\n3. The LED indicator will blink blue to signal communication and turn green for 3 seconds if inclusion is successful or turn red for 3 seconds if the pairing attempt fails",
+      "exclusion": "1. Bring your Z-Wave gateway (hub) close to the switch if possible\n2. Put the Z-Wave hub into exclusion mode (not sure how to do that? ask@getzooz.com) \n3. Tap the lower paddle on the switch 3 times quickly (the LED indicator will start blinking blue)\n4. Your hub will confirm exclusion, the LED indicator on the switch will turn green for 3 seconds, and the device will disappear from your controller's device list",
+      "reset": "If your primary controller is missing or inoperable, you may need to reset the device to factory settings. To reset the switch, press and hold the lower paddle for 10 seconds until the LED indicator starts blinking. Release paddle, and immediately after, tap the lower paddle 5 times to complete the reset. The LED indicator will flash blue 3 times and turn red for 3 seconds to confirm successful reset",
+      "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=product_documents/4108/zooz-700-series-z-wave-dimmer-zen72-manual.pdf"
+    }
+  },
+  "label": "Device",
+  "interviewAttempts": 0,
+  "endpoints": [
+    {
+      "nodeId": 43,
+      "index": 0,
+      "installerIcon": 1536,
+      "userIcon": 1540,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 1,
+          "label": "Multilevel Power Switch"
+        },
+        "mandatorySupportedCCs": [32, 38, 39],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 135,
+          "name": "Indicator",
+          "version": 3,
+          "isSecure": true
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "Test",
+      "propertyKey": "Sensor",
+      "propertyName": "Test",
+      "propertyKeyName": "Sensor",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "description": "Tests non-writeable Indicator CC number gets created as a sensor entity",
+        "label": "Sensor",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 4
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "Test",
+      "propertyKey": "Switch",
+      "propertyName": "Test",
+      "propertyKeyName": "Switch",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "description": "Tests writeable Indicator CC boolean gets created as a switch entity",
+        "label": "Switch",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 5
+        }
+      },
+      "value": false
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "Test",
+      "propertyKey": "Binary Sensor",
+      "propertyName": "Test",
+      "propertyKeyName": "Binary Sensor",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": false,
+        "description": "Tests non-writeable Indicator CC boolean gets created as a binary sensor entity",
+        "label": "Binary Sensor",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 5
+        }
+      },
+      "value": false
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 1,
+      "label": "Multilevel Power Switch"
+    },
+    "mandatorySupportedCCs": [32, 38, 39],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x027a:0x7000:0xa002:10.0.1",
+  "statistics": {
+    "commandsTX": 64,
+    "commandsRX": 88,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 0,
+    "rtt": 74.5,
+    "rssi": -60
+  },
+  "highestSecurityClass": 1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/switch_zooz_zen72_state.json b/tests/components/zwave_js/fixtures/switch_zooz_zen72_state.json
new file mode 100644
index 00000000000000..04b3a336618e65
--- /dev/null
+++ b/tests/components/zwave_js/fixtures/switch_zooz_zen72_state.json
@@ -0,0 +1,1299 @@
+{
+  "nodeId": 43,
+  "index": 0,
+  "installerIcon": 1536,
+  "userIcon": 1540,
+  "status": 4,
+  "ready": true,
+  "isListening": true,
+  "isRouting": true,
+  "isSecure": true,
+  "manufacturerId": 634,
+  "productId": 40962,
+  "productType": 28672,
+  "firmwareVersion": "10.0.1",
+  "zwavePlusVersion": 2,
+  "location": "**REDACTED**",
+  "deviceConfig": {
+    "filename": "/usr/src/app/store/.config-db/devices/0x027a/zen72.json",
+    "isEmbedded": true,
+    "manufacturer": "Zooz",
+    "manufacturerId": 634,
+    "label": "ZEN72",
+    "description": "Z-Wave Plus 700 Series Dimmer Switch",
+    "devices": [
+      {
+        "productType": 28672,
+        "productId": 40962
+      }
+    ],
+    "firmwareVersion": {
+      "min": "0.0",
+      "max": "255.255"
+    },
+    "associations": {},
+    "paramInformation": {
+      "_map": {}
+    },
+    "compat": {
+      "skipConfigurationNameQuery": true,
+      "skipConfigurationInfoQuery": true
+    },
+    "metadata": {
+      "inclusion": "1. Initiate inclusion (pairing) in the app (or web interface).\n2. TAP UP 3 TIMES QUICKLY if using traditional Z-Wave inclusion.\n3. The LED indicator will blink blue to signal communication and turn green for 3 seconds if inclusion is successful or turn red for 3 seconds if the pairing attempt fails",
+      "exclusion": "1. Bring your Z-Wave gateway (hub) close to the switch if possible\n2. Put the Z-Wave hub into exclusion mode (not sure how to do that? ask@getzooz.com) \n3. Tap the lower paddle on the switch 3 times quickly (the LED indicator will start blinking blue)\n4. Your hub will confirm exclusion, the LED indicator on the switch will turn green for 3 seconds, and the device will disappear from your controller's device list",
+      "reset": "If your primary controller is missing or inoperable, you may need to reset the device to factory settings. To reset the switch, press and hold the lower paddle for 10 seconds until the LED indicator starts blinking. Release paddle, and immediately after, tap the lower paddle 5 times to complete the reset. The LED indicator will flash blue 3 times and turn red for 3 seconds to confirm successful reset",
+      "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=product_documents/4108/zooz-700-series-z-wave-dimmer-zen72-manual.pdf"
+    }
+  },
+  "label": "ZEN72",
+  "interviewAttempts": 0,
+  "endpoints": [
+    {
+      "nodeId": 43,
+      "index": 0,
+      "installerIcon": 1536,
+      "userIcon": 1540,
+      "deviceClass": {
+        "basic": {
+          "key": 4,
+          "label": "Routing Slave"
+        },
+        "generic": {
+          "key": 17,
+          "label": "Multilevel Switch"
+        },
+        "specific": {
+          "key": 1,
+          "label": "Multilevel Power Switch"
+        },
+        "mandatorySupportedCCs": [32, 38, 39],
+        "mandatoryControlledCCs": []
+      },
+      "commandClasses": [
+        {
+          "id": 38,
+          "name": "Multilevel Switch",
+          "version": 4,
+          "isSecure": true
+        },
+        {
+          "id": 159,
+          "name": "Security 2",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 94,
+          "name": "Z-Wave Plus Info",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 85,
+          "name": "Transport Service",
+          "version": 2,
+          "isSecure": false
+        },
+        {
+          "id": 108,
+          "name": "Supervision",
+          "version": 1,
+          "isSecure": false
+        },
+        {
+          "id": 134,
+          "name": "Version",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 112,
+          "name": "Configuration",
+          "version": 4,
+          "isSecure": true
+        },
+        {
+          "id": 91,
+          "name": "Central Scene",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 133,
+          "name": "Association",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 142,
+          "name": "Multi Channel Association",
+          "version": 4,
+          "isSecure": true
+        },
+        {
+          "id": 89,
+          "name": "Association Group Information",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 114,
+          "name": "Manufacturer Specific",
+          "version": 2,
+          "isSecure": true
+        },
+        {
+          "id": 90,
+          "name": "Device Reset Locally",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 135,
+          "name": "Indicator",
+          "version": 3,
+          "isSecure": true
+        },
+        {
+          "id": 115,
+          "name": "Powerlevel",
+          "version": 1,
+          "isSecure": true
+        },
+        {
+          "id": 122,
+          "name": "Firmware Update Meta Data",
+          "version": 5,
+          "isSecure": true
+        }
+      ]
+    }
+  ],
+  "values": [
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "targetValue",
+      "propertyName": "targetValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Target value",
+        "valueChangeOptions": ["transitionDuration"],
+        "min": 0,
+        "max": 99
+      },
+      "value": 29
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "duration",
+      "propertyName": "duration",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "duration",
+        "readable": true,
+        "writeable": false,
+        "label": "Remaining duration"
+      },
+      "value": {
+        "value": 3,
+        "unit": "seconds"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "currentValue",
+      "propertyName": "currentValue",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Current value",
+        "min": 0,
+        "max": 99
+      },
+      "value": 99
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Up",
+      "propertyName": "Up",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Perform a level change (Up)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"]
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "Down",
+      "propertyName": "Down",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Perform a level change (Down)",
+        "ccSpecific": {
+          "switchType": 2
+        },
+        "valueChangeOptions": ["transitionDuration"]
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 38,
+      "commandClassName": "Multilevel Switch",
+      "property": "restorePrevious",
+      "propertyName": "restorePrevious",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Restore previous value"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 91,
+      "commandClassName": "Central Scene",
+      "property": "scene",
+      "propertyKey": "001",
+      "propertyName": "scene",
+      "propertyKeyName": "001",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Scene 001",
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "KeyPressed",
+          "1": "KeyReleased",
+          "2": "KeyHeldDown",
+          "3": "KeyPressed2x",
+          "4": "KeyPressed3x",
+          "5": "KeyPressed4x",
+          "6": "KeyPressed5x"
+        }
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 91,
+      "commandClassName": "Central Scene",
+      "property": "scene",
+      "propertyKey": "002",
+      "propertyName": "scene",
+      "propertyKeyName": "002",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Scene 002",
+        "min": 0,
+        "max": 255,
+        "states": {
+          "0": "KeyPressed",
+          "1": "KeyReleased",
+          "2": "KeyHeldDown",
+          "3": "KeyPressed2x",
+          "4": "KeyPressed3x",
+          "5": "KeyPressed4x",
+          "6": "KeyPressed5x"
+        }
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 91,
+      "commandClassName": "Central Scene",
+      "property": "slowRefresh",
+      "propertyName": "slowRefresh",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": true,
+        "writeable": true,
+        "description": "When this is true, KeyHeldDown notifications are sent every 55s. When this is false, the notifications are sent every 200ms.",
+        "label": "Send held down notifications at a slow rate"
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 1,
+      "propertyName": "Inverted Orientation",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Inverted Orientation",
+        "default": 0,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "Disable",
+          "1": "Enable",
+          "2": "Momentary mode"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 2,
+      "propertyName": "LED Indicator",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "LED Indicator",
+        "default": 0,
+        "min": 0,
+        "max": 3,
+        "states": {
+          "0": "On when load is off",
+          "1": "On when load is on",
+          "2": "Always off",
+          "3": "Always on"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 23,
+      "propertyName": "LED Indicator Color",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "LED Indicator Color",
+        "default": 1,
+        "min": 0,
+        "max": 3,
+        "states": {
+          "0": "White",
+          "1": "Blue",
+          "2": "Green",
+          "3": "Red"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 2
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 24,
+      "propertyName": "LED Indicator Brightness",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "LED Indicator Brightness",
+        "default": 1,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "Bright (100%)",
+          "1": "Medium (60%)",
+          "2": "Low (30%)"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 3,
+      "propertyName": "Auto Turn-Off Timer",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Auto Turn-Off Timer",
+        "default": 0,
+        "min": 0,
+        "max": 65535,
+        "states": {
+          "0": "Disable"
+        },
+        "unit": "minutes",
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 5,
+      "propertyName": "Auto Turn-On Timer",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Auto Turn-On Timer",
+        "default": 0,
+        "min": 0,
+        "max": 65535,
+        "states": {
+          "0": "Disable"
+        },
+        "unit": "minutes",
+        "valueSize": 4,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 8,
+      "propertyName": "State After Power Failure",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "State After Power Failure",
+        "default": 2,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "Always off",
+          "1": "Always on",
+          "2": "Previous state"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 2
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 9,
+      "propertyName": "Ramp Rate Off/On (Manual Control)",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Ramp Rate Off/On (Manual Control)",
+        "default": 1,
+        "min": 0,
+        "max": 99,
+        "states": {
+          "0": "Instant on/off"
+        },
+        "unit": "seconds",
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 10,
+      "propertyName": "Minimum Brightness",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Minimum Brightness",
+        "default": 1,
+        "min": 1,
+        "max": 99,
+        "unit": "%",
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 10
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 11,
+      "propertyName": "Maximum Brightness",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Maximum Brightness",
+        "default": 99,
+        "min": 1,
+        "max": 99,
+        "unit": "%",
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 99
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 12,
+      "propertyName": "Double-Tap Upper Paddle Behavior",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Double-Tap Upper Paddle Behavior",
+        "default": 0,
+        "min": 0,
+        "max": 3,
+        "states": {
+          "0": "Full brightness",
+          "1": "Configured custom brightness (parameter 18)",
+          "2": "Configured maximum brightness",
+          "3": "Double tap disabled"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 25,
+      "propertyName": "Single-Tap Upper Paddle Behavior",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Single-Tap Upper Paddle Behavior",
+        "default": 0,
+        "min": 0,
+        "max": 3,
+        "states": {
+          "0": "Previous brightness",
+          "1": "Configured custom brightness (parameter 18)",
+          "2": "Configured maximum brightness",
+          "3": "Full brightness"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 13,
+      "propertyName": "Enable/Disable Scene Control",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Enable or disable scene control functionality for quick double tap triggers.",
+        "label": "Enable/Disable Scene Control",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Disable",
+          "1": "Enable"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 15,
+      "propertyName": "Smart Switch Mode",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Smart Switch Mode",
+        "default": 1,
+        "min": 0,
+        "max": 2,
+        "states": {
+          "0": "Local control disabled",
+          "1": "Local and Z-Wave control enabled",
+          "2": "Local and Z-Wave control disabled"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 19,
+      "propertyName": "3-Way Switch Type",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "3-Way Switch Type",
+        "default": 0,
+        "min": 0,
+        "max": 3,
+        "states": {
+          "0": "Toggle switch",
+          "1": "Toggle switch (with dimming control)",
+          "2": "Momentary switch (with dimming control)",
+          "3": "Momentary switch (with dimming control, but reduce after double click)"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 20,
+      "propertyName": "Smart Bulb Mode: Dimming Reporting Behavior",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Reporting behavior for local control and Z-Wave disabled / enabled, respectively. Final level for Z-Wave control actions is always sent as a Multilevel Switch report, regardless of setting.",
+        "label": "Smart Bulb Mode: Dimming Reporting Behavior",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Each brightness level / Final level",
+          "1": "Final brightness level only for local dimming, regardless of control setting"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 21,
+      "propertyName": "Smart Bulb Mode: Reporting Behavior",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Smart Bulb Mode: Reporting Behavior",
+        "default": 0,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Switch always reports status and changes LED state",
+          "1": "No status or LED state change when physical (and Z-Wave) control disabled"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 16,
+      "propertyName": "Local Dimming Speed",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "The time it takes to get from 0% to 100% brightness when pressing and holding the paddle.",
+        "label": "Local Dimming Speed",
+        "default": 5,
+        "min": 1,
+        "max": 99,
+        "unit": "seconds",
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 18,
+      "propertyName": "Custom Brightness Level",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Custom Brightness Level",
+        "default": 0,
+        "min": 0,
+        "max": 99,
+        "states": {
+          "0": "Previous brightness"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 50
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 22,
+      "propertyName": "Night Light Mode",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Set the brightness level the dimmer will turn on to when off and when lower paddle is held down for one second.",
+        "label": "Night Light Mode",
+        "default": 20,
+        "min": 0,
+        "max": 99,
+        "states": {
+          "0": "Disable"
+        },
+        "valueSize": 1,
+        "format": 0,
+        "allowManualEntry": true,
+        "isFromConfig": true
+      },
+      "value": 25
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 112,
+      "commandClassName": "Configuration",
+      "property": 26,
+      "propertyName": "Local Programming",
+      "ccVersion": 4,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Controls programming (eg. including/excluding) device through physical inputs, allowing the according input sequence to be used for scene control instead. Factory reset remains available.",
+        "label": "Local Programming",
+        "default": 1,
+        "min": 0,
+        "max": 1,
+        "states": {
+          "0": "Enable",
+          "1": "Disable"
+        },
+        "valueSize": 1,
+        "format": 1,
+        "allowManualEntry": false,
+        "isFromConfig": true
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "manufacturerId",
+      "propertyName": "manufacturerId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Manufacturer ID",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 634
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productType",
+      "propertyName": "productType",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product type",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 28672
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 114,
+      "commandClassName": "Manufacturer Specific",
+      "property": "productId",
+      "propertyName": "productId",
+      "ccVersion": 2,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Product ID",
+        "min": 0,
+        "max": 65535
+      },
+      "value": 40962
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "libraryType",
+      "propertyName": "libraryType",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Library type",
+        "states": {
+          "0": "Unknown",
+          "1": "Static Controller",
+          "2": "Controller",
+          "3": "Enhanced Slave",
+          "4": "Slave",
+          "5": "Installer",
+          "6": "Routing Slave",
+          "7": "Bridge Controller",
+          "8": "Device under Test",
+          "9": "N/A",
+          "10": "AV Remote",
+          "11": "AV Device"
+        }
+      },
+      "value": 3
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "protocolVersion",
+      "propertyName": "protocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version"
+      },
+      "value": "7.13"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "firmwareVersions",
+      "propertyName": "firmwareVersions",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string[]",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip firmware versions"
+      },
+      "value": ["10.0"]
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hardwareVersion",
+      "propertyName": "hardwareVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave chip hardware version"
+      },
+      "value": 1
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "sdkVersion",
+      "propertyName": "sdkVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "SDK version"
+      },
+      "value": "7.13.9"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkAPIVersion",
+      "propertyName": "applicationFrameworkAPIVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API version"
+      },
+      "value": "10.13.9"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationFrameworkBuildNumber",
+      "propertyName": "applicationFrameworkBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave application framework API build number"
+      },
+      "value": 405
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceVersion",
+      "propertyName": "hostInterfaceVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API version"
+      },
+      "value": "unused"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "hostInterfaceBuildNumber",
+      "propertyName": "hostInterfaceBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Serial API build number"
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolVersion",
+      "propertyName": "zWaveProtocolVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol version"
+      },
+      "value": "7.13.9"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "zWaveProtocolBuildNumber",
+      "propertyName": "zWaveProtocolBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Z-Wave protocol build number"
+      },
+      "value": 405
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationVersion",
+      "propertyName": "applicationVersion",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application version"
+      },
+      "value": "10.0.1"
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 134,
+      "commandClassName": "Version",
+      "property": "applicationBuildNumber",
+      "propertyName": "applicationBuildNumber",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "string",
+        "readable": true,
+        "writeable": false,
+        "label": "Application build number"
+      },
+      "value": 43707
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 3,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: Duration",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the duration of an on/off period in 1/10th seconds. Must be set together with \"On/Off Cycle Count\"",
+        "label": "Node Identify - On/Off Period: Duration",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 3
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 4,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Cycle Count",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "Sets the number of on/off periods. 0xff means infinite. Must be set together with \"On/Off Period duration\"",
+        "label": "Node Identify - On/Off Cycle Count",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 4
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": 80,
+      "propertyKey": 5,
+      "propertyName": "Node Identify",
+      "propertyKeyName": "On/Off Period: On time",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "description": "This property is used to set the length of the On time during an On/Off period. It allows asymmetric On/Off periods. The value 0x00 MUST represent symmetric On/Off period (On time equal to Off time)",
+        "label": "Node Identify - On/Off Period: On time",
+        "ccSpecific": {
+          "indicatorId": 80,
+          "propertyId": 5
+        }
+      },
+      "value": 0
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "value",
+      "propertyName": "value",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "number",
+        "readable": true,
+        "writeable": true,
+        "label": "Indicator value",
+        "ccSpecific": {
+          "indicatorId": 0
+        },
+        "min": 0,
+        "max": 255
+      }
+    },
+    {
+      "endpoint": 0,
+      "commandClass": 135,
+      "commandClassName": "Indicator",
+      "property": "identify",
+      "propertyName": "identify",
+      "ccVersion": 3,
+      "metadata": {
+        "type": "boolean",
+        "readable": false,
+        "writeable": true,
+        "label": "Identify"
+      }
+    }
+  ],
+  "isFrequentListening": false,
+  "maxDataRate": 100000,
+  "supportedDataRates": [40000, 100000],
+  "protocolVersion": 3,
+  "supportsBeaming": true,
+  "supportsSecurity": false,
+  "nodeType": 1,
+  "zwavePlusNodeType": 0,
+  "zwavePlusRoleType": 5,
+  "deviceClass": {
+    "basic": {
+      "key": 4,
+      "label": "Routing Slave"
+    },
+    "generic": {
+      "key": 17,
+      "label": "Multilevel Switch"
+    },
+    "specific": {
+      "key": 1,
+      "label": "Multilevel Power Switch"
+    },
+    "mandatorySupportedCCs": [32, 38, 39],
+    "mandatoryControlledCCs": []
+  },
+  "interviewStage": "Complete",
+  "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x027a:0x7000:0xa002:10.0.1",
+  "statistics": {
+    "commandsTX": 64,
+    "commandsRX": 88,
+    "commandsDroppedRX": 0,
+    "commandsDroppedTX": 0,
+    "timeoutResponse": 0,
+    "rtt": 74.5,
+    "rssi": -60
+  },
+  "highestSecurityClass": 1,
+  "isControllerNode": false,
+  "keepAwake": false
+}
diff --git a/tests/components/zwave_js/fixtures/zp3111-5_state.json b/tests/components/zwave_js/fixtures/zp3111-5_state.json
index 54f37d389ddbe1..68bb0f03af8d67 100644
--- a/tests/components/zwave_js/fixtures/zp3111-5_state.json
+++ b/tests/components/zwave_js/fixtures/zp3111-5_state.json
@@ -690,8 +690,8 @@
   "interviewStage": "Complete",
   "deviceDatabaseUrl": "https://devices.zwave-js.io/?jumpTo=0x0109:0x2021:0x2101:5.1",
   "statistics": {
-    "commandsTX": 39,
-    "commandsRX": 38,
+    "commandsTX": 0,
+    "commandsRX": 0,
     "commandsDroppedRX": 0,
     "commandsDroppedTX": 0,
     "timeoutResponse": 0
diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py
index f8a7a68f1399e8..c6a0f7a845d51e 100644
--- a/tests/components/zwave_js/test_api.py
+++ b/tests/components/zwave_js/test_api.py
@@ -32,6 +32,7 @@
 from zwave_js_server.model.controller.firmware import ControllerFirmwareUpdateData
 from zwave_js_server.model.node import Node
 from zwave_js_server.model.node.firmware import NodeFirmwareUpdateData
+from zwave_js_server.model.value import ConfigurationValue, get_value_id_str
 
 from homeassistant.components.websocket_api import ERR_INVALID_FORMAT, ERR_NOT_FOUND
 from homeassistant.components.zwave_js.api import (
@@ -43,6 +44,7 @@
     DEVICE_ID,
     DSK,
     ENABLED,
+    ENDPOINT,
     ENTRY_ID,
     ERR_NOT_LOADED,
     FEATURE,
@@ -85,6 +87,8 @@
 from tests.common import MockUser
 from tests.typing import ClientSessionGenerator, WebSocketGenerator
 
+CONTROLLER_PATCH_PREFIX = "zwave_js_server.model.controller.Controller"
+
 
 def get_device(hass: HomeAssistant, node):
     """Get device ID for a node."""
@@ -131,7 +135,7 @@ async def test_network_status(
 
     # Try API call with entry ID
     with patch(
-        "zwave_js_server.model.controller.Controller.async_get_state",
+        f"{CONTROLLER_PATCH_PREFIX}.async_get_state",
         return_value=controller_state["controller"],
     ):
         await ws_client.send_json(
@@ -155,7 +159,7 @@ async def test_network_status(
     )
     assert device
     with patch(
-        "zwave_js_server.model.controller.Controller.async_get_state",
+        f"{CONTROLLER_PATCH_PREFIX}.async_get_state",
         return_value=controller_state["controller"],
     ):
         await ws_client.send_json(
@@ -410,7 +414,8 @@ async def test_node_metadata(
         "controller being inoperable or otherwise unavailable.)"
     )
     assert result["manual"] == (
-        "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/2479/ZP3111-5_R2_20170316.pdf"
+        "https://products.z-wavealliance.org/ProductManual/File?folder=&filename="
+        "MarketCertificationFiles/2479/ZP3111-5_R2_20170316.pdf"
     )
     assert not result["wakeup"]
     assert (
@@ -885,7 +890,7 @@ async def test_add_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_begin_inclusion",
+        f"{CONTROLLER_PATCH_PREFIX}.async_begin_inclusion",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1155,7 +1160,7 @@ async def test_provision_smart_start_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_provision_smart_start_node",
+        f"{CONTROLLER_PATCH_PREFIX}.async_provision_smart_start_node",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1163,7 +1168,9 @@ async def test_provision_smart_start_node(
                 ID: 7,
                 TYPE: "zwave_js/provision_smart_start_node",
                 ENTRY_ID: entry.entry_id,
-                QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
+                QR_CODE_STRING: (
+                    "90testtesttesttesttesttesttesttesttesttesttesttesttest"
+                ),
             }
         )
         msg = await ws_client.receive_json()
@@ -1259,7 +1266,7 @@ async def test_unprovision_smart_start_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_unprovision_smart_start_node",
+        f"{CONTROLLER_PATCH_PREFIX}.async_unprovision_smart_start_node",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1332,7 +1339,7 @@ async def test_get_provisioning_entries(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_get_provisioning_entries",
+        f"{CONTROLLER_PATCH_PREFIX}.async_get_provisioning_entries",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1432,7 +1439,9 @@ async def test_parse_qr_code_string(
                 ID: 6,
                 TYPE: "zwave_js/parse_qr_code_string",
                 ENTRY_ID: entry.entry_id,
-                QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
+                QR_CODE_STRING: (
+                    "90testtesttesttesttesttesttesttesttesttesttesttesttest"
+                ),
             }
         )
         msg = await ws_client.receive_json()
@@ -1497,7 +1506,9 @@ async def test_try_parse_dsk_from_qr_code_string(
                 ID: 6,
                 TYPE: "zwave_js/try_parse_dsk_from_qr_code_string",
                 ENTRY_ID: entry.entry_id,
-                QR_CODE_STRING: "90testtesttesttesttesttesttesttesttesttesttesttesttest",
+                QR_CODE_STRING: (
+                    "90testtesttesttesttesttesttesttesttesttesttesttesttest"
+                ),
             }
         )
         msg = await ws_client.receive_json()
@@ -1572,7 +1583,7 @@ async def test_cancel_inclusion_exclusion(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_stop_inclusion",
+        f"{CONTROLLER_PATCH_PREFIX}.async_stop_inclusion",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1590,7 +1601,7 @@ async def test_cancel_inclusion_exclusion(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_stop_exclusion",
+        f"{CONTROLLER_PATCH_PREFIX}.async_stop_exclusion",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -1709,7 +1720,7 @@ async def test_remove_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_begin_exclusion",
+        f"{CONTROLLER_PATCH_PREFIX}.async_begin_exclusion",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2054,7 +2065,7 @@ async def test_replace_failed_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_replace_failed_node",
+        f"{CONTROLLER_PATCH_PREFIX}.async_replace_failed_node",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2105,7 +2116,7 @@ async def test_remove_failed_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_remove_failed_node",
+        f"{CONTROLLER_PATCH_PREFIX}.async_remove_failed_node",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2200,7 +2211,7 @@ async def test_begin_healing_network(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_begin_healing_network",
+        f"{CONTROLLER_PATCH_PREFIX}.async_begin_healing_network",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2342,7 +2353,7 @@ async def test_stop_healing_network(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_stop_healing_network",
+        f"{CONTROLLER_PATCH_PREFIX}.async_stop_healing_network",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2403,7 +2414,7 @@ async def test_heal_node(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_heal_node",
+        f"{CONTROLLER_PATCH_PREFIX}.async_heal_node",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
@@ -2747,6 +2758,12 @@ async def test_set_config_parameter(
     entry = integration
     ws_client = await hass_ws_client(hass)
     device = get_device(hass, multisensor_6)
+    new_value_data = multisensor_6.values[
+        get_value_id_str(multisensor_6, 112, 102, 0, 1)
+    ].data.copy()
+    new_value_data["endpoint"] = 1
+    new_value = ConfigurationValue(multisensor_6, new_value_data)
+    multisensor_6.values[get_value_id_str(multisensor_6, 112, 102, 1, 1)] = new_value
 
     client.async_send_command_no_wait.return_value = None
 
@@ -2778,14 +2795,46 @@ async def test_set_config_parameter(
 
     client.async_send_command_no_wait.reset_mock()
 
-    # Test that hex strings are accepted and converted as expected
     client.async_send_command_no_wait.return_value = None
 
+    # Test using a different endpoint
     await ws_client.send_json(
         {
             ID: 2,
             TYPE: "zwave_js/set_config_parameter",
             DEVICE_ID: device.id,
+            ENDPOINT: 1,
+            PROPERTY: 102,
+            PROPERTY_KEY: 1,
+            VALUE: 1,
+        }
+    )
+
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+
+    assert len(client.async_send_command_no_wait.call_args_list) == 1
+    args = client.async_send_command_no_wait.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 52
+    assert args["valueId"] == {
+        "commandClass": 112,
+        "endpoint": 1,
+        "property": 102,
+        "propertyKey": 1,
+    }
+    assert args["value"] == 1
+
+    client.async_send_command_no_wait.reset_mock()
+
+    # Test that hex strings are accepted and converted as expected
+    client.async_send_command_no_wait.return_value = None
+
+    await ws_client.send_json(
+        {
+            ID: 3,
+            TYPE: "zwave_js/set_config_parameter",
+            DEVICE_ID: device.id,
             PROPERTY: 102,
             PROPERTY_KEY: 1,
             VALUE: "0x1",
@@ -2815,7 +2864,7 @@ async def test_set_config_parameter(
         set_param_mock.side_effect = InvalidNewValue("test")
         await ws_client.send_json(
             {
-                ID: 3,
+                ID: 4,
                 TYPE: "zwave_js/set_config_parameter",
                 DEVICE_ID: device.id,
                 PROPERTY: 102,
@@ -2834,7 +2883,7 @@ async def test_set_config_parameter(
         set_param_mock.side_effect = NotFoundError("test")
         await ws_client.send_json(
             {
-                ID: 4,
+                ID: 5,
                 TYPE: "zwave_js/set_config_parameter",
                 DEVICE_ID: device.id,
                 PROPERTY: 102,
@@ -2853,7 +2902,7 @@ async def test_set_config_parameter(
         set_param_mock.side_effect = SetValueFailed("test")
         await ws_client.send_json(
             {
-                ID: 5,
+                ID: 6,
                 TYPE: "zwave_js/set_config_parameter",
                 DEVICE_ID: device.id,
                 PROPERTY: 102,
@@ -2872,7 +2921,7 @@ async def test_set_config_parameter(
     # Test getting non-existent node fails
     await ws_client.send_json(
         {
-            ID: 6,
+            ID: 7,
             TYPE: "zwave_js/set_config_parameter",
             DEVICE_ID: "fake_device",
             PROPERTY: 102,
@@ -2891,7 +2940,7 @@ async def test_set_config_parameter(
     ):
         await ws_client.send_json(
             {
-                ID: 7,
+                ID: 8,
                 TYPE: "zwave_js/set_config_parameter",
                 DEVICE_ID: device.id,
                 PROPERTY: 102,
@@ -2911,7 +2960,7 @@ async def test_set_config_parameter(
 
     await ws_client.send_json(
         {
-            ID: 8,
+            ID: 9,
             TYPE: "zwave_js/set_config_parameter",
             DEVICE_ID: device.id,
             PROPERTY: 102,
@@ -2950,6 +2999,7 @@ async def test_get_config_parameters(
     key = "52-112-0-2"
     assert result[key]["property"] == 2
     assert result[key]["property_key"] is None
+    assert result[key]["endpoint"] == 0
     assert result[key]["metadata"]["type"] == "number"
     assert result[key]["configuration_value_type"] == "enumerated"
     assert result[key]["metadata"]["states"]
@@ -3279,7 +3329,7 @@ async def test_subscribe_log_updates(
 async def test_update_log_config(
     hass: HomeAssistant, client, integration, hass_ws_client: WebSocketGenerator
 ) -> None:
-    """Test that the update_log_config WS API call works and that schema validation works."""
+    """Test that update_log_config WS API call and schema validation works."""
     entry = integration
     ws_client = await hass_ws_client(hass)
 
@@ -3841,7 +3891,7 @@ async def test_subscribe_firmware_update_status_initial_value(
     integration,
     hass_ws_client: WebSocketGenerator,
 ) -> None:
-    """Test subscribe_firmware_update_status websocket command with in progress update."""
+    """Test subscribe_firmware_update_status WS command with in progress update."""
     ws_client = await hass_ws_client(hass)
     device = get_device(hass, multisensor_6)
 
@@ -4160,7 +4210,7 @@ async def test_is_any_ota_firmware_update_in_progress(
 
     # Test FailedZWaveCommand is caught
     with patch(
-        "zwave_js_server.model.controller.Controller.async_is_any_ota_firmware_update_in_progress",
+        f"{CONTROLLER_PATCH_PREFIX}.async_is_any_ota_firmware_update_in_progress",
         side_effect=FailedZWaveCommand("failed_command", 1, "error message"),
     ):
         await ws_client.send_json(
diff --git a/tests/components/zwave_js/test_binary_sensor.py b/tests/components/zwave_js/test_binary_sensor.py
index ca7d20aa9cf805..a3ae9954d2ffe8 100644
--- a/tests/components/zwave_js/test_binary_sensor.py
+++ b/tests/components/zwave_js/test_binary_sensor.py
@@ -259,3 +259,29 @@ async def test_property_sensor_door_status(
     state = hass.states.get(PROPERTY_DOOR_STATUS_BINARY_SENSOR)
     assert state
     assert state.state == STATE_UNKNOWN
+
+
+async def test_config_parameter_binary_sensor(
+    hass: HomeAssistant, climate_adc_t3000, integration
+) -> None:
+    """Test config parameter binary sensor is created."""
+    binary_sensor_entity_id = "binary_sensor.adc_t3000_system_configuration_override"
+    ent_reg = er.async_get(hass)
+    entity_entry = ent_reg.async_get(binary_sensor_entity_id)
+    assert entity_entry
+    assert entity_entry.disabled
+    assert entity_entry.entity_category == EntityCategory.DIAGNOSTIC
+
+    updated_entry = ent_reg.async_update_entity(
+        binary_sensor_entity_id, **{"disabled_by": None}
+    )
+    assert updated_entry != entity_entry
+    assert updated_entry.disabled is False
+
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(binary_sensor_entity_id)
+    assert state
+    assert state.state == STATE_OFF
diff --git a/tests/components/zwave_js/test_button.py b/tests/components/zwave_js/test_button.py
index 9e2c518721859d..68a8e07ffe4ba3 100644
--- a/tests/components/zwave_js/test_button.py
+++ b/tests/components/zwave_js/test_button.py
@@ -28,7 +28,7 @@ async def test_ping_entity(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args_list[0][0][0]
     assert args["command"] == "node.ping"
@@ -47,7 +47,7 @@ async def test_ping_entity(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
     # Assert a node ping button entity is not created for the controller
@@ -67,17 +67,20 @@ async def test_notification_idle_button(
 ) -> None:
     """Test Notification idle button."""
     node = multisensor_6
-    state = hass.states.get("button.multisensor_6_idle_cover_status")
+    state = hass.states.get("button.multisensor_6_idle_home_security_cover_status")
     assert state
     assert state.state == "unknown"
-    assert state.attributes["friendly_name"] == "Multisensor 6 Idle Cover status"
+    assert (
+        state.attributes["friendly_name"]
+        == "Multisensor 6 Idle Home Security Cover status"
+    )
 
     # Test successful idle call
     await hass.services.async_call(
         BUTTON_DOMAIN,
         SERVICE_PRESS,
         {
-            ATTR_ENTITY_ID: "button.multisensor_6_idle_cover_status",
+            ATTR_ENTITY_ID: "button.multisensor_6_idle_home_security_cover_status",
         },
         blocking=True,
     )
diff --git a/tests/components/zwave_js/test_climate.py b/tests/components/zwave_js/test_climate.py
index f0c746f7f221ec..753c107c2ee072 100644
--- a/tests/components/zwave_js/test_climate.py
+++ b/tests/components/zwave_js/test_climate.py
@@ -5,6 +5,7 @@
     THERMOSTAT_OPERATING_STATE_PROPERTY,
 )
 from zwave_js_server.event import Event
+from zwave_js_server.exceptions import FailedZWaveCommand
 from zwave_js_server.model.node import Node
 
 from homeassistant.components.climate import (
@@ -17,6 +18,7 @@
     ATTR_MAX_TEMP,
     ATTR_MIN_TEMP,
     ATTR_PRESET_MODE,
+    ATTR_PRESET_MODES,
     ATTR_TARGET_TEMP_HIGH,
     ATTR_TARGET_TEMP_LOW,
     DOMAIN as CLIMATE_DOMAIN,
@@ -30,6 +32,7 @@
     HVACMode,
 )
 from homeassistant.components.zwave_js.climate import ATTR_FAN_STATE
+from homeassistant.components.zwave_js.const import DOMAIN, SERVICE_REFRESH_VALUE
 from homeassistant.components.zwave_js.helpers import ZwaveValueMatcher
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -39,6 +42,7 @@
 from homeassistant.core import HomeAssistant
 
 from .common import (
+    CLIMATE_AIDOO_HVAC_UNIT_ENTITY,
     CLIMATE_DANFOSS_LC13_ENTITY,
     CLIMATE_EUROTRONICS_SPIRIT_Z_ENTITY,
     CLIMATE_FLOOR_THERMOSTAT_ENTITY,
@@ -49,7 +53,11 @@
 
 
 async def test_thermostat_v2(
-    hass: HomeAssistant, client, climate_radio_thermostat_ct100_plus, integration
+    hass: HomeAssistant,
+    client,
+    climate_radio_thermostat_ct100_plus,
+    integration,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test a thermostat v2 command class entity."""
     node = climate_radio_thermostat_ct100_plus
@@ -280,6 +288,20 @@ async def test_thermostat_v2(
             blocking=True,
         )
 
+    # Refresh value should log an error when there is an issue
+    client.async_send_command.reset_mock()
+    client.async_send_command.side_effect = FailedZWaveCommand("test", 1, "test")
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_REFRESH_VALUE,
+        {
+            ATTR_ENTITY_ID: CLIMATE_RADIO_THERMOSTAT_ENTITY,
+        },
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+    assert "Error while refreshing value" in caplog.text
+
 
 async def test_thermostat_different_endpoints(
     hass: HomeAssistant,
@@ -674,3 +696,81 @@ async def test_thermostat_unknown_values(
     state = hass.states.get(CLIMATE_RADIO_THERMOSTAT_ENTITY)
 
     assert ATTR_HVAC_ACTION not in state.attributes
+
+
+async def test_thermostat_dry_and_fan_both_hvac_mode_and_preset(
+    hass: HomeAssistant,
+    client,
+    climate_airzone_aidoo_control_hvac_unit,
+    integration,
+) -> None:
+    """Test that dry and fan modes are both available as hvac mode and preset."""
+    state = hass.states.get(CLIMATE_AIDOO_HVAC_UNIT_ENTITY)
+    assert state
+    assert state.attributes[ATTR_HVAC_MODES] == [
+        HVACMode.OFF,
+        HVACMode.HEAT,
+        HVACMode.COOL,
+        HVACMode.FAN_ONLY,
+        HVACMode.DRY,
+        HVACMode.HEAT_COOL,
+    ]
+    assert state.attributes[ATTR_PRESET_MODES] == [
+        PRESET_NONE,
+        "Fan",
+        "Dry",
+    ]
+
+
+async def test_thermostat_warning_when_setting_dry_preset(
+    hass: HomeAssistant,
+    client,
+    climate_airzone_aidoo_control_hvac_unit,
+    integration,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test warning when setting Dry preset."""
+    state = hass.states.get(CLIMATE_AIDOO_HVAC_UNIT_ENTITY)
+    assert state
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {
+            ATTR_ENTITY_ID: CLIMATE_AIDOO_HVAC_UNIT_ENTITY,
+            ATTR_PRESET_MODE: "Dry",
+        },
+        blocking=True,
+    )
+
+    assert (
+        "Dry and Fan preset modes are deprecated and will be removed in a future release. Use the corresponding Dry and Fan HVAC modes instead"
+        in caplog.text
+    )
+
+
+async def test_thermostat_warning_when_setting_fan_preset(
+    hass: HomeAssistant,
+    client,
+    climate_airzone_aidoo_control_hvac_unit,
+    integration,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test warning when setting Fan preset."""
+    state = hass.states.get(CLIMATE_AIDOO_HVAC_UNIT_ENTITY)
+    assert state
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {
+            ATTR_ENTITY_ID: CLIMATE_AIDOO_HVAC_UNIT_ENTITY,
+            ATTR_PRESET_MODE: "Fan",
+        },
+        blocking=True,
+    )
+
+    assert (
+        "Dry and Fan preset modes are deprecated and will be removed in a future release. Use the corresponding Dry and Fan HVAC modes instead"
+        in caplog.text
+    )
diff --git a/tests/components/zwave_js/test_cover.py b/tests/components/zwave_js/test_cover.py
index f1e9366593807e..502f2413c992cc 100644
--- a/tests/components/zwave_js/test_cover.py
+++ b/tests/components/zwave_js/test_cover.py
@@ -1,4 +1,6 @@
 """Test the Z-Wave JS cover platform."""
+import logging
+
 from zwave_js_server.const import (
     CURRENT_STATE_PROPERTY,
     CURRENT_VALUE_PROPERTY,
@@ -10,14 +12,26 @@
 from homeassistant.components.cover import (
     ATTR_CURRENT_POSITION,
     ATTR_CURRENT_TILT_POSITION,
+    ATTR_POSITION,
+    ATTR_TILT_POSITION,
     DOMAIN,
     SERVICE_CLOSE_COVER,
+    SERVICE_CLOSE_COVER_TILT,
     SERVICE_OPEN_COVER,
+    SERVICE_OPEN_COVER_TILT,
+    SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION,
+    SERVICE_STOP_COVER,
+    SERVICE_STOP_COVER_TILT,
     CoverDeviceClass,
+    CoverEntityFeature,
 )
+from homeassistant.components.zwave_js.const import LOGGER
 from homeassistant.components.zwave_js.helpers import ZwaveValueMatcher
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
+    ATTR_ENTITY_ID,
+    ATTR_SUPPORTED_FEATURES,
     STATE_CLOSED,
     STATE_CLOSING,
     STATE_OPEN,
@@ -34,6 +48,7 @@
 SHUTTER_COVER_ENTITY = "cover.flush_shutter"
 AEOTEC_SHUTTER_COVER_ENTITY = "cover.nano_shutter_v_3"
 FIBARO_SHUTTER_COVER_ENTITY = "cover.fgr_222_test_cover"
+LOGGER.setLevel(logging.DEBUG)
 
 
 async def test_window_cover(
@@ -46,14 +61,14 @@ async def test_window_cover(
     assert state
     assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.WINDOW
 
-    assert state.state == "closed"
+    assert state.state == STATE_CLOSED
     assert state.attributes[ATTR_CURRENT_POSITION] == 0
 
     # Test setting position
     await hass.services.async_call(
-        "cover",
-        "set_cover_position",
-        {"entity_id": WINDOW_COVER_ENTITY, "position": 50},
+        DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY, ATTR_POSITION: 50},
         blocking=True,
     )
 
@@ -72,9 +87,9 @@ async def test_window_cover(
 
     # Test setting position
     await hass.services.async_call(
-        "cover",
-        "set_cover_position",
-        {"entity_id": WINDOW_COVER_ENTITY, "position": 0},
+        DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY, ATTR_POSITION: 0},
         blocking=True,
     )
 
@@ -93,9 +108,9 @@ async def test_window_cover(
 
     # Test opening
     await hass.services.async_call(
-        "cover",
-        "open_cover",
-        {"entity_id": WINDOW_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY},
         blocking=True,
     )
 
@@ -113,9 +128,9 @@ async def test_window_cover(
     client.async_send_command.reset_mock()
     # Test stop after opening
     await hass.services.async_call(
-        "cover",
-        "stop_cover",
-        {"entity_id": WINDOW_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY},
         blocking=True,
     )
 
@@ -152,13 +167,13 @@ async def test_window_cover(
     client.async_send_command.reset_mock()
 
     state = hass.states.get(WINDOW_COVER_ENTITY)
-    assert state.state == "open"
+    assert state.state == STATE_OPEN
 
     # Test closing
     await hass.services.async_call(
-        "cover",
-        "close_cover",
-        {"entity_id": WINDOW_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY},
         blocking=True,
     )
     assert len(client.async_send_command.call_args_list) == 1
@@ -176,9 +191,9 @@ async def test_window_cover(
 
     # Test stop after closing
     await hass.services.async_call(
-        "cover",
-        "stop_cover",
-        {"entity_id": WINDOW_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: WINDOW_COVER_ENTITY},
         blocking=True,
     )
 
@@ -215,10 +230,10 @@ async def test_window_cover(
     node.receive_event(event)
 
     state = hass.states.get(WINDOW_COVER_ENTITY)
-    assert state.state == "closed"
+    assert state.state == STATE_CLOSED
 
 
-async def test_fibaro_FGR222_shutter_cover(
+async def test_fibaro_fgr222_shutter_cover(
     hass: HomeAssistant, client, fibaro_fgr222_shutter, integration
 ) -> None:
     """Test tilt function of the Fibaro Shutter devices."""
@@ -226,14 +241,14 @@ async def test_fibaro_FGR222_shutter_cover(
     assert state
     assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.SHUTTER
 
-    assert state.state == "open"
+    assert state.state == STATE_OPEN
     assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 0
 
     # Test opening tilts
     await hass.services.async_call(
-        "cover",
-        "open_cover_tilt",
-        {"entity_id": FIBARO_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: FIBARO_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
 
@@ -252,9 +267,9 @@ async def test_fibaro_FGR222_shutter_cover(
     client.async_send_command.reset_mock()
     # Test closing tilts
     await hass.services.async_call(
-        "cover",
-        "close_cover_tilt",
-        {"entity_id": FIBARO_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: FIBARO_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
 
@@ -270,6 +285,27 @@ async def test_fibaro_FGR222_shutter_cover(
     }
     assert args["value"] == 0
 
+    client.async_send_command.reset_mock()
+    # Test setting tilt position
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: FIBARO_SHUTTER_COVER_ENTITY, ATTR_TILT_POSITION: 12},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 42
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 145,
+        "property": "fibaro",
+        "propertyKey": "venetianBlindsTilt",
+    }
+    assert args["value"] == 12
+
     # Test some tilt
     event = Event(
         type="value updated",
@@ -306,14 +342,14 @@ async def test_aeotec_nano_shutter_cover(
     assert state
     assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.WINDOW
 
-    assert state.state == "closed"
+    assert state.state == STATE_CLOSED
     assert state.attributes[ATTR_CURRENT_POSITION] == 0
 
     # Test opening
     await hass.services.async_call(
-        "cover",
-        "open_cover",
-        {"entity_id": AEOTEC_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: AEOTEC_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
 
@@ -331,9 +367,9 @@ async def test_aeotec_nano_shutter_cover(
     client.async_send_command.reset_mock()
     # Test stop after opening
     await hass.services.async_call(
-        "cover",
-        "stop_cover",
-        {"entity_id": AEOTEC_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: AEOTEC_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
 
@@ -371,13 +407,13 @@ async def test_aeotec_nano_shutter_cover(
     client.async_send_command.reset_mock()
 
     state = hass.states.get(AEOTEC_SHUTTER_COVER_ENTITY)
-    assert state.state == "open"
+    assert state.state == STATE_OPEN
 
     # Test closing
     await hass.services.async_call(
-        "cover",
-        "close_cover",
-        {"entity_id": AEOTEC_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: AEOTEC_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
     assert len(client.async_send_command.call_args_list) == 1
@@ -395,9 +431,9 @@ async def test_aeotec_nano_shutter_cover(
 
     # Test stop after closing
     await hass.services.async_call(
-        "cover",
-        "stop_cover",
-        {"entity_id": AEOTEC_SHUTTER_COVER_ENTITY},
+        DOMAIN,
+        SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: AEOTEC_SHUTTER_COVER_ENTITY},
         blocking=True,
     )
 
@@ -447,7 +483,7 @@ async def test_motor_barrier_cover(
 
     # Test open
     await hass.services.async_call(
-        DOMAIN, SERVICE_OPEN_COVER, {"entity_id": GDC_COVER_ENTITY}, blocking=True
+        DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: GDC_COVER_ENTITY}, blocking=True
     )
 
     assert len(client.async_send_command.call_args_list) == 1
@@ -469,7 +505,7 @@ async def test_motor_barrier_cover(
 
     # Test close
     await hass.services.async_call(
-        DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": GDC_COVER_ENTITY}, blocking=True
+        DOMAIN, SERVICE_CLOSE_COVER, {ATTR_ENTITY_ID: GDC_COVER_ENTITY}, blocking=True
     )
 
     assert len(client.async_send_command.call_args_list) == 1
@@ -631,7 +667,7 @@ async def test_motor_barrier_cover_no_primary_value(
     assert ATTR_CURRENT_POSITION not in state.attributes
 
 
-async def test_fibaro_FGR222_shutter_cover_no_tilt(
+async def test_fibaro_fgr222_shutter_cover_no_tilt(
     hass: HomeAssistant, client, fibaro_fgr222_shutter_state, integration
 ) -> None:
     """Test tilt function of the Fibaro Shutter devices with tilt value is None."""
@@ -659,3 +695,167 @@ async def test_fibaro_FGR222_shutter_cover_no_tilt(
     assert state.state == STATE_UNKNOWN
     assert ATTR_CURRENT_POSITION not in state.attributes
     assert ATTR_CURRENT_TILT_POSITION not in state.attributes
+
+
+async def test_iblinds_v3_cover(
+    hass: HomeAssistant, client, iblinds_v3, integration
+) -> None:
+    """Test iBlinds v3 cover which uses Window Covering CC."""
+    entity_id = "cover.window_blind_controller_horizontal_slats_angle"
+    state = hass.states.get(entity_id)
+    assert state
+    # This device has no state because there is no position value
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == (
+        CoverEntityFeature.CLOSE_TILT
+        | CoverEntityFeature.OPEN_TILT
+        | CoverEntityFeature.SET_TILT_POSITION
+        | CoverEntityFeature.STOP_TILT
+    )
+    assert ATTR_CURRENT_POSITION not in state.attributes
+    assert ATTR_CURRENT_TILT_POSITION in state.attributes
+    assert state.attributes[ATTR_CURRENT_TILT_POSITION] == 0
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 12
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 106,
+        "property": "targetValue",
+        "propertyKey": 23,
+    }
+    assert args["value"] == 0
+
+    client.async_send_command.reset_mock()
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 12
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 106,
+        "property": "targetValue",
+        "propertyKey": 23,
+    }
+    assert args["value"] == 50
+
+    client.async_send_command.reset_mock()
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: entity_id, ATTR_TILT_POSITION: 12},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 12
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 106,
+        "property": "targetValue",
+        "propertyKey": 23,
+    }
+    assert args["value"] == 12
+
+    client.async_send_command.reset_mock()
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_STOP_COVER_TILT,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 12
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 106,
+        "property": "open",
+        "propertyKey": 23,
+    }
+    assert args["value"] is False
+
+    client.async_send_command.reset_mock()
+
+
+async def test_nice_ibt4zwave_cover(
+    hass: HomeAssistant, client, nice_ibt4zwave, integration
+) -> None:
+    """Test Nice IBT4ZWAVE cover."""
+    entity_id = "cover.portail"
+    state = hass.states.get(entity_id)
+    assert state
+    # This device has no state because there is no position value
+    assert state.state == STATE_CLOSED
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == (
+        CoverEntityFeature.CLOSE
+        | CoverEntityFeature.OPEN
+        | CoverEntityFeature.SET_POSITION
+        | CoverEntityFeature.STOP
+    )
+    assert ATTR_CURRENT_POSITION in state.attributes
+    assert state.attributes[ATTR_CURRENT_POSITION] == 0
+    assert state.attributes[ATTR_DEVICE_CLASS] == CoverDeviceClass.GATE
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 72
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 38,
+        "property": "targetValue",
+    }
+    assert args["value"] == 0
+
+    client.async_send_command.reset_mock()
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == 72
+    assert args["valueId"] == {
+        "endpoint": 0,
+        "commandClass": 38,
+        "property": "targetValue",
+    }
+    assert args["value"] == 99
+
+    client.async_send_command.reset_mock()
diff --git a/tests/components/zwave_js/test_device_action.py b/tests/components/zwave_js/test_device_action.py
index 8672e886ab5c79..ccb65c1d8fa216 100644
--- a/tests/components/zwave_js/test_device_action.py
+++ b/tests/components/zwave_js/test_device_action.py
@@ -79,9 +79,10 @@ async def test_get_actions(
             "domain": DOMAIN,
             "type": "set_config_parameter",
             "device_id": device.id,
+            "endpoint": 0,
             "parameter": 3,
             "bitmask": None,
-            "subtype": "3 (Beeper)",
+            "subtype": "3 (Beeper) on endpoint 0",
             "metadata": {},
         },
     ]
@@ -184,6 +185,22 @@ async def test_actions(
                         "platform": "event",
                         "event_type": "test_event_set_config_parameter",
                     },
+                    "action": {
+                        "domain": DOMAIN,
+                        "type": "set_config_parameter",
+                        "device_id": device.id,
+                        "endpoint": 0,
+                        "parameter": 1,
+                        "bitmask": None,
+                        "subtype": "3 (Beeper)",
+                        "value": 1,
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_set_config_parameter_no_endpoint",
+                    },
                     "action": {
                         "domain": DOMAIN,
                         "type": "set_config_parameter",
@@ -243,6 +260,18 @@ async def test_actions(
         assert args[1] == 1
         assert args[2] == 1
 
+    with patch(
+        "homeassistant.components.zwave_js.services.async_set_config_parameter"
+    ) as mock_call:
+        hass.bus.async_fire("test_event_set_config_parameter_no_endpoint")
+        await hass.async_block_till_done()
+        mock_call.assert_called_once()
+        args = mock_call.call_args_list[0][0]
+        assert len(args) == 3
+        assert args[0].node_id == 13
+        assert args[1] == 1
+        assert args[2] == 1
+
 
 async def test_actions_multiple_calls(
     hass: HomeAssistant,
@@ -510,6 +539,7 @@ async def test_get_action_capabilities(
             "domain": DOMAIN,
             "device_id": device.id,
             "type": "set_config_parameter",
+            "endpoint": 0,
             "parameter": 1,
             "bitmask": None,
             "subtype": "1 (Temperature Reporting Threshold)",
@@ -542,6 +572,7 @@ async def test_get_action_capabilities(
             "domain": DOMAIN,
             "device_id": device.id,
             "type": "set_config_parameter",
+            "endpoint": 0,
             "parameter": 10,
             "bitmask": None,
             "subtype": "10 (Temperature Reporting Filter)",
@@ -569,6 +600,7 @@ async def test_get_action_capabilities(
             "domain": DOMAIN,
             "device_id": device.id,
             "type": "set_config_parameter",
+            "endpoint": 0,
             "parameter": 2,
             "bitmask": None,
             "subtype": "2 (HVAC Settings)",
diff --git a/tests/components/zwave_js/test_device_condition.py b/tests/components/zwave_js/test_device_condition.py
index b66e804eb80c2f..11213d9c37543c 100644
--- a/tests/components/zwave_js/test_device_condition.py
+++ b/tests/components/zwave_js/test_device_condition.py
@@ -28,7 +28,7 @@
 
 
 @pytest.fixture
-def calls(hass):
+def calls(hass: HomeAssistant):
     """Track calls to a mock service."""
     return async_mock_service(hass, "test", "automation")
 
@@ -63,7 +63,7 @@ async def test_get_conditions(
             "type": "config_parameter",
             "device_id": device.id,
             "value_id": value_id,
-            "subtype": f"{config_value.property_} ({name})",
+            "subtype": f"{config_value.property_} ({name}) on endpoint 0",
             "metadata": {},
         },
         {
diff --git a/tests/components/zwave_js/test_device_trigger.py b/tests/components/zwave_js/test_device_trigger.py
index 7f324098324cf6..8209564579c33f 100644
--- a/tests/components/zwave_js/test_device_trigger.py
+++ b/tests/components/zwave_js/test_device_trigger.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from pytest_unordered import unordered
 import voluptuous_serialize
 from zwave_js_server.const import CommandClass
 from zwave_js_server.event import Event
@@ -25,14 +26,13 @@
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
-    assert_lists_same,
     async_get_device_automations,
     async_mock_service,
 )
 
 
 @pytest.fixture
-def calls(hass):
+def calls(hass: HomeAssistant):
     """Track calls to a mock service."""
     return async_mock_service(hass, "test", "automation")
 
@@ -193,16 +193,15 @@ async def test_get_trigger_capabilities_notification_notification(
     )
     assert capabilities and "extra_fields" in capabilities
 
-    assert_lists_same(
-        voluptuous_serialize.convert(
-            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
-        ),
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == unordered(
         [
             {"name": "type.", "optional": True, "type": "string"},
             {"name": "label", "optional": True, "type": "string"},
             {"name": "event", "optional": True, "type": "string"},
             {"name": "event_label", "optional": True, "type": "string"},
-        ],
+        ]
     )
 
 
@@ -323,14 +322,13 @@ async def test_get_trigger_capabilities_entry_control_notification(
     )
     assert capabilities and "extra_fields" in capabilities
 
-    assert_lists_same(
-        voluptuous_serialize.convert(
-            capabilities["extra_fields"], custom_serializer=cv.custom_serializer
-        ),
+    assert voluptuous_serialize.convert(
+        capabilities["extra_fields"], custom_serializer=cv.custom_serializer
+    ) == unordered(
         [
             {"name": "event_type", "optional": True, "type": "string"},
             {"name": "data_type", "optional": True, "type": "string"},
-        ],
+        ]
     )
 
 
@@ -1292,7 +1290,7 @@ async def test_get_value_updated_config_parameter_triggers(
         "property_key": None,
         "endpoint": 0,
         "command_class": CommandClass.CONFIGURATION.value,
-        "subtype": "3 (Beeper)",
+        "subtype": "3 (Beeper) on endpoint 0",
         "metadata": {},
     }
     triggers = await async_get_device_automations(
diff --git a/tests/components/zwave_js/test_diagnostics.py b/tests/components/zwave_js/test_diagnostics.py
index c7a711d10671f5..aa5ec77b7981c0 100644
--- a/tests/components/zwave_js/test_diagnostics.py
+++ b/tests/components/zwave_js/test_diagnostics.py
@@ -18,11 +18,11 @@
     get_value_id_from_unique_id,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import async_get as async_get_dev_reg
-from homeassistant.helpers.entity_registry import async_get as async_get_ent_reg
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
 from .common import PROPERTY_ULTRAVIOLET
 
+from tests.common import MockConfigEntry
 from tests.components.diagnostics import (
     get_diagnostics_for_config_entry,
     get_diagnostics_for_device,
@@ -57,10 +57,26 @@ async def test_device_diagnostics(
     version_state,
 ) -> None:
     """Test the device level diagnostics data dump."""
-    dev_reg = async_get_dev_reg(hass)
+    dev_reg = dr.async_get(hass)
     device = dev_reg.async_get_device({get_device_id(client.driver, multisensor_6)})
     assert device
 
+    # Create mock config entry for fake entity
+    mock_config_entry = MockConfigEntry(domain="test_integration")
+    mock_config_entry.add_to_hass(hass)
+
+    # Add an entity entry to the device that is not part of this config entry
+    ent_reg = er.async_get(hass)
+    ent_reg.async_get_or_create(
+        "test",
+        "test_integration",
+        "test_unique_id",
+        suggested_object_id="unrelated_entity",
+        config_entry=mock_config_entry,
+        device_id=device.id,
+    )
+    assert ent_reg.async_get("test.unrelated_entity")
+
     # Update a value and ensure it is reflected in the node state
     event = Event(
         type="value updated",
@@ -92,16 +108,27 @@ async def test_device_diagnostics(
     }
     # Assert that we only have the entities that were discovered for this device
     # Entities that are created outside of discovery (e.g. node status sensor and
-    # ping button) should not be in dump.
+    # ping button) as well as helper entities created from other integrations should
+    # not be in dump.
     assert len(diagnostics_data["entities"]) == len(
         list(async_discover_node_values(multisensor_6, device, {device.id: set()}))
     )
+    assert any(
+        entity.entity_id == "test.unrelated_entity"
+        for entity in er.async_entries_for_device(ent_reg, device.id)
+    )
+    # Explicitly check that the entity that is not part of this config entry is not
+    # in the dump.
+    assert not any(
+        entity["entity_id"] == "test.unrelated_entity"
+        for entity in diagnostics_data["entities"]
+    )
     assert diagnostics_data["state"] == multisensor_6.data
 
 
 async def test_device_diagnostics_error(hass: HomeAssistant, integration) -> None:
     """Test the device diagnostics raises exception when an invalid device is used."""
-    dev_reg = async_get_dev_reg(hass)
+    dev_reg = dr.async_get(hass)
     device = dev_reg.async_get_or_create(
         config_entry_id=integration.entry_id, identifiers={("test", "test")}
     )
@@ -122,13 +149,13 @@ async def test_device_diagnostics_missing_primary_value(
     integration,
     hass_client: ClientSessionGenerator,
 ) -> None:
-    """Test that the device diagnostics handles an entity with a missing primary value."""
-    dev_reg = async_get_dev_reg(hass)
+    """Test that device diagnostics handles an entity with a missing primary value."""
+    dev_reg = dr.async_get(hass)
     device = dev_reg.async_get_device({get_device_id(client.driver, multisensor_6)})
     assert device
 
     entity_id = "sensor.multisensor_6_air_temperature"
-    ent_reg = async_get_ent_reg(hass)
+    ent_reg = er.async_get(hass)
     entry = ent_reg.async_get(entity_id)
 
     # check that the primary value for the entity exists in the diagnostics
@@ -212,7 +239,7 @@ def _find_ultraviolet_val(data: dict) -> dict:
     client.driver.controller.nodes[node.node_id] = node
     client.driver.controller.emit("node added", {"node": node})
     await hass.async_block_till_done()
-    dev_reg = async_get_dev_reg(hass)
+    dev_reg = dr.async_get(hass)
     device = dev_reg.async_get_device({get_device_id(client.driver, node)})
     assert device
 
diff --git a/tests/components/zwave_js/test_discovery.py b/tests/components/zwave_js/test_discovery.py
index 1840e4d798004c..1c4a69d32e39c6 100644
--- a/tests/components/zwave_js/test_discovery.py
+++ b/tests/components/zwave_js/test_discovery.py
@@ -1,6 +1,19 @@
-"""Test discovery of entities for device-specific schemas for the Z-Wave JS integration."""
+"""Test entity discovery for device-specific schemas for the Z-Wave JS integration."""
 import pytest
 
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
+from homeassistant.components.number import (
+    ATTR_VALUE,
+    DOMAIN as NUMBER_DOMAIN,
+    SERVICE_SET_VALUE,
+)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
 from homeassistant.components.zwave_js.discovery import (
     FirmwareVersionRange,
     ZWaveDiscoverySchema,
@@ -9,6 +22,7 @@
 from homeassistant.components.zwave_js.discovery_data_template import (
     DynamicCurrentTempClimateDataTemplate,
 )
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_UNKNOWN, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
@@ -141,3 +155,141 @@ async def test_merten_507801_disabled_enitites(
         )
         assert updated_entry != entry
         assert updated_entry.disabled is False
+
+
+async def test_zooz_zen72(
+    hass: HomeAssistant, client, switch_zooz_zen72, integration
+) -> None:
+    """Test that Zooz ZEN72 Indicators are discovered as number entities."""
+    ent_reg = er.async_get(hass)
+    assert len(hass.states.async_entity_ids(NUMBER_DOMAIN)) == 1
+    assert len(hass.states.async_entity_ids(BUTTON_DOMAIN)) == 2  # includes ping
+    entity_id = "number.z_wave_plus_700_series_dimmer_switch_indicator_value"
+    entry = ent_reg.async_get(entity_id)
+    assert entry
+    assert entry.entity_category == EntityCategory.CONFIG
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_UNKNOWN
+    await hass.services.async_call(
+        NUMBER_DOMAIN,
+        SERVICE_SET_VALUE,
+        {
+            ATTR_ENTITY_ID: entity_id,
+            ATTR_VALUE: 5,
+        },
+        blocking=True,
+    )
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == switch_zooz_zen72.node_id
+    assert args["valueId"] == {
+        "commandClass": 135,
+        "endpoint": 0,
+        "property": "value",
+    }
+    assert args["value"] == 5
+
+    client.async_send_command.reset_mock()
+
+    entity_id = "button.z_wave_plus_700_series_dimmer_switch_identify"
+    entry = ent_reg.async_get(entity_id)
+    assert entry
+    assert entry.entity_category == EntityCategory.CONFIG
+    await hass.services.async_call(
+        BUTTON_DOMAIN,
+        SERVICE_PRESS,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == switch_zooz_zen72.node_id
+    assert args["valueId"] == {
+        "commandClass": 135,
+        "endpoint": 0,
+        "property": "identify",
+    }
+    assert args["value"] is True
+
+
+async def test_indicator_test(
+    hass: HomeAssistant, client, indicator_test, integration
+) -> None:
+    """Test that Indicators are discovered properly.
+
+    This test covers indicators that we don't already have device fixtures for.
+    """
+    ent_reg = er.async_get(hass)
+    assert len(hass.states.async_entity_ids(NUMBER_DOMAIN)) == 0
+    assert len(hass.states.async_entity_ids(BUTTON_DOMAIN)) == 1  # only ping
+    assert len(hass.states.async_entity_ids(BINARY_SENSOR_DOMAIN)) == 1
+    assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 2  # include node status
+    assert len(hass.states.async_entity_ids(SWITCH_DOMAIN)) == 1
+
+    entity_id = "binary_sensor.this_is_a_fake_device_binary_sensor"
+    entry = ent_reg.async_get(entity_id)
+    assert entry
+    assert entry.entity_category == EntityCategory.DIAGNOSTIC
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OFF
+
+    client.async_send_command.reset_mock()
+
+    entity_id = "sensor.this_is_a_fake_device_sensor"
+    entry = ent_reg.async_get(entity_id)
+    assert entry
+    assert entry.entity_category == EntityCategory.DIAGNOSTIC
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == "0.0"
+
+    client.async_send_command.reset_mock()
+
+    entity_id = "switch.this_is_a_fake_device_switch"
+    entry = ent_reg.async_get(entity_id)
+    assert entry
+    assert entry.entity_category == EntityCategory.CONFIG
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OFF
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == indicator_test.node_id
+    assert args["valueId"] == {
+        "commandClass": 135,
+        "endpoint": 0,
+        "property": "Test",
+        "propertyKey": "Switch",
+    }
+    assert args["value"] is True
+
+    client.async_send_command.reset_mock()
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: entity_id},
+        blocking=True,
+    )
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == indicator_test.node_id
+    assert args["valueId"] == {
+        "commandClass": 135,
+        "endpoint": 0,
+        "property": "Test",
+        "propertyKey": "Switch",
+    }
+    assert args["value"] is False
diff --git a/tests/components/zwave_js/test_fan.py b/tests/components/zwave_js/test_fan.py
index 471246c59aabb1..2b50870041391d 100644
--- a/tests/components/zwave_js/test_fan.py
+++ b/tests/components/zwave_js/test_fan.py
@@ -43,13 +43,13 @@ async def test_generic_fan(
     state = hass.states.get(entity_id)
 
     assert state
-    assert state.state == "off"
+    assert state.state == STATE_OFF
 
-    # Test turn on setting speed
+    # Test turn on no speed
     await hass.services.async_call(
         "fan",
         "turn_on",
-        {"entity_id": entity_id, "percentage": 66},
+        {"entity_id": entity_id},
         blocking=True,
     )
 
@@ -62,26 +62,22 @@ async def test_generic_fan(
         "endpoint": 0,
         "property": "targetValue",
     }
-    assert args["value"] == 66
+    assert args["value"] == 255
 
     client.async_send_command.reset_mock()
 
-    # Test setting unknown speed
-    with pytest.raises(MultipleInvalid):
-        await hass.services.async_call(
-            "fan",
-            "set_percentage",
-            {"entity_id": entity_id, "percentage": "bad"},
-            blocking=True,
-        )
+    # Due to optimistic updates, the state should be on even though the Z-Wave state
+    # hasn't been updated yet
+    state = hass.states.get(entity_id)
 
-    client.async_send_command.reset_mock()
+    assert state
+    assert state.state == STATE_ON
 
-    # Test turn on no speed
+    # Test turn on setting speed
     await hass.services.async_call(
         "fan",
         "turn_on",
-        {"entity_id": entity_id},
+        {"entity_id": entity_id, "percentage": 66},
         blocking=True,
     )
 
@@ -94,7 +90,18 @@ async def test_generic_fan(
         "endpoint": 0,
         "property": "targetValue",
     }
-    assert args["value"] == 255
+    assert args["value"] == 66
+
+    client.async_send_command.reset_mock()
+
+    # Test setting unknown speed
+    with pytest.raises(MultipleInvalid):
+        await hass.services.async_call(
+            "fan",
+            "set_percentage",
+            {"entity_id": entity_id, "percentage": "bad"},
+            blocking=True,
+        )
 
     client.async_send_command.reset_mock()
 
@@ -140,7 +147,7 @@ async def test_generic_fan(
     node.receive_event(event)
 
     state = hass.states.get(entity_id)
-    assert state.state == "on"
+    assert state.state == STATE_ON
     assert state.attributes[ATTR_PERCENTAGE] == 100
 
     client.async_send_command.reset_mock()
@@ -165,7 +172,7 @@ async def test_generic_fan(
     node.receive_event(event)
 
     state = hass.states.get(entity_id)
-    assert state.state == "off"
+    assert state.state == STATE_OFF
     assert state.attributes[ATTR_PERCENTAGE] == 0
 
     client.async_send_command.reset_mock()
@@ -931,3 +938,72 @@ async def test_thermostat_fan_without_preset_modes(
 
     assert not state.attributes.get(ATTR_PRESET_MODE)
     assert not state.attributes.get(ATTR_PRESET_MODES)
+
+
+async def test_honeywell_39358_fan(
+    hass: HomeAssistant, client, fan_honeywell_39358, integration
+) -> None:
+    """Test a Honeywell 39358 fan with 3 fixed speeds."""
+    node = fan_honeywell_39358
+    node_id = 61
+    entity_id = "fan.honeywell_in_wall_smart_fan_control"
+
+    async def get_zwave_speed_from_percentage(percentage):
+        """Set the fan to a particular percentage and get the resulting Zwave speed."""
+        client.async_send_command.reset_mock()
+        await hass.services.async_call(
+            "fan",
+            "turn_on",
+            {"entity_id": entity_id, "percentage": percentage},
+            blocking=True,
+        )
+
+        assert len(client.async_send_command.call_args_list) == 1
+        args = client.async_send_command.call_args[0][0]
+        assert args["command"] == "node.set_value"
+        assert args["nodeId"] == node_id
+        return args["value"]
+
+    async def get_percentage_from_zwave_speed(zwave_speed):
+        """Set the underlying device speed and get the resulting percentage."""
+        event = Event(
+            type="value updated",
+            data={
+                "source": "node",
+                "event": "value updated",
+                "nodeId": node_id,
+                "args": {
+                    "commandClassName": "Multilevel Switch",
+                    "commandClass": 38,
+                    "endpoint": 0,
+                    "property": "currentValue",
+                    "newValue": zwave_speed,
+                    "prevValue": 0,
+                    "propertyName": "currentValue",
+                },
+            },
+        )
+        node.receive_event(event)
+        state = hass.states.get(entity_id)
+        return state.attributes[ATTR_PERCENTAGE]
+
+    # This device has the speeds:
+    # low = 1-32, med = 33-66, high = 67-99
+    percentages_to_zwave_speeds = [
+        [[0], [0]],
+        [range(1, 34), range(1, 33)],
+        [range(34, 68), range(33, 67)],
+        [range(68, 101), range(67, 100)],
+    ]
+
+    for percentages, zwave_speeds in percentages_to_zwave_speeds:
+        for percentage in percentages:
+            actual_zwave_speed = await get_zwave_speed_from_percentage(percentage)
+            assert actual_zwave_speed in zwave_speeds
+        for zwave_speed in zwave_speeds:
+            actual_percentage = await get_percentage_from_zwave_speed(zwave_speed)
+            assert actual_percentage in percentages
+
+    state = hass.states.get(entity_id)
+    assert state.attributes[ATTR_PERCENTAGE_STEP] == pytest.approx(33.3333, rel=1e-3)
+    assert state.attributes[ATTR_PRESET_MODES] == []
diff --git a/tests/components/zwave_js/test_init.py b/tests/components/zwave_js/test_init.py
index 22cbe87d0b4743..a33ee75661ca8b 100644
--- a/tests/components/zwave_js/test_init.py
+++ b/tests/components/zwave_js/test_init.py
@@ -101,7 +101,7 @@ async def test_disabled_statistics(hass: HomeAssistant, client) -> None:
 
 
 async def test_noop_statistics(hass: HomeAssistant, client) -> None:
-    """Test that we don't make any statistics calls if user hasn't provided preference."""
+    """Test that we don't make statistics calls if user hasn't set preference."""
     entry = MockConfigEntry(domain="zwave_js", data={"url": "ws://test.org"})
     entry.add_to_hass(hass)
 
@@ -963,7 +963,7 @@ async def test_removed_device(
     # Check how many entities there are
     ent_reg = er.async_get(hass)
     entity_entries = er.async_entries_for_config_entry(ent_reg, integration.entry_id)
-    assert len(entity_entries) == 36
+    assert len(entity_entries) == 91
 
     # Remove a node and reload the entry
     old_node = driver.controller.nodes.pop(13)
@@ -975,7 +975,7 @@ async def test_removed_device(
     device_entries = dr.async_entries_for_config_entry(dev_reg, integration.entry_id)
     assert len(device_entries) == 2
     entity_entries = er.async_entries_for_config_entry(ent_reg, integration.entry_id)
-    assert len(entity_entries) == 23
+    assert len(entity_entries) == 60
     assert dev_reg.async_get_device({get_device_id(driver, old_node)}) is None
 
 
@@ -1332,7 +1332,7 @@ async def test_node_model_change(
 async def test_disabled_node_status_entity_on_node_replaced(
     hass: HomeAssistant, zp3111_state, zp3111, client, integration
 ) -> None:
-    """Test that when a node replacement event is received the node status sensor is removed."""
+    """Test when node replacement event is received, node status sensor is removed."""
     node_status_entity = "sensor.4_in_1_sensor_node_status"
     state = hass.states.get(node_status_entity)
     assert state
@@ -1362,8 +1362,10 @@ async def test_disabled_entity_on_value_removed(
     er_reg = er.async_get(hass)
 
     # re-enable this default-disabled entity
-    sensor_cover_entity = "sensor.4_in_1_sensor_cover_status"
-    idle_cover_status_button_entity = "button.4_in_1_sensor_idle_cover_status"
+    sensor_cover_entity = "sensor.4_in_1_sensor_home_security_cover_status"
+    idle_cover_status_button_entity = (
+        "button.4_in_1_sensor_idle_home_security_cover_status"
+    )
     er_reg.async_update_entity(entity_id=sensor_cover_entity, disabled_by=None)
     await hass.async_block_till_done()
 
diff --git a/tests/components/zwave_js/test_light.py b/tests/components/zwave_js/test_light.py
index 44cb9d70f76fa3..3a862ee3a0c427 100644
--- a/tests/components/zwave_js/test_light.py
+++ b/tests/components/zwave_js/test_light.py
@@ -70,6 +70,13 @@ async def test_light(
     }
     assert args["value"] == 255
 
+    # Due to optimistic updates, the state should be on even though the Z-Wave state
+    # hasn't been updated yet
+    state = hass.states.get(BULB_6_MULTI_COLOR_LIGHT_ENTITY)
+
+    assert state
+    assert state.state == STATE_ON
+
     client.async_send_command.reset_mock()
 
     # Test turning on with transition
diff --git a/tests/components/zwave_js/test_lock.py b/tests/components/zwave_js/test_lock.py
index 42aee148affa2e..5a5711d9dad281 100644
--- a/tests/components/zwave_js/test_lock.py
+++ b/tests/components/zwave_js/test_lock.py
@@ -1,4 +1,5 @@
 """Test the Z-Wave JS lock platform."""
+import pytest
 from zwave_js_server.const import CommandClass
 from zwave_js_server.const.command_class.lock import (
     ATTR_CODE_SLOT,
@@ -6,6 +7,7 @@
     CURRENT_MODE_PROPERTY,
 )
 from zwave_js_server.event import Event
+from zwave_js_server.exceptions import FailedZWaveCommand
 from zwave_js_server.model.node import Node, NodeStatus
 
 from homeassistant.components.lock import (
@@ -27,6 +29,7 @@
     STATE_UNLOCKED,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 
 from .common import SCHLAGE_BE469_LOCK_ENTITY, replace_value_of_zwave_value
 
@@ -153,6 +156,33 @@ async def test_door_lock(
     }
     assert args["value"] == 0
 
+    client.async_send_command.reset_mock()
+
+    client.async_send_command.side_effect = FailedZWaveCommand("test", 1, "test")
+    # Test set usercode service error handling
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            ZWAVE_JS_DOMAIN,
+            SERVICE_SET_LOCK_USERCODE,
+            {
+                ATTR_ENTITY_ID: SCHLAGE_BE469_LOCK_ENTITY,
+                ATTR_CODE_SLOT: 1,
+                ATTR_USERCODE: "1234",
+            },
+            blocking=True,
+        )
+
+    # Test clear usercode service error handling
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            ZWAVE_JS_DOMAIN,
+            SERVICE_CLEAR_LOCK_USERCODE,
+            {ATTR_ENTITY_ID: SCHLAGE_BE469_LOCK_ENTITY, ATTR_CODE_SLOT: 1},
+            blocking=True,
+        )
+
+    client.async_send_command.reset_mock()
+
     event = Event(
         type="dead",
         data={
diff --git a/tests/components/zwave_js/test_number.py b/tests/components/zwave_js/test_number.py
index d94af41c9d6322..7229d10ebad30c 100644
--- a/tests/components/zwave_js/test_number.py
+++ b/tests/components/zwave_js/test_number.py
@@ -4,7 +4,7 @@
 import pytest
 from zwave_js_server.event import Event
 
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.const import STATE_UNKNOWN, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
@@ -229,3 +229,37 @@ async def test_disabled_basic_number(
     assert entity_entry
     assert entity_entry.disabled
     assert entity_entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
+
+
+async def test_config_parameter_number(
+    hass: HomeAssistant, climate_adc_t3000, integration
+) -> None:
+    """Test config parameter number is created."""
+    number_entity_id = "number.adc_t3000_heat_staging_delay"
+    number_with_states_entity_id = "number.adc_t3000_calibration_temperature"
+    ent_reg = er.async_get(hass)
+    for entity_id in (number_entity_id, number_with_states_entity_id):
+        entity_entry = ent_reg.async_get(entity_id)
+        assert entity_entry
+        assert entity_entry.disabled
+        assert entity_entry.entity_category == EntityCategory.CONFIG
+
+    for entity_id in (number_entity_id, number_with_states_entity_id):
+        updated_entry = ent_reg.async_update_entity(entity_id, **{"disabled_by": None})
+        assert updated_entry != entity_entry
+        assert updated_entry.disabled is False
+
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(number_entity_id)
+    assert state
+    assert state.state == "30.0"
+    assert "reserved_values" not in state.attributes
+
+    state = hass.states.get(number_with_states_entity_id)
+    assert state
+    assert state.state == "0.0"
+    assert "reserved_values" in state.attributes
+    assert state.attributes["reserved_values"] == {-1: "Disabled"}
diff --git a/tests/components/zwave_js/test_select.py b/tests/components/zwave_js/test_select.py
index dc367e637fc069..c63f0c429fd41e 100644
--- a/tests/components/zwave_js/test_select.py
+++ b/tests/components/zwave_js/test_select.py
@@ -294,3 +294,29 @@ async def test_multilevel_switch_select_no_value(
 
     assert state
     assert state.state == STATE_UNKNOWN
+
+
+async def test_config_parameter_select(
+    hass: HomeAssistant, climate_adc_t3000, integration
+) -> None:
+    """Test config parameter select is created."""
+    select_entity_id = "select.adc_t3000_hvac_system_type"
+    ent_reg = er.async_get(hass)
+    entity_entry = ent_reg.async_get(select_entity_id)
+    assert entity_entry
+    assert entity_entry.disabled
+    assert entity_entry.entity_category == EntityCategory.CONFIG
+
+    updated_entry = ent_reg.async_update_entity(
+        select_entity_id, **{"disabled_by": None}
+    )
+    assert updated_entry != entity_entry
+    assert updated_entry.disabled is False
+
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(select_entity_id)
+    assert state
+    assert state.state == "Normal"
diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py
index d38466539e92ba..d809d52821c661 100644
--- a/tests/components/zwave_js/test_sensor.py
+++ b/tests/components/zwave_js/test_sensor.py
@@ -4,6 +4,7 @@
 import pytest
 from zwave_js_server.const.command_class.meter import MeterType
 from zwave_js_server.event import Event
+from zwave_js_server.exceptions import FailedZWaveCommand
 from zwave_js_server.model.node import Node
 
 from homeassistant.components.sensor import (
@@ -29,14 +30,17 @@
     PERCENTAGE,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
+    UV_INDEX,
     EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
     UnitOfTemperature,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 
 from .common import (
@@ -45,8 +49,6 @@
     CURRENT_SENSOR,
     ENERGY_SENSOR,
     HUMIDITY_SENSOR,
-    ID_LOCK_CONFIG_PARAMETER_SENSOR,
-    INDICATOR_SENSOR,
     METER_ENERGY_SENSOR,
     NOTIFICATION_MOTION_SENSOR,
     POWER_SENSOR,
@@ -91,11 +93,9 @@ async def test_numeric_sensor(
 
     assert state
     assert state.state == "0.0"
-    # TODO: Add UV_INDEX unit of measurement to this sensor
-    assert ATTR_UNIT_OF_MEASUREMENT not in state.attributes
+    assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UV_INDEX
     assert ATTR_DEVICE_CLASS not in state.attributes
-    # TODO: Add measurement state class to this sensor
-    assert ATTR_STATE_CLASS not in state.attributes
+    assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
 
     state = hass.states.get("sensor.hsm200_illuminance")
 
@@ -189,7 +189,9 @@ async def test_disabled_notification_sensor(
 
     state = hass.states.get(NOTIFICATION_MOTION_SENSOR)
     assert state.state == "Motion detection"
-    assert state.attributes["value"] == 8
+    assert state.attributes[ATTR_VALUE] == 8
+    assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.ENUM
+    assert state.attributes[ATTR_OPTIONS] == ["idle", "Motion detection"]
 
     event = Event(
         "value updated",
@@ -218,122 +220,97 @@ async def test_disabled_notification_sensor(
     assert state.state == STATE_UNKNOWN
 
 
-async def test_disabled_indcator_sensor(
-    hass: HomeAssistant, climate_radio_thermostat_ct100_plus, integration
-) -> None:
-    """Test sensor is created from Indicator CC and is disabled."""
-    ent_reg = er.async_get(hass)
-    entity_entry = ent_reg.async_get(INDICATOR_SENSOR)
-
-    assert entity_entry
-    assert entity_entry.disabled
-    assert entity_entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
-
-
 async def test_config_parameter_sensor(
-    hass: HomeAssistant, lock_id_lock_as_id150, integration
+    hass: HomeAssistant, climate_adc_t3000, lock_id_lock_as_id150, integration
 ) -> None:
     """Test config parameter sensor is created."""
+    sensor_entity_id = "sensor.adc_t3000_system_configuration_cool_stages"
+    sensor_with_states_entity_id = "sensor.adc_t3000_power_source"
     ent_reg = er.async_get(hass)
-    entity_entry = ent_reg.async_get(ID_LOCK_CONFIG_PARAMETER_SENSOR)
-    assert entity_entry
-    assert entity_entry.disabled
+    for entity_id in (sensor_entity_id, sensor_with_states_entity_id):
+        entity_entry = ent_reg.async_get(entity_id)
+        assert entity_entry
+        assert entity_entry.disabled
+        assert entity_entry.entity_category == EntityCategory.DIAGNOSTIC
 
-    updated_entry = ent_reg.async_update_entity(
-        entity_entry.entity_id, **{"disabled_by": None}
-    )
-    assert updated_entry != entity_entry
-    assert updated_entry.disabled is False
+    for entity_id in (sensor_entity_id, sensor_with_states_entity_id):
+        updated_entry = ent_reg.async_update_entity(entity_id, **{"disabled_by": None})
+        assert updated_entry != entity_entry
+        assert updated_entry.disabled is False
 
     # reload integration and check if entity is correctly there
     await hass.config_entries.async_reload(integration.entry_id)
     await hass.async_block_till_done()
 
-    state = hass.states.get(ID_LOCK_CONFIG_PARAMETER_SENSOR)
+    state = hass.states.get(sensor_entity_id)
     assert state
-    assert state.state == "Disable Away Manual Lock"
-    assert state.attributes[ATTR_VALUE] == 0
-    assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.ENUM
-    assert state.attributes[ATTR_OPTIONS] == [
-        "Disable Away Manual Lock",
-        "Disable Away Auto Lock",
-        "Enable Away Manual Lock",
-        "Enable Away Auto Lock",
-    ]
+    assert state.state == "1"
 
-    event = Event(
-        "value updated",
-        {
-            "source": "node",
-            "event": "value updated",
-            "nodeId": lock_id_lock_as_id150.node_id,
-            "args": {
-                "commandClassName": "Configuration",
-                "commandClass": 112,
-                "endpoint": 0,
-                "property": 1,
-                "newValue": None,
-                "prevValue": 0,
-                "propertyName": "Door lock mode",
-            },
-        },
+    state = hass.states.get(sensor_with_states_entity_id)
+    assert state
+    assert state.state == "C-Wire"
+
+    updated_entry = ent_reg.async_update_entity(
+        entity_entry.entity_id, **{"disabled_by": None}
     )
+    assert updated_entry != entity_entry
+    assert updated_entry.disabled is False
 
-    lock_id_lock_as_id150.receive_event(event)
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
     await hass.async_block_till_done()
-    state = hass.states.get(ID_LOCK_CONFIG_PARAMETER_SENSOR)
-    assert state
-    assert state.state == STATE_UNKNOWN
-    assert ATTR_VALUE not in state.attributes
 
 
 async def test_node_status_sensor(
     hass: HomeAssistant, client, lock_id_lock_as_id150, integration
 ) -> None:
     """Test node status sensor is created and gets updated on node state changes."""
-    NODE_STATUS_ENTITY = "sensor.z_wave_module_for_id_lock_150_and_101_node_status"
+    node_status_entity_id = "sensor.z_wave_module_for_id_lock_150_and_101_node_status"
     node = lock_id_lock_as_id150
     ent_reg = er.async_get(hass)
-    entity_entry = ent_reg.async_get(NODE_STATUS_ENTITY)
+    entity_entry = ent_reg.async_get(node_status_entity_id)
 
     assert not entity_entry.disabled
     assert entity_entry.entity_category is EntityCategory.DIAGNOSTIC
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"
+    assert hass.states.get(node_status_entity_id).state == "alive"
 
     # Test transitions work
     event = Event(
         "dead", data={"source": "node", "event": "dead", "nodeId": node.node_id}
     )
     node.receive_event(event)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "dead"
-    assert hass.states.get(NODE_STATUS_ENTITY).attributes[ATTR_ICON] == "mdi:robot-dead"
+    assert hass.states.get(node_status_entity_id).state == "dead"
+    assert (
+        hass.states.get(node_status_entity_id).attributes[ATTR_ICON] == "mdi:robot-dead"
+    )
 
     event = Event(
         "wake up", data={"source": "node", "event": "wake up", "nodeId": node.node_id}
     )
     node.receive_event(event)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "awake"
-    assert hass.states.get(NODE_STATUS_ENTITY).attributes[ATTR_ICON] == "mdi:eye"
+    assert hass.states.get(node_status_entity_id).state == "awake"
+    assert hass.states.get(node_status_entity_id).attributes[ATTR_ICON] == "mdi:eye"
 
     event = Event(
         "sleep", data={"source": "node", "event": "sleep", "nodeId": node.node_id}
     )
     node.receive_event(event)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "asleep"
-    assert hass.states.get(NODE_STATUS_ENTITY).attributes[ATTR_ICON] == "mdi:sleep"
+    assert hass.states.get(node_status_entity_id).state == "asleep"
+    assert hass.states.get(node_status_entity_id).attributes[ATTR_ICON] == "mdi:sleep"
 
     event = Event(
         "alive", data={"source": "node", "event": "alive", "nodeId": node.node_id}
     )
     node.receive_event(event)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"
+    assert hass.states.get(node_status_entity_id).state == "alive"
     assert (
-        hass.states.get(NODE_STATUS_ENTITY).attributes[ATTR_ICON] == "mdi:heart-pulse"
+        hass.states.get(node_status_entity_id).attributes[ATTR_ICON]
+        == "mdi:heart-pulse"
     )
 
     # Disconnect the client and make sure the entity is still available
     await client.disconnect()
-    assert hass.states.get(NODE_STATUS_ENTITY).state != STATE_UNAVAILABLE
+    assert hass.states.get(node_status_entity_id).state != STATE_UNAVAILABLE
 
     # Assert a node status sensor entity is not created for the controller
     driver = client.driver
@@ -358,15 +335,15 @@ async def test_node_status_sensor_not_ready(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test node status sensor is created and available if node is not ready."""
-    NODE_STATUS_ENTITY = "sensor.z_wave_module_for_id_lock_150_and_101_node_status"
+    node_status_entity_id = "sensor.z_wave_module_for_id_lock_150_and_101_node_status"
     node = lock_id_lock_as_id150_not_ready
     assert not node.ready
     ent_reg = er.async_get(hass)
-    entity_entry = ent_reg.async_get(NODE_STATUS_ENTITY)
+    entity_entry = ent_reg.async_get(node_status_entity_id)
 
     assert not entity_entry.disabled
-    assert hass.states.get(NODE_STATUS_ENTITY)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"
+    assert hass.states.get(node_status_entity_id)
+    assert hass.states.get(node_status_entity_id).state == "alive"
 
     # Mark node as ready
     event = Event(
@@ -380,18 +357,18 @@ async def test_node_status_sensor_not_ready(
     )
     node.receive_event(event)
     assert node.ready
-    assert hass.states.get(NODE_STATUS_ENTITY)
-    assert hass.states.get(NODE_STATUS_ENTITY).state == "alive"
+    assert hass.states.get(node_status_entity_id)
+    assert hass.states.get(node_status_entity_id).state == "alive"
 
     await hass.services.async_call(
         DOMAIN,
         SERVICE_REFRESH_VALUE,
         {
-            ATTR_ENTITY_ID: NODE_STATUS_ENTITY,
+            ATTR_ENTITY_ID: node_status_entity_id,
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
 
@@ -445,6 +422,18 @@ async def test_reset_meter(
 
     client.async_send_command_no_wait.reset_mock()
 
+    client.async_send_command_no_wait.side_effect = FailedZWaveCommand(
+        "test", 1, "test"
+    )
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RESET_METER,
+            {ATTR_ENTITY_ID: METER_ENERGY_SENSOR},
+            blocking=True,
+        )
+
 
 async def test_meter_attributes(
     hass: HomeAssistant,
@@ -593,3 +582,236 @@ async def test_unit_change(hass: HomeAssistant, zp3111, client, integration) ->
     assert state.state == "100.0"
     assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfTemperature.CELSIUS
     assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.TEMPERATURE
+
+
+CONTROLLER_STATISTICS_ENTITY_PREFIX = "sensor.z_stick_gen5_usb_controller_"
+# controller statistics with initial state of 0
+CONTROLLER_STATISTICS_SUFFIXES = {
+    "successful_messages_tx": 1,
+    "successful_messages_rx": 2,
+    "messages_dropped_tx": 3,
+    "messages_dropped_rx": 4,
+    "messages_not_accepted": 5,
+    "collisions": 6,
+    "missing_acks": 7,
+    "timed_out_responses": 8,
+    "timed_out_callbacks": 9,
+}
+# controller statistics with initial state of unknown
+CONTROLLER_STATISTICS_SUFFIXES_UNKNOWN = {
+    "current_background_rssi_channel_0": -1,
+    "average_background_rssi_channel_0": -2,
+    "current_background_rssi_channel_1": -3,
+    "average_background_rssi_channel_1": -4,
+    "current_background_rssi_channel_2": STATE_UNKNOWN,
+    "average_background_rssi_channel_2": STATE_UNKNOWN,
+}
+NODE_STATISTICS_ENTITY_PREFIX = "sensor.4_in_1_sensor_"
+# node statistics with initial state of 0
+NODE_STATISTICS_SUFFIXES = {
+    "successful_commands_tx": 1,
+    "successful_commands_rx": 2,
+    "commands_dropped_tx": 3,
+    "commands_dropped_rx": 4,
+    "timed_out_responses": 5,
+}
+# node statistics with initial state of unknown
+NODE_STATISTICS_SUFFIXES_UNKNOWN = {
+    "round_trip_time": 6,
+    "rssi": 7,
+}
+
+
+async def test_statistics_sensors(
+    hass: HomeAssistant, zp3111, client, integration, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test statistics sensors."""
+    ent_reg = er.async_get(hass)
+
+    for prefix, suffixes in (
+        (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES),
+        (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES_UNKNOWN),
+        (NODE_STATISTICS_ENTITY_PREFIX, NODE_STATISTICS_SUFFIXES),
+        (NODE_STATISTICS_ENTITY_PREFIX, NODE_STATISTICS_SUFFIXES_UNKNOWN),
+    ):
+        for suffix_key in suffixes:
+            entry = ent_reg.async_get(f"{prefix}{suffix_key}")
+            assert entry
+            assert entry.disabled
+            assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
+
+            ent_reg.async_update_entity(entry.entity_id, **{"disabled_by": None})
+
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    for prefix, suffixes, initial_state in (
+        (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES, "0"),
+        (
+            CONTROLLER_STATISTICS_ENTITY_PREFIX,
+            CONTROLLER_STATISTICS_SUFFIXES_UNKNOWN,
+            STATE_UNKNOWN,
+        ),
+        (NODE_STATISTICS_ENTITY_PREFIX, NODE_STATISTICS_SUFFIXES, "0"),
+        (
+            NODE_STATISTICS_ENTITY_PREFIX,
+            NODE_STATISTICS_SUFFIXES_UNKNOWN,
+            STATE_UNKNOWN,
+        ),
+    ):
+        for suffix_key in suffixes:
+            entry = ent_reg.async_get(f"{prefix}{suffix_key}")
+            assert entry
+            assert not entry.disabled
+            assert entry.disabled_by is None
+
+            state = hass.states.get(entry.entity_id)
+            assert state
+            assert state.state == initial_state
+
+    # Fire statistics updated for controller
+    event = Event(
+        "statistics updated",
+        {
+            "source": "controller",
+            "event": "statistics updated",
+            "statistics": {
+                "messagesTX": 1,
+                "messagesRX": 2,
+                "messagesDroppedTX": 3,
+                "messagesDroppedRX": 4,
+                "NAK": 5,
+                "CAN": 6,
+                "timeoutACK": 7,
+                "timeoutResponse": 8,
+                "timeoutCallback": 9,
+                "backgroundRSSI": {
+                    "channel0": {
+                        "current": -1,
+                        "average": -2,
+                    },
+                    "channel1": {
+                        "current": -3,
+                        "average": -4,
+                    },
+                    "timestamp": 1681967176510,
+                },
+            },
+        },
+    )
+    client.driver.controller.receive_event(event)
+
+    # Fire statistics updated event for node
+    event = Event(
+        "statistics updated",
+        {
+            "source": "node",
+            "event": "statistics updated",
+            "nodeId": zp3111.node_id,
+            "statistics": {
+                "commandsTX": 1,
+                "commandsRX": 2,
+                "commandsDroppedTX": 3,
+                "commandsDroppedRX": 4,
+                "timeoutResponse": 5,
+                "rtt": 6,
+                "rssi": 7,
+                "lwr": {
+                    "protocolDataRate": 1,
+                    "rssi": 1,
+                    "repeaters": [],
+                    "repeaterRSSI": [],
+                    "routeFailedBetween": [],
+                },
+                "nlwr": {
+                    "protocolDataRate": 2,
+                    "rssi": 2,
+                    "repeaters": [],
+                    "repeaterRSSI": [],
+                    "routeFailedBetween": [],
+                },
+            },
+        },
+    )
+    zp3111.receive_event(event)
+
+    # Check that states match the statistics from the updates
+    for prefix, suffixes in (
+        (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES),
+        (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES_UNKNOWN),
+        (NODE_STATISTICS_ENTITY_PREFIX, NODE_STATISTICS_SUFFIXES),
+        (NODE_STATISTICS_ENTITY_PREFIX, NODE_STATISTICS_SUFFIXES_UNKNOWN),
+    ):
+        for suffix_key, val in suffixes.items():
+            entity_id = f"{prefix}{suffix_key}"
+            state = hass.states.get(entity_id)
+            assert state
+            assert state.state == str(val)
+
+            await hass.services.async_call(
+                DOMAIN,
+                SERVICE_REFRESH_VALUE,
+                {ATTR_ENTITY_ID: entity_id},
+                blocking=True,
+            )
+    await hass.async_block_till_done()
+    assert caplog.text.count("There is no value to refresh for this entity") == len(
+        [
+            *CONTROLLER_STATISTICS_SUFFIXES,
+            *CONTROLLER_STATISTICS_SUFFIXES_UNKNOWN,
+            *NODE_STATISTICS_SUFFIXES,
+            *NODE_STATISTICS_SUFFIXES_UNKNOWN,
+        ]
+    )
+
+
+ENERGY_PRODUCTION_ENTITY_MAP = {
+    "energy_production_power": {
+        "state": 1.23,
+        "attributes": {
+            "unit_of_measurement": UnitOfPower.WATT,
+            "device_class": SensorDeviceClass.POWER,
+            "state_class": SensorStateClass.MEASUREMENT,
+        },
+    },
+    "energy_production_total": {
+        "state": 1234.56,
+        "attributes": {
+            "unit_of_measurement": UnitOfEnergy.WATT_HOUR,
+            "device_class": SensorDeviceClass.ENERGY,
+            "state_class": SensorStateClass.TOTAL_INCREASING,
+        },
+    },
+    "energy_production_today": {
+        "state": 123.45,
+        "attributes": {
+            "unit_of_measurement": UnitOfEnergy.WATT_HOUR,
+            "device_class": SensorDeviceClass.ENERGY,
+            "state_class": SensorStateClass.TOTAL_INCREASING,
+        },
+    },
+    "energy_production_time": {
+        "state": 123456.0,
+        "attributes": {
+            "unit_of_measurement": UnitOfTime.SECONDS,
+            "device_class": SensorDeviceClass.DURATION,
+        },
+        "missing_attributes": ["state_class"],
+    },
+}
+
+
+async def test_energy_production_sensors(
+    hass: HomeAssistant, energy_production, client, integration
+) -> None:
+    """Test sensors for Energy Production CC."""
+    for entity_id_suffix, state_data in ENERGY_PRODUCTION_ENTITY_MAP.items():
+        state = hass.states.get(f"sensor.node_2_{entity_id_suffix}")
+        assert state
+        assert state.state == str(state_data["state"])
+        for attr, val in state_data["attributes"].items():
+            assert state.attributes[attr] == val
+
+        for attr in state_data.get("missing_attributes", []):
+            assert attr not in state.attributes
diff --git a/tests/components/zwave_js/test_services.py b/tests/components/zwave_js/test_services.py
index 1c57eca2f26bef..a8671edbe64e2d 100644
--- a/tests/components/zwave_js/test_services.py
+++ b/tests/components/zwave_js/test_services.py
@@ -430,6 +430,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -457,6 +458,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -486,6 +488,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -516,6 +519,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -545,6 +549,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -577,6 +582,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -609,6 +615,7 @@ async def test_bulk_set_config_parameters(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -648,6 +655,7 @@ async def test_bulk_set_config_parameters_gather(
     assert args["nodeId"] == 52
     assert args["valueId"] == {
         "commandClass": 112,
+        "endpoint": 0,
         "property": 102,
     }
     assert args["value"] == 241
@@ -670,6 +678,7 @@ async def test_refresh_value(
         {ATTR_ENTITY_ID: CLIMATE_RADIO_THERMOSTAT_ENTITY},
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "node.poll_value"
@@ -693,6 +702,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -708,6 +718,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -725,6 +736,7 @@ async def test_refresh_value(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 8
 
     client.async_send_command.reset_mock()
@@ -1531,6 +1543,18 @@ async def test_ping(
             blocking=True,
         )
 
+    client.async_send_command.reset_mock()
+    client.async_send_command.side_effect = FailedZWaveCommand("test", 1, "test")
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_PING,
+            {
+                ATTR_ENTITY_ID: CLIMATE_RADIO_THERMOSTAT_ENTITY,
+            },
+            blocking=True,
+        )
+
 
 async def test_invoke_cc_api(
     hass: HomeAssistant,
@@ -1573,6 +1597,7 @@ async def test_invoke_cc_api(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "endpoint.invoke_cc_api"
@@ -1625,6 +1650,7 @@ async def test_invoke_cc_api(
         },
         blocking=True,
     )
+    await hass.async_block_till_done()
     assert len(client.async_send_command.call_args_list) == 1
     args = client.async_send_command.call_args[0][0]
     assert args["command"] == "endpoint.invoke_cc_api"
diff --git a/tests/components/zwave_js/test_switch.py b/tests/components/zwave_js/test_switch.py
index 87ad7838ff1814..ebf7d9f441fa1e 100644
--- a/tests/components/zwave_js/test_switch.py
+++ b/tests/components/zwave_js/test_switch.py
@@ -1,12 +1,16 @@
 """Test the Z-Wave JS switch platform."""
+import pytest
 from zwave_js_server.const import CURRENT_VALUE_PROPERTY, CommandClass
 from zwave_js_server.event import Event
+from zwave_js_server.exceptions import FailedZWaveCommand
 from zwave_js_server.model.node import Node
 
 from homeassistant.components.switch import DOMAIN, SERVICE_TURN_OFF, SERVICE_TURN_ON
 from homeassistant.components.zwave_js.helpers import ZwaveValueMatcher
-from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNKNOWN, EntityCategory
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
 
 from .common import SWITCH_ENTITY, replace_value_of_zwave_value
 
@@ -209,3 +213,74 @@ async def test_switch_no_value(
 
     assert state
     assert state.state == STATE_UNKNOWN
+
+
+async def test_config_parameter_switch(
+    hass: HomeAssistant, hank_binary_switch, integration, client
+) -> None:
+    """Test config parameter switch is created."""
+    switch_entity_id = "switch.smart_plug_with_two_usb_ports_overload_protection"
+    ent_reg = er.async_get(hass)
+    entity_entry = ent_reg.async_get(switch_entity_id)
+    assert entity_entry
+    assert entity_entry.disabled
+
+    updated_entry = ent_reg.async_update_entity(
+        switch_entity_id, **{"disabled_by": None}
+    )
+    assert updated_entry != entity_entry
+    assert updated_entry.disabled is False
+    assert entity_entry.entity_category == EntityCategory.CONFIG
+
+    # reload integration and check if entity is correctly there
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(switch_entity_id)
+    assert state
+    assert state.state == STATE_ON
+
+    client.async_send_command.reset_mock()
+
+    # Test turning on
+    await hass.services.async_call(
+        DOMAIN, SERVICE_TURN_ON, {"entity_id": switch_entity_id}, blocking=True
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == hank_binary_switch.node_id
+    assert args["value"] == 1
+    assert args["valueId"] == {
+        "commandClass": 112,
+        "endpoint": 0,
+        "property": 20,
+    }
+
+    client.async_send_command.reset_mock()
+
+    # Test turning off
+    await hass.services.async_call(
+        DOMAIN, SERVICE_TURN_OFF, {"entity_id": switch_entity_id}, blocking=True
+    )
+
+    assert len(client.async_send_command.call_args_list) == 1
+    args = client.async_send_command.call_args[0][0]
+    assert args["command"] == "node.set_value"
+    assert args["nodeId"] == hank_binary_switch.node_id
+    assert args["value"] == 0
+    assert args["valueId"] == {
+        "commandClass": 112,
+        "endpoint": 0,
+        "property": 20,
+    }
+
+    client.async_send_command.reset_mock()
+    client.async_send_command.side_effect = FailedZWaveCommand("test", 1, "test")
+
+    # Test turning off error raises proper exception
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            DOMAIN, SERVICE_TURN_OFF, {"entity_id": switch_entity_id}, blocking=True
+        )
diff --git a/tests/components/zwave_js/test_trigger.py b/tests/components/zwave_js/test_trigger.py
index 9df8aa75f434df..eae9d6f5416fd0 100644
--- a/tests/components/zwave_js/test_trigger.py
+++ b/tests/components/zwave_js/test_trigger.py
@@ -1109,3 +1109,163 @@ def test_get_trigger_platform_failure() -> None:
     """Test _get_trigger_platform."""
     with pytest.raises(ValueError):
         _get_trigger_platform({CONF_PLATFORM: "zwave_js.invalid"})
+
+
+async def test_server_reconnect_event(
+    hass: HomeAssistant,
+    client,
+    lock_schlage_be469,
+    lock_schlage_be469_state,
+    integration,
+) -> None:
+    """Test that when we reconnect to server, event triggers reattach."""
+    trigger_type = f"{DOMAIN}.event"
+    old_node: Node = lock_schlage_be469
+
+    event_name = "interview stage completed"
+
+    old_node = client.driver.controller.nodes[20]
+
+    original_len = len(old_node._listeners.get(event_name, []))
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": trigger_type,
+                        "entity_id": SCHLAGE_BE469_LOCK_ENTITY,
+                        "event_source": "node",
+                        "event": event_name,
+                    },
+                    "action": {
+                        "event": "blah",
+                    },
+                },
+            ]
+        },
+    )
+
+    assert len(old_node._listeners.get(event_name, [])) == original_len + 1
+    old_listener = old_node._listeners.get(event_name, [])[original_len]
+
+    # Remove node so that we can create a new node instance and make sure the listener
+    # attaches
+    node_removed_event = Event(
+        type="node removed",
+        data={
+            "source": "controller",
+            "event": "node removed",
+            "replaced": False,
+            "node": lock_schlage_be469_state,
+        },
+    )
+    client.driver.controller.receive_event(node_removed_event)
+    assert 20 not in client.driver.controller.nodes
+    await hass.async_block_till_done()
+
+    # Add node like new server connection would
+    node_added_event = Event(
+        type="node added",
+        data={
+            "source": "controller",
+            "event": "node added",
+            "node": lock_schlage_be469_state,
+            "result": {},
+        },
+    )
+    client.driver.controller.receive_event(node_added_event)
+    await hass.async_block_till_done()
+
+    # Reload integration to trigger the dispatch signal
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    # Make sure there is a listener added for the trigger to the new node
+    new_node = client.driver.controller.nodes[20]
+    assert len(new_node._listeners.get(event_name, [])) == original_len + 1
+
+    # Make sure the old listener is no longer referenced
+    assert old_listener not in new_node._listeners.get(event_name, [])
+
+
+async def test_server_reconnect_value_updated(
+    hass: HomeAssistant,
+    client,
+    lock_schlage_be469,
+    lock_schlage_be469_state,
+    integration,
+) -> None:
+    """Test that when we reconnect to server, value_updated triggers reattach."""
+    trigger_type = f"{DOMAIN}.value_updated"
+    old_node: Node = lock_schlage_be469
+
+    event_name = "value updated"
+
+    old_node = client.driver.controller.nodes[20]
+
+    original_len = len(old_node._listeners.get(event_name, []))
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": trigger_type,
+                        "entity_id": SCHLAGE_BE469_LOCK_ENTITY,
+                        "command_class": CommandClass.DOOR_LOCK.value,
+                        "property": "latchStatus",
+                    },
+                    "action": {
+                        "event": "no_value_filter",
+                    },
+                },
+            ]
+        },
+    )
+
+    assert len(old_node._listeners.get(event_name, [])) == original_len + 1
+    old_listener = old_node._listeners.get(event_name, [])[original_len]
+
+    # Remove node so that we can create a new node instance and make sure the listener
+    # attaches
+    node_removed_event = Event(
+        type="node removed",
+        data={
+            "source": "controller",
+            "event": "node removed",
+            "replaced": False,
+            "node": lock_schlage_be469_state,
+        },
+    )
+    client.driver.controller.receive_event(node_removed_event)
+    assert 20 not in client.driver.controller.nodes
+    await hass.async_block_till_done()
+
+    # Add node like new server connection would
+    node_added_event = Event(
+        type="node added",
+        data={
+            "source": "controller",
+            "event": "node added",
+            "node": lock_schlage_be469_state,
+            "result": {},
+        },
+    )
+    client.driver.controller.receive_event(node_added_event)
+    await hass.async_block_till_done()
+
+    # Reload integration to trigger the dispatch signal
+    await hass.config_entries.async_reload(integration.entry_id)
+    await hass.async_block_till_done()
+
+    # Make sure there is a listener added for the trigger to the new node
+    new_node = client.driver.controller.nodes[20]
+    assert len(new_node._listeners.get(event_name, [])) == original_len + 1
+
+    # Make sure the old listener is no longer referenced
+    assert old_listener not in new_node._listeners.get(event_name, [])
diff --git a/tests/components/zwave_js/test_update.py b/tests/components/zwave_js/test_update.py
index 1a783f06bea64f..dcd71789e840bb 100644
--- a/tests/components/zwave_js/test_update.py
+++ b/tests/components/zwave_js/test_update.py
@@ -127,7 +127,7 @@ async def test_update_entity_states(
         },
         blocking=True,
     )
-
+    await hass.async_block_till_done()
     assert "There is no value to refresh for this entity" in caplog.text
 
     client.async_send_command.return_value = {"updates": []}
@@ -778,6 +778,42 @@ async def test_update_entity_full_restore_data_no_update_available(
     assert state.attributes[ATTR_LATEST_VERSION] == "10.7"
 
 
+async def test_update_entity_no_latest_version(
+    hass: HomeAssistant,
+    client,
+    climate_radio_thermostat_ct100_plus_different_endpoints,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test entity with no `latest_version` attr restores state."""
+    mock_restore_cache_with_extra_data(
+        hass,
+        [
+            (
+                State(
+                    UPDATE_ENTITY,
+                    STATE_OFF,
+                    {
+                        ATTR_INSTALLED_VERSION: "10.7",
+                        ATTR_LATEST_VERSION: None,
+                        ATTR_SKIPPED_VERSION: None,
+                    },
+                ),
+                {"latest_version_firmware": None},
+            )
+        ],
+    )
+    entry = MockConfigEntry(domain="zwave_js", data={"url": "ws://test.org"})
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(UPDATE_ENTITY)
+    assert state
+    assert state.state == STATE_OFF
+    assert state.attributes[ATTR_SKIPPED_VERSION] is None
+    assert state.attributes[ATTR_LATEST_VERSION] == "10.7"
+
+
 async def test_update_entity_unload_asleep_node(
     hass: HomeAssistant, client, wallmote_central_scene, integration
 ) -> None:
diff --git a/tests/conftest.py b/tests/conftest.py
index 7184fac81891aa..922e42c7a7e33f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -305,7 +305,7 @@ def skip_stop_scripts(
         return
     with patch(
         "homeassistant.helpers.script._schedule_stop_scripts_after_shutdown",
-        AsyncMock(),
+        Mock(),
     ):
         yield
 
@@ -490,17 +490,7 @@ def hass_fixture_setup() -> list[bool]:
 
 
 @pytest.fixture
-def hass(_hass: HomeAssistant) -> HomeAssistant:
-    """Fixture to provide a test instance of Home Assistant."""
-    # This wraps the async _hass fixture inside a sync fixture, to ensure
-    # the `hass` context variable is set in the execution context in which
-    # the test itself is executed
-    ha._cv_hass.set(_hass)
-    return _hass
-
-
-@pytest.fixture
-async def _hass(
+async def hass(
     hass_fixture_setup: list[bool],
     event_loop: asyncio.AbstractEventLoop,
     load_registries: bool,
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index f1f644a36a7087..5ea6df42349d28 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -11,8 +11,14 @@
 import voluptuous as vol
 
 import homeassistant
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, selector, template
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import (
+    config_validation as cv,
+    issue_registry as ir,
+    selector,
+    template,
+)
 
 
 def test_boolean() -> None:
@@ -378,7 +384,7 @@ def test_service() -> None:
     schema("homeassistant.turn_on")
 
 
-def test_service_schema() -> None:
+def test_service_schema(hass: HomeAssistant) -> None:
     """Test service_schema validation."""
     options = (
         {},
@@ -1048,7 +1054,10 @@ def test_deprecated_or_removed_logger_with_config_attributes(
     setattr(config, "__config_file__", file)
     setattr(config, "__line__", line)
 
-    cv.deprecated("mars", replacement_key=replacement_key, default=False)(config)
+    validated = cv.deprecated("mars", replacement_key=replacement_key, default=False)(
+        config
+    )
+    assert "mars" not in validated  # Removed because a replacement_key is defined
 
     assert len(caplog.records) == 1
     assert replacement in caplog.text
@@ -1063,7 +1072,8 @@ def test_deprecated_or_removed_logger_with_config_attributes(
     setattr(config, "__config_file__", file)
     setattr(config, "__line__", line)
 
-    cv.removed("mars", default=False, raise_if_present=False)(config)
+    validated = cv.removed("mars", default=False, raise_if_present=False)(config)
+    assert "mars" not in validated  # Removed because by cv.removed
 
     assert len(caplog.records) == 1
     assert replacement in caplog.text
@@ -1341,9 +1351,9 @@ def test_key_value_schemas_with_default() -> None:
     schema({"mode": "{{ 1 + 1}}"})
 
 
-def test_script(caplog: pytest.LogCaptureFixture) -> None:
-    """Test script validation is user friendly."""
-    for data, msg in (
+@pytest.mark.parametrize(
+    ("config", "error"),
+    (
         ({"delay": "{{ invalid"}, "should be format 'HH:MM'"),
         ({"wait_template": "{{ invalid"}, "invalid template"),
         ({"condition": "invalid"}, "Unexpected value for condition: 'invalid'"),
@@ -1357,20 +1367,33 @@ def test_script(caplog: pytest.LogCaptureFixture) -> None:
             {"condition": "not", "conditions": "not a dynamic template"},
             "Expected a dictionary",
         ),
-        ({"event": None}, "string value is None for dictionary value @ data['event']"),
+        (
+            {"event": None},
+            r"string value is None for dictionary value @ data\['event'\]",
+        ),
         (
             {"device_id": None},
-            "string value is None for dictionary value @ data['device_id']",
+            r"string value is None for dictionary value @ data\['device_id'\]",
         ),
         (
             {"scene": "light.kitchen"},
             "Entity ID 'light.kitchen' does not belong to domain 'scene'",
         ),
-    ):
-        with pytest.raises(vol.Invalid) as excinfo:
-            cv.script_action(data)
-
-        assert msg in str(excinfo.value)
+        (
+            {
+                "alias": "stop step",
+                "stop": "In the name of love",
+                "error": True,
+                "response_variable": "response-value",
+            },
+            "not allowed to add a response to an error stop action",
+        ),
+    ),
+)
+def test_script(caplog: pytest.LogCaptureFixture, config: dict, error: str) -> None:
+    """Test script validation is user friendly."""
+    with pytest.raises(vol.Invalid, match=error):
+        cv.script_action(config)
 
 
 def test_whitespace() -> None:
@@ -1379,7 +1402,7 @@ def test_whitespace() -> None:
 
     for value in (
         None,
-        "" "T",
+        "T",
         "negative",
         "lock",
         "tr  ue",
@@ -1468,3 +1491,103 @@ def test_positive_time_period_template() -> None:
     schema("{{ 'invalid' }}")
     schema({"{{ 'invalid' }}": 5})
     schema({"minutes": "{{ 'invalid' }}"})
+
+
+def test_empty_schema(caplog: pytest.LogCaptureFixture) -> None:
+    """Test empty_config_schema."""
+    expected_message = (
+        "The test_domain integration does not support any configuration parameters"
+    )
+
+    cv.empty_config_schema("test_domain")({})
+    assert expected_message not in caplog.text
+
+    cv.empty_config_schema("test_domain")({"test_domain": {}})
+    assert expected_message not in caplog.text
+
+    cv.empty_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+    assert expected_message in caplog.text
+
+
+def test_empty_schema_cant_find_module() -> None:
+    """Test if the current module cannot be inspected."""
+    with patch("inspect.getmodule", return_value=None):
+        cv.empty_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+
+
+def test_config_entry_only_schema(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test config_entry_only_config_schema."""
+    expected_issue = "config_entry_only_test_domain"
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    issue_registry = ir.async_get(hass)
+
+    cv.config_entry_only_config_schema("test_domain")({})
+    assert expected_message not in caplog.text
+    assert not issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.config_entry_only_config_schema("test_domain")({"test_domain": {}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+    issue_registry.async_delete(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.config_entry_only_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+
+def test_config_entry_only_schema_cant_find_module() -> None:
+    """Test if the current module cannot be inspected."""
+    with patch("inspect.getmodule", return_value=None):
+        cv.config_entry_only_config_schema("test_domain")(
+            {"test_domain": {"foo": "bar"}}
+        )
+
+
+def test_config_entry_only_schema_no_hass(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test if the the hass context is not set in our context."""
+    with patch(
+        "homeassistant.helpers.config_validation.async_get_hass",
+        side_effect=HomeAssistantError,
+    ):
+        cv.config_entry_only_config_schema("test_domain")(
+            {"test_domain": {"foo": "bar"}}
+        )
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    assert expected_message in caplog.text
+    issue_registry = ir.async_get(hass)
+    assert not issue_registry.issues
+
+
+def test_platform_only_schema(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test config_entry_only_config_schema."""
+    expected_issue = "platform_only_test_domain"
+    expected_message = (
+        "The test_domain integration does not support YAML setup, please remove "
+        "it from your configuration"
+    )
+    issue_registry = ir.async_get(hass)
+
+    cv.platform_only_config_schema("test_domain")({})
+    assert expected_message not in caplog.text
+    assert not issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.platform_only_config_schema("test_domain")({"test_domain": {}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
+    issue_registry.async_delete(HOMEASSISTANT_DOMAIN, expected_issue)
+
+    cv.platform_only_config_schema("test_domain")({"test_domain": {"foo": "bar"}})
+    assert expected_message in caplog.text
+    assert issue_registry.async_get_issue(HOMEASSISTANT_DOMAIN, expected_issue)
diff --git a/tests/helpers/test_debounce.py b/tests/helpers/test_debounce.py
index 4d36679d538d3b..f31453cfe967d2 100644
--- a/tests/helpers/test_debounce.py
+++ b/tests/helpers/test_debounce.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import debounce
 from homeassistant.util.dt import utcnow
 
@@ -69,6 +69,133 @@ async def test_immediate_works(hass: HomeAssistant) -> None:
     assert debouncer._job.target == debouncer.function
 
 
+async def test_immediate_works_with_passed_callback_function_raises(
+    hass: HomeAssistant,
+) -> None:
+    """Test immediate works with a callback function that raises."""
+    calls = []
+
+    @callback
+    def _append_and_raise() -> None:
+        calls.append(None)
+        raise RuntimeError("forced_raise")
+
+    debouncer = debounce.Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=0.01,
+        immediate=True,
+        function=_append_and_raise,
+    )
+
+    # Call when nothing happening
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    # Call when cooldown active setting execute at end to True
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
+
+    # Canceling debounce in cooldown
+    debouncer.async_cancel()
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
+
+    # Call and let timer run out
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 2
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job == before_job
+
+    # Test calling doesn't execute/cooldown if currently executing.
+    await debouncer._execute_lock.acquire()
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
+
+
+async def test_immediate_works_with_passed_coroutine_raises(
+    hass: HomeAssistant,
+) -> None:
+    """Test immediate works with a coroutine that raises."""
+    calls = []
+
+    async def _append_and_raise() -> None:
+        calls.append(None)
+        raise RuntimeError("forced_raise")
+
+    debouncer = debounce.Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=0.01,
+        immediate=True,
+        function=_append_and_raise,
+    )
+
+    # Call when nothing happening
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    # Call when cooldown active setting execute at end to True
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
+
+    # Canceling debounce in cooldown
+    debouncer.async_cancel()
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
+
+    # Call and let timer run out
+    with pytest.raises(RuntimeError, match="forced_raise"):
+        await debouncer.async_call()
+    assert len(calls) == 2
+    async_fire_time_changed(hass, utcnow() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job == before_job
+
+    # Test calling doesn't execute/cooldown if currently executing.
+    await debouncer._execute_lock.acquire()
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
+
+
 async def test_not_immediate_works(hass: HomeAssistant) -> None:
     """Test immediate works."""
     calls = []
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index 40c402f6f49b17..7de6f70e793698 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -1,8 +1,10 @@
 """Test the entity helper."""
 import asyncio
+from collections.abc import Iterable
 import dataclasses
 from datetime import timedelta
 import threading
+from typing import Any
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
@@ -17,6 +19,8 @@
 )
 from homeassistant.core import Context, HomeAssistant, HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity, entity_registry as er
+from homeassistant.helpers.entity_component import async_update_entity
+from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
 from tests.common import (
     MockConfigEntry,
@@ -578,12 +582,14 @@ async def test_async_remove_no_platform(hass: HomeAssistant) -> None:
 
 
 async def test_async_remove_runs_callbacks(hass: HomeAssistant) -> None:
-    """Test async_remove method when no platform set."""
+    """Test async_remove runs on_remove callback."""
     result = []
 
+    platform = MockEntityPlatform(hass, domain="test")
     ent = entity.Entity()
     ent.hass = hass
     ent.entity_id = "test.test"
+    await platform.async_add_entities([ent])
     ent.async_on_remove(lambda: result.append(1))
     await ent.async_remove()
     assert len(result) == 1
@@ -593,16 +599,23 @@ async def test_async_remove_ignores_in_flight_polling(hass: HomeAssistant) -> No
     """Test in flight polling is ignored after removing."""
     result = []
 
+    platform = MockEntityPlatform(hass, domain="test")
     ent = entity.Entity()
     ent.hass = hass
     ent.entity_id = "test.test"
     ent.async_on_remove(lambda: result.append(1))
-    ent.async_write_ha_state()
+    await platform.async_add_entities([ent])
     assert hass.states.get("test.test").state == STATE_UNKNOWN
+
+    # Remove the entity from the entity registry
     await ent.async_remove()
     assert len(result) == 1
     assert hass.states.get("test.test") is None
+
+    # Simulate an in-flight poll after the entity was removed
     ent.async_write_ha_state()
+    assert len(result) == 1
+    assert hass.states.get("test.test") is None
 
 
 async def test_set_context(hass: HomeAssistant) -> None:
@@ -798,18 +811,18 @@ async def test_setup_source(hass: HomeAssistant) -> None:
 
 async def test_removing_entity_unavailable(hass: HomeAssistant) -> None:
     """Test removing an entity that is still registered creates an unavailable state."""
-    entry = er.RegistryEntry(
+    er.RegistryEntry(
         entity_id="hello.world",
         unique_id="test-unique-id",
         platform="test-platform",
         disabled_by=None,
     )
 
+    platform = MockEntityPlatform(hass, domain="hello")
     ent = entity.Entity()
-    ent.hass = hass
     ent.entity_id = "hello.world"
-    ent.registry_entry = entry
-    ent.async_write_ha_state()
+    ent._attr_unique_id = "test-unique-id"
+    await platform.async_add_entities([ent])
 
     state = hass.states.get("hello.world")
     assert state is not None
@@ -939,22 +952,392 @@ async def test_entity_description_fallback() -> None:
         assert getattr(ent, field.name) == getattr(ent_with_description, field.name)
 
 
+async def _test_friendly_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    ent: entity.Entity,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name."""
+
+    expected_warning = (
+        f"Entity {ent.entity_id} ({type(ent)}) is implicitly using device name"
+    )
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([ent])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    assert await entity_platform.async_setup_entry(config_entry)
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 1
+    state = hass.states.async_all()[0]
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name
+    assert (expected_warning in caplog.text) is warn_implicit_name
+
+    await async_update_entity(hass, ent.entity_id)
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name
+
+
 @pytest.mark.parametrize(
-    ("has_entity_name", "entity_name", "expected_friendly_name"),
     (
-        (False, "Entity Blu", "Entity Blu"),
-        (False, None, None),
-        (True, "Entity Blu", "Device Bla Entity Blu"),
-        (True, None, "Device Bla"),
+        "has_entity_name",
+        "entity_name",
+        "device_name",
+        "expected_friendly_name",
+        "warn_implicit_name",
+    ),
+    (
+        (False, "Entity Blu", "Device Bla", "Entity Blu", False),
+        (False, None, "Device Bla", None, False),
+        (True, "Entity Blu", "Device Bla", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", "Device Bla", False),
+        (True, "Entity Blu", UNDEFINED, "Entity Blu", False),
+        (True, "Entity Blu", None, "Mock Title Entity Blu", False),
     ),
 )
-async def test_friendly_name(
+async def test_friendly_name_attr(
     hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
     has_entity_name: bool,
     entity_name: str | None,
+    device_name: str | None | UndefinedType,
     expected_friendly_name: str | None,
+    warn_implicit_name: bool,
 ) -> None:
-    """Test entity_id is influenced by entity name."""
+    """Test friendly name when the entity uses _attr_*."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": device_name,
+        },
+    )
+    ent._attr_has_entity_name = has_entity_name
+    ent._attr_name = entity_name
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla", True),
+    ),
+)
+async def test_friendly_name_description(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has an entity description."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+    )
+    ent.entity_description = entity.EntityDescription(
+        "test", has_entity_name=has_entity_name, name=entity_name
+    )
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla English cls", False),
+    ),
+)
+async def test_friendly_name_description_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has an entity description."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+    )
+    ent.entity_description = entity.EntityDescription(
+        "test",
+        device_class="test_class",
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        (True, UNDEFINED, "Device Bla", True),
+    ),
+)
+async def test_friendly_name_property(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has overridden the name property."""
+
+    ent = MockEntity(
+        unique_id="qwer",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    await _test_friendly_name(
+        hass,
+        caplog,
+        ent,
+        expected_friendly_name,
+        warn_implicit_name,
+    )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, "Entity Blu", "Entity Blu", False),
+        (False, None, None, False),
+        (False, UNDEFINED, None, False),
+        (True, "Entity Blu", "Device Bla Entity Blu", False),
+        (True, None, "Device Bla", False),
+        # Won't use the device class name because the entity overrides the name property
+        (True, UNDEFINED, "Device Bla None", False),
+    ),
+)
+async def test_friendly_name_property_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    entity_name: str | None,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has overridden the name property."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_class="test_class",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+        name=entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
+
+
+@pytest.mark.parametrize(
+    ("has_entity_name", "expected_friendly_name", "warn_implicit_name"),
+    (
+        (False, None, False),
+        (True, "Device Bla English cls", False),
+    ),
+)
+async def test_friendly_name_device_class_name(
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    has_entity_name: bool,
+    expected_friendly_name: str | None,
+    warn_implicit_name: bool,
+) -> None:
+    """Test friendly name when the entity has not set the name in any way."""
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+    }
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    class DeviceClassNameMockEntity(MockEntity):
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return True
+
+    ent = DeviceClassNameMockEntity(
+        unique_id="qwer",
+        device_class="test_class",
+        device_info={
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        },
+        has_entity_name=has_entity_name,
+    )
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        await _test_friendly_name(
+            hass,
+            caplog,
+            ent,
+            expected_friendly_name,
+            warn_implicit_name,
+        )
+
+
+@pytest.mark.parametrize(
+    (
+        "entity_name",
+        "expected_friendly_name1",
+        "expected_friendly_name2",
+        "expected_friendly_name3",
+    ),
+    (
+        (
+            "Entity Blu",
+            "Device Bla Entity Blu",
+            "Device Bla2 Entity Blu",
+            "New Device Entity Blu",
+        ),
+        (
+            None,
+            "Device Bla",
+            "Device Bla2",
+            "New Device",
+        ),
+    ),
+)
+async def test_friendly_name_updated(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    entity_registry: er.EntityRegistry,
+    entity_name: str | None,
+    expected_friendly_name1: str,
+    expected_friendly_name2: str,
+    expected_friendly_name3: str,
+) -> None:
+    """Test friendly name is updated when device or entity registry updates."""
 
     async def async_setup_entry(hass, config_entry, async_add_entities):
         """Mock setup entry method."""
@@ -967,7 +1350,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                         "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
                         "name": "Device Bla",
                     },
-                    has_entity_name=has_entity_name,
+                    has_entity_name=True,
                     name=entity_name,
                 ),
             ]
@@ -985,7 +1368,25 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
     assert len(hass.states.async_entity_ids()) == 1
     state = hass.states.async_all()[0]
-    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name1
+
+    device = device_registry.async_get_device(identifiers={("hue", "1234")})
+    device_registry.async_update_device(device.id, name_by_user="Device Bla2")
+    await hass.async_block_till_done()
+
+    state = hass.states.async_all()[0]
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name2
+
+    device = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={("hue", "5678")},
+        name="New Device",
+    )
+    entity_registry.async_update_entity(state.entity_id, device_id=device.id)
+    await hass.async_block_till_done()
+
+    state = hass.states.async_all()[0]
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == expected_friendly_name3
 
 
 async def test_translation_key(hass: HomeAssistant) -> None:
@@ -1029,19 +1430,48 @@ async def test_warn_using_async_update_ha_state(
     """Test we warn once when using async_update_ha_state without force_update."""
     ent = entity.Entity()
     ent.hass = hass
+    ent.platform = MockEntityPlatform(hass)
     ent.entity_id = "hello.world"
+    error_message = "is using self.async_update_ha_state()"
 
     # When forcing, it should not trigger the warning
     caplog.clear()
     await ent.async_update_ha_state(force_refresh=True)
-    assert "is using self.async_update_ha_state()" not in caplog.text
+    assert error_message not in caplog.text
 
     # When not forcing, it should trigger the warning
     caplog.clear()
     await ent.async_update_ha_state()
-    assert "is using self.async_update_ha_state()" in caplog.text
+    assert error_message in caplog.text
 
     # When not forcing, it should not trigger the warning again
     caplog.clear()
     await ent.async_update_ha_state()
-    assert "is using self.async_update_ha_state()" not in caplog.text
+    assert error_message not in caplog.text
+
+
+async def test_warn_no_platform(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test we warn am entity does not have a platform."""
+    ent = entity.Entity()
+    ent.hass = hass
+    ent.platform = MockEntityPlatform(hass)
+    ent.entity_id = "hello.world"
+    error_message = "does not have a platform"
+
+    # No warning if the entity has a platform
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message not in caplog.text
+
+    # Without a platform, it should trigger the warning
+    ent.platform = None
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message in caplog.text
+
+    # Without a platform, it should not trigger the warning again
+    caplog.clear()
+    ent.async_write_ha_state()
+    assert error_message not in caplog.text
diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py
index 4c9847bb3d2df5..4119ccc6e854a2 100644
--- a/tests/helpers/test_entity_component.py
+++ b/tests/helpers/test_entity_component.py
@@ -14,8 +14,14 @@
     ENTITY_MATCH_NONE,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import PlatformNotReady
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+    callback,
+)
+from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity_component import EntityComponent, async_update_entity
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -474,7 +480,7 @@ async def test_extract_all_use_match_all(
 
 
 async def test_register_entity_service(hass: HomeAssistant) -> None:
-    """Test not expanding a group."""
+    """Test registering an enttiy service and calling it."""
     entity = MockEntity(entity_id=f"{DOMAIN}.entity")
     calls = []
 
@@ -524,6 +530,70 @@ def appender(**kwargs):
     assert len(calls) == 2
 
 
+async def test_register_entity_service_response_data(hass: HomeAssistant) -> None:
+    """Test an enttiy service that does not support response data."""
+    entity = MockEntity(entity_id=f"{DOMAIN}.entity")
+
+    async def generate_response(
+        target: MockEntity, call: ServiceCall
+    ) -> ServiceResponse:
+        assert call.return_response
+        return {"response-key": "response-value"}
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_setup({})
+    await component.async_add_entities([entity])
+
+    component.async_register_entity_service(
+        "hello",
+        {"some": str},
+        generate_response,
+        supports_response=SupportsResponse.ONLY,
+    )
+
+    response_data = await hass.services.async_call(
+        DOMAIN,
+        "hello",
+        service_data={"entity_id": entity.entity_id, "some": "data"},
+        blocking=True,
+        return_response=True,
+    )
+    assert response_data == {"response-key": "response-value"}
+
+
+async def test_register_entity_service_response_data_multiple_matches(
+    hass: HomeAssistant,
+) -> None:
+    """Test asking for service response data but matching many entities."""
+    entity1 = MockEntity(entity_id=f"{DOMAIN}.entity1")
+    entity2 = MockEntity(entity_id=f"{DOMAIN}.entity2")
+
+    async def generate_response(
+        target: MockEntity, call: ServiceCall
+    ) -> ServiceResponse:
+        raise ValueError("Should not be invoked")
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_setup({})
+    await component.async_add_entities([entity1, entity2])
+
+    component.async_register_entity_service(
+        "hello",
+        {},
+        generate_response,
+        supports_response=SupportsResponse.ONLY,
+    )
+
+    with pytest.raises(HomeAssistantError, match="matched more than one entity"):
+        await hass.services.async_call(
+            DOMAIN,
+            "hello",
+            target={"entity_id": [entity1.entity_id, entity2.entity_id]},
+            blocking=True,
+            return_response=True,
+        )
+
+
 async def test_platforms_shutdown_on_stop(hass: HomeAssistant) -> None:
     """Test that we shutdown platforms on stop."""
     platform1_setup = Mock(side_effect=[PlatformNotReady, PlatformNotReady, None])
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index 56872fe5b4b6ba..711c333c5ff4e9 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -1,7 +1,9 @@
 """Tests for the EntityPlatform helper."""
 import asyncio
+from collections.abc import Iterable
 from datetime import timedelta
 import logging
+from typing import Any
 from unittest.mock import ANY, Mock, patch
 
 import pytest
@@ -13,9 +15,11 @@
     device_registry as dr,
     entity_platform,
     entity_registry as er,
+    issue_registry as ir,
 )
 from homeassistant.helpers.entity import (
     DeviceInfo,
+    Entity,
     EntityCategory,
     async_generate_entity_id,
 )
@@ -223,16 +227,18 @@ async def test_platform_warn_slow_setup(hass: HomeAssistant) -> None:
 
     component = EntityComponent(_LOGGER, DOMAIN, hass)
 
-    with patch.object(hass.loop, "call_later") as mock_call:
+    with patch.object(hass.loop, "call_at") as mock_call:
         await component.async_setup({DOMAIN: {"platform": "platform"}})
         await hass.async_block_till_done()
         assert mock_call.called
 
-        # mock_calls[0] is the warning message for component setup
-        # mock_calls[4] is the warning message for platform setup
-        timeout, logger_method = mock_call.mock_calls[4][1][:2]
+        # mock_calls[3] is the warning message for component setup
+        # mock_calls[10] is the warning message for platform setup
+        timeout, logger_method = mock_call.mock_calls[10][1][:2]
 
-        assert timeout == entity_platform.SLOW_SETUP_WARNING
+        assert timeout - hass.loop.time() == pytest.approx(
+            entity_platform.SLOW_SETUP_WARNING, 0.5
+        )
         assert logger_method == _LOGGER.warning
 
         assert mock_call().cancel.called
@@ -305,6 +311,7 @@ async def async_update(self):
     entity = AsyncEntity()
     await handle.async_add_entities([entity])
     assert entity.parallel_updates is None
+    assert handle._update_in_sequence is False
 
 
 async def test_parallel_updates_async_platform_with_constant(
@@ -334,6 +341,7 @@ async def async_update(self):
     await handle.async_add_entities([entity])
     assert entity.parallel_updates is not None
     assert entity.parallel_updates._value == 2
+    assert handle._update_in_sequence is False
 
 
 async def test_parallel_updates_sync_platform(hass: HomeAssistant) -> None:
@@ -410,6 +418,104 @@ async def update(self):
     assert entity.parallel_updates._value == 2
 
 
+async def test_parallel_updates_async_platform_updates_in_parallel(
+    hass: HomeAssistant,
+) -> None:
+    """Test an async platform is updated in parallel."""
+    platform = MockPlatform()
+
+    mock_entity_platform(hass, "test_domain.async_platform", platform)
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    component._platforms = {}
+
+    await component.async_setup({DOMAIN: {"platform": "async_platform"}})
+    await hass.async_block_till_done()
+
+    handle = list(component._platforms.values())[-1]
+    updating = []
+    peak_update_count = 0
+
+    class AsyncEntity(MockEntity):
+        """Mock entity that has async_update."""
+
+        async def async_update(self):
+            pass
+
+        async def async_update_ha_state(self, *args: Any, **kwargs: Any) -> None:
+            nonlocal peak_update_count
+            updating.append(self.entity_id)
+            await asyncio.sleep(0)
+            peak_update_count = max(len(updating), peak_update_count)
+            await asyncio.sleep(0)
+            updating.remove(self.entity_id)
+
+    entity1 = AsyncEntity()
+    entity2 = AsyncEntity()
+    entity3 = AsyncEntity()
+
+    await handle.async_add_entities([entity1, entity2, entity3])
+
+    assert entity1.parallel_updates is None
+    assert entity2.parallel_updates is None
+    assert entity3.parallel_updates is None
+
+    assert handle._update_in_sequence is False
+
+    await handle._update_entity_states(dt_util.utcnow())
+    assert peak_update_count > 1
+
+
+async def test_parallel_updates_sync_platform_updates_in_sequence(
+    hass: HomeAssistant,
+) -> None:
+    """Test a sync platform is updated in sequence."""
+    platform = MockPlatform()
+
+    mock_entity_platform(hass, "test_domain.platform", platform)
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    component._platforms = {}
+
+    await component.async_setup({DOMAIN: {"platform": "platform"}})
+    await hass.async_block_till_done()
+
+    handle = list(component._platforms.values())[-1]
+    updating = []
+    peak_update_count = 0
+
+    class SyncEntity(MockEntity):
+        """Mock entity that has update."""
+
+        def update(self):
+            pass
+
+        async def async_update_ha_state(self, *args: Any, **kwargs: Any) -> None:
+            nonlocal peak_update_count
+            updating.append(self.entity_id)
+            await asyncio.sleep(0)
+            peak_update_count = max(len(updating), peak_update_count)
+            await asyncio.sleep(0)
+            updating.remove(self.entity_id)
+
+    entity1 = SyncEntity()
+    entity2 = SyncEntity()
+    entity3 = SyncEntity()
+
+    await handle.async_add_entities([entity1, entity2, entity3])
+    assert entity1.parallel_updates is not None
+    assert entity1.parallel_updates._value == 1
+    assert entity2.parallel_updates is not None
+    assert entity2.parallel_updates._value == 1
+    assert entity3.parallel_updates is not None
+    assert entity3.parallel_updates._value == 1
+
+    assert handle._update_in_sequence is True
+
+    await handle._update_entity_states(dt_util.utcnow())
+    assert peak_update_count == 1
+
+
 async def test_raise_error_on_update(hass: HomeAssistant) -> None:
     """Test the add entity if they raise an error on update."""
     updates = []
@@ -1355,7 +1461,9 @@ async def test_override_restored_entities(
 
 
 async def test_platform_with_no_setup(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test setting up a platform that does not support setup."""
     entity_platform = MockEntityPlatform(
@@ -1368,6 +1476,20 @@ async def test_platform_with_no_setup(
         "The mock-platform platform for the mock-integration integration does not support platform setup."
         in caplog.text
     )
+    issue = issue_registry.async_get_issue(
+        domain="homeassistant",
+        issue_id="platform_integration_no_support_mock-integration_mock-platform",
+    )
+    assert issue
+    assert issue.issue_domain == "mock-platform"
+    assert issue.learn_more_url is None
+    assert issue.translation_key == "no_platform_setup"
+    assert issue.translation_placeholders == {
+        "domain": "mock-integration",
+        "platform": "mock-platform",
+        "platform_key": "platform: mock-platform",
+        "yaml_example": "```yaml\nmock-integration:\n  - platform: mock-platform\n```",
+    }
 
 
 async def test_platforms_sharing_services(hass: HomeAssistant) -> None:
@@ -1557,3 +1679,209 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
     assert len(hass.states.async_entity_ids()) == 1
     assert registry.async_get(expected_entity_id) is not None
+
+
+@pytest.mark.parametrize(
+    ("language", "has_entity_name", "expected_entity_id"),
+    (
+        ("en", False, "test_domain.test_qwer"),  # Set to <platform>_<unique_id>
+        ("en", True, "test_domain.device_bla_english_name"),
+        ("sv", True, "test_domain.device_bla_swedish_name"),
+        # Chinese uses english for entity_id
+        ("cn", True, "test_domain.device_bla_english_name"),
+    ),
+)
+async def test_translated_entity_name_influences_entity_id(
+    hass: HomeAssistant,
+    language: str,
+    has_entity_name: bool,
+    expected_entity_id: str,
+) -> None:
+    """Test entity_id is influenced by translated entity name."""
+
+    class TranslatedEntity(Entity):
+        _attr_unique_id = "qwer"
+        _attr_device_info = {
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        }
+
+        _attr_translation_key = "test"
+
+        def __init__(self, has_entity_name: bool) -> None:
+            """Initialize."""
+            self._attr_has_entity_name = has_entity_name
+
+    registry = er.async_get(hass)
+
+    translations = {
+        "en": {"component.test.entity.test_domain.test.name": "English name"},
+        "sv": {"component.test.entity.test_domain.test.name": "Swedish name"},
+        "cn": {"component.test.entity.test_domain.test.name": "Chinese name"},
+    }
+    hass.config.language = language
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([TranslatedEntity(has_entity_name)])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        assert await entity_platform.async_setup_entry(config_entry)
+        await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 1
+    assert registry.async_get(expected_entity_id) is not None
+
+
+@pytest.mark.parametrize(
+    ("language", "has_entity_name", "device_class", "expected_entity_id"),
+    (
+        ("en", False, None, "test_domain.test_qwer"),  # Set to <platform>_<unique_id>
+        (
+            "en",
+            False,
+            "test_class",
+            "test_domain.test_qwer",
+        ),  # Set to <platform>_<unique_id>
+        ("en", True, "test_class", "test_domain.device_bla_english_cls"),
+        ("sv", True, "test_class", "test_domain.device_bla_swedish_cls"),
+        # Chinese uses english for entity_id
+        ("cn", True, "test_class", "test_domain.device_bla_english_cls"),
+    ),
+)
+async def test_translated_device_class_name_influences_entity_id(
+    hass: HomeAssistant,
+    language: str,
+    has_entity_name: bool,
+    device_class: str | None,
+    expected_entity_id: str,
+) -> None:
+    """Test entity_id is influenced by translated entity name."""
+
+    class TranslatedDeviceClassEntity(Entity):
+        _attr_unique_id = "qwer"
+        _attr_device_info = {
+            "identifiers": {("hue", "1234")},
+            "connections": {(dr.CONNECTION_NETWORK_MAC, "abcd")},
+            "name": "Device Bla",
+        }
+
+        def __init__(self, device_class: str | None, has_entity_name: bool) -> None:
+            """Initialize."""
+            self._attr_device_class = device_class
+            self._attr_has_entity_name = has_entity_name
+
+        def _default_to_device_class_name(self) -> bool:
+            """Return True if an unnamed entity should be named by its device class."""
+            return self.device_class is not None
+
+    registry = er.async_get(hass)
+
+    translations = {
+        "en": {"component.test_domain.entity_component.test_class.name": "English cls"},
+        "sv": {"component.test_domain.entity_component.test_class.name": "Swedish cls"},
+        "cn": {"component.test_domain.entity_component.test_class.name": "Chinese cls"},
+    }
+    hass.config.language = language
+
+    async def async_get_translations(
+        hass: HomeAssistant,
+        language: str,
+        category: str,
+        integrations: Iterable[str] | None = None,
+        config_flow: bool | None = None,
+    ) -> dict[str, Any]:
+        """Return all backend translations."""
+        return translations[language]
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([TranslatedDeviceClassEntity(device_class, has_entity_name)])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(entry_id="super-mock-id")
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    with patch(
+        "homeassistant.helpers.entity_platform.translation.async_get_translations",
+        side_effect=async_get_translations,
+    ):
+        assert await entity_platform.async_setup_entry(config_entry)
+        await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 1
+    assert registry.async_get(expected_entity_id) is not None
+
+
+@pytest.mark.parametrize(
+    ("entity_device_name", "entity_device_default_name", "expected_device_name"),
+    [
+        (None, None, "Mock Config Entry Title"),
+        ("", None, "Mock Config Entry Title"),
+        (None, "Hello", "Hello"),
+        ("Mock Device Name", None, "Mock Device Name"),
+    ],
+)
+async def test_device_name_defaulting_config_entry(
+    hass: HomeAssistant,
+    entity_device_name: str,
+    entity_device_default_name: str,
+    expected_device_name: str,
+) -> None:
+    """Test setting the device name based on input info."""
+    device_info = {
+        "identifiers": {("hue", "1234")},
+        "name": entity_device_name,
+    }
+
+    if entity_device_default_name:
+        device_info["default_name"] = entity_device_default_name
+
+    class DeviceNameEntity(Entity):
+        _attr_unique_id = "qwer"
+        _attr_device_info = device_info
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([DeviceNameEntity()])
+        return True
+
+    platform = MockPlatform(async_setup_entry=async_setup_entry)
+    config_entry = MockConfigEntry(
+        title="Mock Config Entry Title", entry_id="super-mock-id"
+    )
+    entity_platform = MockEntityPlatform(
+        hass, platform_name=config_entry.domain, platform=platform
+    )
+
+    assert await entity_platform.async_setup_entry(config_entry)
+    await hass.async_block_till_done()
+
+    dev_reg = dr.async_get(hass)
+    device = dev_reg.async_get_device({("hue", "1234")})
+    assert device is not None
+    assert device.name == expected_device_name
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index e3b91c46e184f6..57622d330d92cd 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -1,7 +1,9 @@
 """Tests for the Entity Registry."""
+from datetime import timedelta
 from typing import Any
 from unittest.mock import patch
 
+import attr
 import pytest
 import voluptuous as vol
 
@@ -15,7 +17,7 @@
 from homeassistant.exceptions import MaxLengthExceeded
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from tests.common import MockConfigEntry, flush_store
+from tests.common import MockConfigEntry, async_fire_time_changed, flush_store
 
 YAML__OPEN_PATH = "homeassistant.util.yaml.loader.open"
 
@@ -34,6 +36,16 @@ def async_capture(event):
     return events
 
 
+async def test_get(hass: HomeAssistant, entity_registry: er.EntityRegistry):
+    """Test we can get an item."""
+    entry = entity_registry.async_get_or_create("light", "hue", "1234")
+
+    assert entity_registry.async_get(entry.entity_id) is entry
+    assert entity_registry.async_get(entry.id) is entry
+    assert entity_registry.async_get("blah") is None
+    assert entity_registry.async_get("blah.blah") is None
+
+
 async def test_get_or_create_returns_same_entry(
     hass: HomeAssistant, entity_registry: er.EntityRegistry, update_events
 ) -> None:
@@ -266,8 +278,13 @@ async def test_loading_saving_data(
         orig_entry2.entity_id, "light", {"minimum_brightness": 20}
     )
     orig_entry2 = entity_registry.async_get(orig_entry2.entity_id)
+    orig_entry3 = entity_registry.async_get_or_create("light", "hue", "ABCD")
+    orig_entry4 = entity_registry.async_get_or_create("light", "hue", "EFGH")
+    entity_registry.async_remove(orig_entry3.entity_id)
+    entity_registry.async_remove(orig_entry4.entity_id)
 
     assert len(entity_registry.entities) == 2
+    assert len(entity_registry.deleted_entities) == 2
 
     # Now load written data in new registry
     registry2 = er.EntityRegistry(hass)
@@ -276,11 +293,16 @@ async def test_loading_saving_data(
 
     # Ensure same order
     assert list(entity_registry.entities) == list(registry2.entities)
+    assert list(entity_registry.deleted_entities) == list(registry2.deleted_entities)
     new_entry1 = entity_registry.async_get_or_create("light", "hue", "1234")
     new_entry2 = entity_registry.async_get_or_create("light", "hue", "5678")
+    new_entry3 = entity_registry.async_get_or_create("light", "hue", "ABCD")
+    new_entry4 = entity_registry.async_get_or_create("light", "hue", "EFGH")
 
     assert orig_entry1 == new_entry1
     assert orig_entry2 == new_entry2
+    assert orig_entry3 == new_entry3
+    assert orig_entry4 == new_entry4
 
     assert new_entry2.area_id == "mock-area-id"
     assert new_entry2.capabilities == {"max": 100}
@@ -475,6 +497,42 @@ async def test_removing_config_entry_id(
     assert update_events[1]["entity_id"] == entry.entity_id
 
 
+async def test_deleted_entity_removing_config_entry_id(
+    hass, entity_registry: er.EntityRegistry
+):
+    """Test that we update config entry id in registry on deleted entity."""
+    mock_config = MockConfigEntry(domain="light", entry_id="mock-id-1")
+
+    entry = entity_registry.async_get_or_create(
+        "light", "hue", "5678", config_entry=mock_config
+    )
+    assert entry.config_entry_id == "mock-id-1"
+    entity_registry.async_remove(entry.entity_id)
+
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 1
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].config_entry_id
+        == "mock-id-1"
+    )
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].orphaned_timestamp
+        is None
+    )
+
+    entity_registry.async_clear_config_entry("mock-id-1")
+    assert len(entity_registry.entities) == 0
+    assert len(entity_registry.deleted_entities) == 1
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].config_entry_id
+        is None
+    )
+    assert (
+        entity_registry.deleted_entities[("light", "hue", "5678")].orphaned_timestamp
+        is not None
+    )
+
+
 async def test_removing_area_id(entity_registry: er.EntityRegistry) -> None:
     """Make sure we can clear area id."""
     entry = entity_registry.async_get_or_create("light", "hue", "5678")
@@ -748,13 +806,13 @@ async def test_update_entity_options(entity_registry: er.EntityRegistry) -> None
     assert new_entry_1.options == {"light": {"minimum_brightness": 20}}
 
     # Test it's not possible to modify the options
-    with pytest.raises(NotImplementedError):
+    with pytest.raises(RuntimeError):
         new_entry_1.options["blah"] = {}
-    with pytest.raises(NotImplementedError):
+    with pytest.raises(RuntimeError):
         new_entry_1.options["light"] = {}
-    with pytest.raises(TypeError):
+    with pytest.raises(RuntimeError):
         new_entry_1.options["light"]["blah"] = 123
-    with pytest.raises(TypeError):
+    with pytest.raises(RuntimeError):
         new_entry_1.options["light"]["minimum_brightness"] = 123
 
     entity_registry.async_update_entity_options(
@@ -1527,3 +1585,95 @@ def test_migrate_entity_to_new_platform(
             new_unique_id=new_unique_id,
             new_config_entry_id=new_config_entry.entry_id,
         )
+
+
+async def test_restore_entity(hass, update_events, freezer):
+    """Make sure entity registry id is stable and entity_id is reused if possible."""
+    registry = er.async_get(hass)  # We need the real entity registry for this test
+    config_entry = MockConfigEntry(domain="light")
+    entry1 = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2 = registry.async_get_or_create(
+        "light", "hue", "5678", config_entry=config_entry
+    )
+
+    entry1 = registry.async_update_entity(
+        entry1.entity_id, new_entity_id="light.custom_1"
+    )
+
+    registry.async_remove(entry1.entity_id)
+    registry.async_remove(entry2.entity_id)
+    assert len(registry.entities) == 0
+    assert len(registry.deleted_entities) == 2
+
+    # Re-add entities
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2_restored = registry.async_get_or_create("light", "hue", "5678")
+
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1 != entry1_restored
+    # entity_id is not restored
+    assert attr.evolve(entry1, entity_id="light.hue_1234") == entry1_restored
+    assert entry2 != entry2_restored
+    # Config entry is not restored
+    assert attr.evolve(entry2, config_entry_id=None) == entry2_restored
+
+    # Remove two of the entities again, then bump time
+    registry.async_remove(entry1_restored.entity_id)
+    registry.async_remove(entry2.entity_id)
+    assert len(registry.entities) == 0
+    assert len(registry.deleted_entities) == 2
+    freezer.tick(timedelta(seconds=er.ORPHANED_ENTITY_KEEP_SECONDS + 1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Re-add two entities, expect to get a new id after the purge for entity w/o config entry
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    entry2_restored = registry.async_get_or_create("light", "hue", "5678")
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1.id == entry1_restored.id
+    assert entry2.id != entry2_restored.id
+
+    # Remove the first entity, then its config entry, finally bump time
+    registry.async_remove(entry1_restored.entity_id)
+    assert len(registry.entities) == 1
+    assert len(registry.deleted_entities) == 1
+    registry.async_clear_config_entry(config_entry.entry_id)
+    freezer.tick(timedelta(seconds=er.ORPHANED_ENTITY_KEEP_SECONDS + 1))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    # Re-add the entity, expect to get a new id after the purge
+    entry1_restored = registry.async_get_or_create(
+        "light", "hue", "1234", config_entry=config_entry
+    )
+    assert len(registry.entities) == 2
+    assert len(registry.deleted_entities) == 0
+    assert entry1.id != entry1_restored.id
+
+    # Check the events
+    await hass.async_block_till_done()
+    assert len(update_events) == 13
+    assert update_events[0] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[1] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[2]["action"] == "update"
+    assert update_events[3] == {"action": "remove", "entity_id": "light.custom_1"}
+    assert update_events[4] == {"action": "remove", "entity_id": "light.hue_5678"}
+    # Restore entities the 1st time
+    assert update_events[5] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[6] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[7] == {"action": "remove", "entity_id": "light.hue_1234"}
+    assert update_events[8] == {"action": "remove", "entity_id": "light.hue_5678"}
+    # Restore entities the 2nd time
+    assert update_events[9] == {"action": "create", "entity_id": "light.hue_1234"}
+    assert update_events[10] == {"action": "create", "entity_id": "light.hue_5678"}
+    assert update_events[11] == {"action": "remove", "entity_id": "light.hue_1234"}
+    # Restore entities the 3rd time
+    assert update_events[12] == {"action": "create", "entity_id": "light.hue_1234"}
diff --git a/tests/helpers/test_entity_values.py b/tests/helpers/test_entity_values.py
index f953ec0ba9e3eb..1ac8e480f510cb 100644
--- a/tests/helpers/test_entity_values.py
+++ b/tests/helpers/test_entity_values.py
@@ -10,9 +10,12 @@ def test_override_single_value() -> None:
     """Test values with exact match."""
     store = EV({ent: {"key": "value"}})
     assert store.get(ent) == {"key": "value"}
-    assert len(store._cache) == 1
+    assert store.get.cache_info().currsize == 1
+    assert store.get.cache_info().misses == 1
     assert store.get(ent) == {"key": "value"}
-    assert len(store._cache) == 1
+    assert store.get.cache_info().currsize == 1
+    assert store.get.cache_info().misses == 1
+    assert store.get.cache_info().hits == 1
 
 
 def test_override_by_domain() -> None:
diff --git a/tests/helpers/test_entityfilter.py b/tests/helpers/test_entityfilter.py
index 2141c2869142a0..48bc8110ec5dcc 100644
--- a/tests/helpers/test_entityfilter.py
+++ b/tests/helpers/test_entityfilter.py
@@ -395,6 +395,28 @@ def test_explicitly_included() -> None:
     assert filt.explicitly_excluded("light.kitchen")
 
 
+def test_get_filter() -> None:
+    """Test we can get the underlying filter."""
+    conf = {
+        "include": {
+            "domains": ["light"],
+            "entity_globs": ["sensor.kitchen_*"],
+            "entities": ["switch.kitchen"],
+        },
+        "exclude": {
+            "domains": ["cover"],
+            "entity_globs": ["sensor.weather_*"],
+            "entities": ["light.kitchen"],
+        },
+    }
+    filt: EntityFilter = INCLUDE_EXCLUDE_FILTER_SCHEMA(conf)
+    underlying_filter = filt.get_filter()
+    assert underlying_filter("light.any")
+    assert not underlying_filter("switch.other")
+    assert underlying_filter("sensor.kitchen_4")
+    assert underlying_filter("switch.kitchen")
+
+
 def test_complex_include_exclude_filter() -> None:
     """Test a complex include exclude filter."""
     conf = {
diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py
index 9d90ef1b26c322..3740a6b177a25e 100644
--- a/tests/helpers/test_event.py
+++ b/tests/helpers/test_event.py
@@ -18,12 +18,14 @@
 import homeassistant.core as ha
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
+from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED
 from homeassistant.helpers.event import (
     TrackStates,
     TrackTemplate,
     TrackTemplateResult,
     async_call_later,
+    async_track_device_registry_updated_event,
     async_track_entity_registry_updated_event,
     async_track_point_in_time,
     async_track_point_in_utc_time,
@@ -4564,3 +4566,103 @@ async def test_async_track_entity_registry_updated_event_with_empty_list(
 
     unsub_single2()
     unsub_single()
+
+
+async def test_async_track_device_registry_updated_event(hass: HomeAssistant) -> None:
+    """Test tracking device registry updates for an device_id."""
+
+    device_id = "b92c0f06fbc911edacc9eea8ae14f866"
+    device_id2 = "747bbf22fbca11ed843aeea8ae14f866"
+    untracked_device_id = "bda93f86fbc911edacc9eea8ae14f866"
+
+    single_event_data = []
+    multiple_event_data = []
+
+    @ha.callback
+    def single_device_id_callback(event: ha.Event) -> None:
+        single_event_data.append(event.data)
+
+    @ha.callback
+    def multiple_device_id_callback(event: ha.Event) -> None:
+        multiple_event_data.append(event.data)
+
+    unsub1 = async_track_device_registry_updated_event(
+        hass, device_id, single_device_id_callback
+    )
+    unsub2 = async_track_device_registry_updated_event(
+        hass, [device_id, device_id2], multiple_device_id_callback
+    )
+    hass.bus.async_fire(
+        EVENT_DEVICE_REGISTRY_UPDATED, {"action": "create", "device_id": device_id}
+    )
+    hass.bus.async_fire(
+        EVENT_ENTITY_REGISTRY_UPDATED,
+        {"action": "create", "device_id": untracked_device_id},
+    )
+    await hass.async_block_till_done()
+    assert len(single_event_data) == 1
+    assert len(multiple_event_data) == 1
+    hass.bus.async_fire(
+        EVENT_DEVICE_REGISTRY_UPDATED, {"action": "create", "device_id": device_id2}
+    )
+    await hass.async_block_till_done()
+    assert len(single_event_data) == 1
+    assert len(multiple_event_data) == 2
+
+    unsub1()
+    unsub2()
+    hass.bus.async_fire(
+        EVENT_ENTITY_REGISTRY_UPDATED, {"action": "create", "device_id": device_id}
+    )
+    hass.bus.async_fire(
+        EVENT_ENTITY_REGISTRY_UPDATED, {"action": "create", "device_id": device_id2}
+    )
+    await hass.async_block_till_done()
+    assert len(single_event_data) == 1
+    assert len(multiple_event_data) == 2
+
+
+async def test_async_track_device_registry_updated_event_with_empty_list(
+    hass: HomeAssistant,
+) -> None:
+    """Test async_track_device_registry_updated_event passing an empty list of devices."""
+    unsub_single = async_track_device_registry_updated_event(
+        hass, [], ha.callback(lambda event: None)
+    )
+    unsub_single2 = async_track_device_registry_updated_event(
+        hass, [], ha.callback(lambda event: None)
+    )
+
+    unsub_single2()
+    unsub_single()
+
+
+async def test_async_track_device_registry_updated_event_with_a_callback_that_throws(
+    hass: HomeAssistant,
+) -> None:
+    """Test tracking device registry updates for an device when one callback throws."""
+
+    device_id = "b92c0f06fbc911edacc9eea8ae14f866"
+
+    event_data = []
+
+    @ha.callback
+    def run_callback(event: ha.Event) -> None:
+        event_data.append(event.data)
+
+    @ha.callback
+    def failing_callback(event: ha.Event) -> None:
+        raise ValueError
+
+    unsub1 = async_track_device_registry_updated_event(
+        hass, device_id, failing_callback
+    )
+    unsub2 = async_track_device_registry_updated_event(hass, device_id, run_callback)
+    hass.bus.async_fire(
+        EVENT_DEVICE_REGISTRY_UPDATED, {"action": "create", "device_id": device_id}
+    )
+    await hass.async_block_till_done()
+    unsub1()
+    unsub2()
+
+    assert event_data[0] == {"action": "create", "device_id": device_id}
diff --git a/tests/helpers/test_instance_id.py b/tests/helpers/test_instance_id.py
index 453d18b1d2a767..8fb6bfd8d7e203 100644
--- a/tests/helpers/test_instance_id.py
+++ b/tests/helpers/test_instance_id.py
@@ -1,7 +1,10 @@
 """Tests for instance ID helper."""
+from json import JSONDecodeError
 from typing import Any
 from unittest.mock import patch
 
+import pytest
+
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import instance_id
 
@@ -14,6 +17,25 @@ async def test_get_id_empty(hass: HomeAssistant, hass_storage: dict[str, Any]) -
     assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
 
 
+async def test_get_id_load_fail(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Migrate existing file with error."""
+    hass_storage["core.uuid"] = None  # Invalid, will make store.async_load raise
+
+    uuid = await instance_id.async_get(hass)
+
+    assert uuid is not None
+
+    # Assert it's stored
+    assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
+
+    assert (
+        "Could not read hass instance ID from 'core.uuid' or '.uuid', a "
+        "new instance ID will be generated" in caplog.text
+    )
+
+
 async def test_get_id_migrate(
     hass: HomeAssistant, hass_storage: dict[str, Any]
 ) -> None:
@@ -30,3 +52,27 @@ async def test_get_id_migrate(
 
     # assert old deleted
     assert len(mock_remove.mock_calls) == 1
+
+
+async def test_get_id_migrate_fail(
+    hass: HomeAssistant, hass_storage: dict[str, Any], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Migrate existing file with error."""
+    with patch(
+        "homeassistant.util.json.load_json",
+        side_effect=JSONDecodeError("test_error", "test", 1),
+    ), patch("os.path.isfile", return_value=True), patch("os.remove") as mock_remove:
+        uuid = await instance_id.async_get(hass)
+
+    assert uuid is not None
+
+    # Assert it's stored
+    assert hass_storage["core.uuid"]["data"]["uuid"] == uuid
+
+    # assert old not deleted
+    assert len(mock_remove.mock_calls) == 0
+
+    assert (
+        "Could not read hass instance ID from 'core.uuid' or '.uuid', a "
+        "new instance ID will be generated" in caplog.text
+    )
diff --git a/tests/helpers/test_intent.py b/tests/helpers/test_intent.py
index edc6a281172ee4..98e93785f58ede 100644
--- a/tests/helpers/test_intent.py
+++ b/tests/helpers/test_intent.py
@@ -1,4 +1,7 @@
 """Tests for the intent helpers."""
+import asyncio
+from unittest.mock import MagicMock, patch
+
 import pytest
 import voluptuous as vol
 
@@ -184,3 +187,101 @@ async def test_cant_turn_on_lock(hass: HomeAssistant) -> None:
 
     assert result.response.response_type == intent.IntentResponseType.ERROR
     assert result.response.error_code == intent.IntentResponseErrorCode.NO_INTENT_MATCH
+
+
+def test_async_register(hass: HomeAssistant) -> None:
+    """Test registering an intent and verifying it is stored correctly."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+
+    intent.async_register(hass, handler)
+
+    assert hass.data[intent.DATA_KEY]["test_intent"] == handler
+
+
+def test_async_register_overwrite(hass: HomeAssistant) -> None:
+    """Test registering multiple intents with the same type, ensuring the last one overwrites the previous one and a warning is emitted."""
+    handler1 = MagicMock()
+    handler1.intent_type = "test_intent"
+
+    handler2 = MagicMock()
+    handler2.intent_type = "test_intent"
+
+    with patch.object(intent._LOGGER, "warning") as mock_warning:
+        intent.async_register(hass, handler1)
+        intent.async_register(hass, handler2)
+
+        mock_warning.assert_called_once_with(
+            "Intent %s is being overwritten by %s", "test_intent", handler2
+        )
+
+    assert hass.data[intent.DATA_KEY]["test_intent"] == handler2
+
+
+def test_async_remove(hass: HomeAssistant) -> None:
+    """Test removing an intent and verifying it is no longer present in the Home Assistant data."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+
+    intent.async_register(hass, handler)
+    intent.async_remove(hass, "test_intent")
+
+    assert "test_intent" not in hass.data[intent.DATA_KEY]
+
+
+def test_async_remove_no_existing_entry(hass: HomeAssistant) -> None:
+    """Test the removal of a non-existing intent from Home Assistant's data."""
+    handler = MagicMock()
+    handler.intent_type = "test_intent"
+    intent.async_register(hass, handler)
+
+    intent.async_remove(hass, "test_intent2")
+
+    assert "test_intent2" not in hass.data[intent.DATA_KEY]
+
+
+def test_async_remove_no_existing(hass: HomeAssistant) -> None:
+    """Test the removal of an intent where no config exists."""
+
+    intent.async_remove(hass, "test_intent2")
+    # simply shouldn't cause an exception
+
+    assert intent.DATA_KEY not in hass.data
+
+
+async def test_validate_then_run_in_background(hass: HomeAssistant) -> None:
+    """Test we don't execute a service in foreground forever."""
+    hass.states.async_set("light.kitchen", "off")
+    call_done = asyncio.Event()
+    calls = []
+
+    # Register a service that takes 0.1 seconds to execute
+    async def mock_service(call):
+        """Mock service."""
+        await asyncio.sleep(0.1)
+        call_done.set()
+        calls.append(call)
+
+    hass.services.async_register("light", "turn_on", mock_service)
+
+    # Create intent handler with a service timeout of 0.05 seconds
+    handler = intent.ServiceIntentHandler(
+        "TestType", "light", "turn_on", "Turned {} on"
+    )
+    handler.service_timeout = 0.05
+    intent.async_register(hass, handler)
+
+    result = await intent.async_handle(
+        hass,
+        "test",
+        "TestType",
+        slots={"name": {"value": "kitchen"}},
+    )
+
+    assert result.response_type == intent.IntentResponseType.ACTION_DONE
+
+    assert not call_done.is_set()
+    await call_done.wait()
+
+    assert len(calls) == 1
+    assert calls[0].data == {"entity_id": "light.kitchen"}
diff --git a/tests/helpers/test_ratelimit.py b/tests/helpers/test_ratelimit.py
index e7fa639261b773..39e83953c453d9 100644
--- a/tests/helpers/test_ratelimit.py
+++ b/tests/helpers/test_ratelimit.py
@@ -16,7 +16,6 @@ async def test_hit(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     rate_limiter.async_triggered("key1", dt_util.utcnow())
@@ -53,7 +52,6 @@ async def test_miss(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     assert (
@@ -85,7 +83,6 @@ async def test_no_limit(hass: HomeAssistant) -> None:
     def _refresh():
         nonlocal refresh_called
         refresh_called = True
-        return
 
     rate_limiter = ratelimit.KeyedRateLimit(hass)
     rate_limiter.async_triggered("key1", dt_util.utcnow())
diff --git a/tests/helpers/test_restore_state.py b/tests/helpers/test_restore_state.py
index 1e8fa8b7fb41ac..fa0a14b8fbbddd 100644
--- a/tests/helpers/test_restore_state.py
+++ b/tests/helpers/test_restore_state.py
@@ -1,22 +1,43 @@
 """The tests for the Restore component."""
+from collections.abc import Coroutine
 from datetime import datetime, timedelta
+import logging
 from typing import Any
-from unittest.mock import patch
+from unittest.mock import Mock, patch
+
+import pytest
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.reload import async_get_platform_without_config_entry
 from homeassistant.helpers.restore_state import (
-    DATA_RESTORE_STATE_TASK,
+    DATA_RESTORE_STATE,
     STORAGE_KEY,
     RestoreEntity,
     RestoreStateData,
     StoredState,
+    async_get,
+    async_load,
 )
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
-from tests.common import async_fire_time_changed
+from tests.common import (
+    MockEntityPlatform,
+    MockModule,
+    MockPlatform,
+    async_fire_time_changed,
+    mock_entity_platform,
+    mock_integration,
+)
+
+_LOGGER = logging.getLogger(__name__)
+DOMAIN = "test_domain"
+PLATFORM = "test_platform"
 
 
 async def test_caching_data(hass: HomeAssistant) -> None:
@@ -28,12 +49,25 @@ async def test_caching_data(hass: HomeAssistant) -> None:
         StoredState(State("input_boolean.b2", "on"), None, now),
     ]
 
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
     await hass.async_block_till_done()
     await data.store.async_save([state.as_dict() for state in stored_states])
 
     # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    hass.data.pop(DATA_RESTORE_STATE)
+
+    with patch(
+        "homeassistant.helpers.restore_state.Store.async_load",
+        side_effect=HomeAssistantError,
+    ):
+        # Failure to load should not be treated as fatal
+        await async_load(hass)
+
+    data = async_get(hass)
+    assert data.last_states == {}
+
+    await async_load(hass)
+    data = async_get(hass)
 
     entity = RestoreEntity()
     entity.hass = hass
@@ -53,14 +87,30 @@ async def test_caching_data(hass: HomeAssistant) -> None:
     assert mock_write_data.called
 
 
+async def test_async_get_instance_backwards_compatibility(hass: HomeAssistant) -> None:
+    """Test async_get_instance backwards compatibility."""
+    await async_load(hass)
+    data = async_get(hass)
+    # When called from core it should raise
+    with pytest.raises(RuntimeError):
+        await RestoreStateData.async_get_instance(hass)
+
+    # When called from a component it should not raise
+    # but it should report
+    with patch("homeassistant.helpers.restore_state.report"):
+        assert data is await RestoreStateData.async_get_instance(hass)
+
+
 async def test_periodic_write(hass: HomeAssistant) -> None:
     """Test that we write periodiclly but not after stop."""
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
     await hass.async_block_till_done()
     await data.store.async_save([])
 
     # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    hass.data.pop(DATA_RESTORE_STATE)
+    await async_load(hass)
+    data = async_get(hass)
 
     entity = RestoreEntity()
     entity.hass = hass
@@ -101,12 +151,14 @@ async def test_periodic_write(hass: HomeAssistant) -> None:
 
 async def test_save_persistent_states(hass: HomeAssistant) -> None:
     """Test that we cancel the currently running job, save the data, and verify the perdiodic job continues."""
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
     await hass.async_block_till_done()
     await data.store.async_save([])
 
     # Emulate a fresh load
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    hass.data.pop(DATA_RESTORE_STATE)
+    await async_load(hass)
+    data = async_get(hass)
 
     entity = RestoreEntity()
     entity.hass = hass
@@ -166,29 +218,35 @@ async def test_hass_starting(hass: HomeAssistant) -> None:
         StoredState(State("input_boolean.b2", "on"), None, now),
     ]
 
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
     await hass.async_block_till_done()
     await data.store.async_save([state.as_dict() for state in stored_states])
 
     # Emulate a fresh load
     hass.state = CoreState.not_running
-    hass.data.pop(DATA_RESTORE_STATE_TASK)
+    hass.data.pop(DATA_RESTORE_STATE)
+    await async_load(hass)
+    data = async_get(hass)
 
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b1"
 
+    all_states = hass.states.async_all()
+    assert len(all_states) == 0
+    hass.states.async_set("input_boolean.b1", "on")
+
     # Mock that only b1 is present this run
-    states = [State("input_boolean.b1", "on")]
     with patch(
         "homeassistant.helpers.restore_state.Store.async_save"
-    ) as mock_write_data, patch.object(hass.states, "async_all", return_value=states):
+    ) as mock_write_data:
         state = await entity.async_get_last_state()
         await hass.async_block_till_done()
 
     assert state is not None
     assert state.entity_id == "input_boolean.b1"
     assert state.state == "on"
+    hass.states.async_remove("input_boolean.b1")
 
     # Assert that no data was written yet, since hass is still starting.
     assert not mock_write_data.called
@@ -213,17 +271,18 @@ async def test_dump_data(hass: HomeAssistant) -> None:
         State("input_boolean.b5", "unavailable", {"restored": True}),
     ]
 
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = Entity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b1"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
     now = dt_util.utcnow()
     data.last_states = {
         "input_boolean.b0": StoredState(State("input_boolean.b0", "off"), None, now),
@@ -238,15 +297,20 @@ async def test_dump_data(hass: HomeAssistant) -> None:
         "input_boolean.b5": StoredState(State("input_boolean.b5", "off"), None, now),
     }
 
+    for state in states:
+        hass.states.async_set(state.entity_id, state.state, state.attributes)
+
     with patch(
         "homeassistant.helpers.restore_state.Store.async_save"
-    ) as mock_write_data, patch.object(hass.states, "async_all", return_value=states):
+    ) as mock_write_data:
         await data.async_dump_states()
 
     assert mock_write_data.called
     args = mock_write_data.mock_calls[0][1]
     written_states = args[0]
 
+    for state in states:
+        hass.states.async_remove(state.entity_id)
     # b0 should not be written, since it didn't extend RestoreEntity
     # b1 should be written, since it is present in the current run
     # b2 should not be written, since it is not registered with the helper
@@ -264,9 +328,12 @@ async def test_dump_data(hass: HomeAssistant) -> None:
     # Test that removed entities are not persisted
     await entity.async_remove()
 
+    for state in states:
+        hass.states.async_set(state.entity_id, state.state, state.attributes)
+
     with patch(
         "homeassistant.helpers.restore_state.Store.async_save"
-    ) as mock_write_data, patch.object(hass.states, "async_all", return_value=states):
+    ) as mock_write_data:
         await data.async_dump_states()
 
     assert mock_write_data.called
@@ -287,22 +354,26 @@ async def test_dump_error(hass: HomeAssistant) -> None:
         State("input_boolean.b2", "on"),
     ]
 
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = Entity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b1"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
+
+    data = async_get(hass)
 
-    data = await RestoreStateData.async_get_instance(hass)
+    for state in states:
+        hass.states.async_set(state.entity_id, state.state, state.attributes)
 
     with patch(
         "homeassistant.helpers.restore_state.Store.async_save",
         side_effect=HomeAssistantError,
-    ) as mock_write_data, patch.object(hass.states, "async_all", return_value=states):
+    ) as mock_write_data:
         await data.async_dump_states()
 
     assert mock_write_data.called
@@ -325,17 +396,18 @@ async def test_load_error(hass: HomeAssistant) -> None:
 
 async def test_state_saved_on_remove(hass: HomeAssistant) -> None:
     """Test that we save entity state on removal."""
+    platform = MockEntityPlatform(hass, domain="input_boolean")
     entity = RestoreEntity()
     entity.hass = hass
     entity.entity_id = "input_boolean.b0"
-    await entity.async_internal_added_to_hass()
+    await platform.async_add_entities([entity])
 
     now = dt_util.utcnow()
     hass.states.async_set(
         "input_boolean.b0", "on", {"complicated": {"value": {1, 2, now}}}
     )
 
-    data = await RestoreStateData.async_get_instance(hass)
+    data = async_get(hass)
 
     # No last states should currently be saved
     assert not data.last_states
@@ -380,3 +452,89 @@ async def test_restoring_invalid_entity_id(
 
     state = await entity.async_get_last_state()
     assert state is None
+
+
+async def test_restore_entity_end_to_end(
+    hass: HomeAssistant, hass_storage: dict[str, Any]
+) -> None:
+    """Test restoring an entity end-to-end."""
+    component_setup = Mock(return_value=True)
+
+    setup_called = []
+
+    entity_id = "test_domain.unnamed_device"
+    data = async_get(hass)
+    now = dt_util.utcnow()
+    data.last_states = {
+        entity_id: StoredState(State(entity_id, "stored"), None, now),
+    }
+
+    class MockRestoreEntity(RestoreEntity):
+        """Mock restore entity."""
+
+        def __init__(self):
+            """Initialize the mock entity."""
+            self._state: str | None = None
+
+        @property
+        def state(self):
+            """Return the state."""
+            return self._state
+
+        async def async_added_to_hass(self) -> Coroutine[Any, Any, None]:
+            """Run when entity about to be added to hass."""
+            await super().async_added_to_hass()
+            self._state = (await self.async_get_last_state()).state
+
+    async def async_setup_platform(
+        hass: HomeAssistant,
+        config: ConfigType,
+        async_add_entities: AddEntitiesCallback,
+        discovery_info: DiscoveryInfoType | None = None,
+    ) -> None:
+        """Set up the test platform."""
+        async_add_entities([MockRestoreEntity()])
+        setup_called.append(True)
+
+    mock_integration(hass, MockModule(DOMAIN, setup=component_setup))
+    mock_integration(hass, MockModule(PLATFORM, dependencies=[DOMAIN]))
+
+    mock_platform = MockPlatform(async_setup_platform=async_setup_platform)
+    mock_entity_platform(hass, f"{DOMAIN}.{PLATFORM}", mock_platform)
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+
+    await component.async_setup({DOMAIN: {"platform": PLATFORM, "sensors": None}})
+    await hass.async_block_till_done()
+    assert component_setup.called
+
+    assert f"{DOMAIN}.{PLATFORM}" in hass.config.components
+    assert len(setup_called) == 1
+
+    platform = async_get_platform_without_config_entry(hass, PLATFORM, DOMAIN)
+    assert platform.platform_name == PLATFORM
+    assert platform.domain == DOMAIN
+    assert hass.states.get(entity_id).state == "stored"
+
+    await data.async_dump_states()
+    await hass.async_block_till_done()
+
+    storage_data = hass_storage[STORAGE_KEY]["data"]
+    assert len(storage_data) == 1
+    assert storage_data[0]["state"]["entity_id"] == entity_id
+    assert storage_data[0]["state"]["state"] == "stored"
+
+    await platform.async_reset()
+
+    assert hass.states.get(entity_id) is None
+
+    # Make sure the entity still gets saved to restore state
+    # even though the platform has been reset since it should
+    # not be expired yet.
+    await data.async_dump_states()
+    await hass.async_block_till_done()
+
+    storage_data = hass_storage[STORAGE_KEY]["data"]
+    assert len(storage_data) == 1
+    assert storage_data[0]["state"]["entity_id"] == entity_id
+    assert storage_data[0]["state"]["state"] == "stored"
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index 5affce5d501500..7f66ec25977871 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -23,11 +23,12 @@
     SERVICE_TURN_ON,
 )
 from homeassistant.core import (
-    SERVICE_CALL_LIMIT,
     Context,
     CoreState,
     HomeAssistant,
     ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
     callback,
 )
 from homeassistant.exceptions import ConditionError, HomeAssistantError, ServiceNotFound
@@ -264,7 +265,6 @@ async def test_calling_service_basic(
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -317,7 +317,6 @@ async def test_calling_service_template(hass: HomeAssistant) -> None:
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -332,6 +331,126 @@ async def test_calling_service_template(hass: HomeAssistant) -> None:
     )
 
 
+async def test_calling_service_response_data(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test the calling of a service with response data."""
+    context = Context()
+
+    def mock_service(call: ServiceCall) -> ServiceResponse:
+        """Mock service call."""
+        if call.return_response:
+            return {"data": "value-12345"}
+        return None
+
+    hass.services.async_register(
+        "test", "script", mock_service, supports_response=SupportsResponse.OPTIONAL
+    )
+    sequence = cv.SCRIPT_SCHEMA(
+        [
+            {
+                "alias": "service step1",
+                "service": "test.script",
+                # Store the result of the service call as a variable
+                "response_variable": "my_response",
+            },
+            {
+                "alias": "service step2",
+                "service": "test.script",
+                "data_template": {
+                    # Result of previous service call
+                    "key": "{{ my_response.data }}"
+                },
+            },
+        ]
+    )
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    await script_obj.async_run(context=context)
+    await hass.async_block_till_done()
+
+    assert "Executing step service step1" in caplog.text
+    assert "Executing step service step2" in caplog.text
+
+    assert_action_trace(
+        {
+            "0": [
+                {
+                    "result": {
+                        "params": {
+                            "domain": "test",
+                            "service": "script",
+                            "service_data": {},
+                            "target": {},
+                        },
+                        "running_script": False,
+                    }
+                }
+            ],
+            "1": [
+                {
+                    "result": {
+                        "params": {
+                            "domain": "test",
+                            "service": "script",
+                            "service_data": {"key": "value-12345"},
+                            "target": {},
+                        },
+                        "running_script": False,
+                    },
+                    "variables": {
+                        "my_response": {"data": "value-12345"},
+                    },
+                }
+            ],
+        }
+    )
+
+
+@pytest.mark.parametrize(
+    ("supports_response", "params", "expected_error"),
+    [
+        (
+            SupportsResponse.NONE,
+            {"response_variable": "foo"},
+            "does not support 'response_variable'",
+        ),
+        (SupportsResponse.ONLY, {}, "requires 'response_variable'"),
+    ],
+)
+async def test_service_response_data_errors(
+    hass: HomeAssistant,
+    supports_response: SupportsResponse,
+    params: dict[str, str],
+    expected_error: str,
+) -> None:
+    """Test the calling of a service with response data error cases."""
+    context = Context()
+
+    def mock_service(call: ServiceCall) -> ServiceResponse:
+        """Mock service call."""
+        raise ValueError("Never invoked")
+
+    hass.services.async_register(
+        "test", "script", mock_service, supports_response=supports_response
+    )
+
+    sequence = cv.SCRIPT_SCHEMA(
+        [
+            {
+                "alias": "service step1",
+                "service": "test.script",
+                **params,
+            },
+        ]
+    )
+    script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
+
+    with pytest.raises(vol.Invalid, match=expected_error):
+        await script_obj.async_run(context=context)
+        await hass.async_block_till_done()
+
+
 async def test_data_template_with_templated_key(hass: HomeAssistant) -> None:
     """Test the calling of a service with a data_template with a templated key."""
     context = Context()
@@ -356,7 +475,6 @@ async def test_data_template_with_templated_key(hass: HomeAssistant) -> None:
             "0": [
                 {
                     "result": {
-                        "limit": SERVICE_CALL_LIMIT,
                         "params": {
                             "domain": "test",
                             "service": "script",
@@ -3338,7 +3456,6 @@ async def test_parallel_error(
             {
                 "error_type": ServiceNotFound,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "epic",
                         "service": "failure",
@@ -3387,7 +3504,6 @@ async def test_propagate_error_service_not_found(hass: HomeAssistant) -> None:
             {
                 "error_type": ServiceNotFound,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -3424,7 +3540,6 @@ async def test_propagate_error_invalid_service_data(hass: HomeAssistant) -> None
             {
                 "error_type": vol.MultipleInvalid,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -3465,7 +3580,6 @@ def record_call(service):
             {
                 "error_type": ValueError,
                 "result": {
-                    "limit": 10,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4343,7 +4457,6 @@ async def test_set_variable(
         "1": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4386,7 +4499,6 @@ async def test_set_redefines_variable(
         "1": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4402,7 +4514,6 @@ async def test_set_redefines_variable(
         "3": [
             {
                 "result": {
-                    "limit": SERVICE_CALL_LIMIT,
                     "params": {
                         "domain": "test",
                         "service": "script",
@@ -4936,7 +5047,6 @@ def broken_service(service: ServiceCall) -> None:
             "1": [
                 {
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "broken",
                             "service": "service",
@@ -4952,7 +5062,6 @@ def broken_service(service: ServiceCall) -> None:
                 {
                     "error_type": HomeAssistantError,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "broken",
                             "service": "service",
@@ -5011,7 +5120,6 @@ async def test_continue_on_error_automation_issue(hass: HomeAssistant) -> None:
                 {
                     "error_type": ServiceNotFound,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "service",
                             "service": "not_found",
@@ -5059,7 +5167,6 @@ def some_service(service: ServiceCall) -> None:
                 {
                     "error_type": MyLibraryError,
                     "result": {
-                        "limit": 10,
                         "params": {
                             "domain": "some",
                             "service": "service",
diff --git a/tests/helpers/test_selector.py b/tests/helpers/test_selector.py
index 3c04087e48d58e..c518ad227a76f9 100644
--- a/tests/helpers/test_selector.py
+++ b/tests/helpers/test_selector.py
@@ -415,6 +415,17 @@ def test_addon_selector_schema(schema, valid_selections, invalid_selections) ->
     _test_selector("addon", schema, valid_selections, invalid_selections)
 
 
+@pytest.mark.parametrize(
+    ("schema", "valid_selections", "invalid_selections"),
+    (({}, ("abc123", "/backup"), (None, "abc@123", "abc 123", "")),),
+)
+def test_backup_location_selector_schema(
+    schema, valid_selections, invalid_selections
+) -> None:
+    """Test backup location selector."""
+    _test_selector("backup_location", schema, valid_selections, invalid_selections)
+
+
 @pytest.mark.parametrize(
     ("schema", "valid_selections", "invalid_selections"),
     (({}, (1, "one", None), ()),),  # Everything can be coerced to bool
@@ -968,3 +979,25 @@ def test_constant_selector_schema_error(schema) -> None:
     """Test constant selector."""
     with pytest.raises(vol.Invalid):
         selector.validate_selector({"constant": schema})
+
+
+@pytest.mark.parametrize(
+    ("schema", "valid_selections", "invalid_selections"),
+    (
+        (
+            {},
+            ("home_assistant", "2j4hp3uy4p87wyrpiuhk34"),
+            (None, True, 1),
+        ),
+        (
+            {"language": "nl"},
+            ("home_assistant", "2j4hp3uy4p87wyrpiuhk34"),
+            (None, True, 1),
+        ),
+    ),
+)
+def test_conversation_agent_selector_schema(
+    schema, valid_selections, invalid_selections
+) -> None:
+    """Test conversation agent selector."""
+    _test_selector("conversation_agent", schema, valid_selections, invalid_selections)
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index 8e8123ac7af747..bc7a93f0f19d75 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -18,7 +18,7 @@
     STATE_ON,
     EntityCategory,
 )
-from homeassistant.core import Context, HomeAssistant, ServiceCall
+from homeassistant.core import Context, HomeAssistant, ServiceCall, SupportsResponse
 from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
@@ -575,13 +575,155 @@ async def test_async_get_all_descriptions(hass: HomeAssistant) -> None:
     hass.services.async_register(
         logger.DOMAIN, "another_new_service", lambda x: None, None
     )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_optional_response",
+        lambda x: None,
+        None,
+        SupportsResponse.OPTIONAL,
+    )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_only_response",
+        lambda x: None,
+        None,
+        SupportsResponse.ONLY,
+    )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "another_service_with_response",
+        lambda x: None,
+        None,
+        SupportsResponse.OPTIONAL,
+    )
+    service.async_set_service_schema(
+        hass,
+        logger.DOMAIN,
+        "another_service_with_response",
+        {"description": "response service"},
+    )
+
     descriptions = await service.async_get_all_descriptions(hass)
     assert "another_new_service" in descriptions[logger.DOMAIN]
+    assert "service_with_optional_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_optional_response"][
+        "response"
+    ] == {"optional": True}
+    assert "service_with_only_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_only_response"]["response"] == {
+        "optional": False
+    }
+    assert "another_service_with_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["another_service_with_response"]["response"] == {
+        "optional": True
+    }
 
     # Verify the cache returns the same object
     assert await service.async_get_all_descriptions(hass) is descriptions
 
 
+async def test_async_get_all_descriptions_failing_integration(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test async_get_all_descriptions when async_get_integrations returns an exception."""
+    group = hass.components.group
+    group_config = {group.DOMAIN: {}}
+    await async_setup_component(hass, group.DOMAIN, group_config)
+    descriptions = await service.async_get_all_descriptions(hass)
+
+    assert len(descriptions) == 1
+
+    assert "description" in descriptions["group"]["reload"]
+    assert "fields" in descriptions["group"]["reload"]
+
+    logger = hass.components.logger
+    logger_config = {logger.DOMAIN: {}}
+    await async_setup_component(hass, logger.DOMAIN, logger_config)
+    with patch(
+        "homeassistant.helpers.service.async_get_integrations",
+        return_value={"logger": ImportError},
+    ):
+        descriptions = await service.async_get_all_descriptions(hass)
+
+    assert len(descriptions) == 2
+    assert "Failed to load integration: logger" in caplog.text
+
+    # Services are empty defaults if the load fails but should
+    # not raise
+    assert descriptions[logger.DOMAIN]["set_level"] == {
+        "description": "",
+        "fields": {},
+        "name": "",
+    }
+
+    hass.services.async_register(logger.DOMAIN, "new_service", lambda x: None, None)
+    service.async_set_service_schema(
+        hass, logger.DOMAIN, "new_service", {"description": "new service"}
+    )
+    descriptions = await service.async_get_all_descriptions(hass)
+    assert "description" in descriptions[logger.DOMAIN]["new_service"]
+    assert descriptions[logger.DOMAIN]["new_service"]["description"] == "new service"
+
+    hass.services.async_register(
+        logger.DOMAIN, "another_new_service", lambda x: None, None
+    )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_optional_response",
+        lambda x: None,
+        None,
+        SupportsResponse.OPTIONAL,
+    )
+    hass.services.async_register(
+        logger.DOMAIN,
+        "service_with_only_response",
+        lambda x: None,
+        None,
+        SupportsResponse.ONLY,
+    )
+
+    descriptions = await service.async_get_all_descriptions(hass)
+    assert "another_new_service" in descriptions[logger.DOMAIN]
+    assert "service_with_optional_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_optional_response"][
+        "response"
+    ] == {"optional": True}
+    assert "service_with_only_response" in descriptions[logger.DOMAIN]
+    assert descriptions[logger.DOMAIN]["service_with_only_response"]["response"] == {
+        "optional": False
+    }
+
+    # Verify the cache returns the same object
+    assert await service.async_get_all_descriptions(hass) is descriptions
+
+
+async def test_async_get_all_descriptions_dynamically_created_services(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test async_get_all_descriptions when async_get_integrations when services are dynamic."""
+    group = hass.components.group
+    group_config = {group.DOMAIN: {}}
+    await async_setup_component(hass, group.DOMAIN, group_config)
+    descriptions = await service.async_get_all_descriptions(hass)
+
+    assert len(descriptions) == 1
+
+    assert "description" in descriptions["group"]["reload"]
+    assert "fields" in descriptions["group"]["reload"]
+
+    shell_command = hass.components.shell_command
+    shell_command_config = {shell_command.DOMAIN: {"test_service": "ls /bin"}}
+    await async_setup_component(hass, shell_command.DOMAIN, shell_command_config)
+    descriptions = await service.async_get_all_descriptions(hass)
+
+    assert len(descriptions) == 2
+    assert descriptions[shell_command.DOMAIN]["test_service"] == {
+        "description": "",
+        "fields": {},
+        "name": "",
+    }
+
+
 async def test_call_with_required_features(hass: HomeAssistant, mock_entities) -> None:
     """Test service calls invoked only if entity has required features."""
     test_service_mock = AsyncMock(return_value=None)
@@ -714,7 +856,8 @@ async def test_call_context_target_all(
         return_value=Mock(
             permissions=PolicyPermissions(
                 {"entities": {"entity_ids": {"light.kitchen": True}}}, None
-            )
+            ),
+            is_admin=False,
         ),
     ):
         await service.entity_service_call(
@@ -767,7 +910,7 @@ async def test_call_context_target_specific_no_auth(
     """Check targeting specific entities without auth."""
     with pytest.raises(exceptions.Unauthorized) as err, patch(
         "homeassistant.auth.AuthManager.async_get_user",
-        return_value=Mock(permissions=PolicyPermissions({}, None)),
+        return_value=Mock(permissions=PolicyPermissions({}, None), is_admin=False),
     ):
         await service.entity_service_call(
             hass,
@@ -1214,9 +1357,9 @@ async def test_entity_service_call_warn_referenced(
     )
     await service.entity_service_call(hass, {}, "", call)
     assert (
-        "Unable to find referenced areas non-existent-area, devices"
-        " non-existent-device, entities non.existent" in caplog.text
-    )
+        "Referenced areas non-existent-area, devices non-existent-device, "
+        "entities non.existent are missing or not currently available"
+    ) in caplog.text
 
 
 async def test_async_extract_entities_warn_referenced(
@@ -1235,9 +1378,9 @@ async def test_async_extract_entities_warn_referenced(
     extracted = await service.async_extract_entities(hass, {}, call)
     assert len(extracted) == 0
     assert (
-        "Unable to find referenced areas non-existent-area, devices"
-        " non-existent-device, entities non.existent" in caplog.text
-    )
+        "Referenced areas non-existent-area, devices non-existent-device, "
+        "entities non.existent are missing or not currently available"
+    ) in caplog.text
 
 
 async def test_async_extract_config_entry_ids(hass: HomeAssistant) -> None:
diff --git a/tests/helpers/test_state.py b/tests/helpers/test_state.py
index 995305e48d19a8..1919586daa30aa 100644
--- a/tests/helpers/test_state.py
+++ b/tests/helpers/test_state.py
@@ -3,6 +3,7 @@
 from datetime import timedelta
 from unittest.mock import Mock, patch
 
+from freezegun import freeze_time
 import pytest
 
 from homeassistant.components.sun import STATE_ABOVE_HORIZON, STATE_BELOW_HORIZON
@@ -33,20 +34,17 @@ async def test_async_track_states(
     point2 = point1 + timedelta(seconds=5)
     point3 = point2 + timedelta(seconds=5)
 
-    with patch("homeassistant.core.dt_util.utcnow") as mock_utcnow:
-        mock_utcnow.return_value = point2
-
-        with state.AsyncTrackStates(hass) as states:
-            mock_utcnow.return_value = point1
-            hass.states.async_set("light.test", "on")
+    with freeze_time(point2) as freezer, state.AsyncTrackStates(hass) as states:
+        freezer.move_to(point1)
+        hass.states.async_set("light.test", "on")
 
-            mock_utcnow.return_value = point2
-            hass.states.async_set("light.test2", "on")
-            state2 = hass.states.get("light.test2")
+        freezer.move_to(point2)
+        hass.states.async_set("light.test2", "on")
+        state2 = hass.states.get("light.test2")
 
-            mock_utcnow.return_value = point3
-            hass.states.async_set("light.test3", "on")
-            state3 = hass.states.get("light.test3")
+        freezer.move_to(point3)
+        hass.states.async_set("light.test3", "on")
+        state3 = hass.states.get("light.test3")
 
     assert [state2, state3] == sorted(states, key=lambda state: state.entity_id)
 
@@ -92,15 +90,15 @@ async def test_get_changed_since(
     point2 = point1 + timedelta(seconds=5)
     point3 = point2 + timedelta(seconds=5)
 
-    with patch("homeassistant.core.dt_util.utcnow", return_value=point1):
+    with freeze_time(point1) as freezer:
         hass.states.async_set("light.test", "on")
         state1 = hass.states.get("light.test")
 
-    with patch("homeassistant.core.dt_util.utcnow", return_value=point2):
+        freezer.move_to(point2)
         hass.states.async_set("light.test2", "on")
         state2 = hass.states.get("light.test2")
 
-    with patch("homeassistant.core.dt_util.utcnow", return_value=point3):
+        freezer.move_to(point3)
         hass.states.async_set("light.test3", "on")
         state3 = hass.states.get("light.test3")
 
diff --git a/tests/helpers/test_storage.py b/tests/helpers/test_storage.py
index b60e072d2f1537..76dfbdbeb46ebb 100644
--- a/tests/helpers/test_storage.py
+++ b/tests/helpers/test_storage.py
@@ -14,7 +14,7 @@
 )
 from homeassistant.core import CoreState, HomeAssistant
 from homeassistant.helpers import storage
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 from homeassistant.util.color import RGBColor
 
 from tests.common import async_fire_time_changed, async_test_home_assistant
@@ -113,7 +113,7 @@ async def test_saving_with_delay(
     store.async_delay_save(lambda: MOCK_DATA, 1)
     assert store.key not in hass_storage
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done()
     assert hass_storage[store.key] == {
         "version": MOCK_VERSION,
@@ -135,7 +135,7 @@ async def test_saving_on_final_write(
     hass.state = CoreState.stopping
     await hass.async_block_till_done()
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=10))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=10))
     await hass.async_block_till_done()
     assert store.key not in hass_storage
 
@@ -159,7 +159,7 @@ async def test_not_delayed_saving_while_stopping(
     hass.state = CoreState.stopping
 
     store.async_delay_save(lambda: MOCK_DATA, 1)
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=2))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
     await hass.async_block_till_done()
     assert store.key not in hass_storage
 
@@ -177,7 +177,7 @@ async def test_not_delayed_saving_after_stopping(
     await hass.async_block_till_done()
     assert store.key not in hass_storage
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=15))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=15))
     await hass.async_block_till_done()
     assert store.key not in hass_storage
 
@@ -230,7 +230,7 @@ async def test_writing_while_writing_delay(
         "data": {"delay": "no"},
     }
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done()
     assert hass_storage[store.key] == {
         "version": MOCK_VERSION,
@@ -260,7 +260,7 @@ async def test_multiple_delay_save_calls(
         "data": {"delay": "no"},
     }
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done()
     assert hass_storage[store.key] == {
         "version": MOCK_VERSION,
@@ -496,7 +496,7 @@ async def test_changing_delayed_written_data(
 
     loaded_data["hello"] = "earth"
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     await hass.async_block_till_done()
     assert hass_storage[store.key] == {
         "version": MOCK_VERSION,
diff --git a/tests/helpers/test_storage_remove.py b/tests/helpers/test_storage_remove.py
index 21eabe80e45a64..e948f75ea5f1d1 100644
--- a/tests/helpers/test_storage_remove.py
+++ b/tests/helpers/test_storage_remove.py
@@ -7,7 +7,7 @@
 import py
 
 from homeassistant.helpers import storage
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, async_test_home_assistant
 
@@ -32,7 +32,7 @@ async def test_removing_while_delay_in_progress(tmpdir: py.path.local) -> None:
         await real_store.async_remove()
         assert not await hass.async_add_executor_job(os.path.exists, real_store.path)
 
-        async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
         await hass.async_block_till_done()
         assert not await hass.async_add_executor_job(os.path.exists, real_store.path)
         await hass.async_stop()
diff --git a/tests/helpers/test_template.py b/tests/helpers/test_template.py
index 73854147372357..0c3f0e4469ad35 100644
--- a/tests/helpers/test_template.py
+++ b/tests/helpers/test_template.py
@@ -3889,6 +3889,8 @@ def test_state_with_unit_and_rounding(hass: HomeAssistant) -> None:
 
     hass.states.async_set("sensor.test", "23", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
     hass.states.async_set("sensor.test2", "23", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
+    hass.states.async_set("sensor.test3", "-0.0", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
+    hass.states.async_set("sensor.test4", "-0", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
 
     # state_with_unit property
     tpl = template.Template("{{ states.sensor.test.state_with_unit }}", hass)
@@ -3905,6 +3907,8 @@ def test_state_with_unit_and_rounding(hass: HomeAssistant) -> None:
     # AllStates.__call__ and rounded=True
     tpl7 = template.Template("{{ states('sensor.test', rounded=True) }}", hass)
     tpl8 = template.Template("{{ states('sensor.test2', rounded=True) }}", hass)
+    tpl9 = template.Template("{{ states('sensor.test3', rounded=True) }}", hass)
+    tpl10 = template.Template("{{ states('sensor.test4', rounded=True) }}", hass)
 
     assert tpl.async_render() == "23.00 beers"
     assert tpl2.async_render() == "23 beers"
@@ -3914,6 +3918,8 @@ def test_state_with_unit_and_rounding(hass: HomeAssistant) -> None:
     assert tpl6.async_render() == "23 beers"
     assert tpl7.async_render() == 23.0
     assert tpl8.async_render() == 23
+    assert tpl9.async_render() == 0.0
+    assert tpl10.async_render() == 0
 
     hass.states.async_set("sensor.test", "23.015", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
     hass.states.async_set("sensor.test2", "23.015", {ATTR_UNIT_OF_MEASUREMENT: "beers"})
@@ -4527,20 +4533,22 @@ async def test_render_to_info_with_exception(hass: HomeAssistant) -> None:
 async def test_lru_increases_with_many_entities(hass: HomeAssistant) -> None:
     """Test that the template internal LRU cache increases with many entities."""
     # We do not actually want to record 4096 entities so we mock the entity count
-    mock_entity_count = 4096
+    mock_entity_count = 16
 
     assert template.CACHED_TEMPLATE_LRU.get_size() == template.CACHED_TEMPLATE_STATES
     assert (
         template.CACHED_TEMPLATE_NO_COLLECT_LRU.get_size()
         == template.CACHED_TEMPLATE_STATES
     )
+    template.CACHED_TEMPLATE_LRU.set_size(8)
+    template.CACHED_TEMPLATE_NO_COLLECT_LRU.set_size(8)
 
     template.async_setup(hass)
-    with patch.object(
-        hass.states, "async_entity_ids_count", return_value=mock_entity_count
-    ):
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
-        await hass.async_block_till_done()
+    for i in range(mock_entity_count):
+        hass.states.async_set(f"sensor.sensor{i}", "on")
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=10))
+    await hass.async_block_till_done()
 
     assert template.CACHED_TEMPLATE_LRU.get_size() == int(
         round(mock_entity_count * template.ENTITY_COUNT_GROWTH_FACTOR)
@@ -4550,9 +4558,12 @@ async def test_lru_increases_with_many_entities(hass: HomeAssistant) -> None:
     )
 
     await hass.async_stop()
-    with patch.object(hass.states, "async_entity_ids_count", return_value=8192):
-        async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=20))
-        await hass.async_block_till_done()
+
+    for i in range(mock_entity_count):
+        hass.states.async_set(f"sensor.sensor_add_{i}", "on")
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=20))
+    await hass.async_block_till_done()
 
     assert template.CACHED_TEMPLATE_LRU.get_size() == int(
         round(mock_entity_count * template.ENTITY_COUNT_GROWTH_FACTOR)
diff --git a/tests/ruff.toml b/tests/ruff.toml
index dafc6fd6ad7721..05971ce9a08e8c 100644
--- a/tests/ruff.toml
+++ b/tests/ruff.toml
@@ -10,4 +10,28 @@ extend-select = [
     "PT015", # Assertion always fails, replace with pytest.fail()
     "PT021", # use yield instead of request.addfinalizer
     "PT022", # No teardown in fixture, replace useless yield with return
+]
+
+extend-ignore = [
+    "PLC", # pylint
+    "PLE", # pylint
+    "PLR", # pylint
+    "PLW", # pylint
+    "N815", # Variable {name} in class scope should not be mixedCase
+]
+
+[isort]
+known-first-party = [
+    "homeassistant",
+    "tests",
+    "script",
+]
+known-third-party = [
+    "syrupy",
+    "pytest",
+    "voluptuous",
+    "pylint",
+]
+forced-separate = [
+    "tests",
 ]
\ No newline at end of file
diff --git a/tests/syrupy.py b/tests/syrupy.py
index af34cb628fc1ce..9433eb1649c47e 100644
--- a/tests/syrupy.py
+++ b/tests/syrupy.py
@@ -170,7 +170,7 @@ def _serializable_entity_registry_entry(
                 "config_entry_id": ANY,
                 "device_id": ANY,
                 "id": ANY,
-                "options": data.options.as_dict(),
+                "options": {k: dict(v) for k, v in data.options.items()},
             }
         )
         serialized.pop("_partial_repr")
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 53602ec28ff637..68e6fc59987e31 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -31,7 +31,6 @@
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.setup import async_set_domains_to_be_loaded, async_setup_component
-from homeassistant.util import dt
 import homeassistant.util.dt as dt_util
 
 from .common import (
@@ -46,6 +45,8 @@
     mock_integration,
 )
 
+from tests.common import async_get_persistent_notifications
+
 
 @pytest.fixture(autouse=True)
 def mock_handlers() -> Generator[None, None, None]:
@@ -67,9 +68,10 @@ async def async_step_reauth(self, data):
 
 
 @pytest.fixture
-def manager(hass: HomeAssistant) -> config_entries.ConfigEntries:
+async def manager(hass: HomeAssistant) -> config_entries.ConfigEntries:
     """Fixture of a loaded config manager."""
     manager = config_entries.ConfigEntries(hass, {})
+    await manager.async_initialize()
     hass.config_entries = manager
     return manager
 
@@ -648,7 +650,7 @@ async def async_step_user(self, user_input=None):
     )
 
     # To trigger the call_later
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(seconds=1))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
     # To execute the save
     await hass.async_block_till_done()
 
@@ -711,7 +713,9 @@ async def test_forward_entry_does_not_setup_entry_if_setup_fails(
     assert len(mock_setup_entry.mock_calls) == 0
 
 
-async def test_discovery_notification(hass: HomeAssistant) -> None:
+async def test_discovery_notification(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test that we create/dismiss a notification when source is discovery."""
     mock_integration(hass, MockModule("test"))
     mock_entity_platform(hass, "config_flow.test", None)
@@ -733,14 +737,16 @@ async def async_step_discovery_confirm(self, discovery_info):
                     title="Test Title", data={"token": "abcd"}
                 )
 
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" not in notifications
+
         # Start first discovery flow to assert that reconfigure notification fires
         flow1 = await hass.config_entries.flow.async_init(
             "test", context={"source": config_entries.SOURCE_DISCOVERY}
         )
-
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_discovery")
-        assert state is not None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" in notifications
 
         # Start a second discovery flow so we can finish the first and assert that
         # the discovery notification persists until the second one is complete
@@ -752,15 +758,15 @@ async def async_step_discovery_confirm(self, discovery_info):
         assert flow1["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_discovery")
-        assert state is not None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" in notifications
 
         flow2 = await hass.config_entries.flow.async_configure(flow2["flow_id"], {})
         assert flow2["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_discovery")
-        assert state is None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" not in notifications
 
 
 async def test_reauth_notification(hass: HomeAssistant) -> None:
@@ -797,8 +803,8 @@ async def async_step_reauth_confirm(self, user_input):
         )
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_reconfigure")
-        assert state is None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_reconfigure" not in notifications
 
         # Start first reauth flow to assert that reconfigure notification fires
         flow1 = await hass.config_entries.flow.async_init(
@@ -806,8 +812,8 @@ async def async_step_reauth_confirm(self, user_input):
         )
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_reconfigure")
-        assert state is not None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_reconfigure" in notifications
 
         # Start a second reauth flow so we can finish the first and assert that
         # the reconfigure notification persists until the second one is complete
@@ -819,15 +825,15 @@ async def async_step_reauth_confirm(self, user_input):
         assert flow1["type"] == data_entry_flow.FlowResultType.ABORT
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_reconfigure")
-        assert state is not None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_reconfigure" in notifications
 
         flow2 = await hass.config_entries.flow.async_configure(flow2["flow_id"], {})
         assert flow2["type"] == data_entry_flow.FlowResultType.ABORT
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_reconfigure")
-        assert state is None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_reconfigure" not in notifications
 
 
 async def test_discovery_notification_not_created(hass: HomeAssistant) -> None:
@@ -1049,7 +1055,9 @@ async def test_setup_does_not_retry_during_shutdown(hass: HomeAssistant) -> None
     assert len(mock_setup_entry.mock_calls) == 1
 
 
-async def test_create_entry_options(hass: HomeAssistant) -> None:
+async def test_create_entry_options(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test a config entry being created with options."""
 
     async def mock_async_setup(hass, config):
@@ -1607,7 +1615,8 @@ async def test_reload_entry_entity_registry_works(
 
     async_fire_time_changed(
         hass,
-        dt.utcnow() + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
+        dt_util.utcnow()
+        + timedelta(seconds=config_entries.RELOAD_AFTER_UPDATE_DELAY + 1),
     )
     await hass.async_block_till_done()
 
@@ -2461,8 +2470,8 @@ async def async_step_discovery(self, discovery_info):
         assert len(hass.config_entries.flow.async_progress()) == 0
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_discovery")
-        assert state is None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" not in notifications
 
         # Let the flow init complete
         pause_discovery.set()
@@ -2474,11 +2483,13 @@ async def async_step_discovery(self, discovery_info):
         assert len(hass.config_entries.flow.async_progress()) == 1
 
         await hass.async_block_till_done()
-        state = hass.states.get("persistent_notification.config_entry_discovery")
-        assert state is not None
+        notifications = async_get_persistent_notifications(hass)
+        assert "config_entry_discovery" in notifications
 
 
-async def test_async_setup_init_entry(hass: HomeAssistant) -> None:
+async def test_async_setup_init_entry(
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
+) -> None:
     """Test a config entry being initialized during integration setup."""
 
     async def mock_async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -2523,7 +2534,7 @@ async def async_step_import(self, user_input):
 
 
 async def test_async_setup_init_entry_completes_before_loaded_event_fires(
-    hass: HomeAssistant,
+    hass: HomeAssistant, manager: config_entries.ConfigEntries
 ) -> None:
     """Test a config entry being initialized during integration setup before the loaded event fires."""
     load_events: list[Event] = []
@@ -3299,7 +3310,7 @@ async def test_setup_retrying_during_shutdown(hass: HomeAssistant) -> None:
 
     assert len(mock_call.return_value.mock_calls) == 0
 
-    async_fire_time_changed(hass, dt.utcnow() + timedelta(hours=4))
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(hours=4))
     await hass.async_block_till_done()
 
     assert len(mock_call.return_value.mock_calls) == 0
diff --git a/tests/test_core.py b/tests/test_core.py
index 5cb92ffe5c92d7..7e0766c8ac5fbc 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -9,10 +9,12 @@
 import logging
 import os
 from tempfile import TemporaryDirectory
+import threading
 import time
 from typing import Any
 from unittest.mock import MagicMock, Mock, PropertyMock, patch
 
+import async_timeout
 import pytest
 import voluptuous as vol
 
@@ -33,8 +35,17 @@
     __version__,
 )
 import homeassistant.core as ha
-from homeassistant.core import HassJob, HomeAssistant, State
+from homeassistant.core import (
+    HassJob,
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    State,
+    SupportsResponse,
+    callback,
+)
 from homeassistant.exceptions import (
+    HomeAssistantError,
     InvalidEntityFormatError,
     InvalidStateError,
     MaxLengthExceeded,
@@ -194,6 +205,184 @@ def job():
     assert len(hass.async_add_hass_job.mock_calls) == 1
 
 
+async def test_async_get_hass_can_be_called(hass: HomeAssistant) -> None:
+    """Test calling async_get_hass via different paths.
+
+    The test asserts async_get_hass can be called from:
+    - Coroutines and callbacks
+    - Callbacks scheduled from callbacks, coroutines and threads
+    - Coroutines scheduled from callbacks, coroutines and threads
+
+    The test also asserts async_get_hass can not be called from threads
+    other than the event loop.
+    """
+    task_finished = asyncio.Event()
+
+    def can_call_async_get_hass() -> bool:
+        """Test if it's possible to call async_get_hass."""
+        try:
+            if ha.async_get_hass() is hass:
+                return True
+            raise Exception
+        except HomeAssistantError:
+            return False
+
+        raise Exception
+
+    # Test scheduling a coroutine which calls async_get_hass via hass.async_create_task
+    async def _async_create_task() -> None:
+        task_finished.set()
+        assert can_call_async_get_hass()
+
+    hass.async_create_task(_async_create_task(), "create_task")
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a callback which calls async_get_hass via hass.async_add_job
+    @callback
+    def _add_job() -> None:
+        assert can_call_async_get_hass()
+        task_finished.set()
+
+    hass.async_add_job(_add_job)
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a callback which calls async_get_hass from a callback
+    @callback
+    def _schedule_callback_from_callback() -> None:
+        @callback
+        def _callback():
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the scheduled callback itself can call async_get_hass
+        assert can_call_async_get_hass()
+        hass.async_add_job(_callback)
+
+    _schedule_callback_from_callback()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a coroutine which calls async_get_hass from a callback
+    @callback
+    def _schedule_coroutine_from_callback() -> None:
+        async def _coroutine():
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the scheduled callback itself can call async_get_hass
+        assert can_call_async_get_hass()
+        hass.async_add_job(_coroutine())
+
+    _schedule_coroutine_from_callback()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a callback which calls async_get_hass from a coroutine
+    async def _schedule_callback_from_coroutine() -> None:
+        @callback
+        def _callback():
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the coroutine itself can call async_get_hass
+        assert can_call_async_get_hass()
+        hass.async_add_job(_callback)
+
+    await _schedule_callback_from_coroutine()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a coroutine which calls async_get_hass from a coroutine
+    async def _schedule_callback_from_coroutine() -> None:
+        async def _coroutine():
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the coroutine itself can call async_get_hass
+        assert can_call_async_get_hass()
+        await hass.async_create_task(_coroutine())
+
+    await _schedule_callback_from_coroutine()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a callback which calls async_get_hass from an executor
+    def _async_add_executor_job_add_job() -> None:
+        @callback
+        def _async_add_job():
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the executor itself can not call async_get_hass
+        assert not can_call_async_get_hass()
+        hass.add_job(_async_add_job)
+
+    await hass.async_add_executor_job(_async_add_executor_job_add_job)
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a coroutine which calls async_get_hass from an executor
+    def _async_add_executor_job_create_task() -> None:
+        async def _async_create_task() -> None:
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        # Test the executor itself can not call async_get_hass
+        assert not can_call_async_get_hass()
+        hass.create_task(_async_create_task())
+
+    await hass.async_add_executor_job(_async_add_executor_job_create_task)
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+
+    # Test scheduling a callback which calls async_get_hass from a worker thread
+    class MyJobAddJob(threading.Thread):
+        @callback
+        def _my_threaded_job_add_job(self) -> None:
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        def run(self) -> None:
+            # Test the worker thread itself can not call async_get_hass
+            assert not can_call_async_get_hass()
+            hass.add_job(self._my_threaded_job_add_job)
+
+    my_job_add_job = MyJobAddJob()
+    my_job_add_job.start()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+    my_job_add_job.join()
+
+    # Test scheduling a coroutine which calls async_get_hass from a worker thread
+    class MyJobCreateTask(threading.Thread):
+        async def _my_threaded_job_create_task(self) -> None:
+            assert can_call_async_get_hass()
+            task_finished.set()
+
+        def run(self) -> None:
+            # Test the worker thread itself can not call async_get_hass
+            assert not can_call_async_get_hass()
+            hass.create_task(self._my_threaded_job_create_task())
+
+    my_job_create_task = MyJobCreateTask()
+    my_job_create_task.start()
+    async with async_timeout.timeout(1):
+        await task_finished.wait()
+    task_finished.clear()
+    my_job_create_task.join()
+
+
 async def test_stage_shutdown(hass: HomeAssistant) -> None:
     """Simulate a shutdown, test calling stuff."""
     test_stop = async_capture_events(hass, EVENT_HOMEASSISTANT_STOP)
@@ -957,9 +1146,7 @@ async def test_serviceregistry_call_with_blocking_done_in_time(
     assert registered_events[0].data["domain"] == "test_domain"
     assert registered_events[0].data["service"] == "register_calls"
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -981,9 +1168,7 @@ async def service_handler(call):
 
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1000,9 +1185,7 @@ async def service_handler(call):
     )
     await hass.async_block_till_done()
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1017,9 +1200,7 @@ def service_handler(call):
 
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
-    assert await hass.services.async_call(
-        "test_domain", "REGISTER_CALLS", blocking=True
-    )
+    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
     assert len(calls) == 1
 
 
@@ -1063,12 +1244,10 @@ async def service_handler(_):
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
-            "test_domain", "REGISTER_CALLS", blocking=True
-        )
+        await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
 
     # Non-blocking service call never throw exception
-    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
+    hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
     await hass.async_block_till_done()
 
 
@@ -1085,13 +1264,166 @@ def service_handler(_):
     hass.services.async_register("test_domain", "register_calls", service_handler)
 
     with pytest.raises(ValueError):
-        assert await hass.services.async_call(
-            "test_domain", "REGISTER_CALLS", blocking=True
-        )
+        await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=True)
 
     # Non-blocking service call never throw exception
-    await hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
+    hass.services.async_call("test_domain", "REGISTER_CALLS", blocking=False)
+    await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    "supports_response",
+    [
+        SupportsResponse.ONLY,
+        SupportsResponse.OPTIONAL,
+    ],
+)
+async def test_serviceregistry_async_return_response(
+    hass: HomeAssistant, supports_response: SupportsResponse
+) -> None:
+    """Test service call for a service that returns response data."""
+
+    async def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        assert call.return_response
+        return {"test-reply": "test-value1"}
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=supports_response,
+    )
+    result = await hass.services.async_call(
+        "test_domain",
+        "test_service",
+        service_data={},
+        blocking=True,
+        return_response=True,
+    )
     await hass.async_block_till_done()
+    assert result == {"test-reply": "test-value1"}
+
+
+async def test_services_call_return_response_requires_blocking(
+    hass: HomeAssistant,
+) -> None:
+    """Test that non-blocking service calls cannot ask for response data."""
+    async_mock_service(hass, "test_domain", "test_service")
+    with pytest.raises(ValueError, match="when blocking=False"):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=False,
+            return_response=True,
+        )
+
+
+@pytest.mark.parametrize(
+    ("response_data", "expected_error"),
+    [
+        (True, "expected a dictionary"),
+        (False, "expected a dictionary"),
+        (None, "expected a dictionary"),
+        ("some-value", "expected a dictionary"),
+        (["some-list"], "expected a dictionary"),
+    ],
+)
+async def test_serviceregistry_return_response_invalid(
+    hass: HomeAssistant, response_data: Any, expected_error: str
+) -> None:
+    """Test service call response data must be json serializable objects."""
+
+    def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        assert call.return_response
+        return response_data
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=SupportsResponse.ONLY,
+    )
+    with pytest.raises(HomeAssistantError, match=expected_error):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=True,
+            return_response=True,
+        )
+        await hass.async_block_till_done()
+
+
+@pytest.mark.parametrize(
+    ("supports_response", "return_response", "expected_error"),
+    [
+        (SupportsResponse.NONE, True, "not support responses"),
+        (SupportsResponse.ONLY, False, "caller did not ask for responses"),
+    ],
+)
+async def test_serviceregistry_return_response_arguments(
+    hass: HomeAssistant,
+    supports_response: SupportsResponse,
+    return_response: bool,
+    expected_error: str,
+) -> None:
+    """Test service call response data invalid arguments."""
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        "service_handler",
+        supports_response=supports_response,
+    )
+
+    with pytest.raises(ValueError, match=expected_error):
+        await hass.services.async_call(
+            "test_domain",
+            "test_service",
+            service_data={},
+            blocking=True,
+            return_response=return_response,
+        )
+
+
+@pytest.mark.parametrize(
+    ("return_response", "expected_response_data"),
+    [
+        (True, {"key": "value"}),
+        (False, None),
+    ],
+)
+async def test_serviceregistry_return_response_optional(
+    hass: HomeAssistant,
+    return_response: bool,
+    expected_response_data: Any,
+) -> None:
+    """Test optional service call response data."""
+
+    def service_handler(call: ServiceCall) -> ServiceResponse:
+        """Service handler coroutine."""
+        if call.return_response:
+            return {"key": "value"}
+        return None
+
+    hass.services.async_register(
+        "test_domain",
+        "test_service",
+        service_handler,
+        supports_response=SupportsResponse.OPTIONAL,
+    )
+    response_data = await hass.services.async_call(
+        "test_domain",
+        "test_service",
+        service_data={},
+        blocking=True,
+        return_response=return_response,
+    )
+    await hass.async_block_till_done()
+    assert response_data == expected_response_data
 
 
 async def test_config_defaults() -> None:
@@ -1359,42 +1691,6 @@ async def service_handler(call):
     assert len(runs) == 3
 
 
-@pytest.mark.parametrize("cancel_call", [True, False])
-async def test_cancel_service_task(hass: HomeAssistant, cancel_call) -> None:
-    """Test cancellation."""
-    service_called = asyncio.Event()
-    service_cancelled = False
-
-    async def service_handler(call):
-        nonlocal service_cancelled
-        service_called.set()
-        try:
-            await asyncio.sleep(10)
-        except asyncio.CancelledError:
-            service_cancelled = True
-            raise
-
-    hass.services.async_register("test_domain", "test_service", service_handler)
-    call_task = hass.async_create_task(
-        hass.services.async_call("test_domain", "test_service", blocking=True)
-    )
-
-    tasks_1 = asyncio.all_tasks()
-    await asyncio.wait_for(service_called.wait(), timeout=1)
-    tasks_2 = asyncio.all_tasks() - tasks_1
-    assert len(tasks_2) == 1
-    service_task = tasks_2.pop()
-
-    if cancel_call:
-        call_task.cancel()
-    else:
-        service_task.cancel()
-    with pytest.raises(asyncio.CancelledError):
-        await call_task
-
-    assert service_cancelled
-
-
 def test_valid_entity_id() -> None:
     """Test valid entity ID."""
     for invalid in [
diff --git a/tests/test_data_entry_flow.py b/tests/test_data_entry_flow.py
index c3afc3bc8ba06d..168f97ba779afc 100644
--- a/tests/test_data_entry_flow.py
+++ b/tests/test_data_entry_flow.py
@@ -462,6 +462,22 @@ async def async_step_init(self, user_input=None):
     assert result["progress_action"] == "task_one"
     assert len(manager.async_progress()) == 1
     assert len(manager.async_progress_by_handler("test")) == 1
+    assert (
+        len(
+            manager.async_progress_by_handler(
+                "test", match_context={"source": config_entries.SOURCE_HOMEKIT}
+            )
+        )
+        == 1
+    )
+    assert (
+        len(
+            manager.async_progress_by_handler(
+                "test", match_context={"source": config_entries.SOURCE_BLUETOOTH}
+            )
+        )
+        == 0
+    )
     assert manager.async_get(result["flow_id"])["handler"] == "test"
 
     assert (
diff --git a/tests/test_loader.py b/tests/test_loader.py
index a591ccbb204e52..6e62be08f66a6e 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -8,7 +8,7 @@
 from homeassistant.components.hue import light as hue_light
 from homeassistant.core import HomeAssistant, callback
 
-from .common import MockModule, mock_integration
+from .common import MockModule, async_get_persistent_notifications, mock_integration
 
 
 async def test_component_dependencies(hass: HomeAssistant) -> None:
@@ -61,7 +61,8 @@ async def test_component_wrapper(hass: HomeAssistant) -> None:
     components = loader.Components(hass)
     components.persistent_notification.async_create("message")
 
-    assert len(hass.states.async_entity_ids("persistent_notification")) == 1
+    notifications = async_get_persistent_notifications(hass)
+    assert len(notifications)
 
 
 async def test_helpers_wrapper(hass: HomeAssistant) -> None:
diff --git a/tests/test_setup.py b/tests/test_setup.py
index a624929d8ff42d..eb4c645ecb1221 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -728,3 +728,57 @@ async def test_async_start_setup_platforms(hass: HomeAssistant) -> None:
     assert "august" not in hass.data[setup.DATA_SETUP_STARTED]
     assert isinstance(hass.data[setup.DATA_SETUP_TIME]["august"], datetime.timedelta)
     assert "sensor" not in hass.data[setup.DATA_SETUP_TIME]
+
+
+async def test_setup_config_entry_from_yaml(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test attempting to setup an integration which only supports config_entries."""
+    expected_warning = (
+        "The test_integration_only_entry integration does not support YAML setup, "
+        "please remove it from your configuration"
+    )
+
+    mock_integration(
+        hass,
+        MockModule(
+            "test_integration_only_entry",
+            setup=False,
+            async_setup_entry=AsyncMock(return_value=True),
+        ),
+    )
+
+    assert await setup.async_setup_component(hass, "test_integration_only_entry", {})
+    assert expected_warning not in caplog.text
+    caplog.clear()
+    hass.data.pop(setup.DATA_SETUP)
+    hass.config.components.remove("test_integration_only_entry")
+
+    # There should be a warning, but setup should not fail
+    assert await setup.async_setup_component(
+        hass, "test_integration_only_entry", {"test_integration_only_entry": None}
+    )
+    assert expected_warning in caplog.text
+    caplog.clear()
+    hass.data.pop(setup.DATA_SETUP)
+    hass.config.components.remove("test_integration_only_entry")
+
+    # There should be a warning, but setup should not fail
+    assert await setup.async_setup_component(
+        hass, "test_integration_only_entry", {"test_integration_only_entry": {}}
+    )
+    assert expected_warning in caplog.text
+    caplog.clear()
+    hass.data.pop(setup.DATA_SETUP)
+    hass.config.components.remove("test_integration_only_entry")
+
+    # There should be a warning, but setup should not fail
+    assert await setup.async_setup_component(
+        hass,
+        "test_integration_only_entry",
+        {"test_integration_only_entry": {"hello": "world"}},
+    )
+    assert expected_warning in caplog.text
+    caplog.clear()
+    hass.data.pop(setup.DATA_SETUP)
+    hass.config.components.remove("test_integration_only_entry")
diff --git a/tests/testing_config/custom_components/test/datetime.py b/tests/testing_config/custom_components/test/datetime.py
new file mode 100644
index 00000000000000..7fca8d5788141d
--- /dev/null
+++ b/tests/testing_config/custom_components/test/datetime.py
@@ -0,0 +1,50 @@
+"""Provide a mock time platform.
+
+Call init before using it in your tests to ensure clean test data.
+"""
+from datetime import datetime, timezone
+
+from homeassistant.components.datetime import DateTimeEntity
+
+from tests.common import MockEntity
+
+UNIQUE_DATETIME = "unique_datetime"
+
+ENTITIES = []
+
+
+class MockDateTimeEntity(MockEntity, DateTimeEntity):
+    """Mock date/time class."""
+
+    @property
+    def native_value(self):
+        """Return the native value of this date/time."""
+        return self._handle("native_value")
+
+    def set_value(self, value: datetime) -> None:
+        """Change the time."""
+        self._values["native_value"] = value
+
+
+def init(empty=False):
+    """Initialize the platform with entities."""
+    global ENTITIES
+
+    ENTITIES = (
+        []
+        if empty
+        else [
+            MockDateTimeEntity(
+                name="test",
+                unique_id=UNIQUE_DATETIME,
+                native_value=datetime(2020, 1, 1, 1, 2, 3, tzinfo=timezone.utc),
+            ),
+        ]
+    )
+
+
+async def async_setup_platform(
+    hass, config, async_add_entities_callback, discovery_info=None
+):
+    """Return mock entities."""
+    async_add_entities_callback(ENTITIES)
diff --git a/tests/testing_config/custom_components/test/weather.py b/tests/testing_config/custom_components/test/weather.py
index a2977e114e4078..a5c49fb92c2473 100644
--- a/tests/testing_config/custom_components/test/weather.py
+++ b/tests/testing_config/custom_components/test/weather.py
@@ -5,10 +5,15 @@
 from __future__ import annotations
 
 from homeassistant.components.weather import (
+    ATTR_FORECAST_CLOUD_COVERAGE,
+    ATTR_FORECAST_HUMIDITY,
+    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
+    ATTR_FORECAST_NATIVE_DEW_POINT,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_PRESSURE,
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
+    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
     ATTR_FORECAST_PRECIPITATION,
     ATTR_FORECAST_PRESSURE,
@@ -46,6 +51,16 @@ def native_temperature(self) -> float | None:
         """Return the platform temperature."""
         return self._handle("native_temperature")
 
+    @property
+    def native_apparent_temperature(self) -> float | None:
+        """Return the platform apparent temperature."""
+        return self._handle("native_apparent_temperature")
+
+    @property
+    def native_dew_point(self) -> float | None:
+        """Return the platform dewpoint temperature."""
+        return self._handle("native_dew_point")
+
     @property
     def native_temperature_unit(self) -> str | None:
         """Return the unit of measurement for temperature."""
@@ -66,6 +81,11 @@ def humidity(self) -> float | None:
         """Return the humidity."""
         return self._handle("humidity")
 
+    @property
+    def native_wind_gust_speed(self) -> float | None:
+        """Return the wind speed."""
+        return self._handle("native_wind_gust_speed")
+
     @property
     def native_wind_speed(self) -> float | None:
         """Return the wind speed."""
@@ -86,6 +106,11 @@ def ozone(self) -> float | None:
         """Return the ozone level."""
         return self._handle("ozone")
 
+    @property
+    def cloud_coverage(self) -> float | None:
+        """Return the cloud coverage in %."""
+        return self._handle("cloud_coverage")
+
     @property
     def native_visibility(self) -> float | None:
         """Return the visibility."""
@@ -195,13 +220,18 @@ def forecast(self) -> list[Forecast] | None:
         return [
             {
                 ATTR_FORECAST_NATIVE_TEMP: self.native_temperature,
+                ATTR_FORECAST_NATIVE_APPARENT_TEMP: self.native_apparent_temperature,
                 ATTR_FORECAST_NATIVE_TEMP_LOW: self.native_temperature,
+                ATTR_FORECAST_NATIVE_DEW_POINT: self.native_dew_point,
+                ATTR_FORECAST_CLOUD_COVERAGE: self.cloud_coverage,
                 ATTR_FORECAST_NATIVE_PRESSURE: self.native_pressure,
+                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: self.native_wind_gust_speed,
                 ATTR_FORECAST_NATIVE_WIND_SPEED: self.native_wind_speed,
                 ATTR_FORECAST_WIND_BEARING: self.wind_bearing,
                 ATTR_FORECAST_NATIVE_PRECIPITATION: self._values.get(
                     "native_precipitation"
                 ),
+                ATTR_FORECAST_HUMIDITY: self.humidity,
             }
         ]
 
diff --git a/tests/util/test_language.py b/tests/util/test_language.py
index 41f3ef4b301b82..cc4e5d66c316f5 100644
--- a/tests/util/test_language.py
+++ b/tests/util/test_language.py
@@ -226,3 +226,39 @@ def test_no_nb_prefer_exact_regions() -> None:
         "no-AA",
         ["en-US", "en-GB", "no-AA", "nb-AA"],
     ) == ["no-AA", "nb-AA"]
+
+
+def test_he_iw_same() -> None:
+    """Test that the he/iw are interchangeable."""
+    assert language.matches(
+        "he",
+        ["en-US", "en-GB", "iw"],
+    ) == ["iw"]
+    assert language.matches(
+        "iw",
+        ["en-US", "en-GB", "he"],
+    ) == ["he"]
+
+
+def test_he_iw_prefer_exact() -> None:
+    """Test that the exact language is preferred even if an interchangeable language is available."""
+    assert language.matches(
+        "he",
+        ["en-US", "en-GB", "iw", "he"],
+    ) == ["he", "iw"]
+    assert language.matches(
+        "he",
+        ["en-US", "en-GB", "he", "iw"],
+    ) == ["he", "iw"]
+
+
+def test_he_iw_prefer_exact_regions() -> None:
+    """Test that the exact language/region is preferred."""
+    assert language.matches(
+        "he-IL",
+        ["en-US", "en-GB", "iw-IL", "he-IL"],
+    ) == ["he-IL", "iw-IL"]
+    assert language.matches(
+        "he-IL",
+        ["en-US", "en-GB", "he-IL", "iw-IL"],
+    ) == ["he-IL", "iw-IL"]
diff --git a/tests/util/test_process.py b/tests/util/test_process.py
index 243e9f53fca19f..ae28f5d82fc106 100644
--- a/tests/util/test_process.py
+++ b/tests/util/test_process.py
@@ -12,7 +12,7 @@ async def test_kill_process() -> None:
     """Test killing a process."""
     sleeper = subprocess.Popen(
         "sleep 1000",
-        shell=True,  # nosec # shell by design
+        shell=True,  # noqa: S602 # shell by design
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL,
     )
diff --git a/tests/util/test_unit_conversion.py b/tests/util/test_unit_conversion.py
index 1aea64201b5316..18f0c9a12c17c3 100644
--- a/tests/util/test_unit_conversion.py
+++ b/tests/util/test_unit_conversion.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import inspect
+from itertools import chain
 
 import pytest
 
@@ -534,6 +535,86 @@ def test_unit_conversion(
     assert converter.convert(value, from_unit, to_unit) == pytest.approx(expected)
 
 
+@pytest.mark.parametrize(
+    ("converter", "value", "from_unit", "expected", "to_unit"),
+    [
+        # Process all items in _CONVERTED_VALUE
+        (converter, value, from_unit, expected, to_unit)
+        for converter, item in _CONVERTED_VALUE.items()
+        for value, from_unit, expected, to_unit in item
+    ],
+)
+def test_unit_conversion_factory(
+    converter: type[BaseUnitConverter],
+    value: float,
+    from_unit: str,
+    expected: float,
+    to_unit: str,
+) -> None:
+    """Test conversion to other units."""
+    assert converter.converter_factory(from_unit, to_unit)(value) == pytest.approx(
+        expected
+    )
+
+
+def test_unit_conversion_factory_allow_none_with_none() -> None:
+    """Test test_unit_conversion_factory_allow_none with None."""
+    assert (
+        SpeedConverter.converter_factory_allow_none(
+            UnitOfSpeed.FEET_PER_SECOND, UnitOfSpeed.FEET_PER_SECOND
+        )(1)
+        == 1
+    )
+    assert (
+        SpeedConverter.converter_factory_allow_none(
+            UnitOfSpeed.FEET_PER_SECOND, UnitOfSpeed.FEET_PER_SECOND
+        )(None)
+        is None
+    )
+    assert (
+        TemperatureConverter.converter_factory_allow_none(
+            UnitOfTemperature.CELSIUS, UnitOfTemperature.CELSIUS
+        )(1)
+        == 1
+    )
+    assert (
+        TemperatureConverter.converter_factory_allow_none(
+            UnitOfTemperature.CELSIUS, UnitOfTemperature.CELSIUS
+        )(None)
+        is None
+    )
+
+
+@pytest.mark.parametrize(
+    ("converter", "value", "from_unit", "expected", "to_unit"),
+    chain(
+        [
+            # Process all items in _CONVERTED_VALUE
+            (converter, value, from_unit, expected, to_unit)
+            for converter, item in _CONVERTED_VALUE.items()
+            for value, from_unit, expected, to_unit in item
+        ],
+        [
+            # Process all items in _CONVERTED_VALUE and replace the value with None
+            (converter, None, from_unit, None, to_unit)
+            for converter, item in _CONVERTED_VALUE.items()
+            for value, from_unit, expected, to_unit in item
+        ],
+    ),
+)
+def test_unit_conversion_factory_allow_none(
+    converter: type[BaseUnitConverter],
+    value: float,
+    from_unit: str,
+    expected: float,
+    to_unit: str,
+) -> None:
+    """Test conversion to other units."""
+    assert converter.converter_factory_allow_none(from_unit, to_unit)(
+        value
+    ) == pytest.approx(expected)
+
+
 @pytest.mark.parametrize(
     ("value", "from_unit", "expected", "to_unit"),
     [